RHEL/Fedora/MGA/MDV/Suse: update extras for TDE 3.5.13.1

author: Francois Andriot <francois.andriot@free.fr> 2012-10-21 19:23:00 +0200
committer: Francois Andriot <francois.andriot@free.fr> 2012-10-21 19:23:00 +0200
commit: 59daf455b483742c6c47099652117074df37889a (patch)
tree: 5271c465e9468df4e8fe1814bdb413164b40823e /redhat/extras
parent: 7834467b40a454432c3f8d84b6b43e299afe4933 (diff)
download: tde-packaging-59daf455b483742c6c47099652117074df37889a.tar.gz
tde-packaging-59daf455b483742c6c47099652117074df37889a.zip
46 files changed, 11350 insertions, 1557 deletions
diff --git a/redhat/extras/akode/akode-autotools.patch b/redhat/extras/akode/akode-autotools.patch
index a5450a5c1..aa54459ce 100644
--- a/redhat/extras/akode/akode-autotools.patch
+++ b/redhat/extras/akode/akode-autotools.patch
@@ -5,7 +5,7 @@
      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[01]*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;
diff --git a/redhat/extras/akode/trinity-akode-3.5.13.1.spec b/redhat/extras/akode/trinity-akode-3.5.13.1.spec
new file mode 100644
index 000000000..2d1d9706c
--- /dev/null
+++ b/redhat/extras/akode/trinity-akode-3.5.13.1.spec
@@ -0,0 +1,270 @@
+# 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}
+
+Summary: Audio-decoding framework 
+Name:	 trinity-akode 
+Version: 2.0.2
+Release:	3%{?dist}%{?_variant}
+
+License: LGPLv2+
+Group: 	 System Environment/Libraries
+#URL:	 http://carewolf.com/akode/  
+URL:	 http://www.kde-apps.org/content/show.php?content=30375
+Source0: http://www.kde-apps.org/CONTENT/content-files/akode-%{version}.tar.bz2
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+# Legacy Fedora 9 patches
+Patch1: akode-pulseaudio.patch
+Patch2: akode-2.0.2-multilib.patch
+Patch3: akode-2.0.2-flac113-portable.patch
+Patch4: akode-2.0.2-gcc43.patch
+
+# New patch for Fedora 16 / TDE 3.5.13
+Patch10: akode-autotools.patch
+Patch11: akode-2.0.2-fix_ffmpeg_include.patch
+
+# Optional features that are always enabled :-)
+%define _with_flac --with-flac
+
+#  Except on RHEL4 ...
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define _with_jack --with-jack
+%define _with_libsamplerate --with-libsamplerate
+%endif
+
+# Pulseaudio is not available on RHEL 5 and earlier
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define _with_pulseaudio --with-pulseaudio
+%endif
+
+BuildRequires: automake libtool
+BuildRequires: alsa-lib-devel
+%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
+BuildRequires: libvorbis-devel
+BuildRequires: speex-devel
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%{?_with_jack:BuildRequires: %{_lib}jack-devel}
+%{?_with_flac:BuildRequires: %{_lib}flac-devel}
+%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+%{?_with_flac:BuildRequires: flac-devel}
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
+%endif
+%if 0%{?suse_version}
+%{?_with_flac:BuildRequires: flac-devel}
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
+%endif
+
+
+%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).
+
+%package devel
+Summary: Headers for developing programs that will use %{name} 
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+%description devel
+%{summary}.
+
+%package jack 
+Summary: Jack audio output backend for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description jack 
+%{summary}.
+
+%package pulseaudio
+Summary: Pulseaudio output backend for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description pulseaudio
+%{summary}.
+Recommended for network transparent audio.
+
+# Packaged separately to keep main/core %{akode} package LGPL-clean.
+%package libsamplerate 
+Summary: Resampler based on libsamplerate for %{name}
+Group:   Development/Libraries
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+%description libsamplerate 
+%{summary}.
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n akode-%{version}
+
+%patch1 -p1 -b .pulseaudio
+%patch2 -p1 -b .multilib
+%patch3 -p4 -b .flac113_portable
+%patch4 -p1 -b .gcc43
+
+%patch10 -p1
+%patch11 -p1 -b .ffmpeg
+
+# 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 cvs
+
+%build
+%configure \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --includedir=%{tde_includedir} \
+  --datadir=%{tde_datadir} \
+  --disable-static \
+  --enable-shared \
+  --disable-debug --disable-warnings --disable-dependency-tracking \
+  --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 \
+  --without-libmad \
+  --enable-closure \
+  --enable-new-ldflags \
+  --enable-final
+
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+
+%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} 
+
+
+%post
+/sbin/ldconfig
+
+%postun 
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+
+%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
+
+#files -libmad
+#   /opt/trinity/lib64/libakode_mpeg_decoder.la
+#   /opt/trinity/lib64/libakode_mpeg_decoder.so
+
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/akode-config
+%{tde_includedir}/*
+%{tde_libdir}/libakode.la
+%{tde_libdir}/libakode.so
+%{tde_libdir}/pkgconfig/*.pc
+
+%if "%{?_with_jack}" != ""
+%files jack 
+%defattr(-,root,root,-)
+%{tde_libdir}/libakode_jack_sink.la
+%{tde_libdir}/libakode_jack_sink.so
+%endif
+
+# License: GPLv2+
+%if "%{?_with_libsamplerate:1}" == "1"
+%files libsamplerate
+%defattr(-,root,root,-)
+%{tde_libdir}/libakode_src_resampler.la
+%{tde_libdir}/libakode_src_resampler.so
+%endif
+
+%if "%{?_with_pulseaudio:1}" == "1"
+%files pulseaudio
+%defattr(-,root,root,-)
+%{tde_libdir}/libakode_polyp_sink.la
+%{tde_libdir}/libakode_polyp_sink.so
+%endif
+
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
+- Initial build for TDE 3.5.13.1
+
+* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
+- Re-adds '.la' files
+
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
+- Port to TDE 3.5.13
+- Based on spec file from Fedora 9 'akode-2.0.2-5'
diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode-3.5.13.spec
index 88875ec99..d7bb760e2 100644
--- a/redhat/extras/akode/trinity-akode.spec
+++ b/redhat/extras/akode/trinity-akode-3.5.13.spec
@@ -12,8 +12,8 @@
 %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_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
 %define _docdir %{tde_docdir}
diff --git a/redhat/extras/k3b-i18n/k3b-i18n-1.0.5.tar.bz2 b/redhat/extras/k3b-i18n/k3b-i18n-1.0.5.tar.bz2
deleted file mode 100644
index 014b9528e..000000000
--- a/redhat/extras/k3b-i18n/k3b-i18n-1.0.5.tar.bz2
+++ /dev/null
diff --git a/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch b/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
deleted file mode 100644
index dccbfa1ae..000000000
--- a/redhat/extras/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/extras/k3b-i18n/trinity-k3b-i18n.spec b/redhat/extras/k3b-i18n/trinity-k3b-i18n.spec
deleted file mode 100644
index fa2b67c60..000000000
--- a/redhat/extras/k3b-i18n/trinity-k3b-i18n.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 build for TDE 3.5.13
diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch
index 0eae8f419..15e49692c 100644
--- a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch
+++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch
@@ -23,7 +23,7 @@
      exit 1
      ;;
 -  automake*1.6.* | automake*1.7* | automake*1.8* ) : ;;
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;;
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.1[012]* ) : ;;
    "" )
      echo "*** AUTOMAKE NOT FOUND!."
      echo "*** KDE requires automake $required_automake_version"
diff --git a/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec b/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec
new file mode 100644
index 000000000..5cd2ae5aa
--- /dev/null
+++ b/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec
@@ -0,0 +1,183 @@
+%define kdecomp kasablanca
+
+# 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 FTP client
+Version:	0.4.0.2
+Release:	2%{?dist}%{?_variant}
+
+License:	GPLv2+
+Url:		http://kasablanca.berlios.de/ 
+Source:		http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz
+Group:		Applications/Internet 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# [kasablanca] Fix bad content in icon (?)
+Patch1:		kasablanca-0.4.0.2-dt.patch
+# [kasablanca] Fix detection of newer autotools
+Patch2:		kasablanca-0.4.0.2-fix_autotools_detection.patch
+# [kasablanca] Missing LDFLAGS cause FTBFS
+Patch3:		kasablanca-0.4.0.2-missing_ldflags.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext 
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires: openssl-devel
+
+%if 0%{?suse_version}
+BuildRequires: utempter-devel
+%else
+BuildRequires: libutempter-devel
+%endif
+
+%description
+Kasablanca is an ftp client, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{kdecomp}-%{version}
+%patch1 -p1 -b .dt
+%patch2 -p1
+%patch3 -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/qt3.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+export KDEDIR=%{tde_prefix}
+
+## Needed(?) for older/legacy setups, harmless otherwise
+if pkg-config openssl ; then
+	export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
+fi
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --datadir=%{tde_datadir} \
+  --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
+  --disable-static \
+  --disable-rpath \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-extra-includes=%{tde_includedir}/tqt
+
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf $RPM_BUILD_ROOT 
+
+%__make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{tde_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="Network" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{tde_datadir}/applnk/*/*.desktop
+
+## File lists
+# 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
+
+# locale's
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT 
+
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README 
+%{tde_bindir}/kasablanca
+%{tde_tdeappdir}/kasablanca.desktop
+%{tde_datadir}/apps/kasablanca/
+%{tde_datadir}/config.kcfg/kbconfig.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
+%{tde_tdedocdir}/HTML/en/kasablanca/
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-2
+- Initial build for TDE 3.5.13.1
+
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'
diff --git a/redhat/extras/kasablanca/trinity-kasablanca.spec b/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.spec
index 16c5f61ce..16c5f61ce 100644
--- a/redhat/extras/kasablanca/trinity-kasablanca.spec
+++ b/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.spec
diff --git a/redhat/extras/kdebluetooth/kblueplugd.bluez3 b/redhat/extras/kdebluetooth/kblueplugd.bluez3
new file mode 100644
index 000000000..e954b9e42
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kblueplugd.bluez3
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
+
+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.
+"""
+
+import sys
+from   PyQt4 import QtCore, Qt
+import dbus
+import dbus.mainloop.qt
+import distutils.spawn
+
+kbtcmd    = [ 'kbluetooth' ]
+quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ]  # FIXME: quit kbluelock too?
+
+
+app = Qt.QCoreApplication(sys.argv)
+	
+dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+bus = dbus.SystemBus()
+
+try:
+        manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')
+except:
+        print "Unable to connect to bluez."
+        sys.exit(1)
+
+if len(manager.ListAdapters()):
+        print "# of devices at startup:", len(manager.ListAdapters())
+        distutils.spawn.spawn(kbtcmd)
+else:
+        print "No BT device found"
+
+
+def slotAdapterAdded(device):
+        print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
+        distutils.spawn.spawn(kbtcmd)
+
+def slotAdapterRemoved(device):
+        print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
+        if len(manager.ListAdapters()) == 0:
+                for p in quitprogs:
+                        print "exiting:", p, " ..."
+                        try:
+                                distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
+                        except:
+                                pass
+
+manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
+manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
+
+print "waiting for bt device (un)plug events ..."
+
+app.exec_()
diff --git a/redhat/extras/kdebluetooth/kblueplugd.bluez4 b/redhat/extras/kdebluetooth/kblueplugd.bluez4
new file mode 100644
index 000000000..9a1c7bc41
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kblueplugd.bluez4
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
+
+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.
+"""
+
+import sys
+from   PyQt4 import QtCore, Qt
+import dbus
+import dbus.mainloop.qt
+import distutils.spawn
+
+kbtcmd    = [ 'kbluetooth' ]
+quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ]  # FIXME: quit kbluelock too?
+
+
+app = Qt.QCoreApplication(sys.argv)
+	
+dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+bus = dbus.SystemBus()
+
+try:
+        manager = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.bluez.Manager')
+except:
+        print "Unable to connect to bluez."
+        sys.exit(1)
+
+if len(manager.ListAdapters()):
+        print "# of devices at startup:", len(manager.ListAdapters())
+        distutils.spawn.spawn(kbtcmd)
+else:
+        print "No BT device found"
+
+
+def slotAdapterAdded(device):
+        print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
+        distutils.spawn.spawn(kbtcmd)
+
+def slotAdapterRemoved(device):
+        print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
+        if len(manager.ListAdapters()) == 0:
+                for p in quitprogs:
+                        print "exiting:", p, " ..."
+                        try:
+                                distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
+                        except:
+                                pass
+
+manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
+manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
+
+print "waiting for bt device (un)plug events ..."
+
+app.exec_()
diff --git a/redhat/extras/kdebluetooth/kblueplugd.desktop b/redhat/extras/kdebluetooth/kblueplugd.desktop
new file mode 100644
index 000000000..3c7e53780
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kblueplugd.desktop
@@ -0,0 +1,42 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=KBluetoothD
+Name[sv]=Kbluetoothd
+Name[ta]=Kபுலுடுத்D
+Name[xx]=xxKBluetoothDxx
+GenericName=KDE Bluetooth Daemon
+GenericName[ar]=مراقب KDE Bluetooth
+GenericName[bg]=Демон за Bluetooth в KDE
+GenericName[br]=Diaoul KDE Bluetooth
+GenericName[bs]=KDE Bluetooth daemon
+GenericName[ca]=Dimoni Bluetooth de KDE
+GenericName[cs]=Bluetooth démon pro KDE
+GenericName[da]=KDE Bluetooth-dæmon
+GenericName[de]=KDE Bluetooth-Daemon
+GenericName[el]=Ο δαίμονας Bluetooth του KDE
+GenericName[es]=Daemon Bluetooth de KDE
+GenericName[et]=KDE Bluetoothi deemon
+GenericName[fr]=Démon KDE Bluetooth
+GenericName[gl]=Servizo Bluetooth de KDE
+GenericName[it]=Demone Bluetooth di KDE
+GenericName[ja]=KDE Bluetooth デーモン
+GenericName[ka]=KDE ბლუთუს დემონი
+GenericName[nl]=KDE Bluetooth-daemon
+GenericName[pa]=KDE ਬਲਿਊਟੁੱਥ ਡਾਈਮੋਨ
+GenericName[pl]=Demon Bluetooth dla KDE
+GenericName[pt]=Serviço Bluetooth do KDE
+GenericName[ru]=Служба KDE Bluetooth
+GenericName[sr]=Bluetooth демон за KDE
+GenericName[sr@Latn]=Bluetooth demon za KDE
+GenericName[sv]=KDE-Blåtandsdemon
+GenericName[ta]=KDE புலுடுத் டேமொன்
+GenericName[tr]=KDE Bluetooth Hizmeti
+GenericName[xx]=xxKDE Bluetooth Daemonxx
+Exec=kblueplugd
+Icon=kdebluetooth
+Type=Application
+DocPath=kdebluetooth/index.html
+Terminal=false
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-autostart-condition=kbluetoothrc:General:AutoStart:true
diff --git a/redhat/extras/kdebluetooth/kdebluetooth-fix_bluez4_support.patch b/redhat/extras/kdebluetooth/kdebluetooth-fix_bluez4_support.patch
new file mode 100644
index 000000000..e236dc44e
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kdebluetooth-fix_bluez4_support.patch
@@ -0,0 +1,22 @@
+--- a/kdebluetooth/libkbluetooth/dbusinit.h.ORI	2012-09-01 20:45:58.121444854 +0200
++++ a/kdebluetooth/libkbluetooth/dbusinit.h	2012-09-01 20:46:09.735185514 +0200
+@@ -32,7 +32,7 @@
+ #include <dbus/connection.h>
+ 
+ #define BLUEZ_SERVICE "org.bluez"
+-#define BLUEZ_PATH "/org/bluez"
++#define BLUEZ_PATH "/"
+ 
+ #define OBEX_SERVICE "org.openobex"
+ #define OBEX_PATH "/org/openobex"
+--- a/kdebluetooth/libkbluetooth/inputmanager.h.ORI	2012-09-01 20:48:03.215640910 +0200
++++ a/kdebluetooth/libkbluetooth/inputmanager.h	2012-09-01 20:48:12.643428667 +0200
+@@ -32,7 +32,7 @@
+ #include "dbussignal.h"
+ #include "dbusfilter.h"
+ 
+-#define BLUEZ_PATH_INPUTMANAGER "/org/bluez/input"
++#define BLUEZ_PATH_INPUTMANAGER "/input"
+ #define INTERFACE_INPUTMANAGER "org.bluez.input.Manager"
+ 
+ namespace KBluetooth
diff --git a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
index 81a073d71..af429d690 100644
--- a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
+++ b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
@@ -99,7 +99,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh
  
  libkbluetooth_la_LDFLAGS = $(all_libraries)
 -libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-qt-1
-+libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-tqt-1
++libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-tqt-1 $(LIB_QT) $(LIB_KDEUI) -lkdefx
  
  libkbluetoothincludedir = $(includedir)/libkbluetooth
 -libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h dbussignal.h manager.h inputdevice.h inputmanager.h \
@@ -114,7 +114,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh
  
  kbluetooth_SOURCES = adapterconfig.cpp adapterdialog.ui authorize.cpp authdialog.ui deviceconfig.cpp trayicon.cpp main.cpp application.cpp pindefdialog.ui pindialog.cpp confirmationdlgbase.ui confirmation.cpp rfcommportlistener.cpp procinheritsock.cpp portlistener.cpp sdprecord.cpp
 -kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries)
-+kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx
++kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx $(LIB_QT)
  kbluetooth_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI)
  
  # this is where the desktop file will go
diff --git a/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff
new file mode 100644
index 000000000..f5e5c365b
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff
@@ -0,0 +1,3769 @@
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/libkbluetooth0.install
++++ kdebluetooth-1.0~beta9~r769275/debian/libkbluetooth0.install
+@@ -0,0 +1,4 @@
++debian/tmp/usr/lib/lib*.so.*
++debian/tmp/usr/lib/kde3/*.so
++debian/tmp/usr/lib/kde3/*.la
++debian/tmp/usr/lib/kdebluetooth/*
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/libkbluetooth-dev.install
++++ kdebluetooth-1.0~beta9~r769275/debian/libkbluetooth-dev.install
+@@ -0,0 +1,4 @@
++debian/tmp/usr/include/*
++debian/tmp/usr/lib/lib*.la
++debian/tmp/usr/lib/lib*.so
++debian/tmp/usr/lib/*.la
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/patches/kubuntu_01_kdepot.patch
++++ kdebluetooth-1.0~beta9~r769275/debian/patches/kubuntu_01_kdepot.patch
+@@ -0,0 +1,20 @@
++diff -Nur kdebluetooth-1.0~beta5~r695881/admin/cvs.sh kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh
++--- kdebluetooth-1.0~beta5~r695881/admin/cvs.sh	2007-08-02 13:29:02.000000000 +0200
+++++ kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh	2007-08-03 10:19:55.000000000 +0200
++@@ -537,6 +537,8 @@
++ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
++ export EXTRACTRC PREPARETIPS
++ 
+++kdepotpath=/usr/include/kde/kde.pot
+++
++ for subdir in $dirs; do
++   test -z "$VERBOSE" || echo "Making messages in $subdir"
++   (cd $subdir
++@@ -554,7 +556,6 @@
++    fi
++    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
++ 
++-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++    if ! test -f $kdepotpath; then
++ 	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++    fi
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/patches/kubuntu_07_fix_header_include.patch
++++ kdebluetooth-1.0~beta9~r769275/debian/patches/kubuntu_07_fix_header_include.patch
+@@ -0,0 +1,10 @@
++diff -Nur kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am
++--- kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am	2007-08-31 11:52:00.000000000 +0200
+++++ kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am	2007-08-31 18:31:16.000000000 +0200
++@@ -1,5 +1,5 @@
++ # set the include path for X, qt and KDE
++-INCLUDES = -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
+++INCLUDES = -I$(top_builddir)/kdebluetooth/libkbluetooth/ -I$(build_dir)/kdebluetooth/libkbluetooth/ -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
++ 
++ # these are the headers for your project
++ 
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/patches/kubuntu_02_desktop_files.patch
++++ kdebluetooth-1.0~beta9~r769275/debian/patches/kubuntu_02_desktop_files.patch
+@@ -0,0 +1,48 @@
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop	2007-11-10 10:38:44.000000000 +0100
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop	2007-11-16 11:08:12.000000000 +0100
++@@ -38,4 +38,5 @@
++ Comment[tg]=Намоишгари KDE Bluetooth
++ Comment[tr]=KDE Bluetooth İzleyici
++ Comment[xx]=xxKDE Bluetooth Monitorxx
+++Hidden=true
++ 
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop	2007-11-10 10:38:44.000000000 +0100
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop	2007-11-16 11:08:12.000000000 +0100
++@@ -36,4 +36,5 @@
++ Comment[tg]=Намоишгари KDE Bluetooth
++ Comment[tr]=KDE Bluetooth İzleyici
++ Comment[xx]=xxKDE Bluetooth Monitorxx
+++Hidden=true
++ 
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop	2007-11-10 10:38:44.000000000 +0100
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop	2007-11-16 11:08:12.000000000 +0100
++@@ -33,7 +33,7 @@
++ GenericName[tg]=Хидматгоҳи Bluetooth
++ GenericName[tr]=Bluetooth Sunucusu
++ GenericName[xx]=xxBluetooth Serverxx
++-Categories=Settings;HardwareSettings;
+++Categories=Qt;KDE;System;
++ OnlyShowIn=KDE;
++ Comment=KDE Bluetooth Framework Metaserver
++ Comment[bg]=Мета сървър за Bluetooth Framework
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop	2007-10-27 09:44:26.000000000 +0200
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop	2007-11-16 11:08:57.000000000 +0100
++@@ -58,3 +58,5 @@
++ Comment[ta]=KDE புலுடுத் சட்டவேலைக்கான OBEX பொருள் கிளைஞ்சன்
++ Comment[tr]=KDEBluetooth Ortamı için OBEX Nesneleri Destek istemcisi
++ Comment[xx]=xxAn OBEX Object Push client for the KDEBluetooth Frameworkxx
+++NoDisplay=true
+++
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop	2007-11-10 10:38:44.000000000 +0100
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop	2007-11-16 11:08:12.000000000 +0100
++@@ -36,4 +36,5 @@
++ Comment[tg]=Устоди KDE Bluetooth
++ Comment[tr]=KDE Bluetooth Sihirbazı
++ Comment[xx]=xxKDE Bluetooth Wizardxx
+++Hidden=true
++ 
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/patches/kubuntu_09_french_i18n.patch
++++ kdebluetooth-1.0~beta9~r769275/debian/patches/kubuntu_09_french_i18n.patch
+@@ -0,0 +1,2947 @@
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/po/fr/kdebluetooth.po kdebluetooth-1.0~beta9~r734866.new/po/fr/kdebluetooth.po
++--- kdebluetooth-1.0~beta9~r734866/po/fr/kdebluetooth.po	2007-11-16 11:28:44.000000000 +0100
+++++ kdebluetooth-1.0~beta9~r734866.new/po/fr/kdebluetooth.po	2007-11-16 16:01:13.000000000 +0100
++@@ -1,1395 +1,1352 @@
++-# translation of kbluetoothd.po to Français
++-# traduction de kbluetoothd.po en français
++-# traduction de kbluetoothd.po vers le Français
++-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++-# Simon Depiets <2df@tuxfamily.org>, 2005.
++-# Yann Verley <yann.verley@free.fr>, 2005.
++-# Matthieu Robin <kde@macolu.org>, 2005.
+++# translation of kdebluetooth.po to
+++# This file is put in the public domain.
++ #
+++# Anthony Mercatante <tonio@ubuntu.com>, 2007.
++ msgid ""
++ msgstr ""
++-"Project-Id-Version: kbluetoothd\n"
+++"Project-Id-Version: kdebluetooth\n"
++ "Report-Msgid-Bugs-To: \n"
++-"POT-Creation-Date: 2007-09-13 08:28+0200\n"
++-"PO-Revision-Date: 2006-02-01 17:06+0100\n"
++-"Last-Translator: Matthieu Robin <kde@macolu.org>\n"
++-"Language-Team: French <kde-francophone@kde.org>\n"
+++"POT-Creation-Date: 2007-11-16 13:00+0100\n"
+++"PO-Revision-Date: 2007-11-16 15:59+0100\n"
+++"Last-Translator: Anthony Mercatante <tonio@ubuntu.com>\n"
+++"Language-Team:  <fr@li.org>\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
+++"X-Generator: KBabel 1.11.4\n"
++ 
++-#: kbtserialchat/main.cpp:23
++-msgid "A KDE KPart Application"
++-msgstr "Une application KDE KPart"
+++#: kbluelock/kbluelock.cpp:208 kbluelock/kbluelock.cpp:320
+++msgid ""
+++"<p align='center'>KBlueLock <b>ON</b></p>\n"
+++"<p align='center'><i>%1</i></p>"
+++msgstr ""
+++"<p align='center'>KBlueLock <b>ON</b></p>\n"
+++"<p align='center'><i>%1</i></p>"
+++
+++#: kbluelock/kbluelock.cpp:217
+++msgid "KBlueLock - No Device selectetd"
+++msgstr "KBlueLock - Aucun périphérique sélectionné"
+++
+++#: kbluelock/kbluelock.cpp:217
+++msgid "To enable KBlueLock you have to choose a Device."
+++msgstr "Pour activer KBlueLock vous devez choisir un périphérique."
+++
+++#: kbluelock/kbluelock.cpp:301
+++msgid ""
+++"<p align='center'>KBlueLock <b>OFF</b></p>\n"
+++"<p align='center'><i>%1</i></p>"
+++msgstr ""
+++"<p align='center'>KBlueLock <b>OFF</b></p>\n"
+++"<p align='center'><i>%1</i></p>"
+++
+++#: kbluelock/kbluelock.cpp:356
+++msgid "&Disable"
+++msgstr "&Désactiver"
+++
+++#: kbluelock/kbluelock.cpp:362
+++msgid "&Enable"
+++msgstr "&Activer"
+++
+++#: kbluelock/kbluelock.cpp:375 kinputwizard/inputwizard.cpp:554
+++#: kbluemon/monitor.cpp:501
+++msgid "Device Discovery started"
+++msgstr "Recherche de périphériques démarrée"
+++
+++#. i18n: file ./kbluelock/lockdialog.ui line 16
+++#: kbluelock/main.cpp:38 kbluelock/main.cpp:50 rc.cpp:3
+++#, no-c-format
+++msgid "KBlueLock"
+++msgstr "KBlueLock"
+++
+++#: kbluelock/main.cpp:39 kinputwizard/main.cpp:37
+++msgid "Copyright (C) 2007 Novell, Inc."
+++msgstr "Copyright (C) 2007 Novell, Inc."
+++
+++#: kbluelock/main.cpp:54 kinputwizard/main.cpp:52 kbluemon/main.cpp:53
+++#: kbluetooth/main.cpp:36
+++msgid "Author"
+++msgstr "Auteur"
+++
+++#: kbluelock/main.cpp:61
+++msgid "KBlueLock is already running.\n"
+++msgstr "KBlueLock est déjà en fonctionnement.\n"
+++
+++#: kbtobexsrv/main.cpp:24
+++msgid "KDE OBEX Push Server for Bluetooth"
+++msgstr "Serveur Bluetooth Obex pour KDE"
++ 
++ #: kbtobexsrv/main.cpp:28 kbtobexsrv/main.cpp:29 kbtobexsrv/main.cpp:30
++ #: kbtserialchat/main.cpp:29 kbtserialchat/main.cpp:30
++ #: kbtserialchat/main.cpp:31
++ msgid "Used by kbluetoothd"
++-msgstr "Utilisé par KBluetoothd"
+++msgstr "Utilisé par kbluetoothd"
++ 
++-#: kbtobexclient/main.cpp:37 kbtserialchat/main.cpp:32
++-msgid "Used by kio_sdp"
++-msgstr "Utilisé par kio_sdp"
+++#: kbtobexsrv/main.cpp:63
+++msgid ""
+++"kbtobexsrv will be called automatically by kbluetoothd when another device "
+++"tries to send you some files. You don't have to run it manually."
+++msgstr ""
+++"kbtobexsrv sera appelé automatiquement par kbluetoothd quand un périphérique essaye "
+++"de vous envoyer des fichiers. Vous n'avez pas à le lancer manuellement."
++ 
++-#. i18n: file ./kbtserialchat/maindialogbase.ui line 16
++-#: kbtserialchat/main.cpp:41 rc.cpp:3
++-#, fuzzy, no-c-format
++-msgid "Bluetooth Serial Chat"
++-msgstr "Serveur de PIN Bluetooth"
+++#: kbtobexsrv/maindlg.cpp:158
+++msgid "Receiving %1"
+++msgstr "Réception de %1"
+++
+++#: kbtobexsrv/maindlg.cpp:208
+++msgid "Disconnected."
+++msgstr "Déconnecté."
+++
+++#: kbtobexsrv/maindlg.cpp:217
+++msgid ""
+++"The selected folder does not exist.                            Please select "
+++"another folder."
+++msgstr ""
+++"Le répertoire choisi n'existe pas.                            Veuillez choisir un "
+++"autre répertoire."
+++
+++#: kbtobexsrv/maindlg.cpp:218
+++msgid "Obex Server"
+++msgstr "Serveur OBEX"
+++
+++#: kbtobexsrv/maindlg.cpp:254
+++msgid "%1 already exists. Do you want to use %2 as filename instead?"
+++msgstr "%1 exite déjà. Voulez-vous utiliser %2 comme nom de fichier?"
+++
+++#: kbtobexsrv/maindlg.cpp:255
+++msgid "Rename"
+++msgstr "Renommer"
+++
+++#: kbtobexsrv/maindlg.cpp:255
+++msgid "Overwrite"
+++msgstr "Ecraser"
+++
+++#: kbtobexsrv/maindlg.cpp:271
+++msgid "Error writing file %1."
+++msgstr "Erreur lors de l'écriture du fichier %1."
+++
+++#: kbtobexsrv/maindlg.cpp:285
+++msgid ""
+++"The following files already existed in the target folder and were not saved "
+++"again with a different name:"
+++msgstr ""
+++"Les fichiers suivants existaient déjà dans le répertoire cible et n'ont pas été sauvegardés "
+++"avec un nom différent:"
+++
+++#: libkbluetooth/hcidefault.cpp:82
+++msgid "Use bluetooth device hciX (alternative: $HCI_DEVICE)"
+++msgstr "Utiliser le périphérique blouetooth hciX (alternative: $HCI_DEVICE)"
++ 
++ #: libkbluetooth/namerequest.cpp:52
++ msgid "Device is not available."
++-msgstr ""
+++msgstr "Le périphérique n'est pas disponible."
++ 
++ #: libkbluetooth/namerequest.cpp:59
++-#, fuzzy
++ msgid "HCI device open failed."
++-msgstr "&Détails de la connexion"
+++msgstr "L'ouverture du périphérique HCI a échoué."
++ 
++ #: libkbluetooth/namerequest.cpp:73
++ msgid "HCI name request failed."
++-msgstr ""
+++msgstr "L'obtention du nom du périphérique HCI a échoué."
++ 
++ #: libkbluetooth/hcisocket.cpp:60
++ msgid "Error creating socket"
++-msgstr ""
+++msgstr "Error creating socket"
++ 
++ #: libkbluetooth/hcisocket.cpp:72
++ msgid "Error binding to socket"
++-msgstr ""
+++msgstr "Error binding to socket"
++ 
++ #: libkbluetooth/hcisocket.cpp:84
++ msgid "HCI filter setup failed"
++-msgstr ""
+++msgstr "HCI filter setup failed"
++ 
++ #: libkbluetooth/hcisocket.cpp:118
++-#, c-format
++ msgid "HCI socket error: 0x%1."
++-msgstr ""
++-
++-#: libkbluetooth/hcidefault.cpp:82
++-msgid "Use bluetooth device hciX (alternative: $HCI_DEVICE)"
++-msgstr ""
+++msgstr "HCI socket error: 0x%1."
++ 
++ #: libkbluetooth/inquiry.cpp:154
++ msgid "Timeout while waiting for end of inquiry."
++-msgstr ""
+++msgstr "Timeout reçu en attente de la fin de la requète."
++ 
+++#. i18n: file ./kbluelock/lockdialog.ui line 129
++ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 128
++-#: libkbluetooth/serviceselectionwidget.cpp:104 rc.cpp:167 rc.cpp:239
+++#: libkbluetooth/serviceselectionwidget.cpp:104 rc.cpp:30 rc.cpp:172
++ #, no-c-format
++ msgid "Searching..."
++-msgstr ""
+++msgstr "Recherche en cours..."
++ 
++ #: libkbluetooth/serviceselectionwidget.cpp:200
++-#, fuzzy
++ msgid "Bluetooth Service Selection"
++-msgstr "Adaptateur Bluetooth trouvé."
+++msgstr "Sélection du service Bluetooth"
++ 
++ #: libkbluetooth/serviceselectionwidget.cpp:309
++ msgid "Clear the device cache?"
++-msgstr ""
++-
++-#: kioclient/main.cpp:22
++-msgid "KIO command line client"
++-msgstr ""
++-
++-#: kioclient/main.cpp:31
++-msgid "List date"
++-msgstr ""
++-
++-#: kioclient/main.cpp:32
++-msgid "List user"
++-msgstr ""
++-
++-#: kioclient/main.cpp:33
++-msgid "List icon name"
++-msgstr ""
++-
++-#: kioclient/main.cpp:34
++-msgid "List group"
++-msgstr ""
++-
++-#: kioclient/main.cpp:35
++-msgid "List extra"
++-msgstr ""
++-
++-#: kioclient/main.cpp:36
++-msgid "Do not list name"
++-msgstr ""
++-
++-#: kioclient/main.cpp:37
++-msgid "List access permissions"
++-msgstr ""
++-
++-#: kioclient/main.cpp:38
++-msgid "List modification time"
++-msgstr ""
++-
++-#: kioclient/main.cpp:39
++-msgid "List access time"
++-msgstr ""
++-
++-#: kioclient/main.cpp:40
++-msgid "List creation time"
++-msgstr ""
++-
++-#: kioclient/main.cpp:41
++-msgid "List file type"
++-msgstr ""
++-
++-#: kioclient/main.cpp:42
++-msgid "List link destination"
++-msgstr ""
++-
++-#: kioclient/main.cpp:43
++-msgid "List URL"
++-msgstr ""
++-
++-#: kioclient/main.cpp:44
++-msgid "List mime type"
++-msgstr ""
++-
++-#: kioclient/main.cpp:45
++-msgid "List guessed mime type"
++-msgstr ""
++-
++-#: kioclient/main.cpp:46
++-msgid "List XML properties"
++-msgstr ""
++-
++-#: kioclient/main.cpp:47
++-msgid "List size"
++-msgstr ""
++-
++-#: kioclient/main.cpp:48
++-msgid "Output file. Defaults to stdout"
++-msgstr ""
++-
++-#: kioclient/main.cpp:49
++-msgid "Input file. Defaults to stdin"
++-msgstr ""
++-
++-#: kioclient/main.cpp:50
++-msgid "Show a progress window"
++-msgstr ""
++-
++-#: kioclient/main.cpp:51
++-msgid "Ask (graphically) before overwriting files"
++-msgstr ""
++-
++-#: kioclient/main.cpp:52
++-msgid "Show messages from the kioslave"
++-msgstr ""
++-
++-#: kioclient/main.cpp:53
++-msgid "Command (ls, cat, put, cp, rm, mv, mkdir, rmdir)"
++-msgstr ""
++-
++-#: kioclient/main.cpp:60
++-msgid "kio client"
++-msgstr ""
++-
++-#: kioclient/commandhandler.cpp:25
++-msgid "Arguments missing."
++-msgstr ""
++-
++-#: kioclient/commandhandler.cpp:94
++-#, c-format
++-msgid "unknown command: %1"
++-msgstr ""
++-
++-#: _translatorinfo.cpp:1
++-msgid ""
++-"_: NAME OF TRANSLATORS\n"
++-"Your names"
++-msgstr "&traducteurSimonDepiets;"
++-
++-#: _translatorinfo.cpp:3
++-msgid ""
++-"_: EMAIL OF TRANSLATORS\n"
++-"Your emails"
++-msgstr "Simon DEPIETS : 2df@tuxfamily.org"
+++msgstr "Nettoyer le cache des périphériques?"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 30
++-#: kbluemon/main.cpp:38 kbluemon/main.cpp:49 rc.cpp:21
++-#, fuzzy, no-c-format
++-msgid "KBlueMon"
++-msgstr "KBluetoothD"
+++#: libkobex/kobexserver.cpp:177 libkobex/kobexclient.cpp:139
+++msgid "Connecting..."
+++msgstr "Connection en cours..."
++ 
++-#: kbluelock/main.cpp:54 kbluemon/main.cpp:53 kbluetooth/main.cpp:36
++-#: kinputwizard/main.cpp:52
++-msgid "Author"
++-msgstr "Auteur"
+++#: libkobex/kobexserver.cpp:220 libkobex/kobexclient.cpp:175
+++msgid "Disconnecting..."
+++msgstr "Déconnexion..."
++ 
++-#: kbluemon/main.cpp:61
++-#, fuzzy
+++#: libkobex/kobexclient.cpp:79
++ msgid ""
++-"KBlueMon is already running.\n"
++-msgstr ""
++-"KBluetoothD fonctionnait déjà.\n"
++-
++-#: kbluemon/monitor.cpp:57 kbluemon/monitor.cpp:331 kbluemon/monitor.cpp:424
++-msgid "Scanning..."
++-msgstr ""
++-
++-#: kbluemon/monitor.cpp:150
++-msgid "Service Discovery disabled"
++-msgstr ""
++-
++-#: kbluemon/monitor.cpp:151 kbluemon/monitor.cpp:200 kbluemon/monitor.cpp:203
++-#: kbluemon/monitor.cpp:206 kbluemon/monitor.cpp:222 kbluemon/monitor.cpp:253
++-msgid "<i>not available</i>"
++-msgstr ""
++-
++-#: kbluemon/monitor.cpp:221 kbluemon/monitor.cpp:248
++-msgid "no Services discovered"
++-msgstr ""
++-
++-#. i18n: file ./kbluemon/mondialog.ui line 529
++-#: kbluemon/monitor.cpp:338 kbluemon/monitor.cpp:423 rc.cpp:72
++-#, fuzzy, no-c-format
++-msgid "St&op Scan"
++-msgstr "Démarrer"
++-
++-#: kbluemon/monitor.cpp:344 kbluemon/monitor.cpp:445
++-#, fuzzy
++-msgid "St&art Scan"
++-msgstr "Démarrer"
++-
++-#: kbluemon/monitor.cpp:414
++-msgid "Periodic Discovery started"
++-msgstr ""
++-
++-#: kbluemon/monitor.cpp:416
++-msgid "Failed to start Periodic Discovery! ("
++-msgstr ""
++-
++-#: kbluelock/kbluelock.cpp:363 kbluemon/monitor.cpp:501
++-#: kinputwizard/inputwizard.cpp:554
++-msgid "Device Discovery started"
++-msgstr ""
++-
++-#: kioslave/sdp/btsdp.cpp:43
++-#, fuzzy
++-msgid "No working Bluetooth adapter found."
++-msgstr "Adaptateur Bluetooth trouvé."
++-
++-#: kioslave/bluetooth/kiobluetooth.cpp:87 kioslave/sdp/btsdp.cpp:131
++-#, fuzzy
++-msgid "Bluetooth neighborhood"
++-msgstr "Adaptateur Bluetooth trouvé."
++-
++-#: kioslave/sdp/btsdp.cpp:139
++-#, fuzzy
++-msgid "More services"
++-msgstr "Configurer les &Services..."
++-
++-#: kioslave/sdp/btsdp.cpp:145
++-msgid "Could not stat %1. Unknown device"
+++"Error connecting to phone\n"
+++"Response message: "
++ msgstr ""
+++"Erreur lors de la connexion au téléphone\n"
+++"Réponse reçue: "
++ 
++-#: kioslave/sdp/btsdp.cpp:201
++-#, c-format
++-msgid "Retrieving services for %1."
+++#: libkobex/kobexclient.cpp:93
+++msgid ""
+++"Error sending file %1 to phone\n"
+++"Response message: "
++ msgstr ""
+++"Erreur lors de l'envoi du fichier %1 au téléphone\n"
+++"Réponse reçue: "
++ 
++-#: kioslave/obex/kio_obex2/kio_obexprotocol.cpp:252
++-#, fuzzy
++-msgid "Disconnecting"
++-msgstr "Connexion :"
++-
++-#: kioslave/obex/kio_obex2/kio_obexprotocol.cpp:254
++-#, fuzzy
++-msgid "Disconnected"
++-msgstr "Non connecté"
++-
++-#: kioslave/bluetooth/kiobluetooth.cpp:41
++-msgid "Protocol name"
+++#: libkobex/kobexclient.cpp:105
+++msgid ""
+++"Error getting data from phone\n"
+++"Response message: "
++ msgstr ""
+++"Erreur lors de la réception d'informations du téléphone\n"
+++"Réponse reçue: "
++ 
++-#: kioslave/bluetooth/kiobluetooth.cpp:42
++-#: kioslave/bluetooth/kiobluetooth.cpp:43
++-msgid "Socket name"
++-msgstr ""
+++#: libkobex/kobexclient.cpp:120
+++msgid "Done"
+++msgstr "Fait"
++ 
++-#: kioslave/bluetooth/kiobluetooth.cpp:93
++-#, c-format
++-msgid "Could not stat %1."
++-msgstr ""
+++#: libkobex/kobexclient.cpp:164
+++msgid "Error connecting transport"
+++msgstr "Erreur lors de la connexion"
++ 
++-#: kbtobexclient/fileview.cpp:72
++-#, fuzzy
++-msgid "Location: "
++-msgstr "Connexion :"
+++#: libkobex/kobexclient.cpp:208
+++msgid "Sending "
+++msgstr "En cours d'envoi "
++ 
++-#: kbtobexclient/fileview.cpp:94
+++#: libkobex/kobexclient.cpp:208
++ msgid ""
++-"<qt>Click this button to enter the parent folder."
++-"<p>For instance, if the current location is file:/home/%1 clicking this button "
++-"will take you to file:/home.</qt>"
++-msgstr ""
++-"<qt>Cliquez sur ce bouton pour entrer dans le dossier parent. "
++-"<p>Pour le moment, l'emplacement courant est « /home/%1 » et un clic sur ce "
++-"bouton vous emmènera vers « /home ».</qt>"
++-
++-#: kbtobexclient/fileview.cpp:98
++-msgid "Click this button to move backwards one step in the browsing history."
++-msgstr "Cliquez sur ce bouton pour reculer d'un cran dans l'historique."
++-
++-#: kbtobexclient/fileview.cpp:100
++-msgid "Click this button to move forward one step in the browsing history."
++-msgstr "Cliquez sur ce bouton pour avancer d'un cran dans l'historique."
++-
++-#: kbtobexclient/fileview.cpp:102
++-msgid "Click this button to reload the contents of the current location."
+++" to phone\n"
+++"\n"
++ msgstr ""
++-"Cliquez sur ce bouton pour recharger le contenu de l'emplacement courant."
++-
++-#: kbtobexclient/fileview.cpp:105
++-msgid "Click this button to create a new folder."
++-msgstr "Cliquez sur ce bouton pour créer un nouveau dossier."
++-
++-#: kbtobexclient/fileview.cpp:109
++-msgid ""
++-"<qt>This is the configuration menu for the file dialog. Various options can be "
++-"accessed from this menu including: "
++-"<ul>"
++-"<li>how files are sorted in the list</li>"
++-"<li>types of view, including icon and list</li>"
++-"<li>showing of hidden files</li>"
++-"<li>the Quick Access navigation panel</li>"
++-"<li>file previews</li>"
++-"<li>separating folders from files</li></ul></qt>"
++-msgstr ""
++-"<qt>Ceci est le menu de configuration pour la boîte de dialogue de fichiers. "
++-"Des options divers sont accessibles depuis ce menu, dont : "
++-"<ul>"
++-"<li>comment les fichiers sont triés dans la liste</li> "
++-"<li>types de vues, incluant liste et icônes</li> "
++-"<li>vue des fichiers cachés</li> "
++-"<li>panneau de navigation rapide</li> "
++-"<li>aperçu de fichier</li> "
++-"<li>séparation des dossiers et des fichiers</li> </ul></qt>"
++-
++-#: kbtobexclient/fileview.cpp:136
++-msgid "Filter:"
++-msgstr "Filtre :"
++-
++-#: kbtobexclient/fileview.cpp:142
++-msgid "*|All Files"
++-msgstr "*|Tous les fichiers"
++-
++-#: kbtobexclient/fileview.cpp:143
++-msgid "image/jpeg |JPEG Image Files"
++-msgstr "image/jpeg|Images JPEG"
++-
++-#: kbtobexclient/main.cpp:31
++-#, fuzzy
++-msgid "A KDE Bluetooth Framework Application"
++-msgstr "Interface KDE Bluetooth"
++-
++-#: kbtobexclient/main.cpp:46
++-msgid "Bluetooth OBEX Object Push client"
++-msgstr "Objet OBEX Bluetooth Push client"
++-
++-#: kbtobexclient/main.cpp:52
++-msgid "Author, Maintainer"
++-msgstr "Auteur, Mainteneur"
++-
++-#: kbtobexclient/diroperator.cpp:75
++-msgid "Short View"
++-msgstr "Petit afficheur"
++-
++-#: kbtobexclient/fileiconview.cpp:58
++-msgid "&Cancel Selected Files"
++-msgstr "&Annuler la sélection des fichiers"
++-
++-#: kbtobexclient/fileiconview.cpp:63
++-msgid "&New Project"
++-msgstr "&Nouveau projet"
++-
++-#: kbtobexclient/mainwindow.cpp:125 kbtobexclient/mainwindow.cpp:148
++-#: kbtobexclient/mainwindow.cpp:156
++-msgid "Project View"
++-msgstr "Vue du projet"
+++" vers le téléphone\n"
+++"\n"
++ 
++-#: kbtobexclient/mainwindow.cpp:139
++-msgid "File to send:"
++-msgstr "Fichier à envoyer :"
+++#: libkobex/kobexclient.cpp:217
+++msgid "Requesting stream start..."
+++msgstr "Demande de transfert..."
++ 
++-#: kbtobexclient/mainwindow.cpp:145
++-msgid "Send"
++-msgstr "Envoyer"
+++#: libkobex/kobexclient.cpp:254
+++msgid "Streaming data..."
+++msgstr "Transfert des données..."
++ 
++-#: kbtobexclient/mainwindow.cpp:148
++-msgid "Files View"
++-msgstr "Vue des fichiers"
+++#: kcm_btpaired/pairedtab.cpp:288
+++msgid "- trusted "
+++msgstr "- confiance "
++ 
++-#: kbtobexclient/mainwindow.cpp:156
++-msgid "Devices View"
++-msgstr "Vue des périphériques"
+++#: kcm_btpaired/pairedtab.cpp:288
+++msgid " device"
+++msgstr " périphérique"
++ 
++-#: kbtobexclient/mainwindow.cpp:161
++-msgid "Device selector:"
++-msgstr "Sélecteur de périphérique :"
+++#: kcm_btpaired/pairedtab.cpp:302
+++msgid "%1 (%2) %3"
+++msgstr "%1 (%2) %3"
++ 
++-#: kbtobexclient/mainwindow.cpp:192
++-msgid "Show Device Selector"
++-msgstr "Afficher le sélecteur de périphérique"
+++#: kcm_btpaired/pairedtab.cpp:313
+++msgid "Last Seen: %1"
+++msgstr "Vu pour la dernière fois: %1"
++ 
++-#: kbtobexclient/mainwindow.cpp:194
++-msgid "Show File Selector"
++-msgstr "Afficher le sélecteur de fichier"
+++#: kcm_btpaired/pairedtab.cpp:321
+++msgid "Last Used: %1"
+++msgstr "Utilisé pour la dernière fois: %1"
++ 
++-#: kbtobexclient/mainwindow.cpp:196
++-msgid "Show File Browser"
++-msgstr "Afficher le navigateur de fichiers"
+++#. i18n: file ./kcm_btpaired/pairedtabbase.ui line 16
+++#: kcm_btpaired/kcm_btpaired.cpp:51 rc.cpp:83
+++#, no-c-format
+++msgid "Paired/Trusted Devices"
+++msgstr "Périphériques associés/connus"
++ 
++-#: kbtobexclient/mainwindow.cpp:274
+++#: kcm_btpaired/kcm_btpaired.cpp:76
++ msgid ""
++-"\n"
++-" Continue with the remaining files?"
+++"<h1>BtPaired</h1>With this module you can manage the list of paired "
+++"Bluetooth Devices."
++ msgstr ""
++-"\n"
++-" Continuer avec les fichiers restants ?"
+++"<h1>BtPaired</h1>Ce module vous permet de gérer les périphériques "
+++"bluetooth associés."
++ 
++-#. i18n: file ./kbtserialchat/maindialogbase.ui line 27
+++#. i18n: file ./kbluelock/lockdialog.ui line 27
++ #: rc.cpp:6
++ #, no-c-format
++-msgid "<font color=\"#0000ff\" size=\"+2\">Bluetooth Serial Chat</font>"
++-msgstr "<font color=\"#0000ff\" size=\"+2\">Discussion Série Bluetooth</font>"
+++msgid "Lock the screen if the selected device disappears"
+++msgstr "Verrouiller l'écran si le périphérique sélectionné disparaît"
++ 
++-#. i18n: file ./kbtserialchat/maindialogbase.ui line 54
+++#. i18n: file ./kbluelock/lockdialog.ui line 38
++ #: rc.cpp:9
++ #, no-c-format
++-msgid "&Send"
++-msgstr "Envo&yer"
++-
++-#. i18n: file ./kbtserialchat/maindialogbase.ui line 57
++-#: rc.cpp:12
++-#, no-c-format
++-msgid "Alt+S, Return"
++-msgstr "Alt+Y, Entrée"
++-
++-#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 54
++-#: rc.cpp:15
++-#, no-c-format
++-msgid "&Search"
++-msgstr ""
++-
++-#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 67
++-#: rc.cpp:18
++-#, fuzzy, no-c-format
++-msgid "&Clear"
++-msgstr "Effacer la liste"
+++msgid "Unlock the screen if the selected device appears again"
+++msgstr "Déverrouiller l'écran si le périphérique sélectionné apparaît de nouveau"
++ 
+++#. i18n: file ./kbluelock/lockdialog.ui line 44
+++#. i18n: file ./kinputwizard/inputdialog_ext.ui line 58
++ #. i18n: file ./kbluemon/mondialog.ui line 46
++-#: rc.cpp:24 rc.cpp:152 rc.cpp:221
+++#: rc.cpp:12 rc.cpp:157 rc.cpp:180
++ #, no-c-format
++ msgid "Name"
++-msgstr ""
++-
++-#. i18n: file ./kbluemon/mondialog.ui line 57
++-#: rc.cpp:27
++-#, fuzzy, no-c-format
++-msgid "Signal"
++-msgstr "invalide"
++-
++-#. i18n: file ./kbluemon/mondialog.ui line 68
++-#: rc.cpp:30
++-#, no-c-format
++-msgid "Class"
++-msgstr ""
+++msgstr "Nom"
++ 
+++#. i18n: file ./kbluelock/lockdialog.ui line 55
+++#. i18n: file ./kinputwizard/inputdialog_ext.ui line 69
++ #. i18n: file ./kbluemon/mondialog.ui line 79
++-#: rc.cpp:33 rc.cpp:155 rc.cpp:224
++-#, fuzzy, no-c-format
+++#: rc.cpp:15 rc.cpp:160 rc.cpp:189
+++#, no-c-format
++ msgid "Address"
++-msgstr "<b>Adresse : </b>"
+++msgstr "Adresse"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 90
++-#: rc.cpp:36
+++#. i18n: file ./kbluelock/lockdialog.ui line 90
+++#. i18n: file ./kinputwizard/inputdialog.ui line 219
+++#. i18n: file ./kbluemon/mondialog.ui line 532
+++#. i18n: file ./kbluemon/mondialog.ui line 543
+++#: rc.cpp:21 rc.cpp:130 rc.cpp:231 rc.cpp:237
++ #, no-c-format
++-msgid "Icon"
++-msgstr ""
+++msgid "Alt+O"
+++msgstr "Alt+O"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 164
++-#: rc.cpp:39
++-#, fuzzy, no-c-format
++-msgid "Address:"
++-msgstr "<b>Adresse : </b>"
+++#. i18n: file ./kbluelock/lockdialog.ui line 101
+++#. i18n: file ./kinputwizard/inputdialog.ui line 278
+++#: rc.cpp:27 rc.cpp:148
+++#, no-c-format
+++msgid "Alt+C"
+++msgstr "Alt+C"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 212
++-#: rc.cpp:42
+++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 16
+++#: rc.cpp:33 kbluetooth/sdprecord.cpp:364 kbluetooth/sdprecord.cpp:376
++ #, no-c-format
++-msgid "Name:"
++-msgstr ""
+++msgid "KDE Bluetooth Framework"
+++msgstr "Framework Bluetooth pour KDE"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 241
++-#: rc.cpp:46
+++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 37
+++#: rc.cpp:36
++ #, no-c-format
++-msgid "Typ:"
+++msgid ""
+++"<p><font size=\"+2\">Incoming File Transfer</font></p>\n"
+++"<b>%1</b> wants to send you some files.<br/>\n"
+++"Press <i>Save</i> to accept all files or drag them to another application or "
+++"folder."
++ msgstr ""
+++"<p><font size=\"+2\">Transfert de fichier entrant</font></p>\n"
+++"<b>%1</b> veut vous envoyer des fichiers.<br/>\n"
+++"Cliquer sur <i>Sauvegarder</i> pour accepter le transfert et choisir l'application ou "
+++"le répertoire de destination."
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 270
++-#: rc.cpp:50
+++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 78
+++#: rc.cpp:41
++ #, no-c-format
++-msgid "Signal:"
++-msgstr ""
+++msgid "Waiting..."
+++msgstr "En attente..."
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 301
+++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 101
+++#: rc.cpp:44
+++#, no-c-format
+++msgid "Open destination folder:"
+++msgstr "Ouvrir le répertoire de destination:"
+++
+++#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 54
++ #: rc.cpp:53
++ #, no-c-format
++-msgid "Version:"
++-msgstr ""
+++msgid "&Search"
+++msgstr "&Rechercher"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 330
++-#: rc.cpp:57
+++#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 67
+++#: rc.cpp:56
++ #, no-c-format
++-msgid "Revision:"
++-msgstr ""
+++msgid "&Clear"
+++msgstr "&Nettoyer"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 359
++-#: rc.cpp:61
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 16
+++#: rc.cpp:59
++ #, no-c-format
++-msgid "Manufacturer:"
++-msgstr ""
+++msgid "Export Link Keys"
+++msgstr "Exporter les clés de lien"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 388
++-#: rc.cpp:65
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 35
+++#: rc.cpp:62
++ #, no-c-format
++-msgid "Category:"
++-msgstr ""
+++msgid ""
+++"Pairing a device in a dual boot setup breaks an alreay established pairing "
+++"in the other operating system, because the link keys stored by each OS are "
+++"not identical. Here you can export BlueZ's keys for use with Windows, so "
+++"that you don't have to pair devices again each time you switch the OS."
+++msgstr ""
+++"Associer un périphérique dans un environnement \"dual boot\" casse une association "
+++"déjà effectuée avec l'autre système, car les clés de lien stoquées par chaque "
+++"système ne sont aps identiques. Ici, vous pouvez exporter les clés créées pour les "
+++"utiliser avec Windows, de manière à ne pas avoir à recréer l'assotiation chaque fois "
+++"que vous utilisez l'autre système."
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 462
++-#: rc.cpp:69
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 46
+++#: rc.cpp:65
++ #, no-c-format
++-msgid "Services"
++-msgstr ""
+++msgid "Read more about dual boot setups..."
+++msgstr "Plus de détails concernant une installation \"dual bool\""
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 532
++-#: rc.cpp:75 rc.cpp:81 rc.cpp:191 rc.cpp:230
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 71
+++#: rc.cpp:68
++ #, no-c-format
++-msgid "Alt+O"
++-msgstr ""
+++msgid "Bluetooth Stacks Used Besides BlueZ"
+++msgstr "Stacks Bluetooth utilisés via BlueZ"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 564
++-#: rc.cpp:84
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 82
+++#: rc.cpp:71
++ #, no-c-format
++-msgid "Periodic Scan"
++-msgstr ""
+++msgid "Widcomm Bluetooth stack"
+++msgstr "Widcomm Bluetooth stack"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 572
++-#: rc.cpp:87
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 90
+++#: rc.cpp:74
++ #, no-c-format
++-msgid "Discover Remote Services"
++-msgstr ""
+++msgid "Microsoft Bluetooth stack"
+++msgstr "Microsoft Bluetooth stack"
++ 
++-#. i18n: file ./kbluemon/mondialog.ui line 575
++-#: rc.cpp:90
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 142
+++#: rc.cpp:77
++ #, no-c-format
++-msgid ""
++-"Discovering the available Services of the Remote Device takes quiet longer."
++-msgstr ""
+++msgid "Save to File..."
+++msgstr "Enregistrer dans un fichier..."
++ 
++-#. i18n: file ./kcm_btpaired/pairedtabbase.ui line 16
++-#: kcm_btpaired/kcm_btpaired.cpp:51 rc.cpp:94
++-#, fuzzy, no-c-format
++-msgid "Paired/Trusted Devices"
++-msgstr "&Périphériques couplés..."
+++#. i18n: file ./kcm_btpaired/exportdialog.ui line 150
+++#: rc.cpp:80
+++#, no-c-format
+++msgid "Send via OBEX Push..."
+++msgstr "Envoyer par un appel OBEX..."
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 27
++-#: rc.cpp:97
+++#: rc.cpp:86
++ #, no-c-format
++ msgid ""
++-"Currently connected Bluetooth devices with proven identity (<i>"
++-"paired devices</i>):"
+++"Currently connected Bluetooth devices with proven identity (<i>paired "
+++"devices</i>):"
++ msgstr ""
+++"Périphériques Bluetooth actuellement connectés dont l'identité est prouvée (<i>périphériques "
+++"associés</i>):"
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 33
++-#: rc.cpp:100
+++#: rc.cpp:89
++ #, no-c-format
++ msgid "Device"
++ msgstr "Périphérique"
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 74
++-#: rc.cpp:103
+++#: rc.cpp:92
++ #, no-c-format
++ msgid "&Remove Pairing..."
++-msgstr ""
+++msgstr "&Supprimer l'association..."
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 77
++-#: rc.cpp:106
+++#: rc.cpp:95
++ #, no-c-format
++ msgid "Alt+R"
++-msgstr ""
+++msgstr "Alt+R"
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 85
++-#: rc.cpp:109
+++#: rc.cpp:98
++ #, no-c-format
++ msgid "Remove Trust..."
++-msgstr ""
+++msgstr "Supprimer la confiance..."
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 115
++-#: rc.cpp:113
+++#: rc.cpp:102
++ #, no-c-format
++ msgid ""
++ "<b>Note:</b> The pairing procedure to add new devices will be started "
++ "automatically if you access a service which requests a secure connection."
++ msgstr ""
+++"<b>Note:</b> La procédure d'association de nouveau périphérique sera démarrée "
+++"automatiquement si vous accédez à un service au travers d'une connexion sécurisée."
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 154
++-#: rc.cpp:116
+++#: rc.cpp:105
++ #, no-c-format
++ msgid "Export..."
++-msgstr ""
+++msgstr "Exporter..."
++ 
++ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 157
++-#: rc.cpp:119
+++#: rc.cpp:108
++ #, no-c-format
++ msgid "Let's you "
++-msgstr ""
+++msgstr "Vous laisse "
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 16
++-#: rc.cpp:122
+++#. i18n: file ./kinputwizard/inputdialog.ui line 16
+++#: rc.cpp:111
++ #, no-c-format
++-msgid "Export Link Keys"
++-msgstr ""
+++msgid "Input Devices"
+++msgstr "Périphériques de saisie"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 35
++-#: rc.cpp:125
+++#. i18n: file ./kinputwizard/inputdialog.ui line 34
+++#: rc.cpp:114
++ #, no-c-format
++-msgid ""
++-"Pairing a device in a dual boot setup breaks an alreay established pairing in "
++-"the other operating system, because the link keys stored by each OS are not "
++-"identical. Here you can export BlueZ's keys for use with Windows, so that you "
++-"don't have to pair devices again each time you switch the OS."
++-msgstr ""
+++msgid "<font size=\"+1\">Configured Input Devices:</font>"
+++msgstr "<font size=\"+1\">Périphériques de saisie configurés:</font>"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 46
++-#: rc.cpp:128
+++#. i18n: file ./kinputwizard/inputdialog.ui line 48
+++#: rc.cpp:117
++ #, no-c-format
++-msgid "Read more about dual boot setups..."
++-msgstr ""
+++msgid "1"
+++msgstr "1"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 71
++-#: rc.cpp:131
+++#. i18n: file ./kinputwizard/inputdialog.ui line 59
+++#: rc.cpp:120
++ #, no-c-format
++-msgid "Bluetooth Stacks Used Besides BlueZ"
++-msgstr ""
+++msgid "2"
+++msgstr "2"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 82
++-#: rc.cpp:134
+++#. i18n: file ./kinputwizard/inputdialog.ui line 70
+++#. i18n: file ./kinputwizard/inputdialog_ext.ui line 80
+++#: rc.cpp:123 rc.cpp:163
++ #, no-c-format
++-msgid "Widcomm Bluetooth stack"
++-msgstr ""
+++msgid "3"
+++msgstr "3"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 90
++-#: rc.cpp:137
+++#. i18n: file ./kinputwizard/inputdialog.ui line 216
+++#: rc.cpp:127
++ #, no-c-format
++-msgid "Microsoft Bluetooth stack"
++-msgstr ""
+++msgid "C&onnect"
+++msgstr "C&onnecter"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 142
++-#: rc.cpp:140
+++#. i18n: file ./kinputwizard/inputdialog.ui line 236
+++#: rc.cpp:136
++ #, no-c-format
++-msgid "Save to File..."
++-msgstr ""
+++msgid "Alt+D"
+++msgstr "Alt+D"
++ 
++-#. i18n: file ./kcm_btpaired/exportdialog.ui line 150
++-#: rc.cpp:143
+++#. i18n: file ./kinputwizard/inputdialog.ui line 261
+++#: rc.cpp:139
++ #, no-c-format
++-msgid "Send via OBEX Push..."
++-msgstr ""
+++msgid "&Add New Devices >>"
+++msgstr "&Ajouter de nouveaux périphériques >>"
+++
+++#. i18n: file ./kinputwizard/inputdialog.ui line 264
+++#: rc.cpp:142
+++#, no-c-format
+++msgid "Alt+A"
+++msgstr "Alt+A"
++ 
++ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 16
++-#: rc.cpp:146
+++#: rc.cpp:151
++ #, no-c-format
++ msgid "New Device"
++-msgstr ""
+++msgstr "Nouveau périphérique"
++ 
++ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 52
++-#: rc.cpp:149
++-#, fuzzy, no-c-format
++-msgid "<b>New Input Device:</b>"
++-msgstr "<b>Nom du périphérique : </b>"
++-
++-#. i18n: file ./kinputwizard/inputdialog_ext.ui line 80
++-#: rc.cpp:158 rc.cpp:184
+++#: rc.cpp:154
++ #, no-c-format
++-msgid "3"
++-msgstr ""
+++msgid "<b>New Input Device:</b>"
+++msgstr "<b>Nouveau périphérique de saisie:</b>"
++ 
++ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 114
++-#: rc.cpp:161
+++#: rc.cpp:166
++ #, no-c-format
++ msgid "&Setup"
++-msgstr ""
+++msgstr "&Installation"
++ 
++ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 117
++-#: rc.cpp:164
+++#: rc.cpp:169
++ #, no-c-format
++ msgid "Alt+S"
++-msgstr ""
+++msgstr "Alt+S"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 16
++-#: rc.cpp:172
+++#. i18n: file ./kbluemon/mondialog.ui line 30
+++#: rc.cpp:177 kbluemon/main.cpp:38 kbluemon/main.cpp:49
++ #, no-c-format
++-msgid "Input Devices"
++-msgstr ""
+++msgid "KBlueMon"
+++msgstr "KBlueMon"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 34
++-#: rc.cpp:175
+++#. i18n: file ./kbluemon/mondialog.ui line 57
+++#: rc.cpp:183
++ #, no-c-format
++-msgid "<font size=\"+1\">Configured Input Devices:</font>"
++-msgstr ""
+++msgid "Signal"
+++msgstr "Signal"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 48
++-#: rc.cpp:178
+++#. i18n: file ./kbluemon/mondialog.ui line 68
+++#: rc.cpp:186
++ #, no-c-format
++-msgid "1"
++-msgstr ""
+++msgid "Class"
+++msgstr "Classe"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 59
++-#: rc.cpp:181
+++#. i18n: file ./kbluemon/mondialog.ui line 90
+++#: rc.cpp:192
++ #, no-c-format
++-msgid "2"
++-msgstr ""
+++msgid "Icon"
+++msgstr "Icône"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 216
++-#: rc.cpp:188
++-#, fuzzy, no-c-format
++-msgid "C&onnect"
++-msgstr "Connecté à"
+++#. i18n: file ./kbluemon/mondialog.ui line 164
+++#: rc.cpp:195
+++#, no-c-format
+++msgid "Address:"
+++msgstr "Adresse:"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 236
++-#: rc.cpp:197
+++#. i18n: file ./kbluemon/mondialog.ui line 212
+++#: rc.cpp:198
++ #, no-c-format
++-msgid "Alt+D"
++-msgstr ""
+++msgid "Name:"
+++msgstr "Nom:"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 261
++-#: rc.cpp:200
+++#. i18n: file ./kbluemon/mondialog.ui line 241
+++#: rc.cpp:202
++ #, no-c-format
++-msgid "&Add New Devices >>"
++-msgstr ""
+++msgid "Typ:"
+++msgstr "Type:"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 264
++-#: rc.cpp:203
+++#. i18n: file ./kbluemon/mondialog.ui line 270
+++#: rc.cpp:206
++ #, no-c-format
++-msgid "Alt+A"
++-msgstr ""
+++msgid "Signal:"
+++msgstr "Signal:"
++ 
++-#. i18n: file ./kinputwizard/inputdialog.ui line 278
++-#: rc.cpp:209 rc.cpp:236
+++#. i18n: file ./kbluemon/mondialog.ui line 301
+++#: rc.cpp:209
++ #, no-c-format
++-msgid "Alt+C"
++-msgstr ""
+++msgid "Version:"
+++msgstr "Version:"
++ 
++-#. i18n: file ./kbluelock/lockdialog.ui line 16
++-#: kbluelock/main.cpp:38 kbluelock/main.cpp:50 rc.cpp:212
++-#, fuzzy, no-c-format
++-msgid "KBlueLock"
++-msgstr "KBluetoothD"
+++#. i18n: file ./kbluemon/mondialog.ui line 330
+++#: rc.cpp:213
+++#, no-c-format
+++msgid "Revision:"
+++msgstr "Révision:"
++ 
++-#. i18n: file ./kbluelock/lockdialog.ui line 27
++-#: rc.cpp:215
+++#. i18n: file ./kbluemon/mondialog.ui line 359
+++#: rc.cpp:217
++ #, no-c-format
++-msgid "Lock the screen if the selected device disappears"
++-msgstr ""
+++msgid "Manufacturer:"
+++msgstr "Constructeur:"
++ 
++-#. i18n: file ./kbluelock/lockdialog.ui line 38
++-#: rc.cpp:218
+++#. i18n: file ./kbluemon/mondialog.ui line 388
+++#: rc.cpp:221
++ #, no-c-format
++-msgid "Unlock the screen if the selected device appears again"
++-msgstr ""
+++msgid "Category:"
+++msgstr "Catégorie:"
++ 
++-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 16
++-#: kbluetooth/sdprecord.cpp:362 kbluetooth/sdprecord.cpp:374 rc.cpp:242
+++#. i18n: file ./kbluemon/mondialog.ui line 462
+++#: rc.cpp:225
++ #, no-c-format
++-msgid "KDE Bluetooth Framework"
++-msgstr "Interface KDE Bluetooth"
+++msgid "Services"
+++msgstr "Services:"
++ 
++-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 37
++-#: rc.cpp:245
+++#. i18n: file ./kbluemon/mondialog.ui line 529
+++#: rc.cpp:228 kbluemon/monitor.cpp:338 kbluemon/monitor.cpp:423
+++#, no-c-format
+++msgid "St&op Scan"
+++msgstr "St&opper le scan"
+++
+++#. i18n: file ./kbluemon/mondialog.ui line 564
+++#: rc.cpp:240
+++#, no-c-format
+++msgid "Periodic Scan"
+++msgstr "Scan périodique"
+++
+++#. i18n: file ./kbluemon/mondialog.ui line 572
+++#: rc.cpp:243
+++#, no-c-format
+++msgid "Discover Remote Services"
+++msgstr "Découvrir les services distants"
+++
+++#. i18n: file ./kbluemon/mondialog.ui line 575
+++#: rc.cpp:246
+++#, no-c-format
+++msgid "Discovering the available Services of the Remote Device takes quiet longer."
+++msgstr "Découvrir les services disponibles sur les périphériques distants prend du temps."
+++
+++#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 16
+++#: rc.cpp:250
+++#, no-c-format
+++msgid "MyDialog1"
+++msgstr "MyDialog1"
+++
+++#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 103
+++#: rc.cpp:253
++ #, no-c-format
++ msgid ""
++-"<p><font size=\"+2\">Incoming File Transfer</font></p>\n"
++-"<b>%1</b> wants to send you some files."
++-"<br/>\n"
++-"Press <i>Save</i> to accept all files or drag them to another application or "
++-"folder."
+++"<p>The Bluetooth device \"<b>%1</b>\" wants to use the service <b>%2</b>.</"
+++"p>\n"
+++"<p>Do you want to allow this access? </p>"
++ msgstr ""
+++"<p>Le périphérique Bluetooth \"<b>%1</b>\" veut utiliser le service <b>%2</b>.</"
+++"p>\n"
+++"<p>Souhaitez-vous autoriser cet accès? </p>"
++ 
++-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 78
++-#: rc.cpp:250
+++#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 121
+++#: rc.cpp:257
++ #, no-c-format
++-msgid "Waiting..."
+++msgid "Future policy for this device and service:"
+++msgstr "Règle future pour ce périphérique et ce service:"
+++
+++#. i18n: file ./kbluetooth/authdialog.ui line 16
+++#: rc.cpp:260
+++#, no-c-format
+++msgid "PinDefaultDialog"
+++msgstr "PinDefaultDialog"
+++
+++#. i18n: file ./kbluetooth/authdialog.ui line 32
+++#: rc.cpp:263
+++#, no-c-format
+++msgid ""
+++"<font size=\"+2\">Bluetooth Authorization Request</font>\n"
+++"<p><b>%1</b> (device address <b>%2</b>) %3.</p>\n"
+++"\n"
+++"<p>\n"
+++"If you aren't sure about the identity of the other party, then reject \n"
+++"this authorization request.</p>"
++ msgstr ""
+++"<font size=\"+2\">Demande d'autorisation Bluetooth</font>\n"
+++"<p><b>%1</b> (adresse du périphérique <b>%2</b>) %3.</p>\n"
+++"\n"
+++"<p>\n"
+++"Si vous n'êtes pas certain de l'identité du périphérique, alors rejetez \n"
+++"cette demande d'autorisation.</p>"
++ 
++-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 101
++-#: rc.cpp:253
+++#. i18n: file ./kbluetooth/pindefdialog.ui line 29
+++#: rc.cpp:271
++ #, no-c-format
++-msgid "Open destination folder:"
+++msgid ""
+++"<font size=\"+2\">Bluetooth Pairing Request</font>\n"
+++"<p><b>%1</b> (device address <b>%2</b>) wants to pair with your\n"
+++"Bluetooth device, which is needed for authenticated and secure connections.\n"
+++"</p><p>\n"
+++"If you are sure about the identity of the other party, then please enter\n"
+++"the same PIN below as was used by the other device.</p>"
++ msgstr ""
+++"<font size=\"+2\">Demande d'association Bluetooth</font>\n"
+++"<p><b>%1</b> (adresse du périphrique <b>%2</b>) veut s'associer avec votre périphérique\n"
+++"Bluetooth, ce qui est nécessiare à l'authentification et l'établissement de connexions sécurisées.\n"
+++"</p><p>\n"
+++"Si vous êtes certain de l'identité du périphérique distant, entrer le code PIN utilisé par\n"
+++"l'autre périphérique.</p>"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 30
++-#: rc.cpp:262
+++#: rc.cpp:279
++ #, no-c-format
++ msgid "AdapterDialog"
++-msgstr ""
+++msgstr "AdapterDialog"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 59
++-#: rc.cpp:265
+++#: rc.cpp:282
++ #, no-c-format
++ msgid "Device Settings"
++-msgstr ""
+++msgstr "Péramètres du périphérique"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 98
++-#: rc.cpp:268
+++#: rc.cpp:285
++ #, no-c-format
++ msgid "Adapter Name:"
++-msgstr ""
+++msgstr "Nom de l'adaptateur:"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 129
++-#: rc.cpp:271
+++#: rc.cpp:288
++ #, no-c-format
++ msgid "Mode:"
++-msgstr ""
+++msgstr "Mode:"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 163
++-#: rc.cpp:274
++-#, fuzzy, no-c-format
+++#: rc.cpp:291
+++#, no-c-format
++ msgid "Discoverable Timeout:"
++-msgstr "Pas de réponse de la page"
+++msgstr "Limite de temps pour la découverte:"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 213
++-#: rc.cpp:278
+++#: rc.cpp:295
++ #, no-c-format
++ msgid "Timeout after the adapter gets invisible"
++-msgstr ""
+++msgstr "Temps après lequel le périphérique devient invisible"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 235
++-#: rc.cpp:281
+++#: rc.cpp:298
++ #, no-c-format
++ msgid "Class of Device:"
++-msgstr ""
+++msgstr "Classe du périphérique:"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 241
++-#: rc.cpp:284
++-#, fuzzy, no-c-format
+++#: rc.cpp:301
+++#, no-c-format
++ msgid "Unspecified"
++-msgstr "Pas de réponse du LMP"
+++msgstr "Non spécifié"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 246
++-#: rc.cpp:287
+++#: rc.cpp:304
++ #, no-c-format
++ msgid "Desktop"
++-msgstr ""
+++msgstr "Ordinateur de bureau"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 251
++-#: rc.cpp:290
+++#: rc.cpp:307
++ #, no-c-format
++ msgid "Laptop"
++-msgstr ""
+++msgstr "Ordinateur Portable"
++ 
++ #. i18n: file ./kbluetooth/adapterdialog.ui line 291
++-#: rc.cpp:293
+++#: rc.cpp:310
++ #, no-c-format
++ msgid "Device Information"
++-msgstr ""
++-
++-#. i18n: file ./kbluetooth/authdialog.ui line 16
++-#: rc.cpp:298
++-#, no-c-format
++-msgid "PinDefaultDialog"
++-msgstr ""
++-
++-#. i18n: file ./kbluetooth/authdialog.ui line 32
++-#: rc.cpp:301
++-#, fuzzy, no-c-format
++-msgid ""
++-"<font size=\"+2\">Bluetooth Authorization Request</font>\n"
++-"<p><b>%1</b> (device address <b>%2</b>) %3.</p>\n"
++-"\n"
++-"<p>\n"
++-"If you aren't sure about the identity of the other party, then reject \n"
++-"this authorization request.</p>"
++-msgstr ""
++-"<font size=\"+2\">Demande de couplage d'un périphérique Bluetooth</font>\n"
++-"<p><b>%1</b> (adresse du périphérique <b>%2</b>) veut se coupler avec votre\n"
++-"périphérique Bluetooth, ce qui est nécessaire pour une connexion authentifiée "
++-"et sécurisée.\n"
++-"</p>"
++-"<p>\n"
++-"Si vous connaissez l'identité de l'autre partie, alors saisissez ci-dessous\n"
++-"le même code PIN que celui utilisé par l'autre périphérique.</p>"
+++msgstr "Informations du périphérique"
++ 
++-#. i18n: file ./kbluetooth/pindefdialog.ui line 29
++-#: rc.cpp:309
+++#. i18n: file ./kbtserialchat/maindialogbase.ui line 16
+++#: rc.cpp:315 kbtserialchat/main.cpp:42
++ #, no-c-format
++-msgid ""
++-"<font size=\"+2\">Bluetooth Pairing Request</font>\n"
++-"<p><b>%1</b> (device address <b>%2</b>) wants to pair with your\n"
++-"Bluetooth device, which is needed for authenticated and secure connections.\n"
++-"</p>"
++-"<p>\n"
++-"If you are sure about the identity of the other party, then please enter\n"
++-"the same PIN below as was used by the other device.</p>"
++-msgstr ""
++-"<font size=\"+2\">Demande de couplage d'un périphérique Bluetooth</font>\n"
++-"<p><b>%1</b> (adresse du périphérique <b>%2</b>) veut se coupler avec votre\n"
++-"périphérique Bluetooth, ce qui est nécessaire pour une connexion authentifiée "
++-"et sécurisée.\n"
++-"</p>"
++-"<p>\n"
++-"Si vous connaissez l'identité de l'autre partie, alors saisissez ci-dessous\n"
++-"le même code PIN que celui utilisé par l'autre périphérique.</p>"
+++msgid "Bluetooth Serial Chat"
+++msgstr "Connexion Série Bluetooth"
++ 
++-#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 16
++-#: rc.cpp:317
+++#. i18n: file ./kbtserialchat/maindialogbase.ui line 27
+++#: rc.cpp:318
++ #, no-c-format
++-msgid "MyDialog1"
++-msgstr "Ma Fenêtre 1"
+++msgid "<font color=\"#0000ff\" size=\"+2\">Bluetooth Serial Chat</font>"
+++msgstr "<font color=\"#0000ff\" size=\"+2\">Connexion Série Bluetooth</font>"
++ 
++-#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 103
++-#: rc.cpp:320
+++#. i18n: file ./kbtserialchat/maindialogbase.ui line 54
+++#: rc.cpp:321
++ #, no-c-format
++-msgid ""
++-"<p>The Bluetooth device \"<b>%1</b>\" wants to use the service <b>%2</b>.</p>\n"
++-"<p>Do you want to allow this access? </p>"
++-msgstr ""
++-"<p>Le périphérique Bluetooth \"<b>%1</b>\" veut utiliser le service <b>%2</b>"
++-".</p>\n"
++-"<p>Voulez-vous l'autoriser à y accéder ? </p>"
+++msgid "&Send"
+++msgstr "Envoyer"
++ 
++-#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 121
+++#. i18n: file ./kbtserialchat/maindialogbase.ui line 57
++ #: rc.cpp:324
++ #, no-c-format
++-msgid "Future policy for this device and service:"
++-msgstr "Choix futur à faire pour ce périphérique et ce service :"
++-
++-#: kcm_btpaired/pairedtab.cpp:288
++-msgid "- trusted "
++-msgstr ""
++-
++-#: kcm_btpaired/pairedtab.cpp:288
++-#, fuzzy
++-msgid " device"
++-msgstr "périphérique inconnu"
++-
++-#: kcm_btpaired/pairedtab.cpp:302
++-msgid "%1 (%2) %3"
++-msgstr ""
++-
++-#: kcm_btpaired/pairedtab.cpp:313
++-#, c-format
++-msgid "Last Seen: %1"
++-msgstr ""
++-
++-#: kcm_btpaired/pairedtab.cpp:321
++-#, c-format
++-msgid "Last Used: %1"
++-msgstr ""
++-
++-#: kcm_btpaired/kcm_btpaired.cpp:76
++-msgid ""
++-"<h1>BtPaired</h1>With this module you can manage the list of paired Bluetooth "
++-"Devices."
++-msgstr ""
++-
++-#: kinputwizard/main.cpp:36 kinputwizard/main.cpp:48
++-msgid "KInputWizard"
++-msgstr ""
++-
++-#: kbluelock/main.cpp:39 kinputwizard/main.cpp:37
++-msgid "Copyright (C) 2007 Novell, Inc."
++-msgstr ""
++-
++-#: kinputwizard/main.cpp:57
++-#, fuzzy
++-msgid ""
++-"KInputWizard is already running.\n"
++-msgstr ""
++-"KBluetoothD fonctionnait déjà.\n"
+++msgid "Alt+S, Return"
+++msgstr "Alt+S, Return"
++ 
++ #: kinputwizard/inputwizard.cpp:244 kinputwizard/inputwizard.cpp:489
++ #: kinputwizard/inputwizard.cpp:505
++-#, fuzzy
++ msgid "&Disconnect"
++-msgstr "Non connecté"
+++msgstr "&Déconnecter"
++ 
++ #: kinputwizard/inputwizard.cpp:246 kinputwizard/inputwizard.cpp:494
++ #: kinputwizard/inputwizard.cpp:502
++-#, fuzzy
++ msgid "&Connect"
++-msgstr "Connecté à"
+++msgstr "&Connecter"
++ 
++ #: kinputwizard/inputwizard.cpp:273
++ msgid "&Add New Device <<"
++-msgstr ""
+++msgstr "&Ajouter un nouveau périphérique <<"
++ 
++ #: kinputwizard/inputwizard.cpp:287
++ msgid "&Add New Device >>"
++-msgstr ""
+++msgstr "&Ajouter un nouveau périphérique >>"
++ 
++ #: kinputwizard/inputwizard.cpp:391
++-#, fuzzy
++ msgid "Creating Input Device"
++-msgstr "&Périphériques couplés..."
+++msgstr "Création du périphérique de saisie"
++ 
++ #: kinputwizard/inputwizard.cpp:391
++ msgid "You have to select a remote Device to setup!"
++-msgstr ""
+++msgstr "Vous devez choisir un périphérique distant à installer!"
++ 
++ #: kinputwizard/inputwizard.cpp:415
++ msgid "Creating Input Device failed"
++-msgstr ""
+++msgstr "La création du périphérique de saisie a échoué"
++ 
++ #: kinputwizard/inputwizard.cpp:415
++ msgid "Failed to create the input device for %1!"
++-msgstr ""
+++msgstr "Echec de la création du périphérique de saisie pour %1!"
++ 
++ #: kinputwizard/inputwizard.cpp:458
++-#, fuzzy
++ msgid "Connect now?"
++-msgstr "Informations de connexion"
+++msgstr "Connecter maitnenant?"
++ 
++ #: kinputwizard/inputwizard.cpp:459
++ msgid "Would you like to connect to %1 now?"
++-msgstr ""
+++msgstr "Souhaitez-vous vous connecter à %1 maintenant?"
++ 
++ #: kinputwizard/inputwizard.cpp:488
++-#, fuzzy
++ msgid "Connection succesfull"
++-msgstr "Informations de connexion"
+++msgstr "Connexion établie"
++ 
++ #: kinputwizard/inputwizard.cpp:488
++ msgid "Connection to %1 successful established!"
++-msgstr ""
+++msgstr "La connexion à %1 s'est établie avec succès!"
++ 
++ #: kinputwizard/inputwizard.cpp:493
++-#, fuzzy
++ msgid "Connection failed"
++-msgstr "&Détails de la connexion"
+++msgstr "La connexion a échoué"
++ 
++ #: kinputwizard/inputwizard.cpp:493
++-#, fuzzy
++ msgid "Could not connect to "
++-msgstr "Connecté à"
+++msgstr "Impossible de se connecter à "
++ 
++ #: kinputwizard/inputwizard.cpp:493
++ msgid ""
++ "\n"
++ " Check if the device is available and bluetooth enabled."
++ msgstr ""
+++"\n"
+++" Verifier si le périphérique est disponible et si ses fonctionnalités Bluetooth sont activées."
++ 
++ #: kinputwizard/inputwizard.cpp:501
++ msgid "Disconnect succesfull"
++-msgstr ""
+++msgstr "Disconnexion réussie"
++ 
++ #: kinputwizard/inputwizard.cpp:501 kinputwizard/inputwizard.cpp:504
++-#, fuzzy
++ msgid "Connection to "
++-msgstr "Informations de connexion"
+++msgstr "Connexion à "
++ 
++ #: kinputwizard/inputwizard.cpp:501
++ msgid " successful disconnected!"
++-msgstr ""
+++msgstr " a été déconnecté avec succès!"
++ 
++ #: kinputwizard/inputwizard.cpp:504
++-#, fuzzy
++ msgid "Disconnect failed"
++-msgstr "Non connecté"
+++msgstr "La déconnection a échoué"
++ 
++ #: kinputwizard/inputwizard.cpp:504
++-#, fuzzy
++ msgid " could not be disconnected!"
++-msgstr "Non connecté"
+++msgstr " ne peut pas ^etre déconnecté!"
++ 
++-#: libkobex/kobexclient.cpp:139 libkobex/kobexserver.cpp:177
++-#, fuzzy
++-msgid "Connecting..."
++-msgstr "Aucune connexion"
+++#: kinputwizard/main.cpp:36 kinputwizard/main.cpp:48
+++msgid "KInputWizard"
+++msgstr "KInputWizard"
++ 
++-#: libkobex/kobexclient.cpp:175 libkobex/kobexserver.cpp:220
++-#, fuzzy
++-msgid "Disconnecting..."
++-msgstr "Connexion :"
+++#: kinputwizard/main.cpp:57
+++msgid "KInputWizard is already running.\n"
+++msgstr "KInputWizard est déjà en fonctionnement.\n"
++ 
++-#: libkobex/kobexclient.cpp:79
++-msgid ""
++-"Error connecting to phone\n"
++-"Response message: "
++-msgstr ""
+++#: kioslave/obex/kio_obex/obex.cpp:289 kioslave/obex/kio_obex/obex.cpp:297
+++#: kioslave/obex/kio_obex/obex.cpp:678
+++msgid "Authentication failed"
+++msgstr "L'authentification a échoué"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:412
+++msgid "OBEX protocol error: Recieved invalid MTU."
+++msgstr "Erreur du protocole OBEX: Le MTU reçu est invalide."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:415
+++msgid "OBEX protocol error: Recieved invalid packet."
+++msgstr "Erreur du protocole OBEX: Le paquet reçu est invalide."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:418
+++msgid "OBEX protocol error: Invalid protocol version received."
+++msgstr "Erreur du protocole OBEX: La version du protocole est invalide."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:421
+++msgid "Authentication required."
+++msgstr "Authentification requise."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:424
+++msgid "Can not connect."
+++msgstr "Ne peut pas de connecter."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:427
+++msgid "Internal error: Already connected."
+++msgstr "Erreur interne: Déjà connecté."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:430 kioslave/obex/kio_obex/obex.cpp:709
+++msgid "Internal error: Not connedcted."
+++msgstr "Erreur inerne: Non connecté."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:433
+++msgid "Internal error: Client not idle."
+++msgstr "Erreur interne: Le client n'est pas inactif."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:436
+++msgid "Unable to send request."
+++msgstr "Impossible d'envoyer la requête."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:439
+++msgid "Got server error from server."
+++msgstr "Une erreur a été reçue du serveur."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:442
+++msgid "Transport is not connected (anymore)."
+++msgstr "Transport n'est (plus) connecté."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:445
+++msgid "Transport error."
+++msgstr "Erreur de transport."
+++
+++#: kioslave/obex/kio_obex/obex.cpp:448
+++msgid "Internal error."
+++msgstr "Erreur interne."
++ 
++-#: libkobex/kobexclient.cpp:93
+++#: kioslave/obex/kio_obex/obex.cpp:468 kioslave/obex/kio_obex/obex.cpp:715
+++msgid "Disconnecting"
+++msgstr "Déconnection"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:472 kioslave/obex/kio_obex/obex.cpp:718
+++msgid "Disconnected"
+++msgstr "Déconnecté"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:551 kioslave/obex/kio_obex/obex.cpp:562
+++msgid "Transport not available"
+++msgstr "Transport non disponible"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:634
+++msgid "Connecting"
+++msgstr "Connection"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:667
+++msgid "Connected"
+++msgstr "Connecté"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:809 kioslave/obex/kio_obex/obex.cpp:921
+++msgid "Downloading"
+++msgstr "Rception"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:822 kioslave/obex/kio_obex/obex.cpp:923
+++msgid "Downloaded"
+++msgstr "Reçu"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:853
+++msgid "Creating directory"
+++msgstr "Création du répertoire"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:860
+++msgid "Created directory"
+++msgstr "Répertoire créé"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:879
+++msgid "Deleting"
+++msgstr "Suppression"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:885
+++msgid "Deleted"
+++msgstr "Supprimé"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:972
+++msgid "Uploading"
+++msgstr "Envoi"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:981
+++msgid "Uploaded"
+++msgstr "Envoyé"
+++
+++#: kioslave/obex/kio_obex/obex.cpp:1336
+++msgid "OBEX FTP"
+++msgstr "OBEX FTP"
+++
+++#: kioslave/sdp/btsdp.cpp:43
+++msgid "No working Bluetooth adapter found."
+++msgstr "Aucun périphérique Bluetooth n'a été trouvé."
+++
+++#: kioslave/sdp/btsdp.cpp:131 kioslave/bluetooth/kiobluetooth.cpp:87
+++msgid "Bluetooth neighborhood"
+++msgstr "Voisinage Bluetooth"
+++
+++#: kioslave/sdp/btsdp.cpp:139
+++msgid "More services"
+++msgstr "Plus de services"
+++
+++#: kioslave/sdp/btsdp.cpp:145
+++msgid "Could not stat %1. Unknown device"
+++msgstr "Ne peut pas cibler %1. Périphérique inconnu"
+++
+++#: kioslave/sdp/btsdp.cpp:201
+++msgid "Retrieving services for %1."
+++msgstr "Recherche des services pour %1."
+++
+++#: kioslave/bluetooth/kiobluetooth.cpp:41
+++msgid "Protocol name"
+++msgstr "Nom du protocole"
+++
+++#: kioslave/bluetooth/kiobluetooth.cpp:42
+++#: kioslave/bluetooth/kiobluetooth.cpp:43
+++msgid "Socket name"
+++msgstr "Nom du socket"
+++
+++#: kioslave/bluetooth/kiobluetooth.cpp:93
+++msgid "Could not stat %1."
+++msgstr "Ne peut pas cibler %1."
+++
+++#: kbtobexclient/fileiconview.cpp:58
+++msgid "&Cancel Selected Files"
+++msgstr "Annuler la sélection de fichiers"
+++
+++#: kbtobexclient/fileiconview.cpp:63
+++msgid "&New Project"
+++msgstr "&Nouveau projet"
+++
+++#: kbtobexclient/fileview.cpp:72
+++msgid "Location: "
+++msgstr "Emplacement: "
+++
+++#: kbtobexclient/fileview.cpp:94
++ msgid ""
++-"Error sending file %1 to phone\n"
++-"Response message: "
+++"<qt>Click this button to enter the parent folder.<p>For instance, if the "
+++"current location is file:/home/%1 clicking this button will take you to "
+++"file:/home.</qt>"
++ msgstr ""
+++"<qt>Cliquer sur ce bouton pour entrer dans le dossier parent.<p>Si l'emplacement "
+++"actuel est the file:/home/%1 cliquer sur ce bouton vous emmènera à  file:/home.</qt>"
++ 
++-#: libkobex/kobexclient.cpp:105
+++#: kbtobexclient/fileview.cpp:98
+++msgid "Click this button to move backwards one step in the browsing history."
+++msgstr "Cliquer sur ce bouton pour revenir à l'emplacement précédent."
+++
+++#: kbtobexclient/fileview.cpp:100
+++msgid "Click this button to move forward one step in the browsing history."
+++msgstr "Cliquer sur ce bouton vous emmènera à l'emplacement suivant."
+++
+++#: kbtobexclient/fileview.cpp:102
+++msgid "Click this button to reload the contents of the current location."
+++msgstr "Cliquer sur ce bouton actualise le contenu de l'emplacement actuel."
+++
+++#: kbtobexclient/fileview.cpp:105
+++msgid "Click this button to create a new folder."
+++msgstr "Cliquer sur ce bouton crée un nouveau répertoire."
+++
+++#: kbtobexclient/fileview.cpp:109
++ msgid ""
++-"Error getting data from phone\n"
++-"Response message: "
++-msgstr ""
+++"<qt>This is the configuration menu for the file dialog. Various options can "
+++"be accessed from this menu including: <ul><li>how files are sorted in the "
+++"list</li><li>types of view, including icon and list</li><li>showing of "
+++"hidden files</li><li>the Quick Access navigation panel</li><li>file "
+++"previews</li><li>separating folders from files</li></ul></qt>"
+++msgstr ""
+++"<qt>Ceci est le menu de configuration de la boite de dialogue de la gestion "
+++"de fichiers. Diverses option sont accessibles depuis ce menu telles que:"
+++"<ul><li>comment les fichiers sont classés dans la liste</li><li>type de "
+++"vue, incluant \"icônes\" et \"liste\"</li><li>affichage des fichiers cachés</li>"
+++"<li>accès rapide au panneau de navigation</li><li>aperçus de fichiers</li>"
+++"<li>séparer les dossiers des fichiers</li></ul></qt>"
++ 
++-#: libkobex/kobexclient.cpp:120
++-msgid "Done"
++-msgstr ""
+++#: kbtobexclient/fileview.cpp:136
+++msgid "Filter:"
+++msgstr "Filtre:"
++ 
++-#: libkobex/kobexclient.cpp:164
++-msgid "Error connecting transport"
++-msgstr ""
+++#: kbtobexclient/fileview.cpp:142
+++msgid "*|All Files"
+++msgstr "*|Tous les fichiers"
++ 
++-#: libkobex/kobexclient.cpp:208
++-#, fuzzy
++-msgid "Sending "
+++#: kbtobexclient/fileview.cpp:143
+++msgid "image/jpeg |JPEG Image Files"
+++msgstr "image/jpeg |Images JPEG"
+++
+++#: kbtobexclient/diroperator.cpp:75
+++msgid "Short View"
+++msgstr "Vue simple"
+++
+++#: kbtobexclient/mainwindow.cpp:125 kbtobexclient/mainwindow.cpp:148
+++#: kbtobexclient/mainwindow.cpp:156
+++msgid "Project View"
+++msgstr "Vue de projet"
+++
+++#: kbtobexclient/mainwindow.cpp:139
+++msgid "File to send:"
+++msgstr "Fichiers à envoyer"
+++
+++#: kbtobexclient/mainwindow.cpp:145
+++msgid "Send"
++ msgstr "Envoyer"
++ 
++-#: libkobex/kobexclient.cpp:208
++-msgid ""
++-" to phone\n"
++-"\n"
++-msgstr ""
+++#: kbtobexclient/mainwindow.cpp:148
+++msgid "Files View"
+++msgstr "Vue des fichiers"
++ 
++-#: libkobex/kobexclient.cpp:217
++-msgid "Requesting stream start..."
++-msgstr ""
+++#: kbtobexclient/mainwindow.cpp:156
+++msgid "Devices View"
+++msgstr "Vue des périphériques"
++ 
++-#: libkobex/kobexclient.cpp:254
++-msgid "Streaming data..."
++-msgstr ""
+++#: kbtobexclient/mainwindow.cpp:161
+++msgid "Device selector:"
+++msgstr "Sélecteur de périphériques"
++ 
++-#: kbluelock/main.cpp:61
++-#, fuzzy
++-msgid ""
++-"KBlueLock is already running.\n"
++-msgstr ""
++-"KBluetoothD fonctionnait déjà.\n"
+++#: kbtobexclient/mainwindow.cpp:192
+++msgid "Show Device Selector"
+++msgstr "Afficher le sélecteur de périphériques"
++ 
++-#: kbluelock/kbluelock.cpp:215 kbluelock/kbluelock.cpp:308
+++#: kbtobexclient/mainwindow.cpp:194
+++msgid "Show File Selector"
+++msgstr "Afficher le sélecteur de fichiers"
+++
+++#: kbtobexclient/mainwindow.cpp:196
+++msgid "Show File Browser"
+++msgstr "Afficher le gestionnaire de fichiers"
+++
+++#: kbtobexclient/mainwindow.cpp:274
++ msgid ""
++-"<p align='center'>KBlueLock <b>ON</b></p>\n"
++-"<p align='center'><i>%1</i></p>"
+++"\n"
+++" Continue with the remaining files?"
++ msgstr ""
+++"\n"
+++" Continuer avec les fichiers restants?"
++ 
++-#: kbluelock/kbluelock.cpp:227
++-msgid "KBlueLock - No Device selectetd"
++-msgstr ""
+++#: kbtobexclient/main.cpp:31
+++msgid "A KDE Bluetooth Framework Application"
+++msgstr "Un gestionnaire Bluetooth pour KDE"
++ 
++-#: kbluelock/kbluelock.cpp:227
++-msgid "To enable KBlueLock you have to choose a Device."
++-msgstr ""
+++#: kbtobexclient/main.cpp:37 kbtserialchat/main.cpp:32
+++msgid "Used by kio_sdp"
+++msgstr "Utilisé par kio_sdp"
++ 
++-#: kbluelock/kbluelock.cpp:289
++-msgid ""
++-"<p align='center'>KBlueLock <b>OFF</b></p>\n"
++-"<p align='center'><i>%1</i></p>"
++-msgstr ""
+++#: kbtobexclient/main.cpp:47
+++msgid "Bluetooth OBEX Object Push client"
+++msgstr "Client d'envoi de fichier par Bluetooth OBEX"
++ 
++-#: kbluelock/kbluelock.cpp:344
++-msgid "&Disable"
++-msgstr ""
+++#: kbtobexclient/main.cpp:53
+++msgid "Author, Maintainer"
+++msgstr "Auteur, Mainteneur"
++ 
++-#: kbluelock/kbluelock.cpp:350
++-msgid "&Enable"
++-msgstr ""
+++#: kbluemon/monitor.cpp:57 kbluemon/monitor.cpp:331 kbluemon/monitor.cpp:424
+++msgid "Scanning..."
+++msgstr "Analyse..."
++ 
++-#: kbtobexsrv/main.cpp:24
++-msgid "KDE OBEX Push Server for Bluetooth"
++-msgstr ""
+++#: kbluemon/monitor.cpp:150
+++msgid "Service Discovery disabled"
+++msgstr "Découverte de services désactivée"
++ 
++-#: kbtobexsrv/main.cpp:63
++-msgid ""
++-"kbtobexsrv will be called automatically by kbluetoothd when another device "
++-"tries to send you some files. You don't have to run it manually."
++-msgstr ""
+++#: kbluemon/monitor.cpp:151 kbluemon/monitor.cpp:200 kbluemon/monitor.cpp:203
+++#: kbluemon/monitor.cpp:206 kbluemon/monitor.cpp:222 kbluemon/monitor.cpp:253
+++msgid "<i>not available</i>"
+++msgstr "<i>non disponible</i>"
++ 
++-#: kbtobexsrv/maindlg.cpp:158
++-#, c-format
++-msgid "Receiving %1"
++-msgstr ""
+++#: kbluemon/monitor.cpp:221 kbluemon/monitor.cpp:248
+++msgid "no Services discovered"
+++msgstr "aucun service découvert"
++ 
++-#: kbtobexsrv/maindlg.cpp:208
++-#, fuzzy
++-msgid "Disconnected."
++-msgstr "Non connecté"
+++#: kbluemon/monitor.cpp:344 kbluemon/monitor.cpp:445
+++msgid "St&art Scan"
+++msgstr "Dém&arrer l'analise"
++ 
++-#: kbtobexsrv/maindlg.cpp:217
++-msgid ""
++-"The selected folder does not exist.                            Please select "
++-"another folder."
++-msgstr ""
+++#: kbluemon/monitor.cpp:414
+++msgid "Periodic Discovery started"
+++msgstr "Découverte de services démarrée"
++ 
++-#: kbtobexsrv/maindlg.cpp:218
++-msgid "Obex Server"
++-msgstr ""
+++#: kbluemon/monitor.cpp:416
+++msgid "Failed to start Periodic Discovery! ("
+++msgstr "Echec lors du démarrage de la découverte de services"
++ 
++-#: kbtobexsrv/maindlg.cpp:254
++-msgid "%1 already exists. Do you want to use %2 as filename instead?"
++-msgstr ""
+++#: kbluemon/main.cpp:61
+++msgid "KBlueMon is already running.\n"
+++msgstr "KBlueMon est déjà en fonctionnement.\n"
++ 
++-#: kbtobexsrv/maindlg.cpp:255
++-msgid "Rename"
++-msgstr ""
+++#: kbluetooth/sdprecord.cpp:359
+++msgid "Failed to register an SDP record."
+++msgstr "Echec lors de l'écriture d'un enregistrement SDP"
++ 
++-#: kbtobexsrv/maindlg.cpp:255
++-msgid "Overwrite"
+++#: kbluetooth/sdprecord.cpp:360
+++msgid ""
+++"Please make sure that sdpd is running; \n"
+++"without it, other devices will not be able to find out \n"
+++"which services your computer offers. \n"
+++"The error code returned by sdp_record_register() was %1"
++ msgstr ""
+++"Vérifier que sdpd est en fonctionnement; \n"
+++"sans lui, les autres périphériques ne pourront pas vérifier \n"
+++"quels services sont publiés sur votre ordinateur. \n"
+++"L'erreur retournée par sdp_record_register() est %1"
++ 
++-#: kbtobexsrv/maindlg.cpp:271
++-#, c-format
++-msgid "Error writing file %1."
++-msgstr ""
+++#: kbluetooth/sdprecord.cpp:372
+++msgid "Failed to connect to the SDP server."
+++msgstr "Echec lors de la connexion au serveur SDP"
++ 
++-#: kbtobexsrv/maindlg.cpp:285
+++#: kbluetooth/sdprecord.cpp:373
++ msgid ""
++-"The following files already existed in the target folder and were not saved "
++-"again with a different name:"
+++"Please make sure that sdpd is running; \n"
+++"without it, other devices will not be able to find out \n"
+++"which services your computer offers."
++ msgstr ""
+++"Vérifier que sdpd est en fonctionnement; \n"
+++"sans lui, les autres périphériques ne pourront pas vérifier \n"
+++"quels services sont publiés sur votre ordinateur;"
++ 
++ #: kbluetooth/rfcommportlistener.cpp:105
++-#, c-format
++ msgid "Could not create a socket for service %1."
++-msgstr "Impossible de créer une interface de connexion pour le service %1."
+++msgstr "Impossible de créer un socket pour le service %1."
++ 
++ #: kbluetooth/rfcommportlistener.cpp:106
++ msgid ""
++ "<p>KBluetooth was unable to create a socket for the service %1. The error "
++-"message was <i>%2</i> (Error code %3)."
++-"<p>Make sure that BlueZ is installed correctly and all modules are loaded "
++-"(bluez, l2cap, rfcomm..)."
++-msgstr ""
++-"<p>KBluetooth a été désactivé pour créer une interface de connexion pour le "
++-"service %1. Le message d'erreur était <i>%2</i> (Code d'erreur %3)."
++-"<p>Assurez vous que BlueZ est installé correctement et que tous les modules "
++-"sont chargés (bluez, l2cap, rfcomm...)."
+++"message was <i>%2</i> (Error code %3).<p>Make sure that BlueZ is installed "
+++"correctly and all modules are loaded (bluez, l2cap, rfcomm..)."
+++msgstr ""
+++"<p>KBluetooth n'a pas pu créer un socket pour le service %1. Le message d'erreur "
+++"est <i>%2</i> (Code d'erreur %3).<p>Vérifier que BlueZ est installé "
+++"correctement et que tous les modules sont chargés (bluez, l2cap, rfcomm..)."
++ 
++ #: kbluetooth/rfcommportlistener.cpp:136
++ msgid ""
++ "<p>Could not enable security features for <b>%1</b>.The service will not be "
++ "started.</p>"
++ msgstr ""
++-"<p>Impossible d'activer les fonctionnalités de sécurité pour <b>%1</b>"
++-". Le service n'a pu être démarré.</p>"
+++"<p>Impossible d'activer les fonctionnalités de séciruté pour <b>%1</b>.Le service "
+++"ne sera pas démarré.</p>"
++ 
++ #: kbluetooth/rfcommportlistener.cpp:139
++ msgid ""
++ "<p>KBluetoothD was unable to enable authentication and/or encryption for the "
++-"service %1, so this service will not be started.</p>"
++-"<p> The error code returned by setsockopt() was %3 (<i>%2</i>)</p>"
++-"<p>To use encryption/authentication for selected services, you need a Linux "
++-"kernel >= 2.6.10-mh3. For older kernels you have to disable encryption and "
++-"authentication for this service."
++-"<br/> <i>Be careful with allowing unconfirmed connections in that case, since "
++-"the peer address could be faked.</i></p>"
++-msgstr ""
++-"<p>KBluetoothD n'a pu démarrer une authentification et/ou un cryptage pour le "
++-"service %1, ce service ne sera donc pas démarré.</p>"
++-"<p> The code d'erreur retourné par setsockopt() est %3 (<i>%2</i>)</p>"
++-"<p>Pour utiliser le cryptage/l'authentification pour les services sélectionnés, "
++-"vous avez besoin d'un noyau Linux de version supérieure ou égale à la 2.6.10. "
++-"Pour les noyaux plus anciens vous devrez désactiver le cryptage et "
++-"l'authentification pour ce service."
++-"<br/> <i>Dans ce cas, faites attention lorsque vous accordez des connexions non "
++-"confirmées, étant donné que l'adresse peut être falsifiée..</i></p>"
+++"service %1, so this service will not be started.</p><p> The error code "
+++"returned by setsockopt() was %3 (<i>%2</i>)</p><p>To use encryption/"
+++"authentication for selected services, you need a Linux kernel >= 2.6.10-mh3. "
+++"For older kernels you have to disable encryption and authentication for this "
+++"service.<br/> <i>Be careful with allowing unconfirmed connections in that "
+++"case, since the peer address could be faked.</i></p>"
+++msgstr ""
++ 
++ #: kbluetooth/rfcommportlistener.cpp:174
++-#, c-format
++ msgid "Could not listen to a socket for service %1."
++-msgstr "Impossible d'écouter une interface de connexion pour le service %1."
+++msgstr "Impossible d'attendre une connexion pour le service %1."
++ 
++ #: kbluetooth/rfcommportlistener.cpp:175
++ msgid ""
++-"<p>KBluetoothD was unable to listen to a socket for the service %1. The error "
++-"message was <i>%2</i> (Error code %3)."
++-"<p>Make sure that BlueZ is installed correctly and all modules are loaded "
++-"(bluez, l2cap, rfcomm..)."
++-msgstr ""
++-"<p>KBluetoothD n'a pas pu écouter une interface de connexion pour le service "
++-"%1. Le messsage d'erreur fut <i>%2</i> (Code d'erreur %3)."
++-"<p>Assurez vous que BlueZ est installé correctement et que tous les modules "
++-"sont chargés (bluez, l2cap, rfcomm...)."
+++"<p>KBluetoothD was unable to listen to a socket for the service %1. The "
+++"error message was <i>%2</i> (Error code %3).<p>Make sure that BlueZ is "
+++"installed correctly and all modules are loaded (bluez, l2cap, rfcomm..)."
+++msgstr ""
+++"<p>KBluetoothD n'a pas pu attendre une connexion pour le service %1. Le "
+++"message d'erreur est <i>%2</i> (Code d'erreur %3).<p>Vérifier que BlueZ est installé "
+++"correctement et que tous les modules sont chargés (bluez, l2cap, rfcomm..)."
++ 
++ #: kbluetooth/rfcommportlistener.cpp:199
++-#, c-format
++ msgid "Could not bind to a socket for service %1."
++-msgstr "Impossible d'associer une interface de connexion au service %1."
+++msgstr "Impossible de lier la connexion au service %1."
++ 
++ #: kbluetooth/rfcommportlistener.cpp:200
++ msgid ""
++-"<p>KBluetoothD was unable to bind to a socket for the service %1 on channel %2. "
++-"The error message was <i>%3</i> (Error code %4)."
++-"<p>Make sure that BlueZ is installed correctly."
++-msgstr ""
++-"<p>KBluetoothD n'a pas pu associer une interface de connexion au service %1 sur "
++-"le canal %2. Le message d'erreur était <i>%3</i> (Code d'erreur %4)."
++-"<p>Assurez-vous que BlueZ est correctement installé."
+++"<p>KBluetoothD was unable to bind to a socket for the service %1 on channel %"
+++"2. The error message was <i>%3</i> (Error code %4).<p>Make sure that BlueZ "
+++"is installed correctly."
+++msgstr ""
++ 
++ #: kbluetooth/rfcommportlistener.cpp:215
++-#, c-format
++ msgid "Could not assign a channel to service %1."
++-msgstr "Impossible d'associer un canal au service %1."
+++msgstr "Impossible d'assigner un canal au service %1."
++ 
++ #: kbluetooth/rfcommportlistener.cpp:216
++ msgid ""
++-"<p>KBluetoothD was unable to find an unused Rfcomm channel for the service %1, "
++-"so other devices will not be able to access that service.</p>"
++-"<p>Possible reasons:"
++-"<br/> "
++-"<ul> "
++-"<li>Several services are configured to use the same channel.</li> "
++-"<li>Other Bluetooth services are blocking the ports. </li> </ul> Checklist: "
++-"<ul> "
++-"<li>%2 will try to use channels form %3 to %4 - are they all used by other "
++-"services?"
++-"<li>Does <i>/proc/bluetooth/rfcomm</i> show more listening sockets than the "
++-"Bluetooth services tab in the Control Center? </ul> </p>"
++-msgstr ""
++-"<p>KBluetoothD n'a pas pu trouver un canal Rfcomm non utilisé pour le service "
++-"%1, les autres périphériques ne seront donc pas en mesure d'accéder à ce "
++-"service. </p>"
++-"<p>Il y a plusieurs causes possibles : "
++-"<br/> "
++-"<ul> "
++-"<li>Beaucoup de services sont configurés sur le même canal</li> "
++-"<li>D'autres services Bluetooth bloquent les ports</li> </ul> "
++-"Liste des vérifications : "
++-"<ul> "
++-"<li>%2 essaiera d'essayer les canaux %3 à %4 - sont-ils tous utilisés par les "
++-"autres services ? "
++-"<li>Est-ce que <i>/proc/bluetooth/rfcomm</i> affiche plus d'interfaces de "
++-"connexion que l'onglet des services bluetooth du centre de contrôle ? </ul> </p>"
+++"<p>KBluetoothD was unable to find an unused Rfcomm channel for the service %"
+++"1, so other devices will not be able to access that service.</p><p>Possible "
+++"reasons:<br/> <ul> <li>Several services are configured to use the same "
+++"channel.</li> <li>Other Bluetooth services are blocking the ports. </li> </"
+++"ul> Checklist: <ul> <li>%2 will try to use channels form %3 to %4 - are they "
+++"all used by other services?<li>Does <i>/proc/bluetooth/rfcomm</i> show more "
+++"listening sockets than the Bluetooth services tab in the Control Center? </"
+++"ul> </p>"
+++msgstr ""
++ 
++ #: kbluetooth/rfcommportlistener.cpp:478
++ msgid "Connection from <b>%1</b><br/>to channel %3 (<b>%2</b>)"
++-msgstr "Connexion depuis <b>%1</b><br/>vers le canal %3 (<b>%2</b>)"
+++msgstr "Connexion de <b>%1</b><br/>au canal %3 (<b>%2</b>)"
++ 
++ #: kbluetooth/rfcommportlistener.cpp:530
++ msgid "Call \"%1\" failed"
++-msgstr "L'appel à \"%1\" a échoué"
+++msgstr "L'appel \"%1\" a échoué"
++ 
++ #: kbluetooth/confirmation.cpp:52
++ msgid "Kbluetoothd: access to %1 from %2: ALLOW"
++-msgstr "Kbluetoothd : accès à %1 depuis %2 : AUTORISER"
+++msgstr "Kbluetoothd: accès à %1 par %2: AUTORISER"
++ 
++ #: kbluetooth/confirmation.cpp:57
++ msgid "Kbluetoothd: access to %1 from %2: DENY"
++-msgstr "Kbluetoothd : accès à %1 depuis %2 : REFUSER"
+++msgstr "Kbluetoothd: accès à %1 par %2: REFUSER"
++ 
++ #: kbluetooth/confirmation.cpp:62
++ msgid "Kbluetoothd: access to %1 from %2: ASK"
++-msgstr "Kbluetoothd : accès à %1 depuis %2 : DEMANDER"
+++msgstr "Kbluetoothd: accès à %1 par %2: DEMANDER"
++ 
++ #: kbluetooth/confirmation.cpp:74
++ msgid "Unchanged"
++-msgstr "Inchangée"
+++msgstr "Inchangé"
++ 
++-#: kbluetooth/authorize.cpp:30 kbluetooth/confirmation.cpp:90
+++#: kbluetooth/confirmation.cpp:90 kbluetooth/authorize.cpp:30
++ msgid "Accept"
++ msgstr "Accepter"
++ 
++@@ -1398,90 +1355,56 @@
++ msgstr "Rejeter"
++ 
++ #: kbluetooth/authorize.cpp:30
++-#, fuzzy
++ msgid "Always Accept"
++-msgstr "Accepter"
+++msgstr "Toujours accepter"
++ 
++ #: kbluetooth/authorize.cpp:39
++ msgid "wants to act as Input Device"
++-msgstr ""
++-
++-#: kbluetooth/main.cpp:20 kbluetooth/main.cpp:32 kbluetooth/trayicon.cpp:378
++-#: kbluetooth/trayicon.cpp:400 kbluetooth/trayicon.cpp:414
++-#: kbluetooth/trayicon.cpp:427 kbluetooth/trayicon.cpp:441
++-#, fuzzy
++-msgid "KBluetooth"
++-msgstr "KBluetoothD"
++-
++-#: kbluetooth/main.cpp:24
++-msgid "Show the tray icon if it was disabled before."
++-msgstr ""
++-"Afficher l'icône de la barre système si elle a été désactivée auparavant."
++-
++-#: kbluetooth/main.cpp:44
++-#, fuzzy
++-msgid ""
++-"KBluetooth is already running.\n"
++-msgstr ""
++-"KBluetoothD fonctionnait déjà.\n"
++-
++-#: kbluetooth/main.cpp:58
++-msgid ""
++-"Can't connect to DBus!\n"
++-"Unable to start kbluetooth. \n"
++-"\n"
++-" \t\t\t\t\t\t\t\t\tRestart dbus and the bluetooth service"
++-msgstr ""
+++msgstr "veut agir comme périphérique de saisie"
++ 
++ #: kbluetooth/trayicon.cpp:42
++-#, fuzzy
++ msgid "KBlue&Mon"
++-msgstr "KBluetoothD"
+++msgstr "KBlue&Mon"
++ 
++ #: kbluetooth/trayicon.cpp:48
++ msgid "KBlue&Lock"
++-msgstr ""
+++msgstr "KBlue&Lock"
++ 
++ #: kbluetooth/trayicon.cpp:54
++ msgid "&Send File..."
++-msgstr ""
+++msgstr "Envoyer un fichier..."
++ 
++ #: kbluetooth/trayicon.cpp:60
++ msgid "&Configuration"
++ msgstr "&Configuration"
++ 
++ #: kbluetooth/trayicon.cpp:76
++-#, fuzzy
++ msgid "&Input Devices..."
++-msgstr "&Périphériques couplés..."
+++msgstr "Pér&iphériques de saisie..."
++ 
++ #: kbluetooth/trayicon.cpp:82
++-#, fuzzy
++-msgid "&Devices..."
++-msgstr "&Périphériques couplés..."
+++msgid "&Adapters..."
+++msgstr "&Adaptateurs..."
++ 
++ #: kbluetooth/trayicon.cpp:88
++-#, fuzzy
++ msgid "&Paired/Trusted Devices..."
++-msgstr "&Périphériques couplés..."
+++msgstr "&Périphériques associés/de confiance..."
++ 
++ #: kbluetooth/trayicon.cpp:97
++ msgid "&Obex Server"
++-msgstr ""
+++msgstr "Serveur &OBEX"
++ 
++ #: kbluetooth/trayicon.cpp:242
++-#, fuzzy
++ msgid ""
++ "KBluetooth will run in hidden mode now and only show up when there is a "
++ "connection. To enable the permanent tray icon start KBluetooth again."
++ msgstr ""
++-"KBluetoothD se lancera désormais en mode caché et ne se montrera que quand il y "
++-"aura une connexion. Pour activer de nouveau l'icône de la barre système, "
++-"relancez KBluetoothD."
+++"KBluetooth fonctionnera en mode masqué et ne s'affichera que s'il existe une "
+++"connection. Pour l'afficher perpétuellement, démarrer KBluetooth à nouveau."
++ 
++ #: kbluetooth/trayicon.cpp:244
++ msgid "Hidden Mode"
++-msgstr "Mode caché"
+++msgstr "Mode masqué"
++ 
++ #: kbluetooth/trayicon.cpp:254
++ msgid "Not connected"
++@@ -1494,37 +1417,44 @@
++ "Mode: %3\n"
++ "Connected to: "
++ msgstr ""
+++"Adaptateur: %1\n"
+++"Addresse: %2\n"
+++"Mode: %3\n"
+++"Connecté à: "
++ 
++ #: kbluetooth/trayicon.cpp:377
++ msgid "Could not execute the btpaired Control Center module."
++-msgstr "Impossible d'exécuter le module btpaired du centre de contrôle."
+++msgstr "Impossible d'exécuter le module KCM btpaired."
+++
+++#: kbluetooth/trayicon.cpp:378 kbluetooth/trayicon.cpp:400
+++#: kbluetooth/trayicon.cpp:414 kbluetooth/trayicon.cpp:427
+++#: kbluetooth/trayicon.cpp:441 kbluetooth/main.cpp:20 kbluetooth/main.cpp:32
+++msgid "KBluetooth"
+++msgstr "KBluetooth"
++ 
++ #: kbluetooth/trayicon.cpp:399
++ msgid "Could not execute kinputwizard."
++-msgstr ""
+++msgstr "Impossible d'exécuter kinputwizard."
++ 
++ #: kbluetooth/trayicon.cpp:413
++ msgid "Could not execute KBlueMon."
++-msgstr ""
+++msgstr "Impossible d'exécuter KBlueMon."
++ 
++ #: kbluetooth/trayicon.cpp:426
++ msgid "Could not execute KBlueLock."
++-msgstr ""
+++msgstr "Impossible d'exécuter KBlueLock."
++ 
++ #: kbluetooth/trayicon.cpp:440
++-#, fuzzy
++ msgid "Could not execute KBtobexclient."
++-msgstr "Impossible d'exécuter le module btpaired du centre de contrôle."
+++msgstr "Impossible d'exécuter KBtobexclient."
++ 
++ #: kbluetooth/trayicon.cpp:470
++-#, fuzzy
++ msgid "Should KBluetooth still be restarted when you login?"
++-msgstr "KBluetoothD doit-il être relancé quand vous vous connectez ?"
+++msgstr "KBluetooth doit-il démarrer lorsque vous ouvrez une session?"
++ 
++ #: kbluetooth/trayicon.cpp:471
++-#, fuzzy
++ msgid "Automatically Start KBluetooth?"
++-msgstr "Démarrer automatiquement KBluetoothD ?"
+++msgstr "Démarrer KBluetooth automatiquement?"
++ 
++ #: kbluetooth/trayicon.cpp:471
++ msgid "Start"
++@@ -1535,345 +1465,190 @@
++ msgstr "Ne pas Démarrer"
++ 
++ #: kbluetooth/trayicon.cpp:516
++-#, fuzzy
++ msgid "Connected to <b>%1</b><br/>(<b>%2</b>)"
++-msgstr "Connexion depuis <b>%1</b><br/>vers le canal %3 (<b>%2</b>)"
+++msgstr "Connecté à <b>%1</b><br/>(<b>%2</b>)"
++ 
++ #: kbluetooth/trayicon.cpp:575
++ msgid "<i>Bluetooth Monitor</i><br/> Problem connecting with <b>%1</b>:"
++-msgstr ""
++-"<i>Moniteur Bluetooth</i>"
++-"<br/> Problème lors de la connexion avec <b>%1</b> :"
++-
++-#: kbluetooth/sdprecord.cpp:357
++-msgid "Failed to register an SDP record."
++-msgstr "Échec de l'enregistrement SDP"
++-
++-#: kbluetooth/sdprecord.cpp:358
++-#, c-format
++-msgid ""
++-"Please make sure that sdpd is running; \n"
++-"without it, other devices will not be able to find out \n"
++-"which services your computer offers. \n"
++-"The error code returned by sdp_record_register() was %1"
++-msgstr ""
++-"Assurez-vous que sdpd est lancé. \n"
++-"Sans lui aucun périphérique ne pourra se connecter \n"
++-"avec les services qu'offre votre ordinateur. \n"
++-"Le code d'erreur retourné par sdp_record_register() fut %1."
++-
++-#: kbluetooth/sdprecord.cpp:370
++-msgid "Failed to connect to the SDP server."
++-msgstr "Échec de la connexion au serveur SDP."
++-
++-#: kbluetooth/sdprecord.cpp:371
++-msgid ""
++-"Please make sure that sdpd is running; \n"
++-"without it, other devices will not be able to find out \n"
++-"which services your computer offers."
++-msgstr ""
++-"Assurez-vous que sdpd est lancé. \n"
++-"Sans lui aucun périphérique ne pourra se connecter \n"
++-"avec les services qu'offre votre ordinateur."
+++msgstr "<i>Moniteur Bluetooth</i><br/> Problème de connexion avec <b>%1</b>:"
++ 
++ #: kbluetooth/adapterconfig.cpp:49
++ msgid "off"
++-msgstr ""
+++msgstr "off"
++ 
++ #: kbluetooth/adapterconfig.cpp:50
++-#, fuzzy
++ msgid "connectable"
++-msgstr "Non connecté"
+++msgstr "connectable"
++ 
++ #: kbluetooth/adapterconfig.cpp:51
++ msgid "discoverable"
++-msgstr ""
+++msgstr "découvrable"
++ 
++ #: kbluetooth/adapterconfig.cpp:107
++-#, fuzzy
++ msgid "MAC Address: <b>%1</b>"
++-msgstr "<b>Adresse : </b>"
+++msgstr "Adresse MAC: <b>%1</b>"
++ 
++ #: kbluetooth/adapterconfig.cpp:110
++ msgid "Version: <b>%1</b>"
++-msgstr ""
+++msgstr "Version: <b>%1</b>"
++ 
++ #: kbluetooth/adapterconfig.cpp:128
++ msgid "none"
++-msgstr ""
+++msgstr "aucune"
++ 
++ #: kbluetooth/adapterconfig.cpp:132
++ msgid " minutes"
++-msgstr ""
+++msgstr "minutes"
++ 
++ #: kbluetooth/deviceconfig.cpp:45 kbluetooth/deviceconfig.cpp:124
++-#, fuzzy
++ msgid "No Bluetooth device found!"
++-msgstr "Adaptateur Bluetooth trouvé."
+++msgstr "Aucun service Bluetooth trouvé!"
++ 
++ #: kbluetooth/deviceconfig.cpp:46 kbluetooth/deviceconfig.cpp:125
++-#, fuzzy
++ msgid "no device"
++-msgstr "périphérique inconnu"
++-
++-#~ msgid "Always &Visible"
++-#~ msgstr "Toujours &Visible"
++-
++-#, fuzzy
++-#~ msgid "Paired Devices"
++-#~ msgstr "&Périphériques couplés..."
++-
++-#, fuzzy
++-#~ msgid "connect"
++-#~ msgstr "Non connecté"
++-
++-#, fuzzy
++-#~ msgid "disconnect"
++-#~ msgstr "Non connecté"
++-
++-#~ msgid "Configure &Services..."
++-#~ msgstr "Configurer les &Services..."
++-
++-#  i18n: file kbluetoothd/condetailswidget.ui line 43
++-#~ msgid "<unknown>"
++-#~ msgstr "<unknown>"
++-
++-#~ msgid "<b>Role:</b>"
++-#~ msgstr "<b>Rôle : </b>"
++-
++-#~ msgid "<b>Handle:</b>"
++-#~ msgstr "<b>Outil : </b>"
++-
++-#~ msgid "<b>Direction:</b>"
++-#~ msgstr "<b>Direction : </b>"
++-
++-#~ msgid "<b>Link mode:</b>"
++-#~ msgstr "<b>Mode de lien : </b>"
++-
++-#~ msgid "Kill Connection"
++-#~ msgstr "Tuer la connexion"
++-
++-#~ msgid "Bookmark this device"
++-#~ msgstr "Ajouter un signet pour ce périphérique"
++-
++-#~ msgid "Add a bookmark for quicker access"
++-#~ msgstr "Ajouter un signet pour un accès plus rapide"
++-
++-#~ msgid "<qt><p>By adding a bookmark you can bypass the search procedure for devices which are not discoverable by default.</p><p>The bookmark will be created in the first Bookmark folder which already contains a Bluetooth device link</p></qt>"
++-#~ msgstr "<qt><p>En ajoutant un signet vous pouvez éviter la procédure de recherche de périphériques qui ne sont pas visibles par défaut.</p><p>Le signet sera créé dans le premier dossier de signets qui contient déjà un lien vers un périphérique Bluetooth</p></qt>"
++-
++-#~ msgid "00:00:00:00:00:00"
++-#~ msgstr "00:00:00:00:00:00"
++-
++-#~ msgid "<p><b>Signal&nbsp;strength:</b></p>"
++-#~ msgstr "<p><b>Puissance du signal : </b></p>"
++-
++-#~ msgid ""
++-#~ "<font size=\"+2\">Bluetooth Pairing Request</font>\n"
++-#~ "<p><b>%1</b> (device address <b>%2</b>) wants to pair with your\n"
++-#~ "Bluetooth device, which is needed for authenticated and secure connections.\n"
++-#~ "</p><p>\n"
++-#~ "If you are sure about the identity of the other party, then please press\n"
++-#~ "<i>Go</i> and enter the generated PIN below in the other device.</p>"
++-#~ msgstr ""
++-#~ "<font size=\"+2\">Demande de couplage d'un périphérique Bluetooth</font>\n"
++-#~ "<p><b>%1</b> (adresse du périphérique <b>%2</b>) veut se coupler avec votre\n"
++-#~ "périphérique Bluetooth, ce qui est nécessaire pour une connexion authentifiée et sécurisée.\n"
++-#~ "</p><p>\n"
++-#~ "Si vous connaissez l'identité de l'autre partie, alors appuyez sur \n"
++-#~ "<i>C'est parti</i> et saisissez le code PIN généré par l'autre périphérique.</p>"
++-
++-#~ msgid "Go"
++-#~ msgstr "C'est parti"
++-
++-#~ msgid "Use custom PIN"
++-#~ msgstr "Utiliser le code PIN habituel"
++-
++-#~ msgid "<p>You may replace bluez's pin helper program with kbluepin; it is located in <b>%1</b> now.</p>"
++-#~ msgstr "<p>Vous pouvez remplacer le programme d'aide à la saisie du code pin de bluez par kbluepin. Il est désormais situé dans <b>%1</b>.</p>"
++-
++-#~ msgid "You can change the confirmation settings again using the Bluetooth services applet in the Control Center."
++-#~ msgstr "Vous pouvez changer les options de confirmation en utilisant l'applet service Bluetooth du Centre de Contrôle."
++-
++-#~ msgid "outgoing"
++-#~ msgstr "sortant"
++-
++-#~ msgid "incoming"
++-#~ msgstr "rentrant"
++-
++-#~ msgid "master"
++-#~ msgstr "maître"
++-
++-#~ msgid "slave"
++-#~ msgstr "esclave"
+++msgstr "aucun périphérique"
++ 
++-#~ msgid "Could not start hcitool to kill the connection."
++-#~ msgstr "Impossible de lancer hcitool pour tuer la connexion."
++-
++-#~ msgid "<p>Executable <b>%1</b> for device search job <b>%2</b> could not be started.</p>"
++-#~ msgstr "<p>L'exécutable <b>%1</b> pour la recherche des tâches des périphériques <b>%2</b> n'a pas pu être lancé.</p>"
++-
++-#~ msgid "<p>Job <b>%1</b>: <i>%2</i></p>"
++-#~ msgstr "<p>Tâche <b>%1</b> : <i>%2</i></p>"
++-
++-#~ msgid "<p>Device search job <b>%1</b> returned with error code <b>%2</b>.</p>"
++-#~ msgstr "<p>La recherche des tâches du périphérique <b>%1</b> a retourné le code d'erreur <b>%2</b>.</p>"
++-
++-#~ msgid "<p>Device search job <b>%1</b> was killed.</p>"
++-#~ msgstr "<p>La recherche des tâches du périphérique <b>%1</b> a été tuée.</p>"
++-
++-#~ msgid "Bluetooth adaptor was unplugged."
++-#~ msgstr "Adaptateur Bluetooth débranché."
++-
++-#~ msgid "KBluetoothD - Bluetooth Meta Server"
++-#~ msgstr "KBluetoothD - Méta-serveur Bluetooth"
++-
++-#~ msgid "Pairing was sucessful."
++-#~ msgstr "Le couplage a réussi"
++-
++-#~ msgid "Pairing failed."
++-#~ msgstr "Échec du couplage."
++-
++-#~ msgid "The devices could not be paired. The reported HCI error code is 0x%1."
++-#~ msgstr "Les périphériques n'ont pu être couplés. Le code d'erreur rapporté par HCI est 0x%1."
++-
++-#~ msgid "Could not execute the kbluetoothd Control Center module."
++-#~ msgstr "Impossible d'exécuter le module kbluetoothd du centre de contrôle."
++-
++-#~ msgid "Could not execute the khciconfig Control Center module."
++-#~ msgstr "Impossible d'exécuter le module khciconfig du centre de contrôle."
++-
++-#~ msgid "You can reenable the Bluetooth daemon at any time by running 'kbluetoothd'."
++-#~ msgstr "Vous pouvez réactiver le démon Bluetooth à chaque fois en lançant \"kbluetoothd\"."
++-
++-#~ msgid "KDE Bluetooth Daemon"
++-#~ msgstr "Démon KDE Bluetooth"
++-
++-#~ msgid "No adapter"
++-#~ msgstr "Pas d'adaptateur"
++-
++-#~ msgid "Recently Seen Devices"
++-#~ msgstr "Périphériques récemment vus"
++-
++-#~ msgid "Recently Used Services"
++-#~ msgstr "Services récemment utilisés"
++-
++-#~ msgid "error code 0x%1"
++-#~ msgstr "Code d'erreur 0x%1"
++-
++-#~ msgid "Hardware failure"
++-#~ msgstr "Problème matériel"
++-
++-#~ msgid "Authentication Error"
++-#~ msgstr "Erreur d'authentification"
++-
++-#~ msgid "Not paired"
++-#~ msgstr "Non couplé"
++-
++-#~ msgid "Memory full"
++-#~ msgstr "Mémoire pleine"
++-
++-#~ msgid "Connection timeout"
++-#~ msgstr "Connexion perdue"
++-
++-#~ msgid "Maximum number of connections"
++-#~ msgstr "Nombre maximal de connexions"
+++#: kbluetooth/main.cpp:24
+++msgid "Show the tray icon if it was disabled before."
+++msgstr "Afficher l'icône si elle était auparavent désactivée."
++ 
++-#~ msgid "Maximum number of SCO connections to a device"
++-#~ msgstr "Nombre maximal de connexions SCO à un périphérique"
+++#: kbluetooth/main.cpp:44
+++msgid "KBluetooth is already running.\n"
+++msgstr "KBluetooth est déjà en fonctionnement.\n"
++ 
++-#~ msgid "ACL connection already exists"
++-#~ msgstr "Une connexion ACL existe déjà"
+++#: kbluetooth/main.cpp:58
+++msgid ""
+++"Can't connect to DBus!\n"
+++"Unable to start kbluetooth. \n"
+++"\n"
+++" \t\t\t\t\t\t\t\t\tRestart dbus and the bluetooth service"
+++msgstr ""
+++"Connexion à DBus impossible!\n"
+++"Impossible de démarrer kbluetooth. \n"
+++"\n"
+++" \t\t\t\t\t\t\t\t\tRedémarrer DBus et le service Bluetooth"
++ 
++-#~ msgid "Host rejected due to limited resources"
++-#~ msgstr "Hôte rejeté à cause de ressources limitées"
+++#: kioclient/commandhandler.cpp:25
+++msgid "Arguments missing."
+++msgstr "Argument manquant."
++ 
++-#~ msgid "Host rejected for security reasons"
++-#~ msgstr "Hôte rejeté pour des raisons de sécurité"
+++#: kioclient/commandhandler.cpp:94
+++msgid "unknown command: %1"
+++msgstr "commande inconnue: %1"
++ 
++-#~ msgid "Host rejected because remote device is only a personal device"
++-#~ msgstr "Hôte rejeté car le périphérique distant est seulement un périphérique personnel."
+++#: kioclient/main.cpp:22
+++msgid "KIO command line client"
+++msgstr "Client KIO pour la ligne de commandes"
++ 
++-#~ msgid "Host timeout"
++-#~ msgstr "L'hôte ne répond pas"
+++#: kioclient/main.cpp:31
+++msgid "List date"
+++msgstr "Lister les dates"
++ 
++-#~ msgid "Unsupported feature or parameter value"
++-#~ msgstr "Valeur de paramètre ou fonctionnalité non acceptée"
+++#: kioclient/main.cpp:32
+++msgid "List user"
+++msgstr "Lister les utilisateurs"
++ 
++-#~ msgid "Invalid HCI command parameters"
++-#~ msgstr "Paramètres de commandes HCI incorrects"
+++#: kioclient/main.cpp:33
+++msgid "List icon name"
+++msgstr "Lister les noms d'icônes"
++ 
++-#~ msgid "Other end terminated connection: User ended connection"
++-#~ msgstr "Connexion terminée par l'autre périphérique : L'utilisateur à terminé la connexion"
+++#: kioclient/main.cpp:34
+++msgid "List group"
+++msgstr "Lister les groupes"
++ 
++-#~ msgid "Other end terminated connection: Low resources"
++-#~ msgstr "Connexion terminée par l'autre périphérique : Ressources faibles"
+++#: kioclient/main.cpp:35
+++msgid "List extra"
+++msgstr "Lister les extras"
++ 
++-#~ msgid "Other end terminated connection: Imminent power off"
++-#~ msgstr "Connexion terminée par l'autre périphérique : Arrêt imminent"
+++#: kioclient/main.cpp:36
+++msgid "Do not list name"
+++msgstr "Ne pas lister les noms"
++ 
++-#~ msgid "Connection terminated by local host"
++-#~ msgstr "Connexion terminée par l'hôte local"
+++#: kioclient/main.cpp:37
+++msgid "List access permissions"
+++msgstr "Lister les permissions d'accès"
++ 
++-#~ msgid "Repeated attempts"
++-#~ msgstr "Essais répétés"
+++#: kioclient/main.cpp:38
+++msgid "List modification time"
+++msgstr "Lister les dates de modification"
++ 
++-#~ msgid "Pairing not allowed"
++-#~ msgstr "Couplage non autorisé"
+++#: kioclient/main.cpp:39
+++msgid "List access time"
+++msgstr "Lister les dates d'accès"
++ 
++-#~ msgid "Unknown LMP PDU"
++-#~ msgstr "LMP PDU inconnu"
+++#: kioclient/main.cpp:40
+++msgid "List creation time"
+++msgstr "Lister les dates de création"
++ 
++-#~ msgid "Unsupported remote feature"
++-#~ msgstr "Fonctionnalité à distance non disponible"
+++#: kioclient/main.cpp:41
+++msgid "List file type"
+++msgstr "Lister les types de fichiers"
++ 
++-#~ msgid "SCO offset rejected"
++-#~ msgstr "Offset SCO rejeté"
+++#: kioclient/main.cpp:42
+++msgid "List link destination"
+++msgstr "Lister la destination des liens"
++ 
++-#~ msgid "SCO interval rejected"
++-#~ msgstr "Intervalle SCO rejetée"
+++#: kioclient/main.cpp:43
+++msgid "List URL"
+++msgstr "Lister les URLs"
++ 
++-#~ msgid "SCO air mode rejected"
++-#~ msgstr "Mode aérien SCO rejeté"
+++#: kioclient/main.cpp:44
+++msgid "List mime type"
+++msgstr "Lister les types mime"
++ 
++-#~ msgid "Invalid LMP parameter"
++-#~ msgstr "Paramètre LMP invalide"
+++#: kioclient/main.cpp:45
+++msgid "List guessed mime type"
+++msgstr "Lister les types mime supposés"
++ 
++-#~ msgid "Unsupported LMP parameter value"
++-#~ msgstr "Valeur de paramètre LMP non acceptée"
+++#: kioclient/main.cpp:46
+++msgid "List XML properties"
+++msgstr "Lister les propriétés XML"
++ 
++-#~ msgid "Role change not allowed"
++-#~ msgstr "Changement de rôle non autorisé"
+++#: kioclient/main.cpp:47
+++msgid "List size"
+++msgstr "Lister les tailles"
++ 
++-#~ msgid "LMP response timeout"
++-#~ msgstr "Réponse LMP : timeout"
+++#: kioclient/main.cpp:48
+++msgid "Output file. Defaults to stdout"
+++msgstr "Fichier de sortie. Utilise stdout par défaut"
++ 
++-#~ msgid "LMP error transaction collision"
++-#~ msgstr "Erreur LMP, lors de la transaction"
+++#: kioclient/main.cpp:49
+++msgid "Input file. Defaults to stdin"
+++msgstr "Fichier d'entrée. Utilise stdin par défaut"
++ 
++-#~ msgid "LMP PDU not allowed"
++-#~ msgstr "LMP PDU non autorisé"
+++#: kioclient/main.cpp:50
+++msgid "Show a progress window"
+++msgstr "Afficher une barre de progression"
++ 
++-#~ msgid "Encryption mode not acceptable"
++-#~ msgstr "Mode de cryptage non acceptable"
+++#: kioclient/main.cpp:51
+++msgid "Ask (graphically) before overwriting files"
+++msgstr "Demander (graphiquement) avant d'écraser des fichiers"
++ 
++-#~ msgid "Unit key used"
++-#~ msgstr "Clé unité utilisée"
+++#: kioclient/main.cpp:52
+++msgid "Show messages from the kioslave"
+++msgstr "Afficher les messages de kioslave"
++ 
++-#~ msgid "QoS is not supported"
++-#~ msgstr "QoS n'est pas disponible"
+++#: kioclient/main.cpp:53
+++msgid "Command (ls, cat, put, cp, rm, mv, mkdir, rmdir)"
+++msgstr "Commande (ls, cat, put, cp, rm, mv, mkdir, rmdir)"
++ 
++-#~ msgid "Instant passed"
++-#~ msgstr "Demande passée"
+++#: kioclient/main.cpp:60
+++msgid "kio client"
+++msgstr "Client KIO"
++ 
++-#~ msgid "Pairing with unit key not supported"
++-#~ msgstr "Le couplage par clé unité n'est pas disponible"
+++#: kbtserialchat/main.cpp:23
+++msgid "A KDE KPart Application"
+++msgstr "Kpart pour KDE"
++ 
++-#~ msgid "<p>The KDE Bluetooth Daemon (<i>kbluetoothd</i>) is needed and was started.</p>"
++-#~ msgstr "<p>Le démon KDE Bluetooth (<i>kbluetoothd</i>) est nécessaire et a été lancé.</p>"
+++#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
+++msgid ""
+++"_: NAME OF TRANSLATORS\n"
+++"Your names"
+++msgstr "Anthony Mercatante"
++ 
++-#~ msgid "The KDE Bluetooth Daemon (<i>kbluetoothd</i>) could not be started. Please make sure it is installed correctly."
++-#~ msgstr "Le démon KDE Bluetooth (<i>kbluetoothd</i>) n'a pu être démarré. Veuillez vous assurer qu'il a été correctement installé."
+++#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
+++msgid ""
+++"_: EMAIL OF TRANSLATORS\n"
+++"Your emails"
+++msgstr "tonio@ubuntu.com"
++ 
++-#~ msgid "The error message was: %1"
++-#~ msgstr "Le message d'erreur était : %1"
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/patches/kubuntu_08_load_kdebluetooth_catalogue.patch
++++ kdebluetooth-1.0~beta9~r769275/debian/patches/kubuntu_08_load_kdebluetooth_catalogue.patch
+@@ -0,0 +1,50 @@
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp	2007-08-30 17:30:15.000000000 +0200
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp	2007-11-16 18:08:29.000000000 +0100
++@@ -42,6 +42,7 @@
++ 
++ int main(int argc, char **argv)
++ {
+++    KLocale::setMainCatalogue("kdebluetooth");
++     KAboutData about("kbtobexclient",
++                      I18N_NOOP("Bluetooth OBEX Object Push client"),
++                      0, description,
++@@ -58,7 +59,6 @@
++ 
++     KApplication app;
++     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
++-    KGlobal::locale()->insertCatalogue("libkbluetooth");
++ 
++     KURL url;
++     if (args->count() == 0) {
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp	2005-04-20 21:01:14.000000000 +0200
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp	2007-11-16 18:08:29.000000000 +0100
++@@ -37,6 +37,7 @@
++ 
++ int main(int argc, char **argv)
++ {
+++    KLocale::setMainCatalogue("kdebluetooth");
++     KAboutData about("kbtserialchat",
++         I18N_NOOP("Bluetooth Serial Chat"),
++         version, description,
++@@ -49,7 +50,6 @@
++     KApplication app;
++     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
++ 
++-    KGlobal::locale()->insertCatalogue("libkbluetooth");
++     if (args->isSet("rfcommconnection") && args->isSet("peeraddr") &&
++         args->isSet("peername")) {
++         int socket = QString(args->getOption("rfcommconnection"))
++diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp
++--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp	2007-08-27 18:44:57.000000000 +0200
+++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp	2007-11-16 18:14:38.000000000 +0100
++@@ -82,7 +82,7 @@
++ {
++     KCModule *create_btpaired(QWidget *parent, const char* /*name*/)
++     {
++-        KGlobal::locale()->insertCatalogue("btpaired");
+++        KGlobal::locale()->insertCatalogue("kdebluetooth");
++         return new kcm_btpaired(parent, "btpaired");
++     }
++ }
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/patches/kubuntu_06_no_autostart.patch
++++ kdebluetooth-1.0~beta9~r769275/debian/patches/kubuntu_06_no_autostart.patch
+@@ -0,0 +1,15 @@
++diff -Nur kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am
++--- kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am	2007-08-29 14:03:27.000000000 +0200
+++++ kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am	2007-08-29 16:39:13.000000000 +0200
++@@ -12,11 +12,6 @@
++ #shelldesktop_DATA = kbluetooth.desktop
++ xdg_apps_DATA = kbluetooth.desktop
++ 
++-# Autostart entry
++-autostartdir = $(datadir)/autostart
++-autostart_DATA = kbluetooth.autostart.desktop
++-
++-
++ #EXTRA_DIST = $(kbluetooth_SOURCES)\
++ #             $(kde_servicetypes_DATA) \
++ #	     eventsrc 
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/watch
++++ kdebluetooth-1.0~beta9~r769275/debian/watch
+@@ -0,0 +1,8 @@
++# See uscan(1) for format
++
++# Compulsory line, this is a version 3 file
++version=3
++
++# Uncomment to find new files on sourceforge, for debscripts >= 2.9
++opts=uversionmangle=s/_/-/,dversionmangle=s/~/-/ \
++  http://sf.net/kde-bluetooth/kdebluetooth-(.*)\.tar\.gz debian svn-upgrade
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/kblueplugd
++++ kdebluetooth-1.0~beta9~r769275/debian/kblueplugd
+@@ -0,0 +1,59 @@
++#!/usr/bin/python
++# -*- coding: UTF-8 -*-
++"""
++Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
++
++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.
++"""
++
++import sys
++from   PyQt4 import QtCore, Qt
++import dbus
++import dbus.mainloop.qt
++import distutils.spawn
++
++kbtcmd    = [ 'kbluetooth' ]
++quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ]  # FIXME: quit kbluelock too?
++
++
++app = Qt.QCoreApplication(sys.argv)
++	
++dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
++bus = dbus.SystemBus()
++
++try:
++        manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')
++except:
++        print "Unable to connect to bluez."
++        sys.exit(1)
++
++if len(manager.ListAdapters()):
++        print "# of devices at startup:", len(manager.ListAdapters())
++        distutils.spawn.spawn(kbtcmd)
++else:
++        print "No BT device found"
++
++
++def slotAdapterAdded(device):
++        print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
++        distutils.spawn.spawn(kbtcmd)
++
++def slotAdapterRemoved(device):
++        print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
++        if len(manager.ListAdapters()) == 0:
++                for p in quitprogs:
++                        print "exiting:", p, " ..."
++                        try:
++                                distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
++                        except:
++                                pass
++
++manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
++manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
++
++print "waiting for bt device (un)plug events ..."
++
++app.exec_()
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/kblueplugd.desktop
++++ kdebluetooth-1.0~beta9~r769275/debian/kblueplugd.desktop
+@@ -0,0 +1,42 @@
++[Desktop Entry]
++Encoding=UTF-8
++Name=KBluetoothD
++Name[sv]=Kbluetoothd
++Name[ta]=Kபுலுடுத்D
++Name[xx]=xxKBluetoothDxx
++GenericName=KDE Bluetooth Daemon
++GenericName[ar]=مراقب KDE Bluetooth
++GenericName[bg]=Демон за Bluetooth в KDE
++GenericName[br]=Diaoul KDE Bluetooth
++GenericName[bs]=KDE Bluetooth daemon
++GenericName[ca]=Dimoni Bluetooth de KDE
++GenericName[cs]=Bluetooth démon pro KDE
++GenericName[da]=KDE Bluetooth-dæmon
++GenericName[de]=KDE Bluetooth-Daemon
++GenericName[el]=Ο δαίμονας Bluetooth του KDE
++GenericName[es]=Daemon Bluetooth de KDE
++GenericName[et]=KDE Bluetoothi deemon
++GenericName[fr]=Démon KDE Bluetooth
++GenericName[gl]=Servizo Bluetooth de KDE
++GenericName[it]=Demone Bluetooth di KDE
++GenericName[ja]=KDE Bluetooth デーモン
++GenericName[ka]=KDE ბლუთუს დემონი
++GenericName[nl]=KDE Bluetooth-daemon
++GenericName[pa]=KDE ਬਲਿਊਟੁੱਥ ਡਾਈਮੋਨ
++GenericName[pl]=Demon Bluetooth dla KDE
++GenericName[pt]=Serviço Bluetooth do KDE
++GenericName[ru]=Служба KDE Bluetooth
++GenericName[sr]=Bluetooth демон за KDE
++GenericName[sr@Latn]=Bluetooth demon za KDE
++GenericName[sv]=KDE-Blåtandsdemon
++GenericName[ta]=KDE புலுடுத் டேமொன்
++GenericName[tr]=KDE Bluetooth Hizmeti
++GenericName[xx]=xxKDE Bluetooth Daemonxx
++Exec=kblueplugd
++Icon=kdebluetooth
++Type=Application
++DocPath=kdebluetooth/index.html
++Terminal=false
++X-KDE-autostart-after=panel
++X-KDE-StartupNotify=false
++X-KDE-autostart-condition=kbluetoothrc:General:AutoStart:true
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/compat
++++ kdebluetooth-1.0~beta9~r769275/debian/compat
+@@ -0,0 +1 @@
++5
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/copyright
++++ kdebluetooth-1.0~beta9~r769275/debian/copyright
+@@ -0,0 +1,76 @@
++This package was debianized by Anthony Mercatante <tonio@ubuntu.com>
++on Mon, 30 Jun 2007 20:28:22 +0100.
++
++It was downloaded from http://bluetooth.kmobiletools.org
++
++Upstream Authors:
++	Mattia Merzi <merzi@itc.it>
++		khciconfig
++		kbluelock
++	
++	Fred Schaettgen <kdebluetooth@schaettgen.de>
++		kbluetoothd
++		kbtobexsrv
++		kio_sdp
++		kio_bluetooth
++		kbtserialchat
++		khandsfree
++		kbemusedsrv
++		likbluetooth
++		kioclient
++		kbtsearch
++	
++	Simone Gotti <simone.gotti@email.it>
++		kbtobexclient
++		IrMCSync Konnector
++		libkobex
++		Service Discovery
++		Autotools Scripts
++	
++	Alex Ibrado <alex@kdex.org>
++		kbemusedsrv
++	
++	Mathias Froehlich <Mathias.Froehlich@web.de>
++		libqobex
++		kio_obex
++	
++	Daniel Gollub <dgollub@suse.de>
++		BlueZ D-Bus API rewrite
++	
++	Tom Patzig <tpatzig@suse.de>
++		kbluemon
++		kbluelock (rewrite)
++		kinputwizard
++
++Copyright holders:
++	Copyright 2003 by Simone Gotti <simone.gotti@email.it>
++	Copyright 2003 Sebastian Trueg <trueg@k3b.org>
++	Copyright 1998-2003 Sebastian Trueg <trueg@k3b.org>
++	Copyright 2007 Tom Patzig <tpatzig@suse.de>
++	Copyright 2007 Novell, Inc
++	Copyright 2006 Daniel Gollub <dgollub@suse.de>
++	Copyright 2004 Fred Schaettgen <kdebluetooth@schaettgen.de>
++	Copyright 2006 Marcin Przylucki <marcin.przylucki@kdemail.net>
++	Copyright 2006 Kevin Ottens <ervin ipsquad net>
++	Copyright 2006 Marco Gulino <marco@kmobiletools.org>
++
++License:
++All the software:
++
++    This package 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 package 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 package; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++
++On Debian systems, the complete text of the GNU General
++Public License can be found in `/usr/share/common-licenses/GPL'.
++
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/kdebluetooth.install
++++ kdebluetooth-1.0~beta9~r769275/debian/kdebluetooth.install
+@@ -0,0 +1,2 @@
++debian/tmp/usr/share/*
++debian/tmp/usr/bin/*
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/control
++++ kdebluetooth-1.0~beta9~r769275/debian/control
+@@ -0,0 +1,40 @@
++Source: kdebluetooth
++Section: kde
++Priority: optional
++Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
++XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
++Uploaders: Michael Meskes <meskes@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
++Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev (>= 3.1.4), kdepim-dev, libopenobex1-dev (>= 1.3), libdbus-qt-1-dev, libobexftp-dev, automake1.9, autoconf
++Standards-Version: 3.7.2
++XS-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kdebluetooth/trunk/
++XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kdebluetooth/trunk/
++
++Package: kdebluetooth
++Architecture: any
++Depends: ${shlibs:Depends}, bluez-utils (>= 3.9), python-qt4-dbus, python-qt4
++Suggests: python
++Description: KDE Bluetooth Framework
++ The KDE Bluetooth Framework provides several easy to use
++ tools to be used with Bluetooth devices.
++ .
++ Homepage: http://bluetooth.kmobiletools.org/
++
++Package: libkbluetooth0
++Architecture: any
++Section: net
++Depends: ${shlibs:Depends}
++Conflicts: qobex, qobex-dev
++Replaces: qobex, qobex-dev
++Description: shared libs for kdebluetooth
++ Contains the shared libs for KDE Bluetooth Framework. 
++ .
++ Homepage: http://bluetooth.kmobiletools.org/
++
++Package: libkbluetooth-dev
++Architecture: any
++Section: libdevel
++Depends: libkbluetooth0 (= ${binary:Version})
++Description: development files and headers kdebluetooth
++ Contains the development files for kdebluetooth
++ .
++ Homepage: http://bluetooth.kmobiletools.org/
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/rules
++++ kdebluetooth-1.0~beta9~r769275/debian/rules
+@@ -0,0 +1,12 @@
++#!/usr/bin/make -f
++
++include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/rules/simple-patchsys.mk
++include /usr/share/cdbs/1/class/kde.mk
++
++DEB_BUILD_OPTIONS += nostrip
++
++install/kdebluetooth::
++	dh_installdirs usr/share/autostart usr/bin
++	install -m755 debian/kblueplugd debian/kdebluetooth/usr/bin/
++	install -m644 debian/kblueplugd.desktop debian/kdebluetooth/usr/share/autostart/
+--- kdebluetooth-1.0~beta9~r769275.orig/debian/changelog
++++ kdebluetooth-1.0~beta9~r769275/debian/changelog
+@@ -0,0 +1,380 @@
++kdebluetooth (1.0~beta9~r769275-0ubuntu1) hardy; urgency=low
++
++  * New upstream release.
++  * Fixed kblueplugd, using QcoreApplication instead of
++    QApplication
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 01 Feb 2008 01:21:58 +0100
++
++kdebluetooth (1.0~beta9~r734866-0ubuntu6) hardy; urgency=low
++
++  * Fixed kubuntu_08_load_kdebluetooth_catalogue.patch so that
++    the KCM module loads the good Catalogue too. 
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 16 Nov 2007 18:28:38 +0100
++
++kdebluetooth (1.0~beta9~r734866-0ubuntu5) hardy; urgency=low
++
++  * Added kubuntu_08_load_kdebluetooth_catalogue.patch:
++    - Some components are loading libkbluetooth catalogue, which
++      doesn't exist
++  * Added kubuntu_09_french_i18n.patch
++    - French translation 
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 16 Nov 2007 16:01:59 +0100
++
++kdebluetooth (1.0~beta9~r734866-0ubuntu4) hardy; urgency=low
++
++  * Fixed kubuntu_02_desktop_files.patch, no need for entry in the Kmenu
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 16 Nov 2007 11:09:35 +0100
++
++kdebluetooth (1.0~beta9~r734866-0ubuntu3) hardy; urgency=low
++
++  * Fixed packaging, libkbluetooth0.install installs kbtobexsrv.
++    Closes LP: #146145, #157746, #155417
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 16 Nov 2007 10:30:57 +0100
++
++kdebluetooth (1.0~beta9~r734866-0ubuntu2) hardy; urgency=low
++
++    * Reuploaded as the buildd seems to be fixed
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Nov 2007 14:10:49 +0100
++
++kdebluetooth (1.0~beta9~r734866-0ubuntu1) hardy; urgency=low
++
++  * New svn snapshot
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 10 Nov 2007 10:26:52 +0100
++
++kdebluetooth (1.0~beta8-0ubuntu7) hardy; urgency=low
++
++  * New svn snapshot
++  * Removed debian/patches/kubuntu_08_rename_devices.patch, merged
++    upstream
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 26 Oct 2007 16:20:33 +0200
++
++kdebluetooth (1.0~beta8-0ubuntu5) gutsy; urgency=low
++
++  * Fixed kblueplugd, previous upload contained 'testing' code that
++    shouldn't be there...
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 03 Oct 2007 12:01:02 +0200
++
++kdebluetooth (1.0~beta8-0ubuntu4) gutsy; urgency=low
++
++  * Added conflicts/replaces qobex, qobex-dev on libkbluetooth. (LP: #146377)
++
++ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 29 Sep 2007 18:28:39 +1000
++
++kdebluetooth (1.0~beta8-0ubuntu3) gutsy; urgency=low
++
++  * Fixed kblueplugd, quits correctly when connection to dbus is
++    impossible. Avoids kblueplugd to crash when bluetooth services
++    are not started. Fixes LP: #136307
++
++ -- Anthony Mercatante <tonio@kubuntu>  Tue, 25 Sep 2007 22:24:16 +0200
++
++kdebluetooth (1.0~beta8-0ubuntu2) gutsy; urgency=low
++
++  * Fixed debian/control, kdebluetooth depends on python-qt4
++    Fixes LP: #135893
++
++ -- Anthony Mercatante <tonio@kubuntu>  Mon, 24 Sep 2007 16:36:37 +0200
++
++kdebluetooth (1.0~beta8-0ubuntu1) gutsy; urgency=low
++
++  * New upstream release
++
++ -- Stefan Skotte <sfs@enhance-it.dk>  Mon, 24 Sep 2007 11:34:40 +0200
++
++kdebluetooth (1.0~beta7-0ubuntu1) gutsy; urgency=low
++
++  * New upstream release
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 15 Sep 2007 13:04:30 +0200
++
++kdebluetooth (1.0~beta6~r709825-0ubuntu2) gutsy; urgency=low
++
++  * Fixed kblueplugd, no session restore
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 11 Sep 2007 13:39:08 +0200
++
++kdebluetooth (1.0~beta6~r709825-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 08 Sep 2007 12:44:11 +0200
++
++kdebluetooth (1.0~beta6~r709359-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 07 Sep 2007 12:34:41 +0200
++
++kdebluetooth (1.0~beta6~r707240-0ubuntu1) gutsy; urgency=low
++
++  * Update kblueplugd with PyQt 4 version, and change kdebluetooth
++    depends to python-qt4-dbus
++
++ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 01 Sep 2007 23:22:27 +0100
++
++kdebluetooth (1.0~beta6~r707240) gutsy; urgency=low
++
++  * New SVN snapshot
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 01 Sep 2007 13:05:05 +0200
++
++kdebluetooth (1.0~beta6~r706975-0ubuntu2) gutsy; urgency=low
++
++  * Added python-dbus dep because of kblueplug
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 01 Sep 2007 00:06:49 +0200
++
++kdebluetooth (1.0~beta6~r706975-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++  * Added kubuntu_07_fix_header_include.patch, fixes build issue due
++    to missing header
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 31 Aug 2007 13:23:01 +0200
++
++kdebluetooth (1.0~beta6~r706807-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++  * Fixed kubuntu_06_no_autostart.patch, don't just don't install autostart
++    file, but let the yes/no question on quit
++  * Removed kubuntu_07_disable_icon_management.desktop, no in svn
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 31 Aug 2007 12:03:41 +0200
++
++kdebluetooth (1.0~beta6~r706303-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++  * Added debian/kbluetoothd and debian/kbluetoothd.desktop script from
++    Achim Bonner, starts kbluetooth automatically when a bluetooth
++    device is plugged and, and stops it when no bluetooth device is
++    available.
++  * added kubuntu_06_no_autostart.patch, to let kbluetoothd deal with
++    bluetooth autostart
++  * added kubuntu_07_disable_icon_management.patch, removed option to
++    hide the icon, as it is buggy and the icon now only appears when a
++    device is available
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 29 Aug 2007 16:50:43 +0200
++
++kdebluetooth (1.0~beta6~r706091-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 29 Aug 2007 14:06:53 +0200
++
++kdebluetooth (1.0~beta6~r705625-0ubuntu2) gutsy; urgency=low
++
++  * Added back patch to fix segault for the input devices tool
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 29 Aug 2007 14:02:19 +0200
++
++kdebluetooth (1.0~beta6~r705625-0ubuntu1) gutsy; urgency=low
++
++  * New SVN snapshot
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 28 Aug 2007 09:49:58 +0200
++
++kdebluetooth (1.0~beta6~r702320-0ubuntu1) gutsy; urgency=low
++
++  * Sync with svn
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 20 Aug 2007 13:55:39 +0200
++
++kdebluetooth (1.0~beta6~r698638-0ubuntu1) gutsy; urgency=low
++
++  * New upstream release
++  * Modify Maintainer value to match the DebianMaintainerField
++    specification.
++
++ -- Richard A. Johnson <nixternal@ubuntu.com>  Mon, 13 Aug 2007 10:06:51 -0500
++
++kdebluetooth (1.0~beta5~r695881-0ubuntu1) gutsy; urgency=low
++
++  * Added kubuntu_01_kdepot.patch:
++    - extract strings to rosetta
++  * Added kubuntu_02_desktop_files.patch:
++    - no need for several entries in K menu
++  * Added kubuntu_03_obex2_push.patch:
++    - fixes object push uploads, allows more than 16kB
++      Patch by Stefan Skotte <sfs@enhance-it.dk>
++  * Added kubuntu_04_obex2_make_up_work.diff:
++    - fixes "UP" button usage when browsing via obex protocol
++      Patch by Frode M. Døving <frode@lnix.net>
++
++ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 03 Aug 2007 09:26:22 +0100
++
++kdebluetooth (0.99+1.0beta2-7) unstable; urgency=low
++
++  * Only create link in postinst if bluetooth device was found and
++    overwrite link that is not working, closes: #426458
++
++ -- Michael Meskes <meskes@debian.org>  Tue, 29 May 2007 11:59:09 +0200
++
++kdebluetooth (0.99+1.0beta2-6) unstable; urgency=low
++
++  * Changed build dependency to libbluetooth-dev.
++
++ -- Michael Meskes <meskes@debian.org>  Mon, 28 May 2007 19:13:13 +0200
++
++kdebluetooth (0.99+1.0beta2-5) unstable; urgency=low
++
++  * Made package built twice in a row, closes: #424451
++  * Changed source to compile with GCC 4.3, closes: #417272
++  * Added compatibility link for paired devices, closes: #416465
++  * Removed irmcsync building because kdepim moved to opensync.
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 23 May 2007 00:50:21 +0200
++
++kdebluetooth (0.99+1.0beta2-4) unstable; urgency=low
++
++  * Use correct init.d script name, closes: #416053
++
++ -- Michael Meskes <meskes@debian.org>  Sat, 24 Mar 2007 14:07:27 +0100
++
++kdebluetooth (0.99+1.0beta2-3) unstable; urgency=low
++
++  * Added dependancy to bluez-utils, closes: #409631
++
++ -- Michael Meskes <meskes@debian.org>  Mon,  5 Feb 2007 11:48:43 +0100
++
++kdebluetooth (0.99+1.0beta2-2) unstable; urgency=low
++
++  * Added AM_MAINTAINER_MODE again to fix the time-stamp skew problems, closes: #397621
++
++ -- Michael Meskes <meskes@debian.org>  Thu,  9 Nov 2006 15:37:01 +0100
++
++kdebluetooth (0.99+1.0beta2-1) unstable; urgency=low
++
++  * New upstream version that fixes kbluepin.
++  * Added missing docs from beta1.
++  * Added patched passkey-agent and a wrapper around kbluetoothd that starts
++    passkey-agent, closes: #383877
++
++ -- Michael Meskes <meskes@debian.org>  Tue,  7 Nov 2006 16:19:58 +0100
++
++kdebluetooth (0.99+1.0beta1-13) unstable; urgency=low
++
++  * Fixed segfault on click in kbtobexsrv window, closes: #392265
++  * Made kdebluetooth compile with libbluetooth2 >= 3.7-1
++  * Change Build-Depends to list libbluetooth2-dev (>= 3.7-1)
++  * Removed old libsdp2-dev from Build-Depends.
++
++ -- Michael Meskes <meskes@debian.org>  Wed, 11 Oct 2006 19:55:31 +0200
++
++kdebluetooth (0.99+1.0beta1-12) unstable; urgency=low
++
++  * Recompiled for libbluetooth transition, closes: #376884, #376975
++      
++ -- Michael Meskes <meskes@debian.org>  Sat,  8 Jul 2006 12:05:24 +0200
++ 
++kdebluetooth (0.99+1.0beta1-11) unstable; urgency=low
++
++  * Patched qserialdevice.cpp to compile correctly with GCC 4.1
++      
++ -- Michael Meskes <meskes@debian.org>  Tue, 20 Jun 2006 11:24:09 +0200
++
++
++kdebluetooth (0.99+1.0beta1-10) unstable; urgency=low
++
++  * Added AM_MAINTAINER_MODE to fix the time-stamp skew problems, closes: #365113
++      
++ -- Michael Meskes <meskes@debian.org>  Fri, 28 Apr 2006 14:19:39 +0200
++
++
++kdebluetooth (0.99+1.0beta1-9) unstable; urgency=low
++
++  * Remade all configure et al. files which hopefully closes: #364658
++      
++ -- Michael Meskes <meskes@debian.org>  Wed, 26 Apr 2006 14:04:21 +0200
++ 
++kdebluetooth (0.99+1.0beta1-8) unstable; urgency=low
++
++  * Recompiled for openobex transition, closes: #358275
++  * Added patch from KDE bugtracking to fix browsing, closes: #359153
++      
++ -- Michael Meskes <meskes@debian.org>  Sun, 16 Apr 2006 11:51:00 +0200
++
++kdebluetooth (0.99+1.0beta1-7) unstable; urgency=low
++
++  * Fixed source to compile with G++ 4.1, closes: #356155
++      
++ -- Michael Meskes <meskes@debian.org>  Thu, 16 Mar 2006 09:30:55 +0100
++
++kdebluetooth (0.99+1.0beta1-6) unstable; urgency=low
++
++  * Package qobex now provides "flexmem"
++      
++ -- Michael Meskes <meskes@debian.org>  Tue, 22 Nov 2005 22:03:02 +0100
++
++kdebluetooth (0.99+1.0beta1-5) unstable; urgency=low
++
++  * Moved qobex back to section "net", repairing the accidental move from -4
++      
++ -- Michael Meskes <meskes@debian.org>  Mon, 12 Sep 2005 14:46:15 +0200
++
++kdebluetooth (0.99+1.0beta1-4) unstable; urgency=low
++
++  * Moved to section "kde"
++  * Changed description of qobex to give a more information
++      
++ -- Michael Meskes <meskes@debian.org>  Thu,  8 Sep 2005 14:30:16 +0200
++
++kdebluetooth (0.99+1.0beta1-3) unstable; urgency=low
++
++  * Recompiled against KDE 3.4.2, closes: #326787
++  * Uploaded to unstable
++  * Disabled support for xmms, closes: #326218
++      
++ -- Michael Meskes <meskes@debian.org>  Tue,  6 Sep 2005 13:09:10 +0200
++
++kdebluetooth (0.99+1.0beta1-2) experimental; urgency=low
++
++  * Put irmcsync into its own package as done in the (K)Ubuntu package by Simone
++    Gotti <simone.gotti@email.it>
++
++ -- Michael Meskes <meskes@debian.org>  Thu, 30 Jun 2005 15:16:38 +0200
++
++kdebluetooth (0.99+1.0beta1-1) experimental; urgency=low
++
++  * Initial Debian Release, closes: #308319, #293450
++
++ -- Michael Meskes <meskes@debian.org>  Mon, 13 Jun 2005 15:43:49 +0200
++
++kdebluetooth (0.0.cvs.1-1.040203) unstable; urgency=low
++
++  * control: make lintean
++  * rules: use --enable-final again after fixing am files
++  * rules: add CVS_BUILD hack to enable/disalbe full debug build
++    (argl, blow up the deb size by ~ factor of 10 to 7 GB)
++
++ -- Achim Bohnet <ach@mpe.mpg.de>  Wed,  4 Feb 2004 01:54:39 +0100
++
++kdebluetooth (0.0.cvs.1-0.woody.ach.040122) unstable; urgency=low
++
++  * add kdelibs4-dev to build-deps (much not to add here...)
++  * build 0.0.cvs.1.orig.tar file from cvs co + make -f Makefile.cvs
++  * remove empty NEWS from docs
++  * remove unused usr/sbin from dirs
++  * added TODO for pkging
++  * use same email in README as in control
++  * clean up config-stamp
++  * use debiandir settings for configure
++  * use --disabled-final for now
++
++ -- Achim Bohnet <ach@mpe.mpg.de>  Thu, 29 Jan 2004 01:39:21 +0100
++
++kdebluetooth (0.0-1) unstable; urgency=low
++
++  * Initial Release.
++
++ -- Fred Schaettgen <kdebluetooth@0xF.de>  Fri, 19 Sep 2003 18:47:31 +0200
++
diff --git a/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz b/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz
deleted file mode 100644
index ba1d19308..000000000
--- a/redhat/extras/kdebluetooth/kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz
+++ /dev/null
diff --git a/redhat/extras/kdebluetooth/kubuntu_01_kdepot.patch b/redhat/extras/kdebluetooth/kubuntu_01_kdepot.patch
new file mode 100644
index 000000000..1b8b62642
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kubuntu_01_kdepot.patch
@@ -0,0 +1,20 @@
+diff -Nur kdebluetooth-1.0~beta5~r695881/admin/cvs.sh kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh
+--- kdebluetooth-1.0~beta5~r695881/admin/cvs.sh	2007-08-02 13:29:02.000000000 +0200
++++ kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh	2007-08-03 10:19:55.000000000 +0200
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,7 +556,6 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+    if ! test -f $kdepotpath; then
+ 	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+    fi
diff --git a/redhat/extras/kdebluetooth/kubuntu_02_desktop_files.patch b/redhat/extras/kdebluetooth/kubuntu_02_desktop_files.patch
new file mode 100644
index 000000000..d92287bdb
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kubuntu_02_desktop_files.patch
@@ -0,0 +1,48 @@
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop	2007-11-10 10:38:44.000000000 +0100
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop	2007-11-16 11:08:12.000000000 +0100
+@@ -38,4 +38,5 @@
+ Comment[tg]=Намоишгари KDE Bluetooth
+ Comment[tr]=KDE Bluetooth İzleyici
+ Comment[xx]=xxKDE Bluetooth Monitorxx
++Hidden=true
+ 
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop	2007-11-10 10:38:44.000000000 +0100
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop	2007-11-16 11:08:12.000000000 +0100
+@@ -36,4 +36,5 @@
+ Comment[tg]=Намоишгари KDE Bluetooth
+ Comment[tr]=KDE Bluetooth İzleyici
+ Comment[xx]=xxKDE Bluetooth Monitorxx
++Hidden=true
+ 
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop	2007-11-10 10:38:44.000000000 +0100
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop	2007-11-16 11:08:12.000000000 +0100
+@@ -33,7 +33,7 @@
+ GenericName[tg]=Хидматгоҳи Bluetooth
+ GenericName[tr]=Bluetooth Sunucusu
+ GenericName[xx]=xxBluetooth Serverxx
+-Categories=Settings;HardwareSettings;
++Categories=Qt;KDE;System;
+ OnlyShowIn=KDE;
+ Comment=KDE Bluetooth Framework Metaserver
+ Comment[bg]=Мета сървър за Bluetooth Framework
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop	2007-10-27 09:44:26.000000000 +0200
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop	2007-11-16 11:08:57.000000000 +0100
+@@ -58,3 +58,5 @@
+ Comment[ta]=KDE புலுடுத் சட்டவேலைக்கான OBEX பொருள் கிளைஞ்சன்
+ Comment[tr]=KDEBluetooth Ortamı için OBEX Nesneleri Destek istemcisi
+ Comment[xx]=xxAn OBEX Object Push client for the KDEBluetooth Frameworkxx
++NoDisplay=true
++
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop	2007-11-10 10:38:44.000000000 +0100
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop	2007-11-16 11:08:12.000000000 +0100
+@@ -36,4 +36,5 @@
+ Comment[tg]=Устоди KDE Bluetooth
+ Comment[tr]=KDE Bluetooth Sihirbazı
+ Comment[xx]=xxKDE Bluetooth Wizardxx
++Hidden=true
+ 
diff --git a/redhat/extras/kdebluetooth/kubuntu_06_no_autostart.patch b/redhat/extras/kdebluetooth/kubuntu_06_no_autostart.patch
new file mode 100644
index 000000000..a51eb6e92
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kubuntu_06_no_autostart.patch
@@ -0,0 +1,15 @@
+diff -Nur kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am
+--- kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am	2007-08-29 14:03:27.000000000 +0200
++++ kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am	2007-08-29 16:39:13.000000000 +0200
+@@ -12,11 +12,6 @@
+ #shelldesktop_DATA = kbluetooth.desktop
+ xdg_apps_DATA = kbluetooth.desktop
+ 
+-# Autostart entry
+-autostartdir = $(datadir)/autostart
+-autostart_DATA = kbluetooth.autostart.desktop
+-
+-
+ #EXTRA_DIST = $(kbluetooth_SOURCES)\
+ #             $(kde_servicetypes_DATA) \
+ #	     eventsrc 
diff --git a/redhat/extras/kdebluetooth/kubuntu_07_fix_header_include.patch b/redhat/extras/kdebluetooth/kubuntu_07_fix_header_include.patch
new file mode 100644
index 000000000..f55d663f7
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kubuntu_07_fix_header_include.patch
@@ -0,0 +1,10 @@
+diff -Nur kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am
+--- kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am	2007-08-31 11:52:00.000000000 +0200
++++ kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am	2007-08-31 18:31:16.000000000 +0200
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
++INCLUDES = -I$(top_builddir)/kdebluetooth/libkbluetooth/ -I$(build_dir)/kdebluetooth/libkbluetooth/ -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
+ 
+ # these are the headers for your project
+ 
diff --git a/redhat/extras/kdebluetooth/kubuntu_08_load_kdebluetooth_catalogue.patch b/redhat/extras/kdebluetooth/kubuntu_08_load_kdebluetooth_catalogue.patch
new file mode 100644
index 000000000..0904c4bc7
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kubuntu_08_load_kdebluetooth_catalogue.patch
@@ -0,0 +1,50 @@
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp	2007-08-30 17:30:15.000000000 +0200
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp	2007-11-16 18:08:29.000000000 +0100
+@@ -42,6 +42,7 @@
+ 
+ int main(int argc, char **argv)
+ {
++    KLocale::setMainCatalogue("kdebluetooth");
+     KAboutData about("kbtobexclient",
+                      I18N_NOOP("Bluetooth OBEX Object Push client"),
+                      0, description,
+@@ -58,7 +59,6 @@
+ 
+     KApplication app;
+     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+-    KGlobal::locale()->insertCatalogue("libkbluetooth");
+ 
+     KURL url;
+     if (args->count() == 0) {
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp	2005-04-20 21:01:14.000000000 +0200
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp	2007-11-16 18:08:29.000000000 +0100
+@@ -37,6 +37,7 @@
+ 
+ int main(int argc, char **argv)
+ {
++    KLocale::setMainCatalogue("kdebluetooth");
+     KAboutData about("kbtserialchat",
+         I18N_NOOP("Bluetooth Serial Chat"),
+         version, description,
+@@ -49,7 +50,6 @@
+     KApplication app;
+     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ 
+-    KGlobal::locale()->insertCatalogue("libkbluetooth");
+     if (args->isSet("rfcommconnection") && args->isSet("peeraddr") &&
+         args->isSet("peername")) {
+         int socket = QString(args->getOption("rfcommconnection"))
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp
+--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp	2007-08-27 18:44:57.000000000 +0200
++++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp	2007-11-16 18:14:38.000000000 +0100
+@@ -82,7 +82,7 @@
+ {
+     KCModule *create_btpaired(QWidget *parent, const char* /*name*/)
+     {
+-        KGlobal::locale()->insertCatalogue("btpaired");
++        KGlobal::locale()->insertCatalogue("kdebluetooth");
+         return new kcm_btpaired(parent, "btpaired");
+     }
+ }
diff --git a/redhat/extras/kdebluetooth/kubuntu_09_french_i18n.patch b/redhat/extras/kdebluetooth/kubuntu_09_french_i18n.patch
new file mode 100644
index 000000000..d77e7d6d6
--- /dev/null
+++ b/redhat/extras/kdebluetooth/kubuntu_09_french_i18n.patch
@@ -0,0 +1,2947 @@
+diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/po/fr/kdebluetooth.po kdebluetooth-1.0~beta9~r734866.new/po/fr/kdebluetooth.po
+--- kdebluetooth-1.0~beta9~r734866/po/fr/kdebluetooth.po	2007-11-16 11:28:44.000000000 +0100
++++ kdebluetooth-1.0~beta9~r734866.new/po/fr/kdebluetooth.po	2007-11-16 16:01:13.000000000 +0100
+@@ -1,1395 +1,1352 @@
+-# translation of kbluetoothd.po to Français
+-# traduction de kbluetoothd.po en français
+-# traduction de kbluetoothd.po vers le Français
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-# Simon Depiets <2df@tuxfamily.org>, 2005.
+-# Yann Verley <yann.verley@free.fr>, 2005.
+-# Matthieu Robin <kde@macolu.org>, 2005.
++# translation of kdebluetooth.po to
++# This file is put in the public domain.
+ #
++# Anthony Mercatante <tonio@ubuntu.com>, 2007.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: kbluetoothd\n"
++"Project-Id-Version: kdebluetooth\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2007-09-13 08:28+0200\n"
+-"PO-Revision-Date: 2006-02-01 17:06+0100\n"
+-"Last-Translator: Matthieu Robin <kde@macolu.org>\n"
+-"Language-Team: French <kde-francophone@kde.org>\n"
++"POT-Creation-Date: 2007-11-16 13:00+0100\n"
++"PO-Revision-Date: 2007-11-16 15:59+0100\n"
++"Last-Translator: Anthony Mercatante <tonio@ubuntu.com>\n"
++"Language-Team:  <fr@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
+ 
+-#: kbtserialchat/main.cpp:23
+-msgid "A KDE KPart Application"
+-msgstr "Une application KDE KPart"
++#: kbluelock/kbluelock.cpp:208 kbluelock/kbluelock.cpp:320
++msgid ""
++"<p align='center'>KBlueLock <b>ON</b></p>\n"
++"<p align='center'><i>%1</i></p>"
++msgstr ""
++"<p align='center'>KBlueLock <b>ON</b></p>\n"
++"<p align='center'><i>%1</i></p>"
++
++#: kbluelock/kbluelock.cpp:217
++msgid "KBlueLock - No Device selectetd"
++msgstr "KBlueLock - Aucun périphérique sélectionné"
++
++#: kbluelock/kbluelock.cpp:217
++msgid "To enable KBlueLock you have to choose a Device."
++msgstr "Pour activer KBlueLock vous devez choisir un périphérique."
++
++#: kbluelock/kbluelock.cpp:301
++msgid ""
++"<p align='center'>KBlueLock <b>OFF</b></p>\n"
++"<p align='center'><i>%1</i></p>"
++msgstr ""
++"<p align='center'>KBlueLock <b>OFF</b></p>\n"
++"<p align='center'><i>%1</i></p>"
++
++#: kbluelock/kbluelock.cpp:356
++msgid "&Disable"
++msgstr "&Désactiver"
++
++#: kbluelock/kbluelock.cpp:362
++msgid "&Enable"
++msgstr "&Activer"
++
++#: kbluelock/kbluelock.cpp:375 kinputwizard/inputwizard.cpp:554
++#: kbluemon/monitor.cpp:501
++msgid "Device Discovery started"
++msgstr "Recherche de périphériques démarrée"
++
++#. i18n: file ./kbluelock/lockdialog.ui line 16
++#: kbluelock/main.cpp:38 kbluelock/main.cpp:50 rc.cpp:3
++#, no-c-format
++msgid "KBlueLock"
++msgstr "KBlueLock"
++
++#: kbluelock/main.cpp:39 kinputwizard/main.cpp:37
++msgid "Copyright (C) 2007 Novell, Inc."
++msgstr "Copyright (C) 2007 Novell, Inc."
++
++#: kbluelock/main.cpp:54 kinputwizard/main.cpp:52 kbluemon/main.cpp:53
++#: kbluetooth/main.cpp:36
++msgid "Author"
++msgstr "Auteur"
++
++#: kbluelock/main.cpp:61
++msgid "KBlueLock is already running.\n"
++msgstr "KBlueLock est déjà en fonctionnement.\n"
++
++#: kbtobexsrv/main.cpp:24
++msgid "KDE OBEX Push Server for Bluetooth"
++msgstr "Serveur Bluetooth Obex pour KDE"
+ 
+ #: kbtobexsrv/main.cpp:28 kbtobexsrv/main.cpp:29 kbtobexsrv/main.cpp:30
+ #: kbtserialchat/main.cpp:29 kbtserialchat/main.cpp:30
+ #: kbtserialchat/main.cpp:31
+ msgid "Used by kbluetoothd"
+-msgstr "Utilisé par KBluetoothd"
++msgstr "Utilisé par kbluetoothd"
+ 
+-#: kbtobexclient/main.cpp:37 kbtserialchat/main.cpp:32
+-msgid "Used by kio_sdp"
+-msgstr "Utilisé par kio_sdp"
++#: kbtobexsrv/main.cpp:63
++msgid ""
++"kbtobexsrv will be called automatically by kbluetoothd when another device "
++"tries to send you some files. You don't have to run it manually."
++msgstr ""
++"kbtobexsrv sera appelé automatiquement par kbluetoothd quand un périphérique essaye "
++"de vous envoyer des fichiers. Vous n'avez pas à le lancer manuellement."
+ 
+-#. i18n: file ./kbtserialchat/maindialogbase.ui line 16
+-#: kbtserialchat/main.cpp:41 rc.cpp:3
+-#, fuzzy, no-c-format
+-msgid "Bluetooth Serial Chat"
+-msgstr "Serveur de PIN Bluetooth"
++#: kbtobexsrv/maindlg.cpp:158
++msgid "Receiving %1"
++msgstr "Réception de %1"
++
++#: kbtobexsrv/maindlg.cpp:208
++msgid "Disconnected."
++msgstr "Déconnecté."
++
++#: kbtobexsrv/maindlg.cpp:217
++msgid ""
++"The selected folder does not exist.                            Please select "
++"another folder."
++msgstr ""
++"Le répertoire choisi n'existe pas.                            Veuillez choisir un "
++"autre répertoire."
++
++#: kbtobexsrv/maindlg.cpp:218
++msgid "Obex Server"
++msgstr "Serveur OBEX"
++
++#: kbtobexsrv/maindlg.cpp:254
++msgid "%1 already exists. Do you want to use %2 as filename instead?"
++msgstr "%1 exite déjà. Voulez-vous utiliser %2 comme nom de fichier?"
++
++#: kbtobexsrv/maindlg.cpp:255
++msgid "Rename"
++msgstr "Renommer"
++
++#: kbtobexsrv/maindlg.cpp:255
++msgid "Overwrite"
++msgstr "Ecraser"
++
++#: kbtobexsrv/maindlg.cpp:271
++msgid "Error writing file %1."
++msgstr "Erreur lors de l'écriture du fichier %1."
++
++#: kbtobexsrv/maindlg.cpp:285
++msgid ""
++"The following files already existed in the target folder and were not saved "
++"again with a different name:"
++msgstr ""
++"Les fichiers suivants existaient déjà dans le répertoire cible et n'ont pas été sauvegardés "
++"avec un nom différent:"
++
++#: libkbluetooth/hcidefault.cpp:82
++msgid "Use bluetooth device hciX (alternative: $HCI_DEVICE)"
++msgstr "Utiliser le périphérique blouetooth hciX (alternative: $HCI_DEVICE)"
+ 
+ #: libkbluetooth/namerequest.cpp:52
+ msgid "Device is not available."
+-msgstr ""
++msgstr "Le périphérique n'est pas disponible."
+ 
+ #: libkbluetooth/namerequest.cpp:59
+-#, fuzzy
+ msgid "HCI device open failed."
+-msgstr "&Détails de la connexion"
++msgstr "L'ouverture du périphérique HCI a échoué."
+ 
+ #: libkbluetooth/namerequest.cpp:73
+ msgid "HCI name request failed."
+-msgstr ""
++msgstr "L'obtention du nom du périphérique HCI a échoué."
+ 
+ #: libkbluetooth/hcisocket.cpp:60
+ msgid "Error creating socket"
+-msgstr ""
++msgstr "Error creating socket"
+ 
+ #: libkbluetooth/hcisocket.cpp:72
+ msgid "Error binding to socket"
+-msgstr ""
++msgstr "Error binding to socket"
+ 
+ #: libkbluetooth/hcisocket.cpp:84
+ msgid "HCI filter setup failed"
+-msgstr ""
++msgstr "HCI filter setup failed"
+ 
+ #: libkbluetooth/hcisocket.cpp:118
+-#, c-format
+ msgid "HCI socket error: 0x%1."
+-msgstr ""
+-
+-#: libkbluetooth/hcidefault.cpp:82
+-msgid "Use bluetooth device hciX (alternative: $HCI_DEVICE)"
+-msgstr ""
++msgstr "HCI socket error: 0x%1."
+ 
+ #: libkbluetooth/inquiry.cpp:154
+ msgid "Timeout while waiting for end of inquiry."
+-msgstr ""
++msgstr "Timeout reçu en attente de la fin de la requète."
+ 
++#. i18n: file ./kbluelock/lockdialog.ui line 129
+ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 128
+-#: libkbluetooth/serviceselectionwidget.cpp:104 rc.cpp:167 rc.cpp:239
++#: libkbluetooth/serviceselectionwidget.cpp:104 rc.cpp:30 rc.cpp:172
+ #, no-c-format
+ msgid "Searching..."
+-msgstr ""
++msgstr "Recherche en cours..."
+ 
+ #: libkbluetooth/serviceselectionwidget.cpp:200
+-#, fuzzy
+ msgid "Bluetooth Service Selection"
+-msgstr "Adaptateur Bluetooth trouvé."
++msgstr "Sélection du service Bluetooth"
+ 
+ #: libkbluetooth/serviceselectionwidget.cpp:309
+ msgid "Clear the device cache?"
+-msgstr ""
+-
+-#: kioclient/main.cpp:22
+-msgid "KIO command line client"
+-msgstr ""
+-
+-#: kioclient/main.cpp:31
+-msgid "List date"
+-msgstr ""
+-
+-#: kioclient/main.cpp:32
+-msgid "List user"
+-msgstr ""
+-
+-#: kioclient/main.cpp:33
+-msgid "List icon name"
+-msgstr ""
+-
+-#: kioclient/main.cpp:34
+-msgid "List group"
+-msgstr ""
+-
+-#: kioclient/main.cpp:35
+-msgid "List extra"
+-msgstr ""
+-
+-#: kioclient/main.cpp:36
+-msgid "Do not list name"
+-msgstr ""
+-
+-#: kioclient/main.cpp:37
+-msgid "List access permissions"
+-msgstr ""
+-
+-#: kioclient/main.cpp:38
+-msgid "List modification time"
+-msgstr ""
+-
+-#: kioclient/main.cpp:39
+-msgid "List access time"
+-msgstr ""
+-
+-#: kioclient/main.cpp:40
+-msgid "List creation time"
+-msgstr ""
+-
+-#: kioclient/main.cpp:41
+-msgid "List file type"
+-msgstr ""
+-
+-#: kioclient/main.cpp:42
+-msgid "List link destination"
+-msgstr ""
+-
+-#: kioclient/main.cpp:43
+-msgid "List URL"
+-msgstr ""
+-
+-#: kioclient/main.cpp:44
+-msgid "List mime type"
+-msgstr ""
+-
+-#: kioclient/main.cpp:45
+-msgid "List guessed mime type"
+-msgstr ""
+-
+-#: kioclient/main.cpp:46
+-msgid "List XML properties"
+-msgstr ""
+-
+-#: kioclient/main.cpp:47
+-msgid "List size"
+-msgstr ""
+-
+-#: kioclient/main.cpp:48
+-msgid "Output file. Defaults to stdout"
+-msgstr ""
+-
+-#: kioclient/main.cpp:49
+-msgid "Input file. Defaults to stdin"
+-msgstr ""
+-
+-#: kioclient/main.cpp:50
+-msgid "Show a progress window"
+-msgstr ""
+-
+-#: kioclient/main.cpp:51
+-msgid "Ask (graphically) before overwriting files"
+-msgstr ""
+-
+-#: kioclient/main.cpp:52
+-msgid "Show messages from the kioslave"
+-msgstr ""
+-
+-#: kioclient/main.cpp:53
+-msgid "Command (ls, cat, put, cp, rm, mv, mkdir, rmdir)"
+-msgstr ""
+-
+-#: kioclient/main.cpp:60
+-msgid "kio client"
+-msgstr ""
+-
+-#: kioclient/commandhandler.cpp:25
+-msgid "Arguments missing."
+-msgstr ""
+-
+-#: kioclient/commandhandler.cpp:94
+-#, c-format
+-msgid "unknown command: %1"
+-msgstr ""
+-
+-#: _translatorinfo.cpp:1
+-msgid ""
+-"_: NAME OF TRANSLATORS\n"
+-"Your names"
+-msgstr "&traducteurSimonDepiets;"
+-
+-#: _translatorinfo.cpp:3
+-msgid ""
+-"_: EMAIL OF TRANSLATORS\n"
+-"Your emails"
+-msgstr "Simon DEPIETS : 2df@tuxfamily.org"
++msgstr "Nettoyer le cache des périphériques?"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 30
+-#: kbluemon/main.cpp:38 kbluemon/main.cpp:49 rc.cpp:21
+-#, fuzzy, no-c-format
+-msgid "KBlueMon"
+-msgstr "KBluetoothD"
++#: libkobex/kobexserver.cpp:177 libkobex/kobexclient.cpp:139
++msgid "Connecting..."
++msgstr "Connection en cours..."
+ 
+-#: kbluelock/main.cpp:54 kbluemon/main.cpp:53 kbluetooth/main.cpp:36
+-#: kinputwizard/main.cpp:52
+-msgid "Author"
+-msgstr "Auteur"
++#: libkobex/kobexserver.cpp:220 libkobex/kobexclient.cpp:175
++msgid "Disconnecting..."
++msgstr "Déconnexion..."
+ 
+-#: kbluemon/main.cpp:61
+-#, fuzzy
++#: libkobex/kobexclient.cpp:79
+ msgid ""
+-"KBlueMon is already running.\n"
+-msgstr ""
+-"KBluetoothD fonctionnait déjà.\n"
+-
+-#: kbluemon/monitor.cpp:57 kbluemon/monitor.cpp:331 kbluemon/monitor.cpp:424
+-msgid "Scanning..."
+-msgstr ""
+-
+-#: kbluemon/monitor.cpp:150
+-msgid "Service Discovery disabled"
+-msgstr ""
+-
+-#: kbluemon/monitor.cpp:151 kbluemon/monitor.cpp:200 kbluemon/monitor.cpp:203
+-#: kbluemon/monitor.cpp:206 kbluemon/monitor.cpp:222 kbluemon/monitor.cpp:253
+-msgid "<i>not available</i>"
+-msgstr ""
+-
+-#: kbluemon/monitor.cpp:221 kbluemon/monitor.cpp:248
+-msgid "no Services discovered"
+-msgstr ""
+-
+-#. i18n: file ./kbluemon/mondialog.ui line 529
+-#: kbluemon/monitor.cpp:338 kbluemon/monitor.cpp:423 rc.cpp:72
+-#, fuzzy, no-c-format
+-msgid "St&op Scan"
+-msgstr "Démarrer"
+-
+-#: kbluemon/monitor.cpp:344 kbluemon/monitor.cpp:445
+-#, fuzzy
+-msgid "St&art Scan"
+-msgstr "Démarrer"
+-
+-#: kbluemon/monitor.cpp:414
+-msgid "Periodic Discovery started"
+-msgstr ""
+-
+-#: kbluemon/monitor.cpp:416
+-msgid "Failed to start Periodic Discovery! ("
+-msgstr ""
+-
+-#: kbluelock/kbluelock.cpp:363 kbluemon/monitor.cpp:501
+-#: kinputwizard/inputwizard.cpp:554
+-msgid "Device Discovery started"
+-msgstr ""
+-
+-#: kioslave/sdp/btsdp.cpp:43
+-#, fuzzy
+-msgid "No working Bluetooth adapter found."
+-msgstr "Adaptateur Bluetooth trouvé."
+-
+-#: kioslave/bluetooth/kiobluetooth.cpp:87 kioslave/sdp/btsdp.cpp:131
+-#, fuzzy
+-msgid "Bluetooth neighborhood"
+-msgstr "Adaptateur Bluetooth trouvé."
+-
+-#: kioslave/sdp/btsdp.cpp:139
+-#, fuzzy
+-msgid "More services"
+-msgstr "Configurer les &Services..."
+-
+-#: kioslave/sdp/btsdp.cpp:145
+-msgid "Could not stat %1. Unknown device"
++"Error connecting to phone\n"
++"Response message: "
+ msgstr ""
++"Erreur lors de la connexion au téléphone\n"
++"Réponse reçue: "
+ 
+-#: kioslave/sdp/btsdp.cpp:201
+-#, c-format
+-msgid "Retrieving services for %1."
++#: libkobex/kobexclient.cpp:93
++msgid ""
++"Error sending file %1 to phone\n"
++"Response message: "
+ msgstr ""
++"Erreur lors de l'envoi du fichier %1 au téléphone\n"
++"Réponse reçue: "
+ 
+-#: kioslave/obex/kio_obex2/kio_obexprotocol.cpp:252
+-#, fuzzy
+-msgid "Disconnecting"
+-msgstr "Connexion :"
+-
+-#: kioslave/obex/kio_obex2/kio_obexprotocol.cpp:254
+-#, fuzzy
+-msgid "Disconnected"
+-msgstr "Non connecté"
+-
+-#: kioslave/bluetooth/kiobluetooth.cpp:41
+-msgid "Protocol name"
++#: libkobex/kobexclient.cpp:105
++msgid ""
++"Error getting data from phone\n"
++"Response message: "
+ msgstr ""
++"Erreur lors de la réception d'informations du téléphone\n"
++"Réponse reçue: "
+ 
+-#: kioslave/bluetooth/kiobluetooth.cpp:42
+-#: kioslave/bluetooth/kiobluetooth.cpp:43
+-msgid "Socket name"
+-msgstr ""
++#: libkobex/kobexclient.cpp:120
++msgid "Done"
++msgstr "Fait"
+ 
+-#: kioslave/bluetooth/kiobluetooth.cpp:93
+-#, c-format
+-msgid "Could not stat %1."
+-msgstr ""
++#: libkobex/kobexclient.cpp:164
++msgid "Error connecting transport"
++msgstr "Erreur lors de la connexion"
+ 
+-#: kbtobexclient/fileview.cpp:72
+-#, fuzzy
+-msgid "Location: "
+-msgstr "Connexion :"
++#: libkobex/kobexclient.cpp:208
++msgid "Sending "
++msgstr "En cours d'envoi "
+ 
+-#: kbtobexclient/fileview.cpp:94
++#: libkobex/kobexclient.cpp:208
+ msgid ""
+-"<qt>Click this button to enter the parent folder."
+-"<p>For instance, if the current location is file:/home/%1 clicking this button "
+-"will take you to file:/home.</qt>"
+-msgstr ""
+-"<qt>Cliquez sur ce bouton pour entrer dans le dossier parent. "
+-"<p>Pour le moment, l'emplacement courant est « /home/%1 » et un clic sur ce "
+-"bouton vous emmènera vers « /home ».</qt>"
+-
+-#: kbtobexclient/fileview.cpp:98
+-msgid "Click this button to move backwards one step in the browsing history."
+-msgstr "Cliquez sur ce bouton pour reculer d'un cran dans l'historique."
+-
+-#: kbtobexclient/fileview.cpp:100
+-msgid "Click this button to move forward one step in the browsing history."
+-msgstr "Cliquez sur ce bouton pour avancer d'un cran dans l'historique."
+-
+-#: kbtobexclient/fileview.cpp:102
+-msgid "Click this button to reload the contents of the current location."
++" to phone\n"
++"\n"
+ msgstr ""
+-"Cliquez sur ce bouton pour recharger le contenu de l'emplacement courant."
+-
+-#: kbtobexclient/fileview.cpp:105
+-msgid "Click this button to create a new folder."
+-msgstr "Cliquez sur ce bouton pour créer un nouveau dossier."
+-
+-#: kbtobexclient/fileview.cpp:109
+-msgid ""
+-"<qt>This is the configuration menu for the file dialog. Various options can be "
+-"accessed from this menu including: "
+-"<ul>"
+-"<li>how files are sorted in the list</li>"
+-"<li>types of view, including icon and list</li>"
+-"<li>showing of hidden files</li>"
+-"<li>the Quick Access navigation panel</li>"
+-"<li>file previews</li>"
+-"<li>separating folders from files</li></ul></qt>"
+-msgstr ""
+-"<qt>Ceci est le menu de configuration pour la boîte de dialogue de fichiers. "
+-"Des options divers sont accessibles depuis ce menu, dont : "
+-"<ul>"
+-"<li>comment les fichiers sont triés dans la liste</li> "
+-"<li>types de vues, incluant liste et icônes</li> "
+-"<li>vue des fichiers cachés</li> "
+-"<li>panneau de navigation rapide</li> "
+-"<li>aperçu de fichier</li> "
+-"<li>séparation des dossiers et des fichiers</li> </ul></qt>"
+-
+-#: kbtobexclient/fileview.cpp:136
+-msgid "Filter:"
+-msgstr "Filtre :"
+-
+-#: kbtobexclient/fileview.cpp:142
+-msgid "*|All Files"
+-msgstr "*|Tous les fichiers"
+-
+-#: kbtobexclient/fileview.cpp:143
+-msgid "image/jpeg |JPEG Image Files"
+-msgstr "image/jpeg|Images JPEG"
+-
+-#: kbtobexclient/main.cpp:31
+-#, fuzzy
+-msgid "A KDE Bluetooth Framework Application"
+-msgstr "Interface KDE Bluetooth"
+-
+-#: kbtobexclient/main.cpp:46
+-msgid "Bluetooth OBEX Object Push client"
+-msgstr "Objet OBEX Bluetooth Push client"
+-
+-#: kbtobexclient/main.cpp:52
+-msgid "Author, Maintainer"
+-msgstr "Auteur, Mainteneur"
+-
+-#: kbtobexclient/diroperator.cpp:75
+-msgid "Short View"
+-msgstr "Petit afficheur"
+-
+-#: kbtobexclient/fileiconview.cpp:58
+-msgid "&Cancel Selected Files"
+-msgstr "&Annuler la sélection des fichiers"
+-
+-#: kbtobexclient/fileiconview.cpp:63
+-msgid "&New Project"
+-msgstr "&Nouveau projet"
+-
+-#: kbtobexclient/mainwindow.cpp:125 kbtobexclient/mainwindow.cpp:148
+-#: kbtobexclient/mainwindow.cpp:156
+-msgid "Project View"
+-msgstr "Vue du projet"
++" vers le téléphone\n"
++"\n"
+ 
+-#: kbtobexclient/mainwindow.cpp:139
+-msgid "File to send:"
+-msgstr "Fichier à envoyer :"
++#: libkobex/kobexclient.cpp:217
++msgid "Requesting stream start..."
++msgstr "Demande de transfert..."
+ 
+-#: kbtobexclient/mainwindow.cpp:145
+-msgid "Send"
+-msgstr "Envoyer"
++#: libkobex/kobexclient.cpp:254
++msgid "Streaming data..."
++msgstr "Transfert des données..."
+ 
+-#: kbtobexclient/mainwindow.cpp:148
+-msgid "Files View"
+-msgstr "Vue des fichiers"
++#: kcm_btpaired/pairedtab.cpp:288
++msgid "- trusted "
++msgstr "- confiance "
+ 
+-#: kbtobexclient/mainwindow.cpp:156
+-msgid "Devices View"
+-msgstr "Vue des périphériques"
++#: kcm_btpaired/pairedtab.cpp:288
++msgid " device"
++msgstr " périphérique"
+ 
+-#: kbtobexclient/mainwindow.cpp:161
+-msgid "Device selector:"
+-msgstr "Sélecteur de périphérique :"
++#: kcm_btpaired/pairedtab.cpp:302
++msgid "%1 (%2) %3"
++msgstr "%1 (%2) %3"
+ 
+-#: kbtobexclient/mainwindow.cpp:192
+-msgid "Show Device Selector"
+-msgstr "Afficher le sélecteur de périphérique"
++#: kcm_btpaired/pairedtab.cpp:313
++msgid "Last Seen: %1"
++msgstr "Vu pour la dernière fois: %1"
+ 
+-#: kbtobexclient/mainwindow.cpp:194
+-msgid "Show File Selector"
+-msgstr "Afficher le sélecteur de fichier"
++#: kcm_btpaired/pairedtab.cpp:321
++msgid "Last Used: %1"
++msgstr "Utilisé pour la dernière fois: %1"
+ 
+-#: kbtobexclient/mainwindow.cpp:196
+-msgid "Show File Browser"
+-msgstr "Afficher le navigateur de fichiers"
++#. i18n: file ./kcm_btpaired/pairedtabbase.ui line 16
++#: kcm_btpaired/kcm_btpaired.cpp:51 rc.cpp:83
++#, no-c-format
++msgid "Paired/Trusted Devices"
++msgstr "Périphériques associés/connus"
+ 
+-#: kbtobexclient/mainwindow.cpp:274
++#: kcm_btpaired/kcm_btpaired.cpp:76
+ msgid ""
+-"\n"
+-" Continue with the remaining files?"
++"<h1>BtPaired</h1>With this module you can manage the list of paired "
++"Bluetooth Devices."
+ msgstr ""
+-"\n"
+-" Continuer avec les fichiers restants ?"
++"<h1>BtPaired</h1>Ce module vous permet de gérer les périphériques "
++"bluetooth associés."
+ 
+-#. i18n: file ./kbtserialchat/maindialogbase.ui line 27
++#. i18n: file ./kbluelock/lockdialog.ui line 27
+ #: rc.cpp:6
+ #, no-c-format
+-msgid "<font color=\"#0000ff\" size=\"+2\">Bluetooth Serial Chat</font>"
+-msgstr "<font color=\"#0000ff\" size=\"+2\">Discussion Série Bluetooth</font>"
++msgid "Lock the screen if the selected device disappears"
++msgstr "Verrouiller l'écran si le périphérique sélectionné disparaît"
+ 
+-#. i18n: file ./kbtserialchat/maindialogbase.ui line 54
++#. i18n: file ./kbluelock/lockdialog.ui line 38
+ #: rc.cpp:9
+ #, no-c-format
+-msgid "&Send"
+-msgstr "Envo&yer"
+-
+-#. i18n: file ./kbtserialchat/maindialogbase.ui line 57
+-#: rc.cpp:12
+-#, no-c-format
+-msgid "Alt+S, Return"
+-msgstr "Alt+Y, Entrée"
+-
+-#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 54
+-#: rc.cpp:15
+-#, no-c-format
+-msgid "&Search"
+-msgstr ""
+-
+-#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 67
+-#: rc.cpp:18
+-#, fuzzy, no-c-format
+-msgid "&Clear"
+-msgstr "Effacer la liste"
++msgid "Unlock the screen if the selected device appears again"
++msgstr "Déverrouiller l'écran si le périphérique sélectionné apparaît de nouveau"
+ 
++#. i18n: file ./kbluelock/lockdialog.ui line 44
++#. i18n: file ./kinputwizard/inputdialog_ext.ui line 58
+ #. i18n: file ./kbluemon/mondialog.ui line 46
+-#: rc.cpp:24 rc.cpp:152 rc.cpp:221
++#: rc.cpp:12 rc.cpp:157 rc.cpp:180
+ #, no-c-format
+ msgid "Name"
+-msgstr ""
+-
+-#. i18n: file ./kbluemon/mondialog.ui line 57
+-#: rc.cpp:27
+-#, fuzzy, no-c-format
+-msgid "Signal"
+-msgstr "invalide"
+-
+-#. i18n: file ./kbluemon/mondialog.ui line 68
+-#: rc.cpp:30
+-#, no-c-format
+-msgid "Class"
+-msgstr ""
++msgstr "Nom"
+ 
++#. i18n: file ./kbluelock/lockdialog.ui line 55
++#. i18n: file ./kinputwizard/inputdialog_ext.ui line 69
+ #. i18n: file ./kbluemon/mondialog.ui line 79
+-#: rc.cpp:33 rc.cpp:155 rc.cpp:224
+-#, fuzzy, no-c-format
++#: rc.cpp:15 rc.cpp:160 rc.cpp:189
++#, no-c-format
+ msgid "Address"
+-msgstr "<b>Adresse : </b>"
++msgstr "Adresse"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 90
+-#: rc.cpp:36
++#. i18n: file ./kbluelock/lockdialog.ui line 90
++#. i18n: file ./kinputwizard/inputdialog.ui line 219
++#. i18n: file ./kbluemon/mondialog.ui line 532
++#. i18n: file ./kbluemon/mondialog.ui line 543
++#: rc.cpp:21 rc.cpp:130 rc.cpp:231 rc.cpp:237
+ #, no-c-format
+-msgid "Icon"
+-msgstr ""
++msgid "Alt+O"
++msgstr "Alt+O"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 164
+-#: rc.cpp:39
+-#, fuzzy, no-c-format
+-msgid "Address:"
+-msgstr "<b>Adresse : </b>"
++#. i18n: file ./kbluelock/lockdialog.ui line 101
++#. i18n: file ./kinputwizard/inputdialog.ui line 278
++#: rc.cpp:27 rc.cpp:148
++#, no-c-format
++msgid "Alt+C"
++msgstr "Alt+C"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 212
+-#: rc.cpp:42
++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 16
++#: rc.cpp:33 kbluetooth/sdprecord.cpp:364 kbluetooth/sdprecord.cpp:376
+ #, no-c-format
+-msgid "Name:"
+-msgstr ""
++msgid "KDE Bluetooth Framework"
++msgstr "Framework Bluetooth pour KDE"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 241
+-#: rc.cpp:46
++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 37
++#: rc.cpp:36
+ #, no-c-format
+-msgid "Typ:"
++msgid ""
++"<p><font size=\"+2\">Incoming File Transfer</font></p>\n"
++"<b>%1</b> wants to send you some files.<br/>\n"
++"Press <i>Save</i> to accept all files or drag them to another application or "
++"folder."
+ msgstr ""
++"<p><font size=\"+2\">Transfert de fichier entrant</font></p>\n"
++"<b>%1</b> veut vous envoyer des fichiers.<br/>\n"
++"Cliquer sur <i>Sauvegarder</i> pour accepter le transfert et choisir l'application ou "
++"le répertoire de destination."
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 270
+-#: rc.cpp:50
++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 78
++#: rc.cpp:41
+ #, no-c-format
+-msgid "Signal:"
+-msgstr ""
++msgid "Waiting..."
++msgstr "En attente..."
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 301
++#. i18n: file ./kbtobexsrv/maindlgbase.ui line 101
++#: rc.cpp:44
++#, no-c-format
++msgid "Open destination folder:"
++msgstr "Ouvrir le répertoire de destination:"
++
++#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 54
+ #: rc.cpp:53
+ #, no-c-format
+-msgid "Version:"
+-msgstr ""
++msgid "&Search"
++msgstr "&Rechercher"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 330
+-#: rc.cpp:57
++#. i18n: file ./libkbluetooth/serviceselectionwidgetbase.ui line 67
++#: rc.cpp:56
+ #, no-c-format
+-msgid "Revision:"
+-msgstr ""
++msgid "&Clear"
++msgstr "&Nettoyer"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 359
+-#: rc.cpp:61
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 16
++#: rc.cpp:59
+ #, no-c-format
+-msgid "Manufacturer:"
+-msgstr ""
++msgid "Export Link Keys"
++msgstr "Exporter les clés de lien"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 388
+-#: rc.cpp:65
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 35
++#: rc.cpp:62
+ #, no-c-format
+-msgid "Category:"
+-msgstr ""
++msgid ""
++"Pairing a device in a dual boot setup breaks an alreay established pairing "
++"in the other operating system, because the link keys stored by each OS are "
++"not identical. Here you can export BlueZ's keys for use with Windows, so "
++"that you don't have to pair devices again each time you switch the OS."
++msgstr ""
++"Associer un périphérique dans un environnement \"dual boot\" casse une association "
++"déjà effectuée avec l'autre système, car les clés de lien stoquées par chaque "
++"système ne sont aps identiques. Ici, vous pouvez exporter les clés créées pour les "
++"utiliser avec Windows, de manière à ne pas avoir à recréer l'assotiation chaque fois "
++"que vous utilisez l'autre système."
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 462
+-#: rc.cpp:69
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 46
++#: rc.cpp:65
+ #, no-c-format
+-msgid "Services"
+-msgstr ""
++msgid "Read more about dual boot setups..."
++msgstr "Plus de détails concernant une installation \"dual bool\""
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 532
+-#: rc.cpp:75 rc.cpp:81 rc.cpp:191 rc.cpp:230
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 71
++#: rc.cpp:68
+ #, no-c-format
+-msgid "Alt+O"
+-msgstr ""
++msgid "Bluetooth Stacks Used Besides BlueZ"
++msgstr "Stacks Bluetooth utilisés via BlueZ"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 564
+-#: rc.cpp:84
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 82
++#: rc.cpp:71
+ #, no-c-format
+-msgid "Periodic Scan"
+-msgstr ""
++msgid "Widcomm Bluetooth stack"
++msgstr "Widcomm Bluetooth stack"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 572
+-#: rc.cpp:87
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 90
++#: rc.cpp:74
+ #, no-c-format
+-msgid "Discover Remote Services"
+-msgstr ""
++msgid "Microsoft Bluetooth stack"
++msgstr "Microsoft Bluetooth stack"
+ 
+-#. i18n: file ./kbluemon/mondialog.ui line 575
+-#: rc.cpp:90
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 142
++#: rc.cpp:77
+ #, no-c-format
+-msgid ""
+-"Discovering the available Services of the Remote Device takes quiet longer."
+-msgstr ""
++msgid "Save to File..."
++msgstr "Enregistrer dans un fichier..."
+ 
+-#. i18n: file ./kcm_btpaired/pairedtabbase.ui line 16
+-#: kcm_btpaired/kcm_btpaired.cpp:51 rc.cpp:94
+-#, fuzzy, no-c-format
+-msgid "Paired/Trusted Devices"
+-msgstr "&Périphériques couplés..."
++#. i18n: file ./kcm_btpaired/exportdialog.ui line 150
++#: rc.cpp:80
++#, no-c-format
++msgid "Send via OBEX Push..."
++msgstr "Envoyer par un appel OBEX..."
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 27
+-#: rc.cpp:97
++#: rc.cpp:86
+ #, no-c-format
+ msgid ""
+-"Currently connected Bluetooth devices with proven identity (<i>"
+-"paired devices</i>):"
++"Currently connected Bluetooth devices with proven identity (<i>paired "
++"devices</i>):"
+ msgstr ""
++"Périphériques Bluetooth actuellement connectés dont l'identité est prouvée (<i>périphériques "
++"associés</i>):"
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 33
+-#: rc.cpp:100
++#: rc.cpp:89
+ #, no-c-format
+ msgid "Device"
+ msgstr "Périphérique"
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 74
+-#: rc.cpp:103
++#: rc.cpp:92
+ #, no-c-format
+ msgid "&Remove Pairing..."
+-msgstr ""
++msgstr "&Supprimer l'association..."
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 77
+-#: rc.cpp:106
++#: rc.cpp:95
+ #, no-c-format
+ msgid "Alt+R"
+-msgstr ""
++msgstr "Alt+R"
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 85
+-#: rc.cpp:109
++#: rc.cpp:98
+ #, no-c-format
+ msgid "Remove Trust..."
+-msgstr ""
++msgstr "Supprimer la confiance..."
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 115
+-#: rc.cpp:113
++#: rc.cpp:102
+ #, no-c-format
+ msgid ""
+ "<b>Note:</b> The pairing procedure to add new devices will be started "
+ "automatically if you access a service which requests a secure connection."
+ msgstr ""
++"<b>Note:</b> La procédure d'association de nouveau périphérique sera démarrée "
++"automatiquement si vous accédez à un service au travers d'une connexion sécurisée."
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 154
+-#: rc.cpp:116
++#: rc.cpp:105
+ #, no-c-format
+ msgid "Export..."
+-msgstr ""
++msgstr "Exporter..."
+ 
+ #. i18n: file ./kcm_btpaired/pairedtabbase.ui line 157
+-#: rc.cpp:119
++#: rc.cpp:108
+ #, no-c-format
+ msgid "Let's you "
+-msgstr ""
++msgstr "Vous laisse "
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 16
+-#: rc.cpp:122
++#. i18n: file ./kinputwizard/inputdialog.ui line 16
++#: rc.cpp:111
+ #, no-c-format
+-msgid "Export Link Keys"
+-msgstr ""
++msgid "Input Devices"
++msgstr "Périphériques de saisie"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 35
+-#: rc.cpp:125
++#. i18n: file ./kinputwizard/inputdialog.ui line 34
++#: rc.cpp:114
+ #, no-c-format
+-msgid ""
+-"Pairing a device in a dual boot setup breaks an alreay established pairing in "
+-"the other operating system, because the link keys stored by each OS are not "
+-"identical. Here you can export BlueZ's keys for use with Windows, so that you "
+-"don't have to pair devices again each time you switch the OS."
+-msgstr ""
++msgid "<font size=\"+1\">Configured Input Devices:</font>"
++msgstr "<font size=\"+1\">Périphériques de saisie configurés:</font>"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 46
+-#: rc.cpp:128
++#. i18n: file ./kinputwizard/inputdialog.ui line 48
++#: rc.cpp:117
+ #, no-c-format
+-msgid "Read more about dual boot setups..."
+-msgstr ""
++msgid "1"
++msgstr "1"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 71
+-#: rc.cpp:131
++#. i18n: file ./kinputwizard/inputdialog.ui line 59
++#: rc.cpp:120
+ #, no-c-format
+-msgid "Bluetooth Stacks Used Besides BlueZ"
+-msgstr ""
++msgid "2"
++msgstr "2"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 82
+-#: rc.cpp:134
++#. i18n: file ./kinputwizard/inputdialog.ui line 70
++#. i18n: file ./kinputwizard/inputdialog_ext.ui line 80
++#: rc.cpp:123 rc.cpp:163
+ #, no-c-format
+-msgid "Widcomm Bluetooth stack"
+-msgstr ""
++msgid "3"
++msgstr "3"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 90
+-#: rc.cpp:137
++#. i18n: file ./kinputwizard/inputdialog.ui line 216
++#: rc.cpp:127
+ #, no-c-format
+-msgid "Microsoft Bluetooth stack"
+-msgstr ""
++msgid "C&onnect"
++msgstr "C&onnecter"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 142
+-#: rc.cpp:140
++#. i18n: file ./kinputwizard/inputdialog.ui line 236
++#: rc.cpp:136
+ #, no-c-format
+-msgid "Save to File..."
+-msgstr ""
++msgid "Alt+D"
++msgstr "Alt+D"
+ 
+-#. i18n: file ./kcm_btpaired/exportdialog.ui line 150
+-#: rc.cpp:143
++#. i18n: file ./kinputwizard/inputdialog.ui line 261
++#: rc.cpp:139
+ #, no-c-format
+-msgid "Send via OBEX Push..."
+-msgstr ""
++msgid "&Add New Devices >>"
++msgstr "&Ajouter de nouveaux périphériques >>"
++
++#. i18n: file ./kinputwizard/inputdialog.ui line 264
++#: rc.cpp:142
++#, no-c-format
++msgid "Alt+A"
++msgstr "Alt+A"
+ 
+ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 16
+-#: rc.cpp:146
++#: rc.cpp:151
+ #, no-c-format
+ msgid "New Device"
+-msgstr ""
++msgstr "Nouveau périphérique"
+ 
+ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 52
+-#: rc.cpp:149
+-#, fuzzy, no-c-format
+-msgid "<b>New Input Device:</b>"
+-msgstr "<b>Nom du périphérique : </b>"
+-
+-#. i18n: file ./kinputwizard/inputdialog_ext.ui line 80
+-#: rc.cpp:158 rc.cpp:184
++#: rc.cpp:154
+ #, no-c-format
+-msgid "3"
+-msgstr ""
++msgid "<b>New Input Device:</b>"
++msgstr "<b>Nouveau périphérique de saisie:</b>"
+ 
+ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 114
+-#: rc.cpp:161
++#: rc.cpp:166
+ #, no-c-format
+ msgid "&Setup"
+-msgstr ""
++msgstr "&Installation"
+ 
+ #. i18n: file ./kinputwizard/inputdialog_ext.ui line 117
+-#: rc.cpp:164
++#: rc.cpp:169
+ #, no-c-format
+ msgid "Alt+S"
+-msgstr ""
++msgstr "Alt+S"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 16
+-#: rc.cpp:172
++#. i18n: file ./kbluemon/mondialog.ui line 30
++#: rc.cpp:177 kbluemon/main.cpp:38 kbluemon/main.cpp:49
+ #, no-c-format
+-msgid "Input Devices"
+-msgstr ""
++msgid "KBlueMon"
++msgstr "KBlueMon"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 34
+-#: rc.cpp:175
++#. i18n: file ./kbluemon/mondialog.ui line 57
++#: rc.cpp:183
+ #, no-c-format
+-msgid "<font size=\"+1\">Configured Input Devices:</font>"
+-msgstr ""
++msgid "Signal"
++msgstr "Signal"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 48
+-#: rc.cpp:178
++#. i18n: file ./kbluemon/mondialog.ui line 68
++#: rc.cpp:186
+ #, no-c-format
+-msgid "1"
+-msgstr ""
++msgid "Class"
++msgstr "Classe"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 59
+-#: rc.cpp:181
++#. i18n: file ./kbluemon/mondialog.ui line 90
++#: rc.cpp:192
+ #, no-c-format
+-msgid "2"
+-msgstr ""
++msgid "Icon"
++msgstr "Icône"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 216
+-#: rc.cpp:188
+-#, fuzzy, no-c-format
+-msgid "C&onnect"
+-msgstr "Connecté à"
++#. i18n: file ./kbluemon/mondialog.ui line 164
++#: rc.cpp:195
++#, no-c-format
++msgid "Address:"
++msgstr "Adresse:"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 236
+-#: rc.cpp:197
++#. i18n: file ./kbluemon/mondialog.ui line 212
++#: rc.cpp:198
+ #, no-c-format
+-msgid "Alt+D"
+-msgstr ""
++msgid "Name:"
++msgstr "Nom:"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 261
+-#: rc.cpp:200
++#. i18n: file ./kbluemon/mondialog.ui line 241
++#: rc.cpp:202
+ #, no-c-format
+-msgid "&Add New Devices >>"
+-msgstr ""
++msgid "Typ:"
++msgstr "Type:"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 264
+-#: rc.cpp:203
++#. i18n: file ./kbluemon/mondialog.ui line 270
++#: rc.cpp:206
+ #, no-c-format
+-msgid "Alt+A"
+-msgstr ""
++msgid "Signal:"
++msgstr "Signal:"
+ 
+-#. i18n: file ./kinputwizard/inputdialog.ui line 278
+-#: rc.cpp:209 rc.cpp:236
++#. i18n: file ./kbluemon/mondialog.ui line 301
++#: rc.cpp:209
+ #, no-c-format
+-msgid "Alt+C"
+-msgstr ""
++msgid "Version:"
++msgstr "Version:"
+ 
+-#. i18n: file ./kbluelock/lockdialog.ui line 16
+-#: kbluelock/main.cpp:38 kbluelock/main.cpp:50 rc.cpp:212
+-#, fuzzy, no-c-format
+-msgid "KBlueLock"
+-msgstr "KBluetoothD"
++#. i18n: file ./kbluemon/mondialog.ui line 330
++#: rc.cpp:213
++#, no-c-format
++msgid "Revision:"
++msgstr "Révision:"
+ 
+-#. i18n: file ./kbluelock/lockdialog.ui line 27
+-#: rc.cpp:215
++#. i18n: file ./kbluemon/mondialog.ui line 359
++#: rc.cpp:217
+ #, no-c-format
+-msgid "Lock the screen if the selected device disappears"
+-msgstr ""
++msgid "Manufacturer:"
++msgstr "Constructeur:"
+ 
+-#. i18n: file ./kbluelock/lockdialog.ui line 38
+-#: rc.cpp:218
++#. i18n: file ./kbluemon/mondialog.ui line 388
++#: rc.cpp:221
+ #, no-c-format
+-msgid "Unlock the screen if the selected device appears again"
+-msgstr ""
++msgid "Category:"
++msgstr "Catégorie:"
+ 
+-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 16
+-#: kbluetooth/sdprecord.cpp:362 kbluetooth/sdprecord.cpp:374 rc.cpp:242
++#. i18n: file ./kbluemon/mondialog.ui line 462
++#: rc.cpp:225
+ #, no-c-format
+-msgid "KDE Bluetooth Framework"
+-msgstr "Interface KDE Bluetooth"
++msgid "Services"
++msgstr "Services:"
+ 
+-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 37
+-#: rc.cpp:245
++#. i18n: file ./kbluemon/mondialog.ui line 529
++#: rc.cpp:228 kbluemon/monitor.cpp:338 kbluemon/monitor.cpp:423
++#, no-c-format
++msgid "St&op Scan"
++msgstr "St&opper le scan"
++
++#. i18n: file ./kbluemon/mondialog.ui line 564
++#: rc.cpp:240
++#, no-c-format
++msgid "Periodic Scan"
++msgstr "Scan périodique"
++
++#. i18n: file ./kbluemon/mondialog.ui line 572
++#: rc.cpp:243
++#, no-c-format
++msgid "Discover Remote Services"
++msgstr "Découvrir les services distants"
++
++#. i18n: file ./kbluemon/mondialog.ui line 575
++#: rc.cpp:246
++#, no-c-format
++msgid "Discovering the available Services of the Remote Device takes quiet longer."
++msgstr "Découvrir les services disponibles sur les périphériques distants prend du temps."
++
++#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 16
++#: rc.cpp:250
++#, no-c-format
++msgid "MyDialog1"
++msgstr "MyDialog1"
++
++#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 103
++#: rc.cpp:253
+ #, no-c-format
+ msgid ""
+-"<p><font size=\"+2\">Incoming File Transfer</font></p>\n"
+-"<b>%1</b> wants to send you some files."
+-"<br/>\n"
+-"Press <i>Save</i> to accept all files or drag them to another application or "
+-"folder."
++"<p>The Bluetooth device \"<b>%1</b>\" wants to use the service <b>%2</b>.</"
++"p>\n"
++"<p>Do you want to allow this access? </p>"
+ msgstr ""
++"<p>Le périphérique Bluetooth \"<b>%1</b>\" veut utiliser le service <b>%2</b>.</"
++"p>\n"
++"<p>Souhaitez-vous autoriser cet accès? </p>"
+ 
+-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 78
+-#: rc.cpp:250
++#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 121
++#: rc.cpp:257
+ #, no-c-format
+-msgid "Waiting..."
++msgid "Future policy for this device and service:"
++msgstr "Règle future pour ce périphérique et ce service:"
++
++#. i18n: file ./kbluetooth/authdialog.ui line 16
++#: rc.cpp:260
++#, no-c-format
++msgid "PinDefaultDialog"
++msgstr "PinDefaultDialog"
++
++#. i18n: file ./kbluetooth/authdialog.ui line 32
++#: rc.cpp:263
++#, no-c-format
++msgid ""
++"<font size=\"+2\">Bluetooth Authorization Request</font>\n"
++"<p><b>%1</b> (device address <b>%2</b>) %3.</p>\n"
++"\n"
++"<p>\n"
++"If you aren't sure about the identity of the other party, then reject \n"
++"this authorization request.</p>"
+ msgstr ""
++"<font size=\"+2\">Demande d'autorisation Bluetooth</font>\n"
++"<p><b>%1</b> (adresse du périphérique <b>%2</b>) %3.</p>\n"
++"\n"
++"<p>\n"
++"Si vous n'êtes pas certain de l'identité du périphérique, alors rejetez \n"
++"cette demande d'autorisation.</p>"
+ 
+-#. i18n: file ./kbtobexsrv/maindlgbase.ui line 101
+-#: rc.cpp:253
++#. i18n: file ./kbluetooth/pindefdialog.ui line 29
++#: rc.cpp:271
+ #, no-c-format
+-msgid "Open destination folder:"
++msgid ""
++"<font size=\"+2\">Bluetooth Pairing Request</font>\n"
++"<p><b>%1</b> (device address <b>%2</b>) wants to pair with your\n"
++"Bluetooth device, which is needed for authenticated and secure connections.\n"
++"</p><p>\n"
++"If you are sure about the identity of the other party, then please enter\n"
++"the same PIN below as was used by the other device.</p>"
+ msgstr ""
++"<font size=\"+2\">Demande d'association Bluetooth</font>\n"
++"<p><b>%1</b> (adresse du périphrique <b>%2</b>) veut s'associer avec votre périphérique\n"
++"Bluetooth, ce qui est nécessiare à l'authentification et l'établissement de connexions sécurisées.\n"
++"</p><p>\n"
++"Si vous êtes certain de l'identité du périphérique distant, entrer le code PIN utilisé par\n"
++"l'autre périphérique.</p>"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 30
+-#: rc.cpp:262
++#: rc.cpp:279
+ #, no-c-format
+ msgid "AdapterDialog"
+-msgstr ""
++msgstr "AdapterDialog"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 59
+-#: rc.cpp:265
++#: rc.cpp:282
+ #, no-c-format
+ msgid "Device Settings"
+-msgstr ""
++msgstr "Péramètres du périphérique"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 98
+-#: rc.cpp:268
++#: rc.cpp:285
+ #, no-c-format
+ msgid "Adapter Name:"
+-msgstr ""
++msgstr "Nom de l'adaptateur:"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 129
+-#: rc.cpp:271
++#: rc.cpp:288
+ #, no-c-format
+ msgid "Mode:"
+-msgstr ""
++msgstr "Mode:"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 163
+-#: rc.cpp:274
+-#, fuzzy, no-c-format
++#: rc.cpp:291
++#, no-c-format
+ msgid "Discoverable Timeout:"
+-msgstr "Pas de réponse de la page"
++msgstr "Limite de temps pour la découverte:"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 213
+-#: rc.cpp:278
++#: rc.cpp:295
+ #, no-c-format
+ msgid "Timeout after the adapter gets invisible"
+-msgstr ""
++msgstr "Temps après lequel le périphérique devient invisible"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 235
+-#: rc.cpp:281
++#: rc.cpp:298
+ #, no-c-format
+ msgid "Class of Device:"
+-msgstr ""
++msgstr "Classe du périphérique:"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 241
+-#: rc.cpp:284
+-#, fuzzy, no-c-format
++#: rc.cpp:301
++#, no-c-format
+ msgid "Unspecified"
+-msgstr "Pas de réponse du LMP"
++msgstr "Non spécifié"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 246
+-#: rc.cpp:287
++#: rc.cpp:304
+ #, no-c-format
+ msgid "Desktop"
+-msgstr ""
++msgstr "Ordinateur de bureau"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 251
+-#: rc.cpp:290
++#: rc.cpp:307
+ #, no-c-format
+ msgid "Laptop"
+-msgstr ""
++msgstr "Ordinateur Portable"
+ 
+ #. i18n: file ./kbluetooth/adapterdialog.ui line 291
+-#: rc.cpp:293
++#: rc.cpp:310
+ #, no-c-format
+ msgid "Device Information"
+-msgstr ""
+-
+-#. i18n: file ./kbluetooth/authdialog.ui line 16
+-#: rc.cpp:298
+-#, no-c-format
+-msgid "PinDefaultDialog"
+-msgstr ""
+-
+-#. i18n: file ./kbluetooth/authdialog.ui line 32
+-#: rc.cpp:301
+-#, fuzzy, no-c-format
+-msgid ""
+-"<font size=\"+2\">Bluetooth Authorization Request</font>\n"
+-"<p><b>%1</b> (device address <b>%2</b>) %3.</p>\n"
+-"\n"
+-"<p>\n"
+-"If you aren't sure about the identity of the other party, then reject \n"
+-"this authorization request.</p>"
+-msgstr ""
+-"<font size=\"+2\">Demande de couplage d'un périphérique Bluetooth</font>\n"
+-"<p><b>%1</b> (adresse du périphérique <b>%2</b>) veut se coupler avec votre\n"
+-"périphérique Bluetooth, ce qui est nécessaire pour une connexion authentifiée "
+-"et sécurisée.\n"
+-"</p>"
+-"<p>\n"
+-"Si vous connaissez l'identité de l'autre partie, alors saisissez ci-dessous\n"
+-"le même code PIN que celui utilisé par l'autre périphérique.</p>"
++msgstr "Informations du périphérique"
+ 
+-#. i18n: file ./kbluetooth/pindefdialog.ui line 29
+-#: rc.cpp:309
++#. i18n: file ./kbtserialchat/maindialogbase.ui line 16
++#: rc.cpp:315 kbtserialchat/main.cpp:42
+ #, no-c-format
+-msgid ""
+-"<font size=\"+2\">Bluetooth Pairing Request</font>\n"
+-"<p><b>%1</b> (device address <b>%2</b>) wants to pair with your\n"
+-"Bluetooth device, which is needed for authenticated and secure connections.\n"
+-"</p>"
+-"<p>\n"
+-"If you are sure about the identity of the other party, then please enter\n"
+-"the same PIN below as was used by the other device.</p>"
+-msgstr ""
+-"<font size=\"+2\">Demande de couplage d'un périphérique Bluetooth</font>\n"
+-"<p><b>%1</b> (adresse du périphérique <b>%2</b>) veut se coupler avec votre\n"
+-"périphérique Bluetooth, ce qui est nécessaire pour une connexion authentifiée "
+-"et sécurisée.\n"
+-"</p>"
+-"<p>\n"
+-"Si vous connaissez l'identité de l'autre partie, alors saisissez ci-dessous\n"
+-"le même code PIN que celui utilisé par l'autre périphérique.</p>"
++msgid "Bluetooth Serial Chat"
++msgstr "Connexion Série Bluetooth"
+ 
+-#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 16
+-#: rc.cpp:317
++#. i18n: file ./kbtserialchat/maindialogbase.ui line 27
++#: rc.cpp:318
+ #, no-c-format
+-msgid "MyDialog1"
+-msgstr "Ma Fenêtre 1"
++msgid "<font color=\"#0000ff\" size=\"+2\">Bluetooth Serial Chat</font>"
++msgstr "<font color=\"#0000ff\" size=\"+2\">Connexion Série Bluetooth</font>"
+ 
+-#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 103
+-#: rc.cpp:320
++#. i18n: file ./kbtserialchat/maindialogbase.ui line 54
++#: rc.cpp:321
+ #, no-c-format
+-msgid ""
+-"<p>The Bluetooth device \"<b>%1</b>\" wants to use the service <b>%2</b>.</p>\n"
+-"<p>Do you want to allow this access? </p>"
+-msgstr ""
+-"<p>Le périphérique Bluetooth \"<b>%1</b>\" veut utiliser le service <b>%2</b>"
+-".</p>\n"
+-"<p>Voulez-vous l'autoriser à y accéder ? </p>"
++msgid "&Send"
++msgstr "Envoyer"
+ 
+-#. i18n: file ./kbluetooth/confirmationdlgbase.ui line 121
++#. i18n: file ./kbtserialchat/maindialogbase.ui line 57
+ #: rc.cpp:324
+ #, no-c-format
+-msgid "Future policy for this device and service:"
+-msgstr "Choix futur à faire pour ce périphérique et ce service :"
+-
+-#: kcm_btpaired/pairedtab.cpp:288
+-msgid "- trusted "
+-msgstr ""
+-
+-#: kcm_btpaired/pairedtab.cpp:288
+-#, fuzzy
+-msgid " device"
+-msgstr "périphérique inconnu"
+-
+-#: kcm_btpaired/pairedtab.cpp:302
+-msgid "%1 (%2) %3"
+-msgstr ""
+-
+-#: kcm_btpaired/pairedtab.cpp:313
+-#, c-format
+-msgid "Last Seen: %1"
+-msgstr ""
+-
+-#: kcm_btpaired/pairedtab.cpp:321
+-#, c-format
+-msgid "Last Used: %1"
+-msgstr ""
+-
+-#: kcm_btpaired/kcm_btpaired.cpp:76
+-msgid ""
+-"<h1>BtPaired</h1>With this module you can manage the list of paired Bluetooth "
+-"Devices."
+-msgstr ""
+-
+-#: kinputwizard/main.cpp:36 kinputwizard/main.cpp:48
+-msgid "KInputWizard"
+-msgstr ""
+-
+-#: kbluelock/main.cpp:39 kinputwizard/main.cpp:37
+-msgid "Copyright (C) 2007 Novell, Inc."
+-msgstr ""
+-
+-#: kinputwizard/main.cpp:57
+-#, fuzzy
+-msgid ""
+-"KInputWizard is already running.\n"
+-msgstr ""
+-"KBluetoothD fonctionnait déjà.\n"
++msgid "Alt+S, Return"
++msgstr "Alt+S, Return"
+ 
+ #: kinputwizard/inputwizard.cpp:244 kinputwizard/inputwizard.cpp:489
+ #: kinputwizard/inputwizard.cpp:505
+-#, fuzzy
+ msgid "&Disconnect"
+-msgstr "Non connecté"
++msgstr "&Déconnecter"
+ 
+ #: kinputwizard/inputwizard.cpp:246 kinputwizard/inputwizard.cpp:494
+ #: kinputwizard/inputwizard.cpp:502
+-#, fuzzy
+ msgid "&Connect"
+-msgstr "Connecté à"
++msgstr "&Connecter"
+ 
+ #: kinputwizard/inputwizard.cpp:273
+ msgid "&Add New Device <<"
+-msgstr ""
++msgstr "&Ajouter un nouveau périphérique <<"
+ 
+ #: kinputwizard/inputwizard.cpp:287
+ msgid "&Add New Device >>"
+-msgstr ""
++msgstr "&Ajouter un nouveau périphérique >>"
+ 
+ #: kinputwizard/inputwizard.cpp:391
+-#, fuzzy
+ msgid "Creating Input Device"
+-msgstr "&Périphériques couplés..."
++msgstr "Création du périphérique de saisie"
+ 
+ #: kinputwizard/inputwizard.cpp:391
+ msgid "You have to select a remote Device to setup!"
+-msgstr ""
++msgstr "Vous devez choisir un périphérique distant à installer!"
+ 
+ #: kinputwizard/inputwizard.cpp:415
+ msgid "Creating Input Device failed"
+-msgstr ""
++msgstr "La création du périphérique de saisie a échoué"
+ 
+ #: kinputwizard/inputwizard.cpp:415
+ msgid "Failed to create the input device for %1!"
+-msgstr ""
++msgstr "Echec de la création du périphérique de saisie pour %1!"
+ 
+ #: kinputwizard/inputwizard.cpp:458
+-#, fuzzy
+ msgid "Connect now?"
+-msgstr "Informations de connexion"
++msgstr "Connecter maitnenant?"
+ 
+ #: kinputwizard/inputwizard.cpp:459
+ msgid "Would you like to connect to %1 now?"
+-msgstr ""
++msgstr "Souhaitez-vous vous connecter à %1 maintenant?"
+ 
+ #: kinputwizard/inputwizard.cpp:488
+-#, fuzzy
+ msgid "Connection succesfull"
+-msgstr "Informations de connexion"
++msgstr "Connexion établie"
+ 
+ #: kinputwizard/inputwizard.cpp:488
+ msgid "Connection to %1 successful established!"
+-msgstr ""
++msgstr "La connexion à %1 s'est établie avec succès!"
+ 
+ #: kinputwizard/inputwizard.cpp:493
+-#, fuzzy
+ msgid "Connection failed"
+-msgstr "&Détails de la connexion"
++msgstr "La connexion a échoué"
+ 
+ #: kinputwizard/inputwizard.cpp:493
+-#, fuzzy
+ msgid "Could not connect to "
+-msgstr "Connecté à"
++msgstr "Impossible de se connecter à "
+ 
+ #: kinputwizard/inputwizard.cpp:493
+ msgid ""
+ "\n"
+ " Check if the device is available and bluetooth enabled."
+ msgstr ""
++"\n"
++" Verifier si le périphérique est disponible et si ses fonctionnalités Bluetooth sont activées."
+ 
+ #: kinputwizard/inputwizard.cpp:501
+ msgid "Disconnect succesfull"
+-msgstr ""
++msgstr "Disconnexion réussie"
+ 
+ #: kinputwizard/inputwizard.cpp:501 kinputwizard/inputwizard.cpp:504
+-#, fuzzy
+ msgid "Connection to "
+-msgstr "Informations de connexion"
++msgstr "Connexion à "
+ 
+ #: kinputwizard/inputwizard.cpp:501
+ msgid " successful disconnected!"
+-msgstr ""
++msgstr " a été déconnecté avec succès!"
+ 
+ #: kinputwizard/inputwizard.cpp:504
+-#, fuzzy
+ msgid "Disconnect failed"
+-msgstr "Non connecté"
++msgstr "La déconnection a échoué"
+ 
+ #: kinputwizard/inputwizard.cpp:504
+-#, fuzzy
+ msgid " could not be disconnected!"
+-msgstr "Non connecté"
++msgstr " ne peut pas ^etre déconnecté!"
+ 
+-#: libkobex/kobexclient.cpp:139 libkobex/kobexserver.cpp:177
+-#, fuzzy
+-msgid "Connecting..."
+-msgstr "Aucune connexion"
++#: kinputwizard/main.cpp:36 kinputwizard/main.cpp:48
++msgid "KInputWizard"
++msgstr "KInputWizard"
+ 
+-#: libkobex/kobexclient.cpp:175 libkobex/kobexserver.cpp:220
+-#, fuzzy
+-msgid "Disconnecting..."
+-msgstr "Connexion :"
++#: kinputwizard/main.cpp:57
++msgid "KInputWizard is already running.\n"
++msgstr "KInputWizard est déjà en fonctionnement.\n"
+ 
+-#: libkobex/kobexclient.cpp:79
+-msgid ""
+-"Error connecting to phone\n"
+-"Response message: "
+-msgstr ""
++#: kioslave/obex/kio_obex/obex.cpp:289 kioslave/obex/kio_obex/obex.cpp:297
++#: kioslave/obex/kio_obex/obex.cpp:678
++msgid "Authentication failed"
++msgstr "L'authentification a échoué"
++
++#: kioslave/obex/kio_obex/obex.cpp:412
++msgid "OBEX protocol error: Recieved invalid MTU."
++msgstr "Erreur du protocole OBEX: Le MTU reçu est invalide."
++
++#: kioslave/obex/kio_obex/obex.cpp:415
++msgid "OBEX protocol error: Recieved invalid packet."
++msgstr "Erreur du protocole OBEX: Le paquet reçu est invalide."
++
++#: kioslave/obex/kio_obex/obex.cpp:418
++msgid "OBEX protocol error: Invalid protocol version received."
++msgstr "Erreur du protocole OBEX: La version du protocole est invalide."
++
++#: kioslave/obex/kio_obex/obex.cpp:421
++msgid "Authentication required."
++msgstr "Authentification requise."
++
++#: kioslave/obex/kio_obex/obex.cpp:424
++msgid "Can not connect."
++msgstr "Ne peut pas de connecter."
++
++#: kioslave/obex/kio_obex/obex.cpp:427
++msgid "Internal error: Already connected."
++msgstr "Erreur interne: Déjà connecté."
++
++#: kioslave/obex/kio_obex/obex.cpp:430 kioslave/obex/kio_obex/obex.cpp:709
++msgid "Internal error: Not connedcted."
++msgstr "Erreur inerne: Non connecté."
++
++#: kioslave/obex/kio_obex/obex.cpp:433
++msgid "Internal error: Client not idle."
++msgstr "Erreur interne: Le client n'est pas inactif."
++
++#: kioslave/obex/kio_obex/obex.cpp:436
++msgid "Unable to send request."
++msgstr "Impossible d'envoyer la requête."
++
++#: kioslave/obex/kio_obex/obex.cpp:439
++msgid "Got server error from server."
++msgstr "Une erreur a été reçue du serveur."
++
++#: kioslave/obex/kio_obex/obex.cpp:442
++msgid "Transport is not connected (anymore)."
++msgstr "Transport n'est (plus) connecté."
++
++#: kioslave/obex/kio_obex/obex.cpp:445
++msgid "Transport error."
++msgstr "Erreur de transport."
++
++#: kioslave/obex/kio_obex/obex.cpp:448
++msgid "Internal error."
++msgstr "Erreur interne."
+ 
+-#: libkobex/kobexclient.cpp:93
++#: kioslave/obex/kio_obex/obex.cpp:468 kioslave/obex/kio_obex/obex.cpp:715
++msgid "Disconnecting"
++msgstr "Déconnection"
++
++#: kioslave/obex/kio_obex/obex.cpp:472 kioslave/obex/kio_obex/obex.cpp:718
++msgid "Disconnected"
++msgstr "Déconnecté"
++
++#: kioslave/obex/kio_obex/obex.cpp:551 kioslave/obex/kio_obex/obex.cpp:562
++msgid "Transport not available"
++msgstr "Transport non disponible"
++
++#: kioslave/obex/kio_obex/obex.cpp:634
++msgid "Connecting"
++msgstr "Connection"
++
++#: kioslave/obex/kio_obex/obex.cpp:667
++msgid "Connected"
++msgstr "Connecté"
++
++#: kioslave/obex/kio_obex/obex.cpp:809 kioslave/obex/kio_obex/obex.cpp:921
++msgid "Downloading"
++msgstr "Rception"
++
++#: kioslave/obex/kio_obex/obex.cpp:822 kioslave/obex/kio_obex/obex.cpp:923
++msgid "Downloaded"
++msgstr "Reçu"
++
++#: kioslave/obex/kio_obex/obex.cpp:853
++msgid "Creating directory"
++msgstr "Création du répertoire"
++
++#: kioslave/obex/kio_obex/obex.cpp:860
++msgid "Created directory"
++msgstr "Répertoire créé"
++
++#: kioslave/obex/kio_obex/obex.cpp:879
++msgid "Deleting"
++msgstr "Suppression"
++
++#: kioslave/obex/kio_obex/obex.cpp:885
++msgid "Deleted"
++msgstr "Supprimé"
++
++#: kioslave/obex/kio_obex/obex.cpp:972
++msgid "Uploading"
++msgstr "Envoi"
++
++#: kioslave/obex/kio_obex/obex.cpp:981
++msgid "Uploaded"
++msgstr "Envoyé"
++
++#: kioslave/obex/kio_obex/obex.cpp:1336
++msgid "OBEX FTP"
++msgstr "OBEX FTP"
++
++#: kioslave/sdp/btsdp.cpp:43
++msgid "No working Bluetooth adapter found."
++msgstr "Aucun périphérique Bluetooth n'a été trouvé."
++
++#: kioslave/sdp/btsdp.cpp:131 kioslave/bluetooth/kiobluetooth.cpp:87
++msgid "Bluetooth neighborhood"
++msgstr "Voisinage Bluetooth"
++
++#: kioslave/sdp/btsdp.cpp:139
++msgid "More services"
++msgstr "Plus de services"
++
++#: kioslave/sdp/btsdp.cpp:145
++msgid "Could not stat %1. Unknown device"
++msgstr "Ne peut pas cibler %1. Périphérique inconnu"
++
++#: kioslave/sdp/btsdp.cpp:201
++msgid "Retrieving services for %1."
++msgstr "Recherche des services pour %1."
++
++#: kioslave/bluetooth/kiobluetooth.cpp:41
++msgid "Protocol name"
++msgstr "Nom du protocole"
++
++#: kioslave/bluetooth/kiobluetooth.cpp:42
++#: kioslave/bluetooth/kiobluetooth.cpp:43
++msgid "Socket name"
++msgstr "Nom du socket"
++
++#: kioslave/bluetooth/kiobluetooth.cpp:93
++msgid "Could not stat %1."
++msgstr "Ne peut pas cibler %1."
++
++#: kbtobexclient/fileiconview.cpp:58
++msgid "&Cancel Selected Files"
++msgstr "Annuler la sélection de fichiers"
++
++#: kbtobexclient/fileiconview.cpp:63
++msgid "&New Project"
++msgstr "&Nouveau projet"
++
++#: kbtobexclient/fileview.cpp:72
++msgid "Location: "
++msgstr "Emplacement: "
++
++#: kbtobexclient/fileview.cpp:94
+ msgid ""
+-"Error sending file %1 to phone\n"
+-"Response message: "
++"<qt>Click this button to enter the parent folder.<p>For instance, if the "
++"current location is file:/home/%1 clicking this button will take you to "
++"file:/home.</qt>"
+ msgstr ""
++"<qt>Cliquer sur ce bouton pour entrer dans le dossier parent.<p>Si l'emplacement "
++"actuel est the file:/home/%1 cliquer sur ce bouton vous emmènera à  file:/home.</qt>"
+ 
+-#: libkobex/kobexclient.cpp:105
++#: kbtobexclient/fileview.cpp:98
++msgid "Click this button to move backwards one step in the browsing history."
++msgstr "Cliquer sur ce bouton pour revenir à l'emplacement précédent."
++
++#: kbtobexclient/fileview.cpp:100
++msgid "Click this button to move forward one step in the browsing history."
++msgstr "Cliquer sur ce bouton vous emmènera à l'emplacement suivant."
++
++#: kbtobexclient/fileview.cpp:102
++msgid "Click this button to reload the contents of the current location."
++msgstr "Cliquer sur ce bouton actualise le contenu de l'emplacement actuel."
++
++#: kbtobexclient/fileview.cpp:105
++msgid "Click this button to create a new folder."
++msgstr "Cliquer sur ce bouton crée un nouveau répertoire."
++
++#: kbtobexclient/fileview.cpp:109
+ msgid ""
+-"Error getting data from phone\n"
+-"Response message: "
+-msgstr ""
++"<qt>This is the configuration menu for the file dialog. Various options can "
++"be accessed from this menu including: <ul><li>how files are sorted in the "
++"list</li><li>types of view, including icon and list</li><li>showing of "
++"hidden files</li><li>the Quick Access navigation panel</li><li>file "
++"previews</li><li>separating folders from files</li></ul></qt>"
++msgstr ""
++"<qt>Ceci est le menu de configuration de la boite de dialogue de la gestion "
++"de fichiers. Diverses option sont accessibles depuis ce menu telles que:"
++"<ul><li>comment les fichiers sont classés dans la liste</li><li>type de "
++"vue, incluant \"icônes\" et \"liste\"</li><li>affichage des fichiers cachés</li>"
++"<li>accès rapide au panneau de navigation</li><li>aperçus de fichiers</li>"
++"<li>séparer les dossiers des fichiers</li></ul></qt>"
+ 
+-#: libkobex/kobexclient.cpp:120
+-msgid "Done"
+-msgstr ""
++#: kbtobexclient/fileview.cpp:136
++msgid "Filter:"
++msgstr "Filtre:"
+ 
+-#: libkobex/kobexclient.cpp:164
+-msgid "Error connecting transport"
+-msgstr ""
++#: kbtobexclient/fileview.cpp:142
++msgid "*|All Files"
++msgstr "*|Tous les fichiers"
+ 
+-#: libkobex/kobexclient.cpp:208
+-#, fuzzy
+-msgid "Sending "
++#: kbtobexclient/fileview.cpp:143
++msgid "image/jpeg |JPEG Image Files"
++msgstr "image/jpeg |Images JPEG"
++
++#: kbtobexclient/diroperator.cpp:75
++msgid "Short View"
++msgstr "Vue simple"
++
++#: kbtobexclient/mainwindow.cpp:125 kbtobexclient/mainwindow.cpp:148
++#: kbtobexclient/mainwindow.cpp:156
++msgid "Project View"
++msgstr "Vue de projet"
++
++#: kbtobexclient/mainwindow.cpp:139
++msgid "File to send:"
++msgstr "Fichiers à envoyer"
++
++#: kbtobexclient/mainwindow.cpp:145
++msgid "Send"
+ msgstr "Envoyer"
+ 
+-#: libkobex/kobexclient.cpp:208
+-msgid ""
+-" to phone\n"
+-"\n"
+-msgstr ""
++#: kbtobexclient/mainwindow.cpp:148
++msgid "Files View"
++msgstr "Vue des fichiers"
+ 
+-#: libkobex/kobexclient.cpp:217
+-msgid "Requesting stream start..."
+-msgstr ""
++#: kbtobexclient/mainwindow.cpp:156
++msgid "Devices View"
++msgstr "Vue des périphériques"
+ 
+-#: libkobex/kobexclient.cpp:254
+-msgid "Streaming data..."
+-msgstr ""
++#: kbtobexclient/mainwindow.cpp:161
++msgid "Device selector:"
++msgstr "Sélecteur de périphériques"
+ 
+-#: kbluelock/main.cpp:61
+-#, fuzzy
+-msgid ""
+-"KBlueLock is already running.\n"
+-msgstr ""
+-"KBluetoothD fonctionnait déjà.\n"
++#: kbtobexclient/mainwindow.cpp:192
++msgid "Show Device Selector"
++msgstr "Afficher le sélecteur de périphériques"
+ 
+-#: kbluelock/kbluelock.cpp:215 kbluelock/kbluelock.cpp:308
++#: kbtobexclient/mainwindow.cpp:194
++msgid "Show File Selector"
++msgstr "Afficher le sélecteur de fichiers"
++
++#: kbtobexclient/mainwindow.cpp:196
++msgid "Show File Browser"
++msgstr "Afficher le gestionnaire de fichiers"
++
++#: kbtobexclient/mainwindow.cpp:274
+ msgid ""
+-"<p align='center'>KBlueLock <b>ON</b></p>\n"
+-"<p align='center'><i>%1</i></p>"
++"\n"
++" Continue with the remaining files?"
+ msgstr ""
++"\n"
++" Continuer avec les fichiers restants?"
+ 
+-#: kbluelock/kbluelock.cpp:227
+-msgid "KBlueLock - No Device selectetd"
+-msgstr ""
++#: kbtobexclient/main.cpp:31
++msgid "A KDE Bluetooth Framework Application"
++msgstr "Un gestionnaire Bluetooth pour KDE"
+ 
+-#: kbluelock/kbluelock.cpp:227
+-msgid "To enable KBlueLock you have to choose a Device."
+-msgstr ""
++#: kbtobexclient/main.cpp:37 kbtserialchat/main.cpp:32
++msgid "Used by kio_sdp"
++msgstr "Utilisé par kio_sdp"
+ 
+-#: kbluelock/kbluelock.cpp:289
+-msgid ""
+-"<p align='center'>KBlueLock <b>OFF</b></p>\n"
+-"<p align='center'><i>%1</i></p>"
+-msgstr ""
++#: kbtobexclient/main.cpp:47
++msgid "Bluetooth OBEX Object Push client"
++msgstr "Client d'envoi de fichier par Bluetooth OBEX"
+ 
+-#: kbluelock/kbluelock.cpp:344
+-msgid "&Disable"
+-msgstr ""
++#: kbtobexclient/main.cpp:53
++msgid "Author, Maintainer"
++msgstr "Auteur, Mainteneur"
+ 
+-#: kbluelock/kbluelock.cpp:350
+-msgid "&Enable"
+-msgstr ""
++#: kbluemon/monitor.cpp:57 kbluemon/monitor.cpp:331 kbluemon/monitor.cpp:424
++msgid "Scanning..."
++msgstr "Analyse..."
+ 
+-#: kbtobexsrv/main.cpp:24
+-msgid "KDE OBEX Push Server for Bluetooth"
+-msgstr ""
++#: kbluemon/monitor.cpp:150
++msgid "Service Discovery disabled"
++msgstr "Découverte de services désactivée"
+ 
+-#: kbtobexsrv/main.cpp:63
+-msgid ""
+-"kbtobexsrv will be called automatically by kbluetoothd when another device "
+-"tries to send you some files. You don't have to run it manually."
+-msgstr ""
++#: kbluemon/monitor.cpp:151 kbluemon/monitor.cpp:200 kbluemon/monitor.cpp:203
++#: kbluemon/monitor.cpp:206 kbluemon/monitor.cpp:222 kbluemon/monitor.cpp:253
++msgid "<i>not available</i>"
++msgstr "<i>non disponible</i>"
+ 
+-#: kbtobexsrv/maindlg.cpp:158
+-#, c-format
+-msgid "Receiving %1"
+-msgstr ""
++#: kbluemon/monitor.cpp:221 kbluemon/monitor.cpp:248
++msgid "no Services discovered"
++msgstr "aucun service découvert"
+ 
+-#: kbtobexsrv/maindlg.cpp:208
+-#, fuzzy
+-msgid "Disconnected."
+-msgstr "Non connecté"
++#: kbluemon/monitor.cpp:344 kbluemon/monitor.cpp:445
++msgid "St&art Scan"
++msgstr "Dém&arrer l'analise"
+ 
+-#: kbtobexsrv/maindlg.cpp:217
+-msgid ""
+-"The selected folder does not exist.                            Please select "
+-"another folder."
+-msgstr ""
++#: kbluemon/monitor.cpp:414
++msgid "Periodic Discovery started"
++msgstr "Découverte de services démarrée"
+ 
+-#: kbtobexsrv/maindlg.cpp:218
+-msgid "Obex Server"
+-msgstr ""
++#: kbluemon/monitor.cpp:416
++msgid "Failed to start Periodic Discovery! ("
++msgstr "Echec lors du démarrage de la découverte de services"
+ 
+-#: kbtobexsrv/maindlg.cpp:254
+-msgid "%1 already exists. Do you want to use %2 as filename instead?"
+-msgstr ""
++#: kbluemon/main.cpp:61
++msgid "KBlueMon is already running.\n"
++msgstr "KBlueMon est déjà en fonctionnement.\n"
+ 
+-#: kbtobexsrv/maindlg.cpp:255
+-msgid "Rename"
+-msgstr ""
++#: kbluetooth/sdprecord.cpp:359
++msgid "Failed to register an SDP record."
++msgstr "Echec lors de l'écriture d'un enregistrement SDP"
+ 
+-#: kbtobexsrv/maindlg.cpp:255
+-msgid "Overwrite"
++#: kbluetooth/sdprecord.cpp:360
++msgid ""
++"Please make sure that sdpd is running; \n"
++"without it, other devices will not be able to find out \n"
++"which services your computer offers. \n"
++"The error code returned by sdp_record_register() was %1"
+ msgstr ""
++"Vérifier que sdpd est en fonctionnement; \n"
++"sans lui, les autres périphériques ne pourront pas vérifier \n"
++"quels services sont publiés sur votre ordinateur. \n"
++"L'erreur retournée par sdp_record_register() est %1"
+ 
+-#: kbtobexsrv/maindlg.cpp:271
+-#, c-format
+-msgid "Error writing file %1."
+-msgstr ""
++#: kbluetooth/sdprecord.cpp:372
++msgid "Failed to connect to the SDP server."
++msgstr "Echec lors de la connexion au serveur SDP"
+ 
+-#: kbtobexsrv/maindlg.cpp:285
++#: kbluetooth/sdprecord.cpp:373
+ msgid ""
+-"The following files already existed in the target folder and were not saved "
+-"again with a different name:"
++"Please make sure that sdpd is running; \n"
++"without it, other devices will not be able to find out \n"
++"which services your computer offers."
+ msgstr ""
++"Vérifier que sdpd est en fonctionnement; \n"
++"sans lui, les autres périphériques ne pourront pas vérifier \n"
++"quels services sont publiés sur votre ordinateur;"
+ 
+ #: kbluetooth/rfcommportlistener.cpp:105
+-#, c-format
+ msgid "Could not create a socket for service %1."
+-msgstr "Impossible de créer une interface de connexion pour le service %1."
++msgstr "Impossible de créer un socket pour le service %1."
+ 
+ #: kbluetooth/rfcommportlistener.cpp:106
+ msgid ""
+ "<p>KBluetooth was unable to create a socket for the service %1. The error "
+-"message was <i>%2</i> (Error code %3)."
+-"<p>Make sure that BlueZ is installed correctly and all modules are loaded "
+-"(bluez, l2cap, rfcomm..)."
+-msgstr ""
+-"<p>KBluetooth a été désactivé pour créer une interface de connexion pour le "
+-"service %1. Le message d'erreur était <i>%2</i> (Code d'erreur %3)."
+-"<p>Assurez vous que BlueZ est installé correctement et que tous les modules "
+-"sont chargés (bluez, l2cap, rfcomm...)."
++"message was <i>%2</i> (Error code %3).<p>Make sure that BlueZ is installed "
++"correctly and all modules are loaded (bluez, l2cap, rfcomm..)."
++msgstr ""
++"<p>KBluetooth n'a pas pu créer un socket pour le service %1. Le message d'erreur "
++"est <i>%2</i> (Code d'erreur %3).<p>Vérifier que BlueZ est installé "
++"correctement et que tous les modules sont chargés (bluez, l2cap, rfcomm..)."
+ 
+ #: kbluetooth/rfcommportlistener.cpp:136
+ msgid ""
+ "<p>Could not enable security features for <b>%1</b>.The service will not be "
+ "started.</p>"
+ msgstr ""
+-"<p>Impossible d'activer les fonctionnalités de sécurité pour <b>%1</b>"
+-". Le service n'a pu être démarré.</p>"
++"<p>Impossible d'activer les fonctionnalités de séciruté pour <b>%1</b>.Le service "
++"ne sera pas démarré.</p>"
+ 
+ #: kbluetooth/rfcommportlistener.cpp:139
+ msgid ""
+ "<p>KBluetoothD was unable to enable authentication and/or encryption for the "
+-"service %1, so this service will not be started.</p>"
+-"<p> The error code returned by setsockopt() was %3 (<i>%2</i>)</p>"
+-"<p>To use encryption/authentication for selected services, you need a Linux "
+-"kernel >= 2.6.10-mh3. For older kernels you have to disable encryption and "
+-"authentication for this service."
+-"<br/> <i>Be careful with allowing unconfirmed connections in that case, since "
+-"the peer address could be faked.</i></p>"
+-msgstr ""
+-"<p>KBluetoothD n'a pu démarrer une authentification et/ou un cryptage pour le "
+-"service %1, ce service ne sera donc pas démarré.</p>"
+-"<p> The code d'erreur retourné par setsockopt() est %3 (<i>%2</i>)</p>"
+-"<p>Pour utiliser le cryptage/l'authentification pour les services sélectionnés, "
+-"vous avez besoin d'un noyau Linux de version supérieure ou égale à la 2.6.10. "
+-"Pour les noyaux plus anciens vous devrez désactiver le cryptage et "
+-"l'authentification pour ce service."
+-"<br/> <i>Dans ce cas, faites attention lorsque vous accordez des connexions non "
+-"confirmées, étant donné que l'adresse peut être falsifiée..</i></p>"
++"service %1, so this service will not be started.</p><p> The error code "
++"returned by setsockopt() was %3 (<i>%2</i>)</p><p>To use encryption/"
++"authentication for selected services, you need a Linux kernel >= 2.6.10-mh3. "
++"For older kernels you have to disable encryption and authentication for this "
++"service.<br/> <i>Be careful with allowing unconfirmed connections in that "
++"case, since the peer address could be faked.</i></p>"
++msgstr ""
+ 
+ #: kbluetooth/rfcommportlistener.cpp:174
+-#, c-format
+ msgid "Could not listen to a socket for service %1."
+-msgstr "Impossible d'écouter une interface de connexion pour le service %1."
++msgstr "Impossible d'attendre une connexion pour le service %1."
+ 
+ #: kbluetooth/rfcommportlistener.cpp:175
+ msgid ""
+-"<p>KBluetoothD was unable to listen to a socket for the service %1. The error "
+-"message was <i>%2</i> (Error code %3)."
+-"<p>Make sure that BlueZ is installed correctly and all modules are loaded "
+-"(bluez, l2cap, rfcomm..)."
+-msgstr ""
+-"<p>KBluetoothD n'a pas pu écouter une interface de connexion pour le service "
+-"%1. Le messsage d'erreur fut <i>%2</i> (Code d'erreur %3)."
+-"<p>Assurez vous que BlueZ est installé correctement et que tous les modules "
+-"sont chargés (bluez, l2cap, rfcomm...)."
++"<p>KBluetoothD was unable to listen to a socket for the service %1. The "
++"error message was <i>%2</i> (Error code %3).<p>Make sure that BlueZ is "
++"installed correctly and all modules are loaded (bluez, l2cap, rfcomm..)."
++msgstr ""
++"<p>KBluetoothD n'a pas pu attendre une connexion pour le service %1. Le "
++"message d'erreur est <i>%2</i> (Code d'erreur %3).<p>Vérifier que BlueZ est installé "
++"correctement et que tous les modules sont chargés (bluez, l2cap, rfcomm..)."
+ 
+ #: kbluetooth/rfcommportlistener.cpp:199
+-#, c-format
+ msgid "Could not bind to a socket for service %1."
+-msgstr "Impossible d'associer une interface de connexion au service %1."
++msgstr "Impossible de lier la connexion au service %1."
+ 
+ #: kbluetooth/rfcommportlistener.cpp:200
+ msgid ""
+-"<p>KBluetoothD was unable to bind to a socket for the service %1 on channel %2. "
+-"The error message was <i>%3</i> (Error code %4)."
+-"<p>Make sure that BlueZ is installed correctly."
+-msgstr ""
+-"<p>KBluetoothD n'a pas pu associer une interface de connexion au service %1 sur "
+-"le canal %2. Le message d'erreur était <i>%3</i> (Code d'erreur %4)."
+-"<p>Assurez-vous que BlueZ est correctement installé."
++"<p>KBluetoothD was unable to bind to a socket for the service %1 on channel %"
++"2. The error message was <i>%3</i> (Error code %4).<p>Make sure that BlueZ "
++"is installed correctly."
++msgstr ""
+ 
+ #: kbluetooth/rfcommportlistener.cpp:215
+-#, c-format
+ msgid "Could not assign a channel to service %1."
+-msgstr "Impossible d'associer un canal au service %1."
++msgstr "Impossible d'assigner un canal au service %1."
+ 
+ #: kbluetooth/rfcommportlistener.cpp:216
+ msgid ""
+-"<p>KBluetoothD was unable to find an unused Rfcomm channel for the service %1, "
+-"so other devices will not be able to access that service.</p>"
+-"<p>Possible reasons:"
+-"<br/> "
+-"<ul> "
+-"<li>Several services are configured to use the same channel.</li> "
+-"<li>Other Bluetooth services are blocking the ports. </li> </ul> Checklist: "
+-"<ul> "
+-"<li>%2 will try to use channels form %3 to %4 - are they all used by other "
+-"services?"
+-"<li>Does <i>/proc/bluetooth/rfcomm</i> show more listening sockets than the "
+-"Bluetooth services tab in the Control Center? </ul> </p>"
+-msgstr ""
+-"<p>KBluetoothD n'a pas pu trouver un canal Rfcomm non utilisé pour le service "
+-"%1, les autres périphériques ne seront donc pas en mesure d'accéder à ce "
+-"service. </p>"
+-"<p>Il y a plusieurs causes possibles : "
+-"<br/> "
+-"<ul> "
+-"<li>Beaucoup de services sont configurés sur le même canal</li> "
+-"<li>D'autres services Bluetooth bloquent les ports</li> </ul> "
+-"Liste des vérifications : "
+-"<ul> "
+-"<li>%2 essaiera d'essayer les canaux %3 à %4 - sont-ils tous utilisés par les "
+-"autres services ? "
+-"<li>Est-ce que <i>/proc/bluetooth/rfcomm</i> affiche plus d'interfaces de "
+-"connexion que l'onglet des services bluetooth du centre de contrôle ? </ul> </p>"
++"<p>KBluetoothD was unable to find an unused Rfcomm channel for the service %"
++"1, so other devices will not be able to access that service.</p><p>Possible "
++"reasons:<br/> <ul> <li>Several services are configured to use the same "
++"channel.</li> <li>Other Bluetooth services are blocking the ports. </li> </"
++"ul> Checklist: <ul> <li>%2 will try to use channels form %3 to %4 - are they "
++"all used by other services?<li>Does <i>/proc/bluetooth/rfcomm</i> show more "
++"listening sockets than the Bluetooth services tab in the Control Center? </"
++"ul> </p>"
++msgstr ""
+ 
+ #: kbluetooth/rfcommportlistener.cpp:478
+ msgid "Connection from <b>%1</b><br/>to channel %3 (<b>%2</b>)"
+-msgstr "Connexion depuis <b>%1</b><br/>vers le canal %3 (<b>%2</b>)"
++msgstr "Connexion de <b>%1</b><br/>au canal %3 (<b>%2</b>)"
+ 
+ #: kbluetooth/rfcommportlistener.cpp:530
+ msgid "Call \"%1\" failed"
+-msgstr "L'appel à \"%1\" a échoué"
++msgstr "L'appel \"%1\" a échoué"
+ 
+ #: kbluetooth/confirmation.cpp:52
+ msgid "Kbluetoothd: access to %1 from %2: ALLOW"
+-msgstr "Kbluetoothd : accès à %1 depuis %2 : AUTORISER"
++msgstr "Kbluetoothd: accès à %1 par %2: AUTORISER"
+ 
+ #: kbluetooth/confirmation.cpp:57
+ msgid "Kbluetoothd: access to %1 from %2: DENY"
+-msgstr "Kbluetoothd : accès à %1 depuis %2 : REFUSER"
++msgstr "Kbluetoothd: accès à %1 par %2: REFUSER"
+ 
+ #: kbluetooth/confirmation.cpp:62
+ msgid "Kbluetoothd: access to %1 from %2: ASK"
+-msgstr "Kbluetoothd : accès à %1 depuis %2 : DEMANDER"
++msgstr "Kbluetoothd: accès à %1 par %2: DEMANDER"
+ 
+ #: kbluetooth/confirmation.cpp:74
+ msgid "Unchanged"
+-msgstr "Inchangée"
++msgstr "Inchangé"
+ 
+-#: kbluetooth/authorize.cpp:30 kbluetooth/confirmation.cpp:90
++#: kbluetooth/confirmation.cpp:90 kbluetooth/authorize.cpp:30
+ msgid "Accept"
+ msgstr "Accepter"
+ 
+@@ -1398,90 +1355,56 @@
+ msgstr "Rejeter"
+ 
+ #: kbluetooth/authorize.cpp:30
+-#, fuzzy
+ msgid "Always Accept"
+-msgstr "Accepter"
++msgstr "Toujours accepter"
+ 
+ #: kbluetooth/authorize.cpp:39
+ msgid "wants to act as Input Device"
+-msgstr ""
+-
+-#: kbluetooth/main.cpp:20 kbluetooth/main.cpp:32 kbluetooth/trayicon.cpp:378
+-#: kbluetooth/trayicon.cpp:400 kbluetooth/trayicon.cpp:414
+-#: kbluetooth/trayicon.cpp:427 kbluetooth/trayicon.cpp:441
+-#, fuzzy
+-msgid "KBluetooth"
+-msgstr "KBluetoothD"
+-
+-#: kbluetooth/main.cpp:24
+-msgid "Show the tray icon if it was disabled before."
+-msgstr ""
+-"Afficher l'icône de la barre système si elle a été désactivée auparavant."
+-
+-#: kbluetooth/main.cpp:44
+-#, fuzzy
+-msgid ""
+-"KBluetooth is already running.\n"
+-msgstr ""
+-"KBluetoothD fonctionnait déjà.\n"
+-
+-#: kbluetooth/main.cpp:58
+-msgid ""
+-"Can't connect to DBus!\n"
+-"Unable to start kbluetooth. \n"
+-"\n"
+-" \t\t\t\t\t\t\t\t\tRestart dbus and the bluetooth service"
+-msgstr ""
++msgstr "veut agir comme périphérique de saisie"
+ 
+ #: kbluetooth/trayicon.cpp:42
+-#, fuzzy
+ msgid "KBlue&Mon"
+-msgstr "KBluetoothD"
++msgstr "KBlue&Mon"
+ 
+ #: kbluetooth/trayicon.cpp:48
+ msgid "KBlue&Lock"
+-msgstr ""
++msgstr "KBlue&Lock"
+ 
+ #: kbluetooth/trayicon.cpp:54
+ msgid "&Send File..."
+-msgstr ""
++msgstr "Envoyer un fichier..."
+ 
+ #: kbluetooth/trayicon.cpp:60
+ msgid "&Configuration"
+ msgstr "&Configuration"
+ 
+ #: kbluetooth/trayicon.cpp:76
+-#, fuzzy
+ msgid "&Input Devices..."
+-msgstr "&Périphériques couplés..."
++msgstr "Pér&iphériques de saisie..."
+ 
+ #: kbluetooth/trayicon.cpp:82
+-#, fuzzy
+-msgid "&Devices..."
+-msgstr "&Périphériques couplés..."
++msgid "&Adapters..."
++msgstr "&Adaptateurs..."
+ 
+ #: kbluetooth/trayicon.cpp:88
+-#, fuzzy
+ msgid "&Paired/Trusted Devices..."
+-msgstr "&Périphériques couplés..."
++msgstr "&Périphériques associés/de confiance..."
+ 
+ #: kbluetooth/trayicon.cpp:97
+ msgid "&Obex Server"
+-msgstr ""
++msgstr "Serveur &OBEX"
+ 
+ #: kbluetooth/trayicon.cpp:242
+-#, fuzzy
+ msgid ""
+ "KBluetooth will run in hidden mode now and only show up when there is a "
+ "connection. To enable the permanent tray icon start KBluetooth again."
+ msgstr ""
+-"KBluetoothD se lancera désormais en mode caché et ne se montrera que quand il y "
+-"aura une connexion. Pour activer de nouveau l'icône de la barre système, "
+-"relancez KBluetoothD."
++"KBluetooth fonctionnera en mode masqué et ne s'affichera que s'il existe une "
++"connection. Pour l'afficher perpétuellement, démarrer KBluetooth à nouveau."
+ 
+ #: kbluetooth/trayicon.cpp:244
+ msgid "Hidden Mode"
+-msgstr "Mode caché"
++msgstr "Mode masqué"
+ 
+ #: kbluetooth/trayicon.cpp:254
+ msgid "Not connected"
+@@ -1494,37 +1417,44 @@
+ "Mode: %3\n"
+ "Connected to: "
+ msgstr ""
++"Adaptateur: %1\n"
++"Addresse: %2\n"
++"Mode: %3\n"
++"Connecté à: "
+ 
+ #: kbluetooth/trayicon.cpp:377
+ msgid "Could not execute the btpaired Control Center module."
+-msgstr "Impossible d'exécuter le module btpaired du centre de contrôle."
++msgstr "Impossible d'exécuter le module KCM btpaired."
++
++#: kbluetooth/trayicon.cpp:378 kbluetooth/trayicon.cpp:400
++#: kbluetooth/trayicon.cpp:414 kbluetooth/trayicon.cpp:427
++#: kbluetooth/trayicon.cpp:441 kbluetooth/main.cpp:20 kbluetooth/main.cpp:32
++msgid "KBluetooth"
++msgstr "KBluetooth"
+ 
+ #: kbluetooth/trayicon.cpp:399
+ msgid "Could not execute kinputwizard."
+-msgstr ""
++msgstr "Impossible d'exécuter kinputwizard."
+ 
+ #: kbluetooth/trayicon.cpp:413
+ msgid "Could not execute KBlueMon."
+-msgstr ""
++msgstr "Impossible d'exécuter KBlueMon."
+ 
+ #: kbluetooth/trayicon.cpp:426
+ msgid "Could not execute KBlueLock."
+-msgstr ""
++msgstr "Impossible d'exécuter KBlueLock."
+ 
+ #: kbluetooth/trayicon.cpp:440
+-#, fuzzy
+ msgid "Could not execute KBtobexclient."
+-msgstr "Impossible d'exécuter le module btpaired du centre de contrôle."
++msgstr "Impossible d'exécuter KBtobexclient."
+ 
+ #: kbluetooth/trayicon.cpp:470
+-#, fuzzy
+ msgid "Should KBluetooth still be restarted when you login?"
+-msgstr "KBluetoothD doit-il être relancé quand vous vous connectez ?"
++msgstr "KBluetooth doit-il démarrer lorsque vous ouvrez une session?"
+ 
+ #: kbluetooth/trayicon.cpp:471
+-#, fuzzy
+ msgid "Automatically Start KBluetooth?"
+-msgstr "Démarrer automatiquement KBluetoothD ?"
++msgstr "Démarrer KBluetooth automatiquement?"
+ 
+ #: kbluetooth/trayicon.cpp:471
+ msgid "Start"
+@@ -1535,345 +1465,190 @@
+ msgstr "Ne pas Démarrer"
+ 
+ #: kbluetooth/trayicon.cpp:516
+-#, fuzzy
+ msgid "Connected to <b>%1</b><br/>(<b>%2</b>)"
+-msgstr "Connexion depuis <b>%1</b><br/>vers le canal %3 (<b>%2</b>)"
++msgstr "Connecté à <b>%1</b><br/>(<b>%2</b>)"
+ 
+ #: kbluetooth/trayicon.cpp:575
+ msgid "<i>Bluetooth Monitor</i><br/> Problem connecting with <b>%1</b>:"
+-msgstr ""
+-"<i>Moniteur Bluetooth</i>"
+-"<br/> Problème lors de la connexion avec <b>%1</b> :"
+-
+-#: kbluetooth/sdprecord.cpp:357
+-msgid "Failed to register an SDP record."
+-msgstr "Échec de l'enregistrement SDP"
+-
+-#: kbluetooth/sdprecord.cpp:358
+-#, c-format
+-msgid ""
+-"Please make sure that sdpd is running; \n"
+-"without it, other devices will not be able to find out \n"
+-"which services your computer offers. \n"
+-"The error code returned by sdp_record_register() was %1"
+-msgstr ""
+-"Assurez-vous que sdpd est lancé. \n"
+-"Sans lui aucun périphérique ne pourra se connecter \n"
+-"avec les services qu'offre votre ordinateur. \n"
+-"Le code d'erreur retourné par sdp_record_register() fut %1."
+-
+-#: kbluetooth/sdprecord.cpp:370
+-msgid "Failed to connect to the SDP server."
+-msgstr "Échec de la connexion au serveur SDP."
+-
+-#: kbluetooth/sdprecord.cpp:371
+-msgid ""
+-"Please make sure that sdpd is running; \n"
+-"without it, other devices will not be able to find out \n"
+-"which services your computer offers."
+-msgstr ""
+-"Assurez-vous que sdpd est lancé. \n"
+-"Sans lui aucun périphérique ne pourra se connecter \n"
+-"avec les services qu'offre votre ordinateur."
++msgstr "<i>Moniteur Bluetooth</i><br/> Problème de connexion avec <b>%1</b>:"
+ 
+ #: kbluetooth/adapterconfig.cpp:49
+ msgid "off"
+-msgstr ""
++msgstr "off"
+ 
+ #: kbluetooth/adapterconfig.cpp:50
+-#, fuzzy
+ msgid "connectable"
+-msgstr "Non connecté"
++msgstr "connectable"
+ 
+ #: kbluetooth/adapterconfig.cpp:51
+ msgid "discoverable"
+-msgstr ""
++msgstr "découvrable"
+ 
+ #: kbluetooth/adapterconfig.cpp:107
+-#, fuzzy
+ msgid "MAC Address: <b>%1</b>"
+-msgstr "<b>Adresse : </b>"
++msgstr "Adresse MAC: <b>%1</b>"
+ 
+ #: kbluetooth/adapterconfig.cpp:110
+ msgid "Version: <b>%1</b>"
+-msgstr ""
++msgstr "Version: <b>%1</b>"
+ 
+ #: kbluetooth/adapterconfig.cpp:128
+ msgid "none"
+-msgstr ""
++msgstr "aucune"
+ 
+ #: kbluetooth/adapterconfig.cpp:132
+ msgid " minutes"
+-msgstr ""
++msgstr "minutes"
+ 
+ #: kbluetooth/deviceconfig.cpp:45 kbluetooth/deviceconfig.cpp:124
+-#, fuzzy
+ msgid "No Bluetooth device found!"
+-msgstr "Adaptateur Bluetooth trouvé."
++msgstr "Aucun service Bluetooth trouvé!"
+ 
+ #: kbluetooth/deviceconfig.cpp:46 kbluetooth/deviceconfig.cpp:125
+-#, fuzzy
+ msgid "no device"
+-msgstr "périphérique inconnu"
+-
+-#~ msgid "Always &Visible"
+-#~ msgstr "Toujours &Visible"
+-
+-#, fuzzy
+-#~ msgid "Paired Devices"
+-#~ msgstr "&Périphériques couplés..."
+-
+-#, fuzzy
+-#~ msgid "connect"
+-#~ msgstr "Non connecté"
+-
+-#, fuzzy
+-#~ msgid "disconnect"
+-#~ msgstr "Non connecté"
+-
+-#~ msgid "Configure &Services..."
+-#~ msgstr "Configurer les &Services..."
+-
+-#  i18n: file kbluetoothd/condetailswidget.ui line 43
+-#~ msgid "<unknown>"
+-#~ msgstr "<unknown>"
+-
+-#~ msgid "<b>Role:</b>"
+-#~ msgstr "<b>Rôle : </b>"
+-
+-#~ msgid "<b>Handle:</b>"
+-#~ msgstr "<b>Outil : </b>"
+-
+-#~ msgid "<b>Direction:</b>"
+-#~ msgstr "<b>Direction : </b>"
+-
+-#~ msgid "<b>Link mode:</b>"
+-#~ msgstr "<b>Mode de lien : </b>"
+-
+-#~ msgid "Kill Connection"
+-#~ msgstr "Tuer la connexion"
+-
+-#~ msgid "Bookmark this device"
+-#~ msgstr "Ajouter un signet pour ce périphérique"
+-
+-#~ msgid "Add a bookmark for quicker access"
+-#~ msgstr "Ajouter un signet pour un accès plus rapide"
+-
+-#~ msgid "<qt><p>By adding a bookmark you can bypass the search procedure for devices which are not discoverable by default.</p><p>The bookmark will be created in the first Bookmark folder which already contains a Bluetooth device link</p></qt>"
+-#~ msgstr "<qt><p>En ajoutant un signet vous pouvez éviter la procédure de recherche de périphériques qui ne sont pas visibles par défaut.</p><p>Le signet sera créé dans le premier dossier de signets qui contient déjà un lien vers un périphérique Bluetooth</p></qt>"
+-
+-#~ msgid "00:00:00:00:00:00"
+-#~ msgstr "00:00:00:00:00:00"
+-
+-#~ msgid "<p><b>Signal&nbsp;strength:</b></p>"
+-#~ msgstr "<p><b>Puissance du signal : </b></p>"
+-
+-#~ msgid ""
+-#~ "<font size=\"+2\">Bluetooth Pairing Request</font>\n"
+-#~ "<p><b>%1</b> (device address <b>%2</b>) wants to pair with your\n"
+-#~ "Bluetooth device, which is needed for authenticated and secure connections.\n"
+-#~ "</p><p>\n"
+-#~ "If you are sure about the identity of the other party, then please press\n"
+-#~ "<i>Go</i> and enter the generated PIN below in the other device.</p>"
+-#~ msgstr ""
+-#~ "<font size=\"+2\">Demande de couplage d'un périphérique Bluetooth</font>\n"
+-#~ "<p><b>%1</b> (adresse du périphérique <b>%2</b>) veut se coupler avec votre\n"
+-#~ "périphérique Bluetooth, ce qui est nécessaire pour une connexion authentifiée et sécurisée.\n"
+-#~ "</p><p>\n"
+-#~ "Si vous connaissez l'identité de l'autre partie, alors appuyez sur \n"
+-#~ "<i>C'est parti</i> et saisissez le code PIN généré par l'autre périphérique.</p>"
+-
+-#~ msgid "Go"
+-#~ msgstr "C'est parti"
+-
+-#~ msgid "Use custom PIN"
+-#~ msgstr "Utiliser le code PIN habituel"
+-
+-#~ msgid "<p>You may replace bluez's pin helper program with kbluepin; it is located in <b>%1</b> now.</p>"
+-#~ msgstr "<p>Vous pouvez remplacer le programme d'aide à la saisie du code pin de bluez par kbluepin. Il est désormais situé dans <b>%1</b>.</p>"
+-
+-#~ msgid "You can change the confirmation settings again using the Bluetooth services applet in the Control Center."
+-#~ msgstr "Vous pouvez changer les options de confirmation en utilisant l'applet service Bluetooth du Centre de Contrôle."
+-
+-#~ msgid "outgoing"
+-#~ msgstr "sortant"
+-
+-#~ msgid "incoming"
+-#~ msgstr "rentrant"
+-
+-#~ msgid "master"
+-#~ msgstr "maître"
+-
+-#~ msgid "slave"
+-#~ msgstr "esclave"
++msgstr "aucun périphérique"
+ 
+-#~ msgid "Could not start hcitool to kill the connection."
+-#~ msgstr "Impossible de lancer hcitool pour tuer la connexion."
+-
+-#~ msgid "<p>Executable <b>%1</b> for device search job <b>%2</b> could not be started.</p>"
+-#~ msgstr "<p>L'exécutable <b>%1</b> pour la recherche des tâches des périphériques <b>%2</b> n'a pas pu être lancé.</p>"
+-
+-#~ msgid "<p>Job <b>%1</b>: <i>%2</i></p>"
+-#~ msgstr "<p>Tâche <b>%1</b> : <i>%2</i></p>"
+-
+-#~ msgid "<p>Device search job <b>%1</b> returned with error code <b>%2</b>.</p>"
+-#~ msgstr "<p>La recherche des tâches du périphérique <b>%1</b> a retourné le code d'erreur <b>%2</b>.</p>"
+-
+-#~ msgid "<p>Device search job <b>%1</b> was killed.</p>"
+-#~ msgstr "<p>La recherche des tâches du périphérique <b>%1</b> a été tuée.</p>"
+-
+-#~ msgid "Bluetooth adaptor was unplugged."
+-#~ msgstr "Adaptateur Bluetooth débranché."
+-
+-#~ msgid "KBluetoothD - Bluetooth Meta Server"
+-#~ msgstr "KBluetoothD - Méta-serveur Bluetooth"
+-
+-#~ msgid "Pairing was sucessful."
+-#~ msgstr "Le couplage a réussi"
+-
+-#~ msgid "Pairing failed."
+-#~ msgstr "Échec du couplage."
+-
+-#~ msgid "The devices could not be paired. The reported HCI error code is 0x%1."
+-#~ msgstr "Les périphériques n'ont pu être couplés. Le code d'erreur rapporté par HCI est 0x%1."
+-
+-#~ msgid "Could not execute the kbluetoothd Control Center module."
+-#~ msgstr "Impossible d'exécuter le module kbluetoothd du centre de contrôle."
+-
+-#~ msgid "Could not execute the khciconfig Control Center module."
+-#~ msgstr "Impossible d'exécuter le module khciconfig du centre de contrôle."
+-
+-#~ msgid "You can reenable the Bluetooth daemon at any time by running 'kbluetoothd'."
+-#~ msgstr "Vous pouvez réactiver le démon Bluetooth à chaque fois en lançant \"kbluetoothd\"."
+-
+-#~ msgid "KDE Bluetooth Daemon"
+-#~ msgstr "Démon KDE Bluetooth"
+-
+-#~ msgid "No adapter"
+-#~ msgstr "Pas d'adaptateur"
+-
+-#~ msgid "Recently Seen Devices"
+-#~ msgstr "Périphériques récemment vus"
+-
+-#~ msgid "Recently Used Services"
+-#~ msgstr "Services récemment utilisés"
+-
+-#~ msgid "error code 0x%1"
+-#~ msgstr "Code d'erreur 0x%1"
+-
+-#~ msgid "Hardware failure"
+-#~ msgstr "Problème matériel"
+-
+-#~ msgid "Authentication Error"
+-#~ msgstr "Erreur d'authentification"
+-
+-#~ msgid "Not paired"
+-#~ msgstr "Non couplé"
+-
+-#~ msgid "Memory full"
+-#~ msgstr "Mémoire pleine"
+-
+-#~ msgid "Connection timeout"
+-#~ msgstr "Connexion perdue"
+-
+-#~ msgid "Maximum number of connections"
+-#~ msgstr "Nombre maximal de connexions"
++#: kbluetooth/main.cpp:24
++msgid "Show the tray icon if it was disabled before."
++msgstr "Afficher l'icône si elle était auparavent désactivée."
+ 
+-#~ msgid "Maximum number of SCO connections to a device"
+-#~ msgstr "Nombre maximal de connexions SCO à un périphérique"
++#: kbluetooth/main.cpp:44
++msgid "KBluetooth is already running.\n"
++msgstr "KBluetooth est déjà en fonctionnement.\n"
+ 
+-#~ msgid "ACL connection already exists"
+-#~ msgstr "Une connexion ACL existe déjà"
++#: kbluetooth/main.cpp:58
++msgid ""
++"Can't connect to DBus!\n"
++"Unable to start kbluetooth. \n"
++"\n"
++" \t\t\t\t\t\t\t\t\tRestart dbus and the bluetooth service"
++msgstr ""
++"Connexion à DBus impossible!\n"
++"Impossible de démarrer kbluetooth. \n"
++"\n"
++" \t\t\t\t\t\t\t\t\tRedémarrer DBus et le service Bluetooth"
+ 
+-#~ msgid "Host rejected due to limited resources"
+-#~ msgstr "Hôte rejeté à cause de ressources limitées"
++#: kioclient/commandhandler.cpp:25
++msgid "Arguments missing."
++msgstr "Argument manquant."
+ 
+-#~ msgid "Host rejected for security reasons"
+-#~ msgstr "Hôte rejeté pour des raisons de sécurité"
++#: kioclient/commandhandler.cpp:94
++msgid "unknown command: %1"
++msgstr "commande inconnue: %1"
+ 
+-#~ msgid "Host rejected because remote device is only a personal device"
+-#~ msgstr "Hôte rejeté car le périphérique distant est seulement un périphérique personnel."
++#: kioclient/main.cpp:22
++msgid "KIO command line client"
++msgstr "Client KIO pour la ligne de commandes"
+ 
+-#~ msgid "Host timeout"
+-#~ msgstr "L'hôte ne répond pas"
++#: kioclient/main.cpp:31
++msgid "List date"
++msgstr "Lister les dates"
+ 
+-#~ msgid "Unsupported feature or parameter value"
+-#~ msgstr "Valeur de paramètre ou fonctionnalité non acceptée"
++#: kioclient/main.cpp:32
++msgid "List user"
++msgstr "Lister les utilisateurs"
+ 
+-#~ msgid "Invalid HCI command parameters"
+-#~ msgstr "Paramètres de commandes HCI incorrects"
++#: kioclient/main.cpp:33
++msgid "List icon name"
++msgstr "Lister les noms d'icônes"
+ 
+-#~ msgid "Other end terminated connection: User ended connection"
+-#~ msgstr "Connexion terminée par l'autre périphérique : L'utilisateur à terminé la connexion"
++#: kioclient/main.cpp:34
++msgid "List group"
++msgstr "Lister les groupes"
+ 
+-#~ msgid "Other end terminated connection: Low resources"
+-#~ msgstr "Connexion terminée par l'autre périphérique : Ressources faibles"
++#: kioclient/main.cpp:35
++msgid "List extra"
++msgstr "Lister les extras"
+ 
+-#~ msgid "Other end terminated connection: Imminent power off"
+-#~ msgstr "Connexion terminée par l'autre périphérique : Arrêt imminent"
++#: kioclient/main.cpp:36
++msgid "Do not list name"
++msgstr "Ne pas lister les noms"
+ 
+-#~ msgid "Connection terminated by local host"
+-#~ msgstr "Connexion terminée par l'hôte local"
++#: kioclient/main.cpp:37
++msgid "List access permissions"
++msgstr "Lister les permissions d'accès"
+ 
+-#~ msgid "Repeated attempts"
+-#~ msgstr "Essais répétés"
++#: kioclient/main.cpp:38
++msgid "List modification time"
++msgstr "Lister les dates de modification"
+ 
+-#~ msgid "Pairing not allowed"
+-#~ msgstr "Couplage non autorisé"
++#: kioclient/main.cpp:39
++msgid "List access time"
++msgstr "Lister les dates d'accès"
+ 
+-#~ msgid "Unknown LMP PDU"
+-#~ msgstr "LMP PDU inconnu"
++#: kioclient/main.cpp:40
++msgid "List creation time"
++msgstr "Lister les dates de création"
+ 
+-#~ msgid "Unsupported remote feature"
+-#~ msgstr "Fonctionnalité à distance non disponible"
++#: kioclient/main.cpp:41
++msgid "List file type"
++msgstr "Lister les types de fichiers"
+ 
+-#~ msgid "SCO offset rejected"
+-#~ msgstr "Offset SCO rejeté"
++#: kioclient/main.cpp:42
++msgid "List link destination"
++msgstr "Lister la destination des liens"
+ 
+-#~ msgid "SCO interval rejected"
+-#~ msgstr "Intervalle SCO rejetée"
++#: kioclient/main.cpp:43
++msgid "List URL"
++msgstr "Lister les URLs"
+ 
+-#~ msgid "SCO air mode rejected"
+-#~ msgstr "Mode aérien SCO rejeté"
++#: kioclient/main.cpp:44
++msgid "List mime type"
++msgstr "Lister les types mime"
+ 
+-#~ msgid "Invalid LMP parameter"
+-#~ msgstr "Paramètre LMP invalide"
++#: kioclient/main.cpp:45
++msgid "List guessed mime type"
++msgstr "Lister les types mime supposés"
+ 
+-#~ msgid "Unsupported LMP parameter value"
+-#~ msgstr "Valeur de paramètre LMP non acceptée"
++#: kioclient/main.cpp:46
++msgid "List XML properties"
++msgstr "Lister les propriétés XML"
+ 
+-#~ msgid "Role change not allowed"
+-#~ msgstr "Changement de rôle non autorisé"
++#: kioclient/main.cpp:47
++msgid "List size"
++msgstr "Lister les tailles"
+ 
+-#~ msgid "LMP response timeout"
+-#~ msgstr "Réponse LMP : timeout"
++#: kioclient/main.cpp:48
++msgid "Output file. Defaults to stdout"
++msgstr "Fichier de sortie. Utilise stdout par défaut"
+ 
+-#~ msgid "LMP error transaction collision"
+-#~ msgstr "Erreur LMP, lors de la transaction"
++#: kioclient/main.cpp:49
++msgid "Input file. Defaults to stdin"
++msgstr "Fichier d'entrée. Utilise stdin par défaut"
+ 
+-#~ msgid "LMP PDU not allowed"
+-#~ msgstr "LMP PDU non autorisé"
++#: kioclient/main.cpp:50
++msgid "Show a progress window"
++msgstr "Afficher une barre de progression"
+ 
+-#~ msgid "Encryption mode not acceptable"
+-#~ msgstr "Mode de cryptage non acceptable"
++#: kioclient/main.cpp:51
++msgid "Ask (graphically) before overwriting files"
++msgstr "Demander (graphiquement) avant d'écraser des fichiers"
+ 
+-#~ msgid "Unit key used"
+-#~ msgstr "Clé unité utilisée"
++#: kioclient/main.cpp:52
++msgid "Show messages from the kioslave"
++msgstr "Afficher les messages de kioslave"
+ 
+-#~ msgid "QoS is not supported"
+-#~ msgstr "QoS n'est pas disponible"
++#: kioclient/main.cpp:53
++msgid "Command (ls, cat, put, cp, rm, mv, mkdir, rmdir)"
++msgstr "Commande (ls, cat, put, cp, rm, mv, mkdir, rmdir)"
+ 
+-#~ msgid "Instant passed"
+-#~ msgstr "Demande passée"
++#: kioclient/main.cpp:60
++msgid "kio client"
++msgstr "Client KIO"
+ 
+-#~ msgid "Pairing with unit key not supported"
+-#~ msgstr "Le couplage par clé unité n'est pas disponible"
++#: kbtserialchat/main.cpp:23
++msgid "A KDE KPart Application"
++msgstr "Kpart pour KDE"
+ 
+-#~ msgid "<p>The KDE Bluetooth Daemon (<i>kbluetoothd</i>) is needed and was started.</p>"
+-#~ msgstr "<p>Le démon KDE Bluetooth (<i>kbluetoothd</i>) est nécessaire et a été lancé.</p>"
++#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Anthony Mercatante"
+ 
+-#~ msgid "The KDE Bluetooth Daemon (<i>kbluetoothd</i>) could not be started. Please make sure it is installed correctly."
+-#~ msgstr "Le démon KDE Bluetooth (<i>kbluetoothd</i>) n'a pu être démarré. Veuillez vous assurer qu'il a été correctement installé."
++#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "tonio@ubuntu.com"
+ 
+-#~ msgid "The error message was: %1"
+-#~ msgstr "Le message d'erreur était : %1"
diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
index 454eff149..69360204b 100644
--- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
+++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
@@ -10,8 +10,9 @@
 %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_datadir}/applications/kde
+%define tde_tdeappdir %{tde_appdir}/kde
 %define tde_tdedocdir %{tde_docdir}/kde
 %define tde_tdeincludedir %{tde_includedir}/kde
 %define tde_tdelibdir %{tde_libdir}/trinity
@@ -21,7 +22,7 @@
 
 Name:			trinity-kdebluetooth
 Version:		1.0_beta9_r769275
-Release:		1%{?dist}%{?_variant}
+Release:		2%{?dist}%{?_variant}
 
 Summary:		The TDE Bluetooth Framework
 
@@ -30,12 +31,25 @@ Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
 
 Source0:		kdebluetooth_1.0~beta9~r769275.orig.tar.gz
-Patch0:			kdebluetooth-1.0_beta8-gcc43.patch
-Patch1:			kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz
+Source1:		kblueplugd.bluez3
+Source2:		kblueplugd.bluez4
+Source3:		kblueplugd.desktop
+
+Patch1:			kdebluetooth-1.0_beta8-gcc43.patch
 Patch2:			kdebluetooth-trinity.patch
 Patch3:			kdebluetooth-fix_gcc_46_compilation.patch
 
+Patch4:			kdebluetooth-fix_bluez4_support.patch
+
+Patch11:		kubuntu_01_kdepot.patch
+Patch12:		kubuntu_02_desktop_files.patch
+Patch13:		kubuntu_06_no_autostart.patch
+Patch14:		kubuntu_07_fix_header_include.patch
+Patch15:		kubuntu_08_load_kdebluetooth_catalogue.patch
+Patch16:		kubuntu_09_french_i18n.patch
+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	lockdev-devel
@@ -49,20 +63,23 @@ Buildrequires:	libidn-devel
 Buildrequires:	dbus-tqt-devel
 BuildRequires:	automake >= 1.6.1
 BuildRequires:	autoconf >= 2.52
+BuildRequires:	obexftp-devel
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}bluez-devel
 %else
 BuildRequires:	bluez-libs-devel
-BuildRequires:	obexftp-devel
 %endif
 
-Requires:		%{name}-libs = %{version}-%{release}
-
 # kdesu binary
 Requires:		trinity-tdebase-bin
 
+%if 0%{?fedora} >= 8
+Provides:		dbus-bluez-pin-helper
+%endif
 
+Obsoletes:		%{name}-libs < %{version}-%{release}
+Provides:		%{name}-libs = %{version}-%{release}
 
 %description
 The KDE Bluetooth Framework is a set of tools built on top of Linux'
@@ -71,25 +88,11 @@ common Bluetooth profiles and to make data exchange with Bluetooth
 enabled devices as straightforward as possible.
 
 
-%package libs
-Summary: Base libraries for %{name}
-Group:	 System Environment/Libraries
-
-%if 0%{?fedora} >= 8
-Provides:		dbus-bluez-pin-helper
-%endif
-
-
-%description libs
-KDE Bluetooth framework libraries.
-
-
 %package devel
-Summary: Development files for %{name}
-Group:	 Development/Libraries
-Requires: trinity-kdelibs-devel
-Requires: bluez-libs-devel
-Requires: %{name}-libs = %{version}-%{release}
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	trinity-tdelibs-devel
+Requires:	bluez-libs-devel
 
 
 %description devel
@@ -98,11 +101,21 @@ KDE Bluetooth framework development libraries and headers.
 
 %prep
 %setup -q -n kdebluetooth-1.0~beta9~r769275
-%patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .gcc43
 %patch2 -p1 -b .trinity
 %patch3 -p1 -b .gcc46
 
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%patch4 -p1 -b .bluez4
+%endif
+
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -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" \
@@ -147,6 +160,7 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
+# icons
 for DESK_PATH in applications/kde applnk/Utilities ; do
 	desktop-file-install												\
 		--mode=644														\
@@ -158,6 +172,7 @@ for DESK_PATH in applications/kde applnk/Utilities ; do
 		$RPM_BUILD_ROOT%{tde_datadir}/$DESK_PATH/*.desktop ||:
 done
 
+# Locales
 PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
 			kcm_btpaired  kio_bluetooth kio_obex2 kio_sdp
 			libkbluetooth kdebluetooth"
@@ -165,52 +180,122 @@ for PROG in $PROG_LIST ; do
 	%find_lang $PROG && cat $PROG.lang >> %{name}.lang	||:
 done
 
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
-
-rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/*.a
-rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/kde3/*.a
-
-%find_lang kdebluetooth
-
 # Unwanted files
+%__rm -f %{buildroot}%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
+%__rm -f %{buildroot}%{tde_libdir}/*.a
 %__rm -f %{buildroot}%{tde_tdelibdir}/kcm_btpaired.a
 %__rm -f %{buildroot}%{tde_tdelibdir}/kio_bluetooth.a
 %__rm -f %{buildroot}%{tde_tdelibdir}/kio_obex.a
 %__rm -f %{buildroot}%{tde_tdelibdir}/kio_sdp.a
 %__rm -f %{buildroot}%{tde_datadir}/applnk/Settings/Network/Bluetooth/.directory
 
+# Installs 'kblueplugd'
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%__install -D -m 755 %{SOURCE2} %{buildroot}%{tde_bindir}/kblueplugd
+%else
+%__install -D -m 755 %{SOURCE1} %{buildroot}%{tde_bindir}/kblueplugd
+%endif
+%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/autostart/kblueplugd.desktop
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{tde_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -qf %{tde_datadir}/icons/hicolor 2> /dev/null ||:
+/sbin/ldconfig || :
+update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 
 %postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{tde_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -qf %{tde_datadir}/icons/hicolor 2> /dev/null ||:
+/sbin/ldconfig || :
+update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
+%post devel
+/sbin/ldconfig || :
 
-%files -f kdebluetooth.lang
+%postun devel
+/sbin/ldconfig || :
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL README
-%{tde_bindir}/kblue*
+%{tde_bindir}/kbluelock
+%{tde_bindir}/kbluemon
+%{tde_bindir}/kblueplugd
+%{tde_bindir}/kbluetooth
 %{tde_bindir}/kbtobexclient
 %{tde_bindir}/kioobex_start
 %{tde_bindir}/kinputwizard
-%{tde_tdeappdir}/*.desktop
 %{tde_datadir}/applnk/.hidden/*.desktop
 %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
-%{tde_datadir}/apps/*/*
-%{tde_datadir}/autostart/*
-%{tde_datadir}/desktop-directories/*
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/mimelnk/bluetooth/
-%{tde_datadir}/service*/*
+%{tde_datadir}/apps/konqueror/servicemenus/kbtobexclient_sendfile.desktop
+%{tde_datadir}/apps/kbtobexclient/kbtobexclientui.rc
+%{tde_datadir}/apps/kdebluetooth/
+%{tde_tdeappdir}/dunhandler.desktop
+%{tde_tdeappdir}/faxhandler.desktop
+%{tde_tdeappdir}/kbluelock.desktop
+%{tde_tdeappdir}/kbluemon.desktop
+%{tde_tdeappdir}/kbluetooth.desktop
+%{tde_tdeappdir}/kbtobexclient.desktop
+%{tde_tdeappdir}/kbtobexsrv.desktop
+%{tde_tdeappdir}/kcm_btpaired.desktop
+%{tde_tdeappdir}/kinputwizard.desktop
+%{tde_datadir}/autostart/kblueplugd.desktop
+%{tde_datadir}/desktop-directories/kde-settings-network-bluetooth.directory
+%{tde_datadir}/icons/hicolor/*/apps/kbluetooth.png
+%{tde_datadir}/icons/hicolor/*/apps/kdebluetooth.png
+%{tde_datadir}/icons/hicolor/*/apps/kbluelock.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kdebluetooth.svgz
+%{tde_datadir}/mimelnk/bluetooth/av-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/computer-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/dun-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/fax-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/handsfree-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/headset-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/imaging-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/keyboard-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/lan-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/misc-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/mouse-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/obex-ftp-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/obexobjectpush-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/peripheral-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/phone-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/serial-port-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/synchronization-profile.desktop
+%{tde_datadir}/mimelnk/bluetooth/unknown-device-class.desktop
+%{tde_datadir}/mimelnk/bluetooth/unknown-profile.desktop
+%{tde_datadir}/services/bluetooth.protocol
+%{tde_datadir}/services/btsdp.protocol
+%{tde_datadir}/services/kbluetooth_kbtobexsrv.desktop
+%{tde_datadir}/services/kbluetooth_kbtobexsrv.sdp.xml
+%{tde_datadir}/services/obex.protocol
+%{tde_datadir}/services/sdpmime-dun-profile.desktop
+%{tde_datadir}/services/sdpmime-fax-profile.desktop
+%{tde_datadir}/services/sdpmime-handsfree-profile.desktop
+%{tde_datadir}/services/sdpmime-headset-profile.desktop
+%{tde_datadir}/services/sdpmime-obex-client-profile.desktop
+%{tde_datadir}/services/sdpmime-obex-ftp-profile.desktop
+%{tde_datadir}/services/sdpmime-serial-port-profile.desktop
+%{tde_datadir}/services/sdpmime-synchronization-profile.desktop
+%{tde_datadir}/servicetypes/sdpservicehandler.desktop
+%{tde_libdir}/kdebluetooth/servers/kbtobexsrv
+%{tde_libdir}/libkbluetooth.so.0
+%{tde_libdir}/libkbluetooth.so.0.0.0
+%{tde_libdir}/libqobex.so.0
+%{tde_libdir}/libqobex.so.0.0.9
+%{tde_tdelibdir}/kcm_btpaired.la
+%{tde_tdelibdir}/kcm_btpaired.so
+%{tde_tdelibdir}/kio_bluetooth.la
+%{tde_tdelibdir}/kio_bluetooth.so
+%{tde_tdelibdir}/kio_obex.la
+%{tde_tdelibdir}/kio_obex.so
+%{tde_tdelibdir}/kio_sdp.la
+%{tde_tdelibdir}/kio_sdp.so
 %lang(ca) %{tde_tdedocdir}/HTML/ca/kdebluetooth/
 %lang(da) %{tde_tdedocdir}/HTML/da/kdebluetooth/
 %lang(en) %{tde_tdedocdir}/HTML/en/kdebluetooth/
@@ -224,22 +309,24 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 %lang(sv) %{tde_tdedocdir}/HTML/sv/kdebluetooth/
 
 
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_libdir}/kdebluetooth/
-
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/*
-%{tde_libdir}/*.so
+%{tde_tdeincludedir}/libkbluetooth/
+%{tde_tdeincludedir}/qobex/
+%{tde_libdir}/libkbluetooth.la
+%{tde_libdir}/libkbluetooth.so
+%{tde_libdir}/libqobex.la
+%{tde_libdir}/libqobex.so
 
 
 %changelog
+* Sat Sep 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-2
+- Rebuilt for Mageia 2 and Mandriva 2011
+- Drops useless '-libs' package
+- Correctly applies Ubuntu patches
+- Fix support for Bluez4
+
 * Sun Feb 12 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-1
 - Initial version for TDE 3.5.13
 - Updates base version to 1.0_beta9_r769275 (taken from Ubuntu Hardy)
@@ -332,7 +419,7 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 - Fix 64bit compile due to bad default in configure. (with_bluetooth_dir)
 - Missing BR: libtempter-devel.
 - Missing BT: libidn-devel.
-- Added: kbluepin wrapper - configure kbluepin as the old-style pin helper.
+- Added: kbluepin wrapper - cotde_datadirnfigure kbluepin as the old-style pin helper.
 
 * Wed Apr 04 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.20.beta2
 - Re-merge Ville Skytta's latest .spec. (Got dropped by mistake)
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch
index 154f138db..3f8ec4139 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch
@@ -5,7 +5,7 @@
      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[01]*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;
diff --git a/redhat/extras/kickoff-i18n/trinity-kickoff-i18n-3.5.13.1.spec b/redhat/extras/kickoff-i18n/trinity-kickoff-i18n-3.5.13.1.spec
new file mode 100644
index 000000000..4a1b84a1d
--- /dev/null
+++ b/redhat/extras/kickoff-i18n/trinity-kickoff-i18n-3.5.13.1.spec
@@ -0,0 +1,101 @@
+# 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
+
+# Speed build options
+%define debug_package %{nil}
+%define __spec_install_post %{nil}
+AutoReq: no
+
+# 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-kickoff-i18n
+Summary:		Kickoff translations for Trinity Desktop Environment
+Version:		1.0
+Release:	2%{?dist}%{?_variant}
+Group:			System/Internationalization
+License:		GPL
+URL:			http://www.mandriva.com
+
+Source0:		kickoff-i18n-1.0.tar.bz2
+Patch0:			kickoff-i18n-1.0-uz-po.patch
+Patch1:			kickoff-i18n-1.0-tr-po.patch
+
+# [kickoff-i18n] Fix directories for Trinity
+Patch2:			kickoff-i18n-1.0-fix_trinity_location.patch
+# [kickoff-i18n] Fix build with automake 1.11
+Patch3:			kickoff-i18n-1.0-fix_autotools_detection.patch
+
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch:		noarch
+
+BuildRequires:	qt3-devel
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
+
+%description
+kickoff translations
+
+%prep
+%setup -q -n kickoff-i18n-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1 -b .dir
+%patch3 -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|/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} \
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -fr %{buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+%find_lang kickoff
+
+%clean
+#rm -fr %{buildroot}
+
+%files -f kickoff.lang
+%defattr(-,root,root,-)
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
+- Initial build for TDE 3.5.13.1
+
+* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial build for TDE 3.5.13
diff --git a/redhat/extras/kickoff-i18n/trinity-kickoff-i18n.spec b/redhat/extras/kickoff-i18n/trinity-kickoff-i18n-3.5.13.spec
index 31e76f50b..31e76f50b 100644
--- a/redhat/extras/kickoff-i18n/trinity-kickoff-i18n.spec
+++ b/redhat/extras/kickoff-i18n/trinity-kickoff-i18n-3.5.13.spec
diff --git a/redhat/extras/koffice-l10n/koffice-l10n_1.6.3-1.diff.gz b/redhat/extras/koffice-l10n/koffice-l10n_1.6.3-1.diff.gz
deleted file mode 100644
index 6491e1cb3..000000000
--- a/redhat/extras/koffice-l10n/koffice-l10n_1.6.3-1.diff.gz
+++ /dev/null
diff --git a/redhat/extras/koffice-l10n/trinity-koffice-l10n.spec b/redhat/extras/koffice-l10n/trinity-koffice-l10n.spec
deleted file mode 100644
index 790ce5f71..000000000
--- a/redhat/extras/koffice-l10n/trinity-koffice-l10n.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 build for TDE 3.5.13
-
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
new file mode 100644
index 000000000..6cb76f8a3
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
@@ -0,0 +1,11 @@
+--- ksensors-0.7.3/admin/cvs.sh.ORI	2012-10-07 11:06:41.616636004 +0200
++++ ksensors-0.7.3/admin/cvs.sh	2012-10-07 11:07:55.975129334 +0200
+@@ -64,7 +64,7 @@
+     echo "*** KDE requires automake 1.6.1 or newer"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* ) : ;;
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) : ;;
+   "" )
+     echo "*** AUTOMAKE NOT FOUND!."
+     echo "*** KDE requires automake 1.6.1 or newer"
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch
new file mode 100644
index 000000000..265fa1e75
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-fix_sound_installation.patch
@@ -0,0 +1,10 @@
+--- ksensors-0.7.3/src/sounds/Makefile.am.ORI	2012-10-07 11:24:46.315092603 +0200
++++ ksensors-0.7.3/src/sounds/Makefile.am	2012-10-07 11:25:08.288633760 +0200
+@@ -5,6 +5,7 @@
+ EXTRA_DIST = ksensors_alert.wav
+ 
+ install-data-local:
++	$(mkinstalldirs) $(kde_sounddir)
+ 	$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
+ uninstall-local:
+ 	rm -f $(kde_sounddir)/ksensors_alert.wav
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch b/redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch
new file mode 100644
index 000000000..fe3ae5c42
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-tde_includedir.patch
@@ -0,0 +1,84 @@
+--- ksensors-0.7.3/admin/acinclude.m4.in.tdeinc	2003-09-09 16:44:53.000000000 +0200
++++ ksensors-0.7.3/admin/acinclude.m4.in	2012-10-07 11:10:55.098502427 +0200
+@@ -459,14 +459,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/trinity/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/trinity/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications'
+@@ -528,7 +528,7 @@
+     )
+     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
+ 
+-        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"
++        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
+@@ -549,7 +549,7 @@
+         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+ 
+         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ 	    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
+@@ -1688,8 +1688,8 @@
+ 
+ if test -z "$1"; then
+ 
+-kde_incdirs="/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="/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/tde $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"
+@@ -1700,7 +1700,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-kde_libdirs="/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}"
++kde_libdirs="/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)
+@@ -1708,7 +1708,7 @@
+ 
+ kde_widgetdir=NO
+ dnl this might be somewhere else
+-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
++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([
+@@ -1716,14 +1716,14 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++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/kde3/plugins/designer"
++    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
+ fi
+ 
+ 
diff --git a/redhat/extras/ksensors/ksensors_0.7.3-18.diff b/redhat/extras/ksensors/ksensors_0.7.3-18.diff
new file mode 100644
index 000000000..5bfd493a4
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors_0.7.3-18.diff
@@ -0,0 +1,2868 @@
+--- ksensors-0.7.3.orig/config.h.in
++++ ksensors-0.7.3/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 if you have the CoreAudio API */
+ #undef HAVE_COREAUDIO
+ 
+@@ -85,6 +88,10 @@
+ /* Define a safe value for MAXPATHLEN */
+ #undef KDEMAXPATHLEN
+ 
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#undef LT_OBJDIR
++
+ /* Name of package */
+ #undef PACKAGE
+ 
+@@ -100,22 +107,25 @@
+ /* 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
+ 
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+ 
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+ 
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+@@ -124,9 +134,17 @@
+ /* Version number of package */
+ #undef VERSION
+ 
+-/* 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
+ 
+ /*
+  * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
+--- ksensors-0.7.3.orig/src/sensorslist.h
++++ ksensors-0.7.3/src/sensorslist.h
+@@ -19,7 +19,7 @@
+ #define SENSORSLIST_H
+ 
+ #include <qobject.h>
+-#include <qobjcoll.h>
++#include <qobjectlist.h>
+ #include <kconfig.h>
+ #include <qstringlist.h>
+ 
+--- ksensors-0.7.3.orig/src/cpupanel.cpp
++++ ksensors-0.7.3/src/cpupanel.cpp
+@@ -60,11 +60,11 @@
+ 
+ CpuPanel::CpuPanel(QWidget *parent, const char *name) : Panel(parent,name)
+ {
+- sCpu= "Unknow";
++ sCpu= "Unknown";
+  getCpuInfoValue("model name",sCpu);
+  adjustString(sCpu,16);
+ 
+- sVendor= "Unknow";
++ sVendor= "Unknown";
+  getCpuInfoValue("vendor_id",sVendor);
+  adjustString(sVendor,16);
+ 
+--- ksensors-0.7.3.orig/src/Makefile.am
++++ ksensors-0.7.3/src/Makefile.am
+@@ -43,7 +43,7 @@
+ 		   systemcfg.cpp systemcfgdesign.ui uptimepanel.cpp
+ 
+ ksensors_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) -lsensors -lm
++ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lsensors -lm
+ 
+ # this is where the desktop file will go 
+ shelldesktopdir   = $(kde_appsdir)/Utilities
+--- ksensors-0.7.3.orig/src/lmsensorscfg.cpp
++++ ksensors-0.7.3/src/lmsensorscfg.cpp
+@@ -29,7 +29,7 @@
+ #include <qgroupbox.h>
+ #include <qradiobutton.h>
+ #include <qpushbutton.h>
+-#include <qobjcoll.h>
++#include <qobjectlist.h>
+ #include <qtabwidget.h>
+ #include <qcombobox.h>
+ #include <qspinbox.h>
+--- ksensors-0.7.3.orig/src/hdsensorslist.h
++++ ksensors-0.7.3/src/hdsensorslist.h
+@@ -47,7 +47,7 @@
+ 
+   static bool isHddTempInstalled();
+   static bool getDisks(QStringList &disks);
+-  static bool getDiskInfo(const char *buf, QString disk, QString &name, double &value);
++  static bool getDiskInfo(const QString buf, QString &name, double &value);
+ };
+ 
+ #endif
+--- ksensors-0.7.3.orig/src/lmsensors.cpp
++++ ksensors-0.7.3/src/lmsensors.cpp
+@@ -45,17 +45,23 @@
+ 
+ bool LMSensors::initSensors()
+ {
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  FILE *fp=fopen("/etc/sensors.conf","r");
+  if(!fp) {
+    qWarning("KSensors error: /etc/sensors.conf not found !");
+    return false;
+  }
++#else
++ FILE *fp=NULL;
++#endif
+  int err= sensors_init(fp);
+  if(err) {
+    qWarning("KSensors error: sensors_init fail, error code %d",err);
+    return false;
+  }
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  fclose(fp);
++#endif
+  return true;
+ }
+ 
+@@ -63,12 +69,19 @@
+ {
+  const sensors_chip_name *chip_name;
+  int err= 0;
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  while( (chip_name= sensors_get_detected_chips(&err)) )
++ {
+    if( existSensor(chip_name,"temp")  ||
+        existSensor(chip_name,"fan")   )
+        {
+           (void)new LMSensorsChip(chip_name,this);
+        }
++ }
++#else
++ while( (chip_name= sensors_get_detected_chips(NULL, &err)) )
++          (void)new LMSensorsChip(chip_name,this);
++#endif
+ }
+ 
+ void LMSensors::createHDSensors()
+@@ -84,6 +97,7 @@
+ }
+ 
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ int LMSensors::existSensor(const sensors_chip_name *chip_name,const char *sensor_name)
+ {
+ int nr1,nr2;
+@@ -91,10 +105,13 @@
+ 
+  nr1=nr2= 0;
+  while( (sensor_data= sensors_get_all_features(*chip_name, &nr1, &nr2)) )
++ {
+    if( strstr(sensor_data->name,sensor_name) )
+      return sensor_data->number;
++ }
+  return 0;
+ }
++#endif
+ 
+ void LMSensors::setMonitorized(bool enable)
+ {
+--- ksensors-0.7.3.orig/src/processexec.h
++++ ksensors-0.7.3/src/processexec.h
+@@ -33,11 +33,11 @@
+ 
+   bool run();
+   bool runAndWait();
+-  bool outputErrors() { return fErrors; };
++  bool outputErrors()				{ return fErrors; };
+ 
+-  inline char *getStdoutData()       { return buffer; };
+-  inline int getStdoutDataLen()      { return bufLen; }
+-  inline void clearData()            { bufLen= 0; buffer[0]= 0; fErrors= false; };
++  inline QString getStdoutData()		{ return buffer; };
++  inline unsigned int getStdoutDataLen()	{ return buffer.length(); }
++  inline void clearData()			{ buffer.truncate(0); fErrors= false; };
+ 
+ protected slots:
+ 
+@@ -47,8 +47,7 @@
+ private:
+ 
+   static const int bufMax= 1023;
+-  char buffer[bufMax+1];
+-  int  bufLen;
++  QString buffer;
+   bool fErrors;
+ };
+ 
+--- ksensors-0.7.3.orig/src/lmsensor.cpp
++++ ksensors-0.7.3/src/lmsensor.cpp
+@@ -30,25 +30,70 @@
+ LMSensor::~LMSensor(){
+ }
+ 
+-
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ bool LMSensor::init(const sensors_feature_data **data, int *nr1,int *nr2)
++#else
++bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2)
++#endif
+ {
+-double min,max;
+-
++ double min,max;
+  const sensors_chip_name *chip_name= getChipName();
++ const char* main_name = (*data)->name;
++ feature= (*data)->number;
++ char *label = NULL;
++ QString uniqueSensorName;
++
++ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus.nr, chip_name->addr, main_name);
++ setName(uniqueSensorName.latin1());
++ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
++ bool min_found=false;
++ bool max_found=false;
++ while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
++   int len = strlen((*data)->name);
++   const char *postfix = (*data)->name + len - 4;
++
++   if (len < 5)
++     continue;
++
++   if((!strcmp(postfix, "_min") || !strcmp(postfix, "_low")) &&
++      !sensors_get_feature(*chip_name, (*data)->number, &valMin))
++     min_found=true;
++   
++   if(!strcmp(postfix, "_max") &&
++      !sensors_get_feature(*chip_name, (*data)->number, &valMax)) {
++     max_found=true;
++     continue;
++   }
++
++   postfix--;
++
++   if((!strcmp(postfix, "_over") || !strcmp(postfix, "_high")) &&
++      !sensors_get_feature(*chip_name, (*data)->number, &valMax))
++     max_found=true;
++ }
++
++ double newVal;
++ if ((sensors_get_ignored(*chip_name, feature) != 1) || (sensors_get_feature(*chip_name, feature, &newVal) != 0)) {
++   return false;
++ }
+ 
+- if (strstr((*data)->name, "temp"))
++ if (strstr(main_name, "temp"))
+  {
+     setType(lmTemp);
+     max= 65;
+     min= 0;
+  }
+- else if (strstr((*data)->name, "fan"))
++ else if (strstr(main_name, "fan"))
+  {
+     setType(lmFan);
+     max= 10000;
+     min= 3000;
+  }
++ else if (strstr(main_name, "alarm") || strstr(main_name, "sensor") || strstr(main_name, "vrm"))
++ {
++    return false;
++ }
+  else
+  {
+     setType(lmVoltage);
+@@ -56,47 +101,129 @@
+     min= -16;
+  }
+ 
+- feature= (*data)->number;
++ sensors_get_label(*chip_name,feature,&label);
++ if (label)
++ {
++    setDescription(QString(label));
++    delete label;
++    label = NULL;
++ }
++ else
++ {
++    setDescription(uniqueSensorName.latin1());
++ }
++ 
++ if(min_found)
++   min = valMin;
++   
++ if(max_found)
++   max = valMax;
++
++#else /* libsensors4 code */
++
++  const sensors_subfeature *sub_feature;
++  const sensors_feature *feature_data = *data;
++  
++  /* Move to next feature for the loop in LMSensorsChip::createSensors() */
++  *data = sensors_get_features(chip_name, nr1);
++ 
++  switch(feature_data->type)
++  {
++    case SENSORS_FEATURE_IN:
++      sub_feature = sensors_get_subfeature(chip_name, feature_data,
++        SENSORS_SUBFEATURE_IN_INPUT);
++
++      if (!sub_feature)
++        return false;
++
++      feature = sub_feature->number;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_IN_MIN)) ||
++          sensors_get_value(chip_name, sub_feature->number, &min))
++        min = -16;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_IN_MAX)) ||
++          sensors_get_value(chip_name, sub_feature->number, &max))
++        max = 16;
++ 
++      setType(lmVoltage);
++      break;
++
++    case SENSORS_FEATURE_FAN:
++      sub_feature = sensors_get_subfeature(chip_name, feature_data,
++        SENSORS_SUBFEATURE_FAN_INPUT);
++
++      if (!sub_feature)
++        return false;
++
++      feature = sub_feature->number;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_FAN_MIN)) ||
++          sensors_get_value(chip_name, sub_feature->number, &min))
++        min = 3000;
++
++      max = 10000;
++
++      setType(lmFan);
++      break;
++
++    case SENSORS_FEATURE_TEMP:
++      sub_feature = sensors_get_subfeature(chip_name, feature_data,
++        SENSORS_SUBFEATURE_TEMP_INPUT);
++
++      if (!sub_feature)
++        return false;
++
++      feature = sub_feature->number;
++
++      if (!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++            SENSORS_SUBFEATURE_TEMP_MIN)) ||
++          sensors_get_value(chip_name, sub_feature->number, &min))
++        min = 0;
++
++      if ((!(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++              SENSORS_SUBFEATURE_TEMP_MAX)) &&
++           !(sub_feature = sensors_get_subfeature(chip_name, feature_data,
++              SENSORS_SUBFEATURE_TEMP_CRIT))) ||
++          sensors_get_value(chip_name, sub_feature->number, &max))
++        max = 65;
++
++      setType(lmTemp);
++      break;
++    
++    default:
++      return false;
++  }
+ 
+- QString str;
+- str.sprintf("%s.%s", chip_name->prefix, (*data)->name );
+- setName( str.latin1() );
++  label = sensors_get_label(chip_name, feature_data);
++  if (label)
++  {
++     setDescription(QString(label));
++     delete label;
++     label = NULL;
++  }
++  else
++    setDescription( uniqueSensorName.latin1() );
+ 
+- char *label;
+- sensors_get_label(*chip_name,feature,&label);
+- setDescription(QString(label));
++#endif /* libsensors3 / libsensors4 code */
+ 
+- bool valid= false;
+- while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
+-   str= (*data)->name;
+-   if(str.find("_min")>=0 || str.find("_low")>=0) {
+-       sensors_get_feature(*chip_name, (*data)->number, &valMin);
+-       valid= true;
+-   } else
+-       if(str.find("_max")>=0 || str.find("_over")>=0  || str.find("_high")>=0) {
+-          sensors_get_feature(*chip_name, (*data)->number, &valMax);
+-          valid= true;
+-       }
+- }
+-
+- if(valid) {
+-    double newVal;
+-    valid= (sensors_get_feature(*chip_name, feature, &newVal)==0);
+-    if(valid) {
+-        if(min>max) {
+-          double pivot= valMin;
+-          min= max;
+-          max= pivot;
+-        }
+-        setValueMax(max,dgCelsius);
+-        setValueMin(min,dgCelsius);
+-        setValue((max+min)/2,dgCelsius);
+-        readConfig();
+-        updateValue();
+-        setValueIdeal(getValue());
+-    }
++ if(min>max) {
++   double pivot= min;
++   min= max;
++   max= pivot;
+  }
+- return valid;
++
++ setValueMax(max,dgCelsius);
++ setValueMin(min,dgCelsius);
++
++ readConfig();
++ updateValue();
++ setValueIdeal(getValue());
++
++ return true;
+ }
+ 
+ void LMSensor::updateValue()
+@@ -108,7 +235,11 @@
+ {
+  double newVal;
+  const sensors_chip_name *chip_name= getChipName();
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+  sensors_get_feature(*chip_name, feature, &newVal);
++#else
++ sensors_get_value(chip_name, feature, &newVal);
++#endif
+  return newVal;
+ }
+ 
+--- ksensors-0.7.3.orig/src/lmsensors.h
++++ ksensors-0.7.3/src/lmsensors.h
+@@ -19,7 +19,7 @@
+ #define LMSENSORS_H
+ 
+ #include <qobject.h>
+-#include <qobjcoll.h>
++#include <qobjectlist.h>
+ #include <kconfig.h>
+ #include <qstringlist.h>
+ 
+@@ -65,7 +65,9 @@
+   void createI8KSensors();
+   void childEvent ( QChildEvent *e );
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+   static int existSensor(const sensors_chip_name *chip_name,const char *sensor_name);
++#endif
+ };
+ 
+ #endif
+--- ksensors-0.7.3.orig/src/lmsensor.h
++++ ksensors-0.7.3/src/lmsensor.h
+@@ -51,7 +51,11 @@
+ 
+   double calculateIdealValue();
+ 
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+   bool init(const sensors_feature_data **data, int *nr1,int *nr2);
++#else
++  bool init(const sensors_feature **data, int *nr1,int *nr2);
++#endif
+   const sensors_chip_name *getChipName();
+ 
+ private:
+--- ksensors-0.7.3.orig/src/lmsensorscfgdesign.ui
++++ ksensors-0.7.3/src/lmsensorscfgdesign.ui
+@@ -748,29 +748,13 @@
+                                 <property name="name">
+                                     <cstring>unnamed</cstring>
+                                 </property>
+-                                <widget class="QLabel">
++                                <widget class="QButtonGroup">
+                                     <property name="name">
+-                                        <cstring>TextLabel1_3_2_2_2_2</cstring>
++                                        <cstring>ButtonGroup9</cstring>
+                                     </property>
+-                                    <property name="text">
++                                    <property name="title">
+                                         <string>On reach alarm value:</string>
+                                     </property>
+-                                </widget>
+-                                <widget class="QFrame">
+-                                    <property name="name">
+-                                        <cstring>Frame11_2_2_2</cstring>
+-                                    </property>
+-                                    <property name="frameShape">
+-                                        <enum>HLine</enum>
+-                                    </property>
+-                                    <property name="frameShadow">
+-                                        <enum>Sunken</enum>
+-                                    </property>
+-                                </widget>
+-                                <widget class="QLayoutWidget">
+-                                    <property name="name">
+-                                        <cstring>layout9</cstring>
+-                                    </property>
+                                     <grid>
+                                         <property name="name">
+                                             <cstring>unnamed</cstring>
+--- ksensors-0.7.3.orig/src/palettecfg.cpp
++++ ksensors-0.7.3/src/palettecfg.cpp
+@@ -82,13 +82,7 @@
+ {
+  labelTitle->unsetPalette();
+  framePanel->setPalette(pal);
+-#if ( KDE_VERSION_MAJOR >= 3 )
+  labelTitle->setPaletteForegroundColor(pal.active().text());
+-#else
+- QPalette p= labelTitle->palette();
+- p.setColor(QColorGroup::Foreground,pal.active().text());
+- labelTitle->setPalette(p);
+-#endif
+  if(updateColorButton) slotComboSelected(comboSelect->currentItem());
+ }
+ 
+--- ksensors-0.7.3.orig/src/lmsensorschip.cpp
++++ ksensors-0.7.3/src/lmsensorschip.cpp
+@@ -50,10 +50,15 @@
+ void LMSensorsChip::createSensors()
+ {
+  if(!chip_name) return;
+- const sensors_feature_data *data;
+  int nr1= 0;
+  int nr2= 0;
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
++ const sensors_feature_data *data;
+  data= sensors_get_all_features(*chip_name, &nr1, &nr2);
++#else
++ const sensors_feature *data;
++ data= sensors_get_features(chip_name, &nr1);
++#endif
+  while(data) {
+    LMSensor *sensor= new LMSensor(this);
+    if( !sensor->init(&data,&nr1,&nr2) )
+--- ksensors-0.7.3.orig/src/hdsensorslist.cpp
++++ ksensors-0.7.3/src/hdsensorslist.cpp
+@@ -23,7 +23,7 @@
+ #include <stdlib.h>
+ #include <qstringlist.h>
+ #include <klocale.h>
+-#include <regex.h>
++#include <qregexp.h>
+ 
+ #include "sensor.h"
+ #include "hdsensorslist.h"
+@@ -44,28 +44,25 @@
+  QStringList disks;
+  if(!getDisks(disks)) return;
+ 
+- ProcessExec proc;
+- proc << "hddtemp" << "-q";
+  for(QStringList::Iterator it = disks.begin(); it != disks.end(); ++it ) {
++   ProcessExec proc;
++   proc << "hddtemp" << "-q";
+    proc << *it;
+- }
+-
+- if(proc.runAndWait()) {
+-    double value;
+-    QString str;
+-    for(QStringList::Iterator it = disks.begin(); it != disks.end(); ++it ) {
+-      if(getDiskInfo(proc.getStdoutData(),*it,str,value)) {
+-         Sensor *sensor= new Sensor(this);
+-         sensor->setType(Sensor::lmTemp);
+-         sensor->setName(*it);
+-         sensor->setDescription(str);
+-         sensor->setValueMax  (40   , Sensor::dgCelsius);
+-         sensor->setValueMin  ( 0   , Sensor::dgCelsius);
+-         sensor->setValueIdeal(value, Sensor::dgCelsius);
+-         sensor->setValue     (value, Sensor::dgCelsius);
+-         sensor->readConfig();
+-      }
+-    }
++   if(proc.runAndWait()) {
++     double value;
++     QString str;
++     if(getDiskInfo(proc.getStdoutData(),str,value)) {
++       Sensor *sensor= new Sensor(this);
++       sensor->setType(Sensor::lmTemp);
++       sensor->setName(*it);
++       sensor->setDescription(str);
++       sensor->setValueMax  (40   , Sensor::dgCelsius);
++       sensor->setValueMin  ( 0   , Sensor::dgCelsius);
++       sensor->setValueIdeal(value, Sensor::dgCelsius);
++       sensor->setValue     (value, Sensor::dgCelsius);
++       sensor->readConfig();
++     }
++   }
+  }
+ }
+ 
+@@ -90,50 +87,29 @@
+ 
+  if(params.count()>0) {
+    process= new ProcessExec;
+-#if ( KDE_VERSION_MAJOR >= 3 )
+    *process << "hddtemp" << "-q" << params;
+-#else
+-   *process << "hddtemp" << "-q";
+-   for (QStringList::Iterator it= params.begin(); it!=params.end(); ++it)
+-    *process << *it;
+-#endif
+    connect( process, SIGNAL(processExited(KProcess *)), this, SLOT(slotProcessExited(KProcess *)) );
+    process->run();
+  }
+ }
+ 
+-
+ void HDSensorsList::slotProcessExited(KProcess *)
+ {
+  QObjectList *list= (QObjectList *)children();
+ 
+- if(!list) return;
+-
+- char *buf= process->getStdoutData();
++ if (!list) return;
+ 
+- if( process->outputErrors() ) {
+-   qWarning("HddTemp Error:\n%s", buf);
+- }
++ if (process->outputErrors())
++   qWarning("HddTemp Error:\n%s", process->getStdoutData().ascii());
+ 
+- char *ptr;
+- regex_t *preg;
+- regmatch_t pmatch[1];
+- preg = (regex_t*) malloc(sizeof(regex_t));
+- regcomp(preg, ": [0-9]\\+.*C$", REG_NEWLINE);
+- 
+- for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) {
+-   buf= strstr(buf,obj->name());
+-   if(!buf) break;
+-   if (regexec(preg, buf, 1, pmatch, 0) == 0)
+-   {
+-     ptr = buf + pmatch[0].rm_so + 2;
+-     buf += pmatch[0].rm_eo;
+-     obj->setValue(atof(ptr), Sensor::dgCelsius); 
++ QStringList buf = QStringList::split(QChar('\n'), process->getStdoutData());
++ for(QStringList::Iterator it = buf.begin(); it != buf.end(); ++it ) {
++   for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) {
++     QRegExp rx(QString(obj->name()) + QString(":\\s+.+:\\s+(\\d+).*C"));
++     if (rx.search((*it)) > -1)
++       obj->setValue(rx.cap(1).toDouble(), Sensor::dgCelsius); 
+    }
+  }
+- regfree(preg);
+- free(preg);
+-
+  delete process;
+  process= 0;
+ }
+@@ -141,78 +117,49 @@
+ // ***************  Static methods
+ 
+ 
+-bool HDSensorsList::getDiskInfo(const char *buf, QString disk, QString &name, double &value)
++bool HDSensorsList::getDiskInfo(const QString buf, QString &name, double &value)
+ {
+- regex_t *preg;
+- regmatch_t pmatch[1];
+- preg = (regex_t*) malloc(sizeof(regex_t));
+-
+- // Take disk model
+- char reg_string[30];
+- snprintf(reg_string, sizeof(reg_string), "%s: .*: [0-9]", disk.latin1());
+- regcomp(preg, reg_string, REG_NEWLINE);
+- if (regexec(preg, buf, 1, pmatch, 0) == 0)
+- {	    
+-   name="";	   
+-   pmatch[0].rm_eo -= 3;
+-   pmatch[0].rm_so += 10;
+-   buf += pmatch[0].rm_so;
+-   while (pmatch[0].rm_so < pmatch[0].rm_eo) 
+-   {	    
+-     name += *buf;
+-     buf++;
+-     pmatch[0].rm_so++;
+-   }
+-   regfree(preg);
+-   name= name.stripWhiteSpace();
+-   if( name.length()>40 ) name= disk;
+- }
+- else
+- {
+-   regfree(preg);
+-   free(preg);
+-   return false;
++ QRegExp rx(":\\s+(.+):\\s+(\\d+).*C");
++
++ if (rx.search(buf) > -1) {
++   bool ok;
++   name = rx.cap(1);
++   value = rx.cap(2).toDouble(&ok);
++   if (ok)
++     return true;
++   else
++     return false;
+  }
+- 
+- // Take disk temperature
+- regcomp(preg, ": [0-9]\\+.*C$", REG_NEWLINE);
+- if (regexec(preg, buf, 1, pmatch, 0) == 0)
+- {	    
+-   value= atof(buf + pmatch[0].rm_so + 2);
+-   regfree(preg);
+-   free(preg);
+- } 
+- else
+- {	    
+-   regfree(preg);
+-   free(preg);
++ else 
+    return false;
+- }
+- return true;
+ }
+ 
+ 
+ bool HDSensorsList::isHddTempInstalled()
+ {
+-ProcessExec proc;
++ ProcessExec proc;
+ 
+- proc << "hddtemp" ;
++ proc << "hddtemp" << "-v" ;
+  if(proc.runAndWait()) {
+-   if(strstr(proc.getStdoutData(),"ERROR")==0) return true;
+-   qWarning("HddTemp Error:\n%s", proc.getStdoutData());
++   if(proc.getStdoutData().contains("ERROR")==0) return true;
++   qWarning("HddTemp Error:\n%s", proc.getStdoutData().ascii());
+  }
+  return false;
+ }
+ 
+ bool HDSensorsList::getDisks(QStringList &disks )
+ {
+-  DIR *dir= opendir("/proc/ide");
+-  if(!dir) return false;
++  DIR *dir;
++
++  /* Get a listing of the hard drives looking under sysfs first then falling back to /proc/ide */
++  if((dir = opendir ("/sys/block")) == NULL)
++    if ((dir = opendir ("/proc/ide")) == NULL)
++      return false;
+   QString str;
+   struct dirent *ptr;
+   while((ptr= readdir(dir))) {
+-    if(ptr->d_name[0]=='h' && ptr->d_name[1]=='d') {
+-       str.sprintf("/dev/hd%c",ptr->d_name[2]);
++    if((ptr->d_name[0]=='h' || ptr->d_name[0]=='s') && ptr->d_name[1]=='d') {
++       str.sprintf("/dev/%s",ptr->d_name);
+        disks << str;
+     }
+   }
+--- ksensors-0.7.3.orig/src/ksensors.desktop
++++ ksensors-0.7.3/src/ksensors.desktop
+@@ -1,24 +1,16 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=ksensors
+-Name[xx]=xxksensorsxx
++Name=KSensors
+ Exec=ksensors
+ Icon=ksensors
+ Type=Application
+-Comment=A simple KDE Application
+-Comment[ca]=Una simple aplicació KDE
+-Comment[da]=Et simpelt KDE program
+-Comment[de]=Eine einfache KDE-Anwendung
+-Comment[el]=Μια απλή εφαρμογή του KDE
+-Comment[es]=Una aplicación de KDE sencilla
+-Comment[et]=Lihtne KDE rakendus
+-Comment[fr]=Une application simple pour KDE.
+-Comment[hu]=Egyszerű KDE-alkalmazás
+-Comment[it]=Una semplice applicazione KDE
+-Comment[pt]=Uma aplicação KDE simples
+-Comment[pt_BR]=Um simples Aplicativo do KDE
+-Comment[ru]=Простое приложение KDE
+-Comment[sl]=Preprost program za KDE
+-Comment[sr]=Проста KDE-ова апликација
+-Comment[sv]=Ett enkelt KDE-program
+-Comment[xx]=xxA simple KDE Applicationxx
++Comment=A nice lmsensors frontend for KDE
++Comment[cs]=Pěkné rozhraní pro lmsemsors v KDE
++Comment[de]=Ein benutzerfreundliches lmsensors Frontend für KDE
++Comment[es]=Un agradable lmsensors frontend para KDE
++Comment[fr]=Un frontend sympatique pour lm-sensors et KDE
++Comment[he]=היישום KSensors -תוכנית קידמה יפה של KDE עבור lmsensors
++Comment[nb]=Ett behagelig lmsensors-grensesnitt for KDE
++Comment[nl]=Een gebruiksvriendelijke interface voor KDE
++Comment[pl]=Ładny frondend lmsensors dla KDE
++Comment[sv]=Ett trevligt gränssnitt mot lmsensors för KDE
+--- ksensors-0.7.3.orig/src/processexec.cpp
++++ ksensors-0.7.3/src/processexec.cpp
+@@ -37,17 +37,12 @@
+ bool ProcessExec::runAndWait()
+ {
+  clearData();
+- return start(Block,Communication(Stdout|Stderr));
++ return start(Block,Communication(Stdout | Stderr));
+ }
+ 
+ void ProcessExec::slotReceivedStdout(KProcess *proc, char *buf, int len)
+ {
+- if(bufLen+len>=bufMax) len= bufMax-bufLen;
+- if(len) {
+-   memcpy(buffer+bufLen,buf,len);
+-   bufLen+= len;
+-   buffer[bufLen]=0;
+- }
++  buffer = QString(buf);
+ }
+ 
+ void ProcessExec::slotReceivedStderr(KProcess *proc, char *buf, int len)
+--- ksensors-0.7.3.orig/src/sounds/Makefile.am
++++ ksensors-0.7.3/src/sounds/Makefile.am
+@@ -5,9 +5,8 @@
+ EXTRA_DIST = ksensors_alert.wav
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(kde_datadir)/sounds
+-	$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_datadir)/sounds/ksensors_alert.wav
++	$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
+ uninstall-local:
+-	-rm -f $(kde_datadir)/sounds/ksensors_alert.wav
++	rm -f $(kde_sounddir)/ksensors_alert.wav
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+--- ksensors-0.7.3.orig/po/sv.po
++++ ksensors-0.7.3/po/sv.po
+@@ -0,0 +1,423 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ksensors 0.7.3-7\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-08-18 23:19+0200\n"
++"PO-Revision-Date: 2005-11-02 22:34+0100\n"
++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Language-Team: Swedish <sv@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Poedit-Language: swe\n"
++"X-Poedit-Country: swe\n"
++
++#: hdsensorslist.cpp:36
++msgid "Hard Disks"
++msgstr "H�rddiskar"
++
++#: i8ksensorslist.cpp:29
++msgid "MainBoard"
++msgstr "Moderkort"
++
++#: ksensorscfg.cpp:51
++msgid "KSensors Configuration"
++msgstr "Konfiguration av KSensors"
++
++#: ksensorscfg.cpp:56
++msgid "Global settings"
++msgstr "Globala inst�llningar"
++
++#: ksensorscfg.cpp:68
++msgid " sensors"
++msgstr " sensorer"
++
++#: ksensorscfg.cpp:85
++msgid "System Information"
++msgstr "Systeminformation"
++
++#: lmsensorscfg.cpp:101
++msgid "Temperature"
++msgstr "Temperatur"
++
++#: lmsensorscfg.cpp:107
++msgid "Fan"
++msgstr "Fl�kt"
++
++#: lmsensorscfg.cpp:110
++msgid "Voltage"
++msgstr "Volttal"
++
++#: lmsensorsdock.cpp:62
++msgid "&About KSensors"
++msgstr "&Om KSensors"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Minimize"
++msgstr "&Minimera"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Restore"
++msgstr "&�terst�ll"
++
++#: lmsensorsdock.cpp:65
++msgid "&Exit"
++msgstr "&Avsluta"
++
++#: main.cpp:27
++msgid "KSensors - A nice lmsensors frontend for KDE"
++msgstr "KSensors - Ett trevligt gr�nssnitt mot lmsensors f�r KDE"
++
++#: main.cpp:33
++msgid "Don't dock in KDE system tray."
++msgstr "Docka inte till KDE's systemraden."
++
++#: main.cpp:34
++msgid "Show splash screen."
++msgstr "Visa startbild."
++
++#: main.cpp:43
++#: rc.cpp:5
++msgid "KSensors"
++msgstr "KSensors"
++
++#: rc.cpp:1
++msgid "C&ustom"
++msgstr "Egendefinerad"
++
++#: rc.cpp:2
++msgid "AboutCfgDesign"
++msgstr "AboutCfgDesign"
++
++#: rc.cpp:3
++msgid "KSensors configuration"
++msgstr "KSensors konfiguration"
++
++#: rc.cpp:4
++msgid "Monitoring your motherboard"
++msgstr "�vervaka ditt moderkort"
++
++#: rc.cpp:6
++msgid "Welcome to the KSensors configuration window. Click on the left to select a configuration option."
++msgstr "V�lkommen till KSenors konfigurationsf�nster. Klicka p� v�nster sida f�r att v�lja en inst�llning."
++
++#: rc.cpp:7
++msgid "GeneralCfg"
++msgstr "GeneralCfg"
++
++#: rc.cpp:8
++msgid "Panels size"
++msgstr "Panelstorlek"
++
++#: rc.cpp:9
++msgid "64 x 64"
++msgstr "64 x 64"
++
++#: rc.cpp:10
++msgid "56 x 56"
++msgstr "56 x 56"
++
++#: rc.cpp:11
++msgid "48 x 48"
++msgstr "48 x 48"
++
++#: rc.cpp:12
++#: rc.cpp:55
++#: rc.cpp:59
++#: rc.cpp:91
++msgid "Colors"
++msgstr "F�rger"
++
++#: rc.cpp:13
++msgid "Startup"
++msgstr "Starta upp"
++
++#: rc.cpp:14
++msgid "Autostart KSensors on KDE startup"
++msgstr "Autostarta KSensors vid uppstart av KDE"
++
++#: rc.cpp:15
++msgid "LMSensorsCfgDesign"
++msgstr "LMSensorsCfgDesign"
++
++#: rc.cpp:16
++msgid "Sensors"
++msgstr "Sensorer"
++
++#: rc.cpp:17
++msgid "General"
++msgstr "Allm�nt"
++
++#: rc.cpp:19
++msgid "Description"
++msgstr "Beskrivning"
++
++#: rc.cpp:21
++msgid "Values"
++msgstr "V�rden"
++
++#: rc.cpp:23
++msgid "Current"
++msgstr "Nuvarande"
++
++#: rc.cpp:24
++msgid "Maximum"
++msgstr "Maximum"
++
++#: rc.cpp:25
++msgid "+1%"
++msgstr "+1%"
++
++#: rc.cpp:26
++msgid "+2%"
++msgstr "+2%"
++
++#: rc.cpp:27
++msgid "+3%"
++msgstr "+3%"
++
++#: rc.cpp:28
++msgid "+4%"
++msgstr "+4%"
++
++#: rc.cpp:29
++msgid "+5%"
++msgstr "+5%"
++
++#: rc.cpp:30
++msgid "+10%"
++msgstr "+10%"
++
++#: rc.cpp:31
++msgid "+15%"
++msgstr "+15%"
++
++#: rc.cpp:32
++msgid "+20%"
++msgstr "+20%"
++
++#: rc.cpp:33
++msgid "+30%"
++msgstr "+30%"
++
++#: rc.cpp:34
++msgid "+40%"
++msgstr "+40%"
++
++#: rc.cpp:35
++msgid "+50%"
++msgstr "+50%"
++
++#: rc.cpp:36
++msgid "Multiplier"
++msgstr "Multiplikator"
++
++#: rc.cpp:37
++msgid "Ideal"
++msgstr "Ideal"
++
++#: rc.cpp:38
++msgid "Minimum"
++msgstr "Minimum"
++
++#: rc.cpp:39
++msgid "Addition"
++msgstr "Till�gg"
++
++#: rc.cpp:41
++msgid "-1%"
++msgstr "-1%"
++
++#: rc.cpp:42
++msgid "-2%"
++msgstr "-2%"
++
++#: rc.cpp:43
++msgid "-3%"
++msgstr "-3%"
++
++#: rc.cpp:44
++msgid "-4%"
++msgstr "-4%"
++
++#: rc.cpp:45
++msgid "-5%"
++msgstr "-5%"
++
++#: rc.cpp:46
++msgid "-10%"
++msgstr "-10%"
++
++#: rc.cpp:47
++msgid "-15%"
++msgstr "-15%"
++
++#: rc.cpp:48
++msgid "-20%"
++msgstr "-20%"
++
++#: rc.cpp:49
++msgid "-30%"
++msgstr "-30%"
++
++#: rc.cpp:50
++msgid "-40%"
++msgstr "-40%"
++
++#: rc.cpp:51
++msgid "-50%"
++msgstr "-50%"
++
++#: rc.cpp:52
++msgid "Panel"
++msgstr "Panel"
++
++#: rc.cpp:54
++#: rc.cpp:58
++#: rc.cpp:90
++msgid "Visible"
++msgstr "Synlig"
++
++#: rc.cpp:56
++msgid "Dock"
++msgstr "Dockning"
++
++#: rc.cpp:60
++msgid "Alarm"
++msgstr "Alarm"
++
++#: rc.cpp:63
++msgid "Normal"
++msgstr "Normal"
++
++#: rc.cpp:64
++msgid "Alarms"
++msgstr "Larm"
++
++#: rc.cpp:65
++msgid "On reach alarm value:"
++msgstr "N�r larmv�rdet uppn�s:"
++
++#: rc.cpp:66
++msgid "Apply to all sensors"
++msgstr "Till�mpa p� alla sensorer"
++
++#: rc.cpp:67
++msgid "Do nothing"
++msgstr "G�r inget"
++
++#: rc.cpp:68
++msgid "Test"
++msgstr "Test"
++
++#: rc.cpp:69
++msgid "Play alarm sound"
++msgstr "Spela upp larmljud"
++
++#: rc.cpp:70
++msgid "Run command"
++msgstr "K�r kommando"
++
++#: rc.cpp:71
++#: rc.cpp:92
++msgid "Preferences"
++msgstr "Egenskaper"
++
++#: rc.cpp:72
++msgid "Temperatures scale"
++msgstr "Temperaturskala"
++
++#: rc.cpp:73
++msgid "Fahrenheit"
++msgstr "Fahrenheit"
++
++#: rc.cpp:74
++msgid "Celsius"
++msgstr "Celsius"
++
++#: rc.cpp:75
++msgid "Kelvin"
++msgstr "Kelvin"
++
++#: rc.cpp:76
++#: rc.cpp:93
++msgid "Update interval"
++msgstr "Uppdateringsintervall"
++
++#: rc.cpp:77
++#: rc.cpp:94
++msgid "s"
++msgstr "s"
++
++#: rc.cpp:78
++msgid "PaletteCfg"
++msgstr "PaletteCfg"
++
++#: rc.cpp:79
++#: rc.cpp:84
++msgid "Title"
++msgstr "Titel"
++
++#: rc.cpp:80
++msgid "+3.5V"
++msgstr "+3.5V"
++
++#: rc.cpp:81
++msgid "Default colors"
++msgstr "Standardf�rger"
++
++#: rc.cpp:82
++msgid "Background"
++msgstr "Bakgrund"
++
++#: rc.cpp:85
++msgid "Value"
++msgstr "V�rde"
++
++#: rc.cpp:87
++msgid "SystemCfgDesign"
++msgstr "SystemCfgDesign"
++
++#: rc.cpp:88
++msgid "System Panels"
++msgstr "Systempaneler"
++
++#: systemcfg.cpp:47
++msgid "CPU Speed"
++msgstr "CPU-hastighet"
++
++#: systemcfg.cpp:48
++msgid "CPU State"
++msgstr "CPU Status"
++
++#: systemcfg.cpp:49
++msgid "RAM Used"
++msgstr "RAM anv�nt"
++
++#: systemcfg.cpp:50
++msgid "SWAP Used"
++msgstr "SWAP anv�nt"
++
++#: systemcfg.cpp:51
++msgid "Up Time"
++msgstr "Uppetid"
++
++#: _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Daniel Nylander"
++
++#: _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "po@danielnylander.se"
++
+--- ksensors-0.7.3.orig/po/pl.po
++++ ksensors-0.7.3/po/pl.po
+@@ -0,0 +1,413 @@
++# translation of pl.po to 
++# translation of pl.po to
++# translation of ksensors.po to
++# This file is distributed under the same license as the PACKAGE package.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: pl\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-08-18 23:19+0200\n"
++"PO-Revision-Date: 2005-03-18 15:42+0100\n"
++"Last-Translator: \n"
++"Language-Team:  <pl@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.9.1\n"
++
++#: hdsensorslist.cpp:36
++msgid "Hard Disks"
++msgstr "Twarde dyski"
++
++#: i8ksensorslist.cpp:29
++msgid "MainBoard"
++msgstr "Płyta główna"
++
++#: ksensorscfg.cpp:51
++msgid "KSensors Configuration"
++msgstr "Konfiguracja KSensors"
++
++#: ksensorscfg.cpp:56
++msgid "Global settings"
++msgstr "Globalne ustawienia"
++
++#: ksensorscfg.cpp:68
++msgid " sensors"
++msgstr " czujniki"
++
++#: ksensorscfg.cpp:85
++msgid "System Information"
++msgstr "Informacja o systemie"
++
++#: lmsensorscfg.cpp:101
++msgid "Temperature"
++msgstr "Temperatura"
++
++#: lmsensorscfg.cpp:107
++msgid "Fan"
++msgstr "Wiatrak"
++
++#: lmsensorscfg.cpp:110
++msgid "Voltage"
++msgstr "Napięcie"
++
++#: lmsensorsdock.cpp:62
++msgid "&About KSensors"
++msgstr "&O KSensors"
++
++#: lmsensorsdock.cpp:64 lmsensorsdock.cpp:124
++msgid "&Minimize"
++msgstr "&Minimalizuj"
++
++#: lmsensorsdock.cpp:64 lmsensorsdock.cpp:124
++msgid "&Restore"
++msgstr "&Przywróć"
++
++#: lmsensorsdock.cpp:65
++msgid "&Exit"
++msgstr "&Wyjście"
++
++#: main.cpp:27
++msgid "KSensors - A nice lmsensors frontend for KDE"
++msgstr "KSensors - Ładny frondend lmsensors dla KDE"
++
++#: main.cpp:33
++msgid "Don't dock in KDE system tray."
++msgstr "Nie dokuj w trayu systemowym KDE."
++
++#: main.cpp:34
++msgid "Show splash screen."
++msgstr "Pokaż ekran powitalny."
++
++#: main.cpp:43 rc.cpp:5
++msgid "KSensors"
++msgstr "KSensors"
++
++#: rc.cpp:1
++msgid "C&ustom"
++msgstr "&Własne"
++
++#: rc.cpp:2
++msgid "AboutCfgDesign"
++msgstr ""
++
++#: rc.cpp:3
++msgid "KSensors configuration"
++msgstr "Konfiguracja KSensors"
++
++#: rc.cpp:4
++msgid "Monitoring your motherboard"
++msgstr "Monitorowanie Twojej płyty głównej"
++
++#: rc.cpp:6
++msgid ""
++"Welcome to the KSensors configuration window. Click on the left to select a "
++"configuration option."
++msgstr "Witamy w oknie konfiguracji programu KSensors. Kliknij po lewej aby wybrać opcję do konfiguracji."
++
++#: rc.cpp:7
++msgid "GeneralCfg"
++msgstr ""
++
++#: rc.cpp:8
++msgid "Panels size"
++msgstr "Rozmiar panelu"
++
++#: rc.cpp:9
++msgid "64 x 64"
++msgstr ""
++
++#: rc.cpp:10
++msgid "56 x 56"
++msgstr ""
++
++#: rc.cpp:11
++msgid "48 x 48"
++msgstr ""
++
++#: rc.cpp:12 rc.cpp:55 rc.cpp:59 rc.cpp:91
++msgid "Colors"
++msgstr "Kolory"
++
++#: rc.cpp:13
++msgid "Startup"
++msgstr ""
++
++#: rc.cpp:14
++msgid "Autostart KSensors on KDE startup"
++msgstr "Uruchom KSensors przy starcie KDE"
++
++#: rc.cpp:15
++msgid "LMSensorsCfgDesign"
++msgstr ""
++
++#: rc.cpp:16
++msgid "Sensors"
++msgstr "Czujniki"
++
++#: rc.cpp:17
++msgid "General"
++msgstr "Ogólne"
++
++#: rc.cpp:19
++msgid "Description"
++msgstr "Opis"
++
++#: rc.cpp:21
++msgid "Values"
++msgstr "Wartość"
++
++#: rc.cpp:23
++msgid "Current"
++msgstr "Bieżaca"
++
++#: rc.cpp:24
++msgid "Maximum"
++msgstr "Maksymalna"
++
++#: rc.cpp:25
++msgid "+1%"
++msgstr ""
++
++#: rc.cpp:26
++msgid "+2%"
++msgstr ""
++
++#: rc.cpp:27
++msgid "+3%"
++msgstr ""
++
++#: rc.cpp:28
++msgid "+4%"
++msgstr ""
++
++#: rc.cpp:29
++msgid "+5%"
++msgstr ""
++
++#: rc.cpp:30
++msgid "+10%"
++msgstr ""
++
++#: rc.cpp:31
++msgid "+15%"
++msgstr ""
++
++#: rc.cpp:32
++msgid "+20%"
++msgstr ""
++
++#: rc.cpp:33
++msgid "+30%"
++msgstr ""
++
++#: rc.cpp:34
++msgid "+40%"
++msgstr ""
++
++#: rc.cpp:35
++msgid "+50%"
++msgstr ""
++
++#: rc.cpp:36
++msgid "Multiplier"
++msgstr "Mnożnik"
++
++#: rc.cpp:37
++msgid "Ideal"
++msgstr "Idealna"
++
++#: rc.cpp:38
++msgid "Minimum"
++msgstr "Minimalna"
++
++#: rc.cpp:39
++msgid "Addition"
++msgstr "Dodanie"
++
++#: rc.cpp:41
++msgid "-1%"
++msgstr ""
++
++#: rc.cpp:42
++msgid "-2%"
++msgstr ""
++
++#: rc.cpp:43
++msgid "-3%"
++msgstr ""
++
++#: rc.cpp:44
++msgid "-4%"
++msgstr ""
++
++#: rc.cpp:45
++msgid "-5%"
++msgstr ""
++
++#: rc.cpp:46
++msgid "-10%"
++msgstr ""
++
++#: rc.cpp:47
++msgid "-15%"
++msgstr ""
++
++#: rc.cpp:48
++msgid "-20%"
++msgstr ""
++
++#: rc.cpp:49
++msgid "-30%"
++msgstr ""
++
++#: rc.cpp:50
++msgid "-40%"
++msgstr ""
++
++#: rc.cpp:51
++msgid "-50%"
++msgstr ""
++
++#: rc.cpp:52
++msgid "Panel"
++msgstr ""
++
++#: rc.cpp:54 rc.cpp:58 rc.cpp:90
++msgid "Visible"
++msgstr "Widoczne"
++
++#: rc.cpp:56
++msgid "Dock"
++msgstr "Dokowanie"
++
++#: rc.cpp:60
++msgid "Alarm"
++msgstr ""
++
++#: rc.cpp:63
++msgid "Normal"
++msgstr "Normalne"
++
++#: rc.cpp:64
++msgid "Alarms"
++msgstr "Alarmy"
++
++#: rc.cpp:65
++msgid "On reach alarm value:"
++msgstr "Przy osiągnięciu wartości alarmowej:"
++
++#: rc.cpp:66
++msgid "Apply to all sensors"
++msgstr "Zatwierdź do wszystkich czujników"
++
++#: rc.cpp:67
++msgid "Do nothing"
++msgstr "Nie rób nic"
++
++#: rc.cpp:68
++msgid "Test"
++msgstr ""
++
++#: rc.cpp:69
++msgid "Play alarm sound"
++msgstr "Odtwarzaj dźwięk"
++
++#: rc.cpp:70
++msgid "Run command"
++msgstr "Wykonaj polecenie"
++
++#: rc.cpp:71 rc.cpp:92
++msgid "Preferences"
++msgstr "Właściwości"
++
++#: rc.cpp:72
++msgid "Temperatures scale"
++msgstr "Skala temperatur"
++
++#: rc.cpp:73
++msgid "Fahrenheit"
++msgstr ""
++
++#: rc.cpp:74
++msgid "Celsius"
++msgstr "Celciusz"
++
++#: rc.cpp:75
++msgid "Kelvin"
++msgstr "Kelwin"
++
++#: rc.cpp:76 rc.cpp:93
++msgid "Update interval"
++msgstr "Interwał aktualizacji"
++
++#: rc.cpp:77 rc.cpp:94
++msgid "s"
++msgstr ""
++
++#: rc.cpp:78
++msgid "PaletteCfg"
++msgstr ""
++
++#: rc.cpp:79 rc.cpp:84
++msgid "Title"
++msgstr "Tytuł"
++
++#: rc.cpp:80
++msgid "+3.5V"
++msgstr ""
++
++#: rc.cpp:81
++msgid "Default colors"
++msgstr "Domyślne kolory"
++
++#: rc.cpp:82
++msgid "Background"
++msgstr "Tło"
++
++#: rc.cpp:85
++msgid "Value"
++msgstr "Wartość"
++
++#: rc.cpp:87
++msgid "SystemCfgDesign"
++msgstr ""
++
++#: rc.cpp:88
++msgid "System Panels"
++msgstr "Panele systemowe"
++
++#: systemcfg.cpp:47
++msgid "CPU Speed"
++msgstr "Zegar CPU"
++
++#: systemcfg.cpp:48
++msgid "CPU State"
++msgstr "Status CPU"
++
++#: systemcfg.cpp:49
++msgid "RAM Used"
++msgstr "Użycie RAM"
++
++#: systemcfg.cpp:50
++msgid "SWAP Used"
++msgstr "Użycie SWAP"
++
++#: systemcfg.cpp:51
++msgid "Up Time"
++msgstr ""
++
++#: _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Tomasz Waleńczak"
++
++#: _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "tom@w.pl"
++
+--- ksensors-0.7.3.orig/po/nb.po
++++ ksensors-0.7.3/po/nb.po
+@@ -0,0 +1,422 @@
++# translation of nb.po to Norwegian Bokmål
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++#
++# Per Øyvind Karlsen <pkarlsen@mandriva.com>, 2006.
++msgid ""
++msgstr ""
++"Project-Id-Version: nb\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-08-18 23:19+0200\n"
++"PO-Revision-Date: 2006-09-27 20:52+0200\n"
++"Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
++"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
++
++#: hdsensorslist.cpp:36
++msgid "Hard Disks"
++msgstr "Harddisker"
++
++#: i8ksensorslist.cpp:29
++msgid "MainBoard"
++msgstr "Hovedkort"
++
++#: ksensorscfg.cpp:51
++msgid "KSensors Configuration"
++msgstr "KSensors-oppsett"
++
++#: ksensorscfg.cpp:56
++msgid "Global settings"
++msgstr "Globale innstillinger"
++
++#: ksensorscfg.cpp:68
++msgid " sensors"
++msgstr " sensorer"
++
++#: ksensorscfg.cpp:85
++msgid "System Information"
++msgstr "Systeminformasjon"
++
++#: lmsensorscfg.cpp:101
++msgid "Temperature"
++msgstr "Temperatur"
++
++#: lmsensorscfg.cpp:107
++msgid "Fan"
++msgstr "Vifte"
++
++#: lmsensorscfg.cpp:110
++msgid "Voltage"
++msgstr "Spenning"
++
++#: lmsensorsdock.cpp:62
++msgid "&About KSensors"
++msgstr "&Om KSensors"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Minimize"
++msgstr "&Minimiser"
++
++#: lmsensorsdock.cpp:64
++#: lmsensorsdock.cpp:124
++msgid "&Restore"
++msgstr "&Gjenopprett"
++
++#: lmsensorsdock.cpp:65
++msgid "&Exit"
++msgstr "&Avslutt"
++
++#: main.cpp:27
++msgid "KSensors - A nice lmsensors frontend for KDE"
++msgstr "KSensors - Ett behagelig lmsensors-grensesnitt for KDE"
++
++#: main.cpp:33
++msgid "Don't dock in KDE system tray."
++msgstr "Ikke fest i KDE systemkurv."
++
++#: main.cpp:34
++msgid "Show splash screen."
++msgstr "Vis velkomstbilde."
++
++#: main.cpp:43
++#: rc.cpp:5
++msgid "KSensors"
++msgstr "KSensors"
++
++#: rc.cpp:1
++msgid "C&ustom"
++msgstr "&Egendefinert"
++
++#: rc.cpp:2
++msgid "AboutCfgDesign"
++msgstr "AboutCfgDesign"
++
++#: rc.cpp:3
++msgid "KSensors configuration"
++msgstr "KSensors-oppsett"
++
++#: rc.cpp:4
++msgid "Monitoring your motherboard"
++msgstr "Overvåk hovedkortet ditt"
++
++#: rc.cpp:6
++msgid "Welcome to the KSensors configuration window. Click on the left to select a configuration option."
++msgstr "Velkommen til KSensors opppsettsvindu. Klikk til venstre for å velge ett oppsettsvalg."
++
++#: rc.cpp:7
++msgid "GeneralCfg"
++msgstr "GeneralCfg"
++
++#: rc.cpp:8
++msgid "Panels size"
++msgstr "Panelstørrelse"
++
++#: rc.cpp:9
++msgid "64 x 64"
++msgstr "64 x 64"
++
++#: rc.cpp:10
++msgid "56 x 56"
++msgstr "56 x 56"
++
++#: rc.cpp:11
++msgid "48 x 48"
++msgstr "48 x 48"
++
++#: rc.cpp:12
++#: rc.cpp:55
++#: rc.cpp:59
++#: rc.cpp:91
++msgid "Colors"
++msgstr "Farger"
++
++#: rc.cpp:13
++msgid "Startup"
++msgstr "Oppstart"
++
++#: rc.cpp:14
++msgid "Autostart KSensors on KDE startup"
++msgstr "Start opp automatisk ved oppstart av KDE"
++
++#: rc.cpp:15
++msgid "LMSensorsCfgDesign"
++msgstr "LMSensorsCfgDesign"
++
++#: rc.cpp:16
++msgid "Sensors"
++msgstr "Sensorer"
++
++#: rc.cpp:17
++msgid "General"
++msgstr "Generelt"
++
++#: rc.cpp:19
++msgid "Description"
++msgstr "Beskrivelse"
++
++#: rc.cpp:21
++msgid "Values"
++msgstr "Verdier"
++
++#: rc.cpp:23
++msgid "Current"
++msgstr "Gjeldende"
++
++#: rc.cpp:24
++msgid "Maximum"
++msgstr "Maksimum"
++
++#: rc.cpp:25
++msgid "+1%"
++msgstr "+1%"
++
++#: rc.cpp:26
++msgid "+2%"
++msgstr "+2%"
++
++#: rc.cpp:27
++msgid "+3%"
++msgstr "+3%"
++
++#: rc.cpp:28
++msgid "+4%"
++msgstr "+4%"
++
++#: rc.cpp:29
++msgid "+5%"
++msgstr "+5%"
++
++#: rc.cpp:30
++msgid "+10%"
++msgstr "+10%"
++
++#: rc.cpp:31
++msgid "+15%"
++msgstr "+15%"
++
++#: rc.cpp:32
++msgid "+20%"
++msgstr "+20%"
++
++#: rc.cpp:33
++msgid "+30%"
++msgstr "+30%"
++
++#: rc.cpp:34
++msgid "+40%"
++msgstr "+40%"
++
++#: rc.cpp:35
++msgid "+50%"
++msgstr "+50%"
++
++#: rc.cpp:36
++msgid "Multiplier"
++msgstr "Multiplikator"
++
++#: rc.cpp:37
++msgid "Ideal"
++msgstr "Ideell"
++
++#: rc.cpp:38
++msgid "Minimum"
++msgstr "Minimum"
++
++#: rc.cpp:39
++msgid "Addition"
++msgstr "Tillegg"
++
++#: rc.cpp:41
++msgid "-1%"
++msgstr "-1%"
++
++#: rc.cpp:42
++msgid "-2%"
++msgstr "-2%"
++
++#: rc.cpp:43
++msgid "-3%"
++msgstr "-3%"
++
++#: rc.cpp:44
++msgid "-4%"
++msgstr "-4%"
++
++#: rc.cpp:45
++msgid "-5%"
++msgstr "-5%"
++
++#: rc.cpp:46
++msgid "-10%"
++msgstr "-10%"
++
++#: rc.cpp:47
++msgid "-15%"
++msgstr "-15%"
++
++#: rc.cpp:48
++msgid "-20%"
++msgstr "-20%"
++
++#: rc.cpp:49
++msgid "-30%"
++msgstr "-30%"
++
++#: rc.cpp:50
++msgid "-40%"
++msgstr "-40%"
++
++#: rc.cpp:51
++msgid "-50%"
++msgstr "-50%"
++
++#: rc.cpp:52
++msgid "Panel"
++msgstr "Panel"
++
++#: rc.cpp:54
++#: rc.cpp:58
++#: rc.cpp:90
++msgid "Visible"
++msgstr "Synlig"
++
++#: rc.cpp:56
++msgid "Dock"
++msgstr "Systemkurvfesting"
++
++#: rc.cpp:60
++msgid "Alarm"
++msgstr "Alarm"
++
++#: rc.cpp:63
++msgid "Normal"
++msgstr "Normal"
++
++#: rc.cpp:64
++msgid "Alarms"
++msgstr "Alarmer"
++
++#: rc.cpp:65
++msgid "On reach alarm value:"
++msgstr "Ved oppnådd alarmverdi:"
++
++#: rc.cpp:66
++msgid "Apply to all sensors"
++msgstr "Bruk for sensorer"
++
++#: rc.cpp:67
++msgid "Do nothing"
++msgstr "Gjør ingenting"
++
++#: rc.cpp:68
++msgid "Test"
++msgstr "Test"
++
++#: rc.cpp:69
++msgid "Play alarm sound"
++msgstr "Spill alarmlyd"
++
++#: rc.cpp:70
++msgid "Run command"
++msgstr "Kjør kommando"
++
++#: rc.cpp:71
++#: rc.cpp:92
++msgid "Preferences"
++msgstr "Egenskaper"
++
++#: rc.cpp:72
++msgid "Temperatures scale"
++msgstr "Temperaturskala"
++
++#: rc.cpp:73
++msgid "Fahrenheit"
++msgstr "Fahrenheit"
++
++#: rc.cpp:74
++msgid "Celsius"
++msgstr "Celsius"
++
++#: rc.cpp:75
++msgid "Kelvin"
++msgstr "Kelvin"
++
++#: rc.cpp:76
++#: rc.cpp:93
++msgid "Update interval"
++msgstr "Oppdateringsintervall"
++
++#: rc.cpp:77
++#: rc.cpp:94
++msgid "s"
++msgstr "s"
++
++#: rc.cpp:78
++msgid "PaletteCfg"
++msgstr "PaletteCfg"
++
++#: rc.cpp:79
++#: rc.cpp:84
++msgid "Title"
++msgstr "Tittel"
++
++#: rc.cpp:80
++msgid "+3.5V"
++msgstr "+3.5V"
++
++#: rc.cpp:81
++msgid "Default colors"
++msgstr "Standardfarger"
++
++#: rc.cpp:82
++msgid "Background"
++msgstr "Bakgrunn"
++
++#: rc.cpp:85
++msgid "Value"
++msgstr "Verdi"
++
++#: rc.cpp:87
++msgid "SystemCfgDesign"
++msgstr "SystemCfgDesign"
++
++#: rc.cpp:88
++msgid "System Panels"
++msgstr "Systempaneler"
++
++#: systemcfg.cpp:47
++msgid "CPU Speed"
++msgstr "CPU-hastighet"
++
++#: systemcfg.cpp:48
++msgid "CPU State"
++msgstr "CPU-status"
++
++#: systemcfg.cpp:49
++msgid "RAM Used"
++msgstr "RAM brukt"
++
++#: systemcfg.cpp:50
++msgid "SWAP Used"
++msgstr "SWAP brukt"
++
++#: systemcfg.cpp:51
++msgid "Up Time"
++msgstr "Oppetid"
++
++#: _translatorinfo.cpp:1
++msgid ""
++"_: NAME OF TRANSLATORS\n"
++"Your names"
++msgstr "Per Øyvind Karlsen"
++
++#: _translatorinfo.cpp:3
++msgid ""
++"_: EMAIL OF TRANSLATORS\n"
++"Your emails"
++msgstr "pkarlsen@mandriva.com"
++
+--- ksensors-0.7.3.orig/admin/cvs.sh
++++ ksensors-0.7.3/admin/cvs.sh
+@@ -29,7 +29,7 @@
+ {
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.[56]* | autoconf*2.[56]* ) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
+@@ -44,7 +44,7 @@
+  
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.[56]* | autoheader*2.[56]* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
+--- ksensors-0.7.3.orig/debian/control
++++ ksensors-0.7.3/debian/control
+@@ -0,0 +1,19 @@
++Source: ksensors
++Section: kde
++Priority: optional
++Maintainer: Aurelien Jarno <aurel32@debian.org>
++Build-Depends: debhelper (>> 5), autotools-dev, automake1.7, autoconf, libtool, perl, libsensors4-dev, libqt3-mt-dev (>= 3:3.3.4-7), kdelibs4-dev (>= 4:3.4.2), imagemagick
++Build-Conflicts: autoconf2.13
++Standards-Version: 3.8.3
++Homepage: http://ksensors.sourceforge.net
++
++Package: ksensors
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}, lm-sensors
++Recommends: hddtemp (>= 0.3beta2-1)
++Description: lm-sensors frontend for KDE
++ This is a lm-sensors frontend for KDE for monitoring a motherboard.
++ It allows you to access information from temperature and fan speed
++ sensors.
++ .
++ You will need lm-sensors kernel modules to use this package.
+--- ksensors-0.7.3.orig/debian/overrides
++++ ksensors-0.7.3/debian/overrides
+@@ -0,0 +1 @@
++ksensors: menu-item-contains-unknown-tag kderemove /usr/lib/menu/ksensors:8
+--- ksensors-0.7.3.orig/debian/docs
++++ ksensors-0.7.3/debian/docs
+@@ -0,0 +1,5 @@
++LEEME
++LIESMICH
++LISEZMOI
++README
++TODO
+--- ksensors-0.7.3.orig/debian/menu
++++ ksensors-0.7.3/debian/menu
+@@ -0,0 +1,7 @@
++?package(ksensors): \
++	needs="X11" \
++	section="Applications/System/Hardware" \
++        hints="KDE" \
++	title="KSensors" \
++	command="/usr/bin/ksensors" \
++	icon="/usr/share/pixmaps/ksensors.xpm"
+--- ksensors-0.7.3.orig/debian/dirs
++++ ksensors-0.7.3/debian/dirs
+@@ -0,0 +1,3 @@
++usr/share/lintian/overrides
++usr/share/pixmaps
++usr/share/sounds
+--- ksensors-0.7.3.orig/debian/ksensors.1
++++ ksensors-0.7.3/debian/ksensors.1
+@@ -0,0 +1,62 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH KSENSORS 1 "May 02, 2002"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++ksensors \- lm-sensors frontend for KDE 
++.SH SYNOPSIS
++.B ksensors
++.RI "[ options ]"
++.SH DESCRIPTION
++.B KSensors
++is a lm-sensors frontend for KDE for monitoring a motherboard.
++It allows you to access information from temperature and fan
++speed sensors.
++.SH OPTIONS
++A summary of options are included below.
++.TP
++.B \-\-nodock
++Don't dock in KDE system tray.
++.TP
++.B \-\-splash
++Show splash screen.
++.TP
++.B \-\-help
++Show summary of options.
++.TP
++.B \-\-help\-qt
++Show Qt specific options
++.TP
++.B \-\-help\-kde
++Show KDE specific options
++.TP
++.B \-\-help\-all
++Show all options
++.TP
++.B \-\-author
++Show author information
++.TP
++.B \-v, \-\-version
++Show version of program.
++.TP
++.B \-\-license
++Show license information
++.SH AUTHOR
++.B KSensors
++was written by Miguel Novas <michaell@teleline.es>.
++.br
++This manual page was written by Aurelien Jarno <aurel32@debian.org>,
++for the Debian GNU/Linux system (but may be used by others).
+--- ksensors-0.7.3.orig/debian/changelog
++++ ksensors-0.7.3/debian/changelog
+@@ -0,0 +1,436 @@
++ksensors (0.7.3-18) unstable; urgency=low
++
++  * Link the ksensors binary with libqt-mt (closes: bug#555063).
++  * Apply patch from Michael Schuele to fix multi-core sensors (closes: 
++    bug#494090).
++  * Bumped standard version to 3.8.3 (no changes).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sat, 14 Nov 2009 13:50:57 +0000
++
++ksensors (0.7.3-17) unstable; urgency=low
++
++  * Switch to debhelper 5.
++  * Bumped standard version to 3.8.2 (no changes).
++  * Don't assume config.guess and config.sub are updated by libtoolize
++    (Closes: bug#533987).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue, 30 Jun 2009 14:45:13 +0200
++
++ksensors (0.7.3-16) unstable; urgency=medium
++
++  * Bumped standard version to 3.8.0 (no changes).
++  * Get rid of libqt3-compat-headers, patch by Barry de Freese (closes:
++    bug#464657).
++  * Use to libsensors4 API.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Mon, 30 Jun 2008 16:12:07 +0200
++
++ksensors (0.7.3-15) unstable; urgency=low
++
++  * Update menu to match the new Debian menu subpolicy. 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Mon, 30 Jul 2007 19:36:50 +0200
++
++ksensors (0.7.3-14) unstable; urgency=low
++
++  * Remove debconf templates as version 0.6.0 is now very old (not even
++    in sarge).
++  * Fix the installation path of the sound files (closes: bug#406706).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 21 Jun 2007 21:01:59 +0200
++
++ksensors (0.7.3-13) unstable; urgency=medium
++
++  * Fix the parsing of hddtemp output (closes: bug#394057).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 19 Oct 2006 17:46:29 +0200
++
++ksensors (0.7.3-12) unstable; urgency=medium
++
++  * Backports Norvegian translation from CVS.
++  * Add support for sensors without min/max settings (closes: bug#391922).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue, 10 Oct 2006 22:41:09 +0200
++
++ksensors (0.7.3-11) unstable; urgency=low
++
++  * Fixed a silly test of the autoconf version in the KDE scripts.
++  * Bumped standard version to 3.7.2 (no changes).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Fri, 21 Jul 2006 19:20:41 +0200
++
++ksensors (0.7.3-10) unstable; urgency=low
++
++  * Put all QRadioButtons of the alarm tab into a QButtonGroup widget 
++    instead of a QLayout widget (closes: bug#353553).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 19 Feb 2006 22:32:06 +0100
++
++ksensors (0.7.3-9) unstable; urgency=low
++
++  * Relibtoolize the package to get rid of a lot of unneeded
++    dependencies,
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 24 Nov 2005 20:35:47 +0100
++
++ksensors (0.7.3-8) unstable; urgency=low
++
++  * Added Swedish translation of ksensors. Thanks to Daniel Nylander (closes:
++    bug#337117).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu,  3 Nov 2005 01:59:54 +0100
++
++ksensors (0.7.3-7) unstable; urgency=low
++
++  * Patches pulled from CVS:
++    - Polish translation.
++    - Support for reading temperature from SCSI disks. Thanks to James
++      Stark (closes: bug#334614).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed, 19 Oct 2005 22:19:56 +0200
++
++ksensors (0.7.3-6) unstable; urgency=low
++
++  * Added Swedish debconf translation. Thanks to Daniel Nylander (closes:
++    bug#330609). 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Mon,  3 Oct 2005 00:27:51 +0200
++
++ksensors (0.7.3-5) unstable; urgency=low
++
++  * C++ transition: build-depends on libqt3-mt-dev (>= 3:3.3.4-7) and
++    kdelibs4-dev (>= 4:3.4.2-1).
++  * Bumped Standards-Version to 3.6.2 (no changes).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 18 Aug 2005 11:05:13 +0200
++
++ksensors (0.7.3-4) unstable; urgency=low
++
++  * Added Vietnamese debconf translation. Thanks to Clytie Siddall (closes
++    bug#312175).
++  * Fixed a typo in the debconf template. Thanks to Clytie Siddall (closes:
++    bug#312176).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue,  7 Jun 2005 01:15:46 +0200
++
++ksensors (0.7.3-3) unstable; urgency=low
++
++  * Added Czech debconf translation. Thanks to Miroslav Kure (closes: 
++    bug#293619). 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Fri,  4 Feb 2005 21:41:06 +0100
++
++ksensors (0.7.3-2) unstable; urgency=low
++
++  * Added Italian debconf translation. Thanks to Luca Monducci. (closes:
++    bug#272147).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 26 Sep 2004 00:57:43 +0200
++
++ksensors (0.7.3-1) unstable; urgency=low
++
++  * New upstream version:
++    - Added support for reading ACPI temperatures (closes: bug#255079).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 19 Aug 2004 00:06:13 +0200
++
++ksensors (0.7.2-17) unstable; urgency=low
++
++  * Fixed display of values in the panel (closes: bug#265807).
++  * Fixed segfault when removing an info panel (closes: bug#225712, 
++    #265806).
++  * Added an alarm sound (closes: bug#231280).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue, 17 Aug 2004 01:45:27 +0200
++
++ksensors (0.7.2-16) unstable; urgency=low
++
++  * Dont build-depends on make, it is a build-essential package. 
++  * Applied a patch from Geoff Oakham to fix a freeze when used with hddtemp.
++    Thanks! (closes: bug#249093).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sat, 15 May 2004 21:50:48 +0200
++
++ksensors (0.7.2-15) unstable; urgency=low
++
++  * Build-Depends on libsensors-dev (>= 2.8.4-1) so KSensors will be
++    built against libsensors3.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 29 Feb 2004 18:58:22 +0100
++
++ksensors (0.7.2-14) unstable; urgency=low
++
++  * Moved ja.po in the right directory (closes: bug#227820).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 15 Feb 2004 23:20:17 +0100
++
++ksensors (0.7.2-13) unstable; urgency=low
++
++  * Added Japanese debconf translation. Thanks to Hideki Yamane. (closes:
++    bug#227820).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue, 10 Feb 2004 23:58:39 +0100
++
++ksensors (0.7.2-12) unstable; urgency=low
++
++  * Added de debconf translation. Thanks to the german Skolelinux team 
++    (closes: bug#2223114).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sat,  6 Dec 2003 23:45:54 +0100
++
++ksensors (0.7.2-11) unstable; urgency=low
++
++  * Added dependency on lm-sensors (closes: Bug#215794).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue, 14 Oct 2003 21:48:13 +0200
++
++ksensors (0.7.2-10) unstable; urgency=low
++
++  * Build-Depends on libsensors-dev (>= 2.8.0-2) so KSensors will be
++    built against libsensors2 (closes: Bug#203953, Bug#212938).
++  * Added ru debconf translation. Thanks to Ilgiz Kalmetev (closes:
++    Bug#214366).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Mon,  6 Oct 2003 11:01:36 +0200
++
++ksensors (0.7.2-9) unstable; urgency=low
++
++  * The nl debconf translation is from Bart Cornelis and not Wessel 
++    Dankers. Updated the changelog. Sorry Bart.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed, 20 Aug 2003 12:37:05 +0200
++
++ksensors (0.7.2-8) unstable; urgency=low
++
++  * Added nl debconf translation. Thanks to Bart Cornelis (closes:
++    Bug#204919).
++  * Bumped Standards-Version to 3.6.1.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed, 20 Aug 2003 11:24:53 +0200
++
++ksensors (0.7.2-7) unstable; urgency=low
++
++  * Added es debconf translation. Thanks to Carlos Alberto Martín Edo
++    (closes: Bug#201571).
++  * Bumped Standards-Version to 3.6.0.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed, 16 Jul 2003 17:36:03 +0200
++
++ksensors (0.7.2-6) unstable; urgency=low
++
++  * Added pt_BR debconf translations. Thanks to Andre Luis Lopes
++    (closes: Bug#198362).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 22 Jun 2003 02:59:03 +0200
++
++ksensors (0.7.2-5) unstable; urgency=low
++
++  * Rebuilt against latests libsensors-1debian1.
++  * Build-Depends on libsensors-dev (>= 2.7.0-4).
++  * Bumped Standards-Version to 3.5.10.
++  * Changed icon to full colors.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun,  1 Jun 2003 23:52:09 +0200
++
++ksensors (0.7.2-4) unstable; urgency=low
++
++  * Rebuilt against latest libsensors1 (closes: Bug#191562).
++  * Depends on libsensors1 (>> 2.7.0) as this libraries has some lack
++    of dependencies.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu,  1 May 2003 21:50:57 +0200
++
++ksensors (0.7.2-3) unstable; urgency=low
++
++  * Bumped Standards-Version to 3.5.9.
++  * Changed section from x11 to kde.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sat, 19 Apr 2003 15:31:26 +0200
++
++ksensors (0.7.2-2) unstable; urgency=low
++
++  * Debconf templates are now managed with po-debconf.
++  * Depends on ${misc:Depends}.
++  * Don't depends on both xlibs (>> 4.1.0) and xlibs (>> 4.2.0).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue,  4 Mar 2003 23:19:44 +0100
++
++ksensors (0.7.2-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Mon, 24 Feb 2003 09:42:58 +0100
++
++ksensors (0.7-11) unstable; urgency=low
++
++  * Build-depends on libqt3-compat-headers.
++  * Fixed a bug introduced by KDE 3 (closes: Bug#180982). 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 16 Feb 2003 17:48:52 +0100
++
++ksensors (0.7-10) unstable; urgency=low
++
++  * Rebuilt for KDE 3.1.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed,  5 Feb 2003 22:51:50 +0100
++
++ksensors (0.7-9) unstable; urgency=low
++
++  * Force build with gcc-2.95 on most archs, gcc-2.96 on ia64 and gcc-3.0 on
++    hppa. 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed,  8 Jan 2003 14:53:22 +0100
++
++ksensors (0.7-8) unstable; urgency=low
++
++  * Updated the code for hddtemp-0.3.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sat,  4 Jan 2003 10:11:30 +0100
++
++ksensors (0.7-7) unstable; urgency=low
++
++  * Standards-Version bumped to 3.5.8.
++  * Changed icon to 24 colors to follow the menu policy.
++  * Updated copyright file.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Fri, 20 Dec 2002 19:08:58 +0100
++
++ksensors (0.7-6) unstable; urgency=low
++
++  * Added a patch to handle temperature sensors whose name doesn't begin with
++    "temp" or "temp1" correctly (closes: Bug#165353).
++  
++ -- Aurelien Jarno <aurel32@debian.org>  Sat, 19 Oct 2002 20:56:32 +0200
++
++ksensors (0.7-5) unstable; urgency=low
++
++  * Added a patch to save the config on KDE exit (closes: Bug#158164). 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Tue,  8 Oct 2002 01:13:24 +0200
++
++ksensors (0.7-4) unstable; urgency=low
++
++  * Updated the code to correctly handle the degree sign in the output of
++    hddtemp.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 26 Sep 2002 02:24:47 +0200
++
++ksensors (0.7-3) unstable; urgency=low
++
++  * Added an autostart option in configuration dialog (closes: Bug#155532).
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sat,  7 Sep 2002 11:59:19 +0200
++
++ksensors (0.7-2) unstable; urgency=low
++
++  * Added a patch to open the panel on same desktop as on exit
++    (closes: Bug#158164).
++  * Updated Policy standard compliance to 3.5.7
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed,  4 Sep 2002 15:04:42 +0200
++
++ksensors (0.7-1) unstable; urgency=low
++
++  * New upstream release
++    Changelog:
++    - Allow docking fan and voltage sensors
++    - Configuration dialog redesign (more modular).
++    - Several panel sizes
++    For more information, please see the full Changelog in
++    /usr/share/doc/ksensors.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu, 13 Jun 2002 17:49:49 +0200
++
++ksensors (0.6.1-2) unstable; urgency=low
++
++  * Now depends on debconf.
++  * Now recommends hddtemp.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed,  8 May 2002 22:45:50 +0200
++
++ksensors (0.6.1-1) unstable; urgency=low
++
++  * New upstream release.
++    Changelog:
++    - New Hardisks Temperatures sensor panels
++    - Changed cpu state, swap and ram panels appearance.
++    - Added splash screen.
++    - Added --nodock option.
++    - Configurable Panels colors.
++    - Support for multiple lm-sensors chips.
++    For more information, please see the full Changelog in
++    /usr/share/doc/ksensors.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Thu,  2 May 2002 01:09:17 +0200
++
++ksensors (0.5-8) unstable; urgency=low
++
++  * This time with a correct "Maintainer" field.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed, 10 Apr 2002 23:05:17 +0200
++
++ksensors (0.5-7) unstable; urgency=low
++
++  * Rebuild ksensors under pbuilder so it will depends on libsensors1
++    (closes: Bug#142218). 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Wed, 10 Apr 2002 21:29:53 +0200
++
++ksensors (0.5-6) unstable; urgency=low
++
++  * Added Build-Depends.
++
++ -- Aurelien Jarno <aurel32@debian.org>  Sun, 31 Mar 2002 13:26:10 +0200
++
++ksensors (0.5-5) unstable; urgency=low
++
++  * Changed my maintainer e-mail address to <aurel32@debian.org>.  :) 
++
++ -- Aurelien Jarno <aurel32@debian.org>  Mon, 18 Mar 2002 21:24:46 +0100
++
++ksensors (0.5-4) unstable; urgency=low
++
++  * Created an autostart file (closes: Bug#136562). 
++
++ -- Aurelien Jarno <aurelien@aurel32.net>  Sun,  3 Mar 2002 19:51:32 +0100
++
++ksensors (0.5-3) unstable; urgency=low
++
++  * Initial Debian upload (closes: Bug#129913).
++
++ -- Aurelien Jarno <aurelien@aurel32.net>  Fri,  8 Feb 2002 14:23:09 +0100
++
++ksensors (0.5-2) unstable; urgency=low
++
++  * Add Build-Depends. 
++
++ -- Aurelien Jarno <aurelien@aurel32.net>  Thu, 24 Jan 2002 15:49:03 +0100
++
++ksensors (0.5-1) unstable; urgency=low
++
++  * New upstream release.
++    Changelog:
++     * Added Voltage Sensors panels
++     * Added Cpu state and Uptime panels
++     * Temperatures in celsius,farenheit or kelvin scales
++     * Configurable update intervals for sensors and system info panels
++     * English, spanish, french, german and dutch translations
++     * Configuration dialog redesign
++
++ -- Aurelien Jarno <aurelien@aurel32.net>  Sun, 12 Jan 2002 23:41:57 +0100
++
++sensors (0.4-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Aurelien Jarno <aurelien@aurel32.net>  Mon, 07 Jan 2002 09:43:17 +0100
++
++ksensors (0.3-1) unstable; urgency=low
++
++  * Initial Release.
++
++ -- Aurelien Jarno <aurelien@aurel32.net>  Wed, 12 Dec 2001 16:49:52 +0100
++
++Local variables:
++mode: debian-changelog
++End:
+--- ksensors-0.7.3.orig/debian/rules
++++ ksensors-0.7.3/debian/rules
+@@ -0,0 +1,111 @@
++#!/usr/bin/make -f
++# Sample debian/rules that uses debhelper.
++# GNU copyright 1997 to 1999 by Joey Hess.
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++# These are used for cross-compiling and for saving the configure script
++# from having to guess our platform (since we know it already)
++DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++	CFLAGS += -g
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++	INSTALL_PROGRAM += -s
++endif
++
++build: build-stamp
++	
++-include debian/debiandirs
++
++debian/debiandirs: admin/debianrules
++	perl -w admin/debianrules echodirs > debian/debiandirs
++
++build-stamp:
++	dh_testdir
++
++	/usr/bin/libtoolize -f
++	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
++	cp -f /usr/share/misc/config.guess admin/config.guess
++	cp -f /usr/share/misc/config.sub admin/config.sub
++
++	$(MAKE) -f admin/Makefile.common
++	
++	QTDIR=/usr/share/qt3 ./configure $(configkde) --disable-final 
++	$(MAKE)
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	[ ! -f Makefile ] || $(MAKE) clean distclean
++	-rm -f po/*.gmo
++	-rm -f debian/debiandirs
++	-rm -f admin/config.sub admin/config.guess admin/ltmain.sh configure
++	-rm -f admin/libtool.m4.in aclocal.m4 acinclude.m4
++	-rm -f config.log
++	-find $(CURDIR) -name Makefile.in -exec rm -f {} \;
++	-rm -f build-stamp install-stamp
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++
++	# Install overrides.
++	install -p -o root -g root -m 644 $(CURDIR)/debian/overrides $(CURDIR)/debian/ksensors/usr/share/lintian/overrides/ksensors
++
++	# Main install.
++	$(MAKE) install DESTDIR=$(CURDIR)/debian/ksensors
++
++	# Make common links for docs.
++	for p in `dh_listpackages`; do \
++	  for i in `find $(CURDIR)/debian/ksensors/usr/share/doc/kde/HTML -type d -name $$p -name $$p -not -regex .*/en/$$p`; do \
++	    ln -f -n -s ../common $$i/common; done; done
++	
++	# Installing icons
++	/usr/bin/convert $(CURDIR)/src/pics/hi16-app-ksensors.png $(CURDIR)/debian/ksensors/usr/share/pixmaps/ksensors.xpm
++
++	perl -w admin/debianrules cleanup
++
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installdebconf	
++	dh_installdocs
++#	dh_installexamples
++	dh_installmenu
++#	dh_installlogrotate
++#	dh_installemacsen
++#	dh_installpam
++#	dh_installmime
++#	dh_installinit
++#	dh_installcron
++	dh_installman
++#	dh_installinfo
++	dh_installchangelogs ChangeLog
++	dh_link
++	dh_strip
++	dh_compress --exclude=.docbook
++	dh_fixperms
++#	dh_makeshlibs
++	dh_installdeb
++#	dh_perl
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install configure
+--- ksensors-0.7.3.orig/debian/compat
++++ ksensors-0.7.3/debian/compat
+@@ -0,0 +1 @@
++5
+--- ksensors-0.7.3.orig/debian/copyright
++++ ksensors-0.7.3/debian/copyright
+@@ -0,0 +1,16 @@
++This package was debianized by Aurelien Jarno <aurelien@aurel32.net> on
++Wed, 12 Dec 2001 16:49:52 +0100
++
++It was downloaded from http://ksensors.sourceforge.net
++
++Upstream Authors:  
++  Miguel Novas <michaell@teleline.es>
++
++Copyright:
++  (C) 2001-2002 by Miguel Novas <michaell@teleline.es>
++
++
++
++You are free to distribute this software under the terms of the GNU General
++Public License.  On Debian systems, the complete text of the GNU General Public
++License can be found in /usr/share/common-licenses/GPL file.
+--- ksensors-0.7.3.orig/debian/manpages
++++ ksensors-0.7.3/debian/manpages
+@@ -0,0 +1 @@
++debian/ksensors.1
diff --git a/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz b/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz
deleted file mode 100644
index 1ea0e2152..000000000
--- a/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz
+++ /dev/null
diff --git a/redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec b/redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec
new file mode 100644
index 000000000..f00bcc569
--- /dev/null
+++ b/redhat/extras/ksensors/trinity-ksensors-3.5.13.1.spec
@@ -0,0 +1,268 @@
+# 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_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:		19p3%{?dist}%{?_variant}
+
+Summary:        KDE frontend to lm_sensors
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://ksensors.sourceforge.net/
+
+Source0:        http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
+
+# Debian (upstream) patch
+Patch2:         ksensors_0.7.3-18.diff
+# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
+Patch7:			ksensors-0.7.3-18-lmsensors_2x_fix.patch
+# [ksensors] Fix autotools detection
+Patch9:			ksensors-0.7.3-fix_autotools_detection.patch
+# Fix TDE directories detection
+Patch10:		ksensors-0.7.3-tde_includedir.patch
+# Fix sound installation
+Patch11:		ksensors-0.7.3-fix_sound_installation.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires:	gettext
+BuildRequires:	desktop-file-utils
+
+%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}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n ksensors-%{version}
+%patch2 -p1 -b .debian
+%patch7 -p1 -b .lm2x
+%patch9 -p1 -b .autotools
+%patch10 -p1 -b .tdeinc
+%patch11 -p1 -b .sound
+
+# 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"
+
+%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
+for f in ChangeLog LIESMICH LISEZMOI ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
+
+%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} \
+	--disable-dependency-tracking \
+	--disable-rpath \
+	--with-extra-includes=%{tde_includedir}/tqt \
+	--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
+	--bindir=%{tde_bindir} \
+	--libdir=%{tde_libdir} \
+	--datadir=%{tde_datadir} \
+	--includedir=%{tde_tdeincludedir} 
+
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+
+%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
+
+#__rm -rf $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML
+
+%find_lang ksensors
+
+
+%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 ksensors.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/Utilities/ksensors.desktop
+%{tde_datadir}/apps/ksensors/
+%{tde_datadir}/autostart/ksensors.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
+%{tde_datadir}/icons/locolor/
+%{tde_datadir}/sounds/ksensors_alert.wav
+%{tde_tdedocdir}/HTML/en/ksensors/
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
+- Initial build for TDE 3.5.13.1
+
+* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
+- Update Debian patch to -18 release
+
+* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p1
+- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 15 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-16
+- Update Debian patch to -15 release
+
+* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-15
+- Change BuildRequires: kdelibs-devel into kdelibs3-devel
+
+* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-14
+- Patch for and Rebuild against lm_sensors-3.0.0
+
+* Sun Nov 11 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-13
+- Fix reading of min and max tresholds from libsensors
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-12
+- Update License tag for new Licensing Guidelines compliance
+
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-11
+- Remove OnlyShowIn=KDE; from .desktop file (I like using ksensors under GNOME,
+  works fine grumbel) 
+
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.3-10
+- Add icon-cache update scriptlets
+- Add Requires: hicolor-icon-theme for dir ownership
+
+* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
+- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
+
+* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
+- Update Debian patchset to -14 for additional fixes and translations;
+  drop our hddtemp detection patch in favour of the one included in it.
+- Drop Application and X-Fedora categories from .desktop file, add GenericName.
+- Make autostart checkbox effective again (#242570).
+- Convert docs to UTF-8.
+
+* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+  support for hddtemp with SCSI disks and more translations.
+
+* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-6
+- Rebuild.
+
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-5
+- Rebuild.
+
+* Thu Nov  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-4
+- Clean up build dependencies.
+
+* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-3
+- Sync arch availability with FC4 lm_sensors (%%{ix86}, x86_64, alpha).
+- Reduce directory ownership bloat.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.3-2
+- rebuilt
+
+* Sat Aug 21 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.3-0.fdr.1
+- Update to 0.7.3, most patches applied upstream.
+- Disable dependency tracking to speed up the build.
+
+* Tue Jul 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.4
+- Force use of multithreaded Qt with --enable-mt to fix build on FC2.
+- Sync Debian patch to 0.7.2-16 to get a fix for freeze with hddtemp.
+- Apply upstream patches #913569 and #915725.
+- Disable RPATH.
+- Don't ship the "handbook", it's just a template.
+- Other minor improvements here and there.
+
+* Sat Aug  2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.3
+- Own dirs under %%{_datadir}/icons and %%{_docdir}/HTML (bug 21).
+- Don't tweak path to hddtemp.
+- Patch to fix hddtemp detection.
+- s/--enable-xinerama/--with-xinerama/
+- Borrow man page from Debian.
+
+* Sat May 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.2
+- Spec cleanups.
+
+* Fri Apr  4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.2-0.fdr.1
+- Update to current Fedora guidelines.
+- Move desktop entry to %%{_datadir}/applications using desktop-file-install.
+
+* Sun Feb 23 2003 Warren Togami <warren@togami.com> - 0.7.2-1.fedora.2
+- BuildRequires libart_lgpl-devel needed for Red Hat 8.1
+
+* Sun Feb 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1.fedora.1
+- Update to 0.7.2.
+- Don't apply startup crash patch, but keep it around for now.
+
+* Sat Feb 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.2
+- Include startup crash patch from upstream SRPM.
+
+* Sun Feb  9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1.fedora.1
+- First Fedora release.
diff --git a/redhat/extras/ksensors/trinity-ksensors.spec b/redhat/extras/ksensors/trinity-ksensors-3.5.13.spec
index 529d2623e..529d2623e 100644
--- a/redhat/extras/ksensors/trinity-ksensors.spec
+++ b/redhat/extras/ksensors/trinity-ksensors-3.5.13.spec
diff --git a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
index dcde642e3..0d3190cef 100644
--- a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
+++ b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
@@ -5,7 +5,7 @@
      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[01]* )
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* )
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;
diff --git a/redhat/extras/style-ia-ora/trinity-style-ia-ora-3.5.13.1.spec b/redhat/extras/style-ia-ora/trinity-style-ia-ora-3.5.13.1.spec
new file mode 100644
index 000000000..34d4a7215
--- /dev/null
+++ b/redhat/extras/style-ia-ora/trinity-style-ia-ora-3.5.13.1.spec
@@ -0,0 +1,288 @@
+# 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}
+
+
+Summary:        Mandriva theme for TDE - Widget design
+Name:           trinity-style-ia-ora
+Version:        1.0.8
+Release:	2%{?dist}%{?_variant}
+License:        GPL
+Group:          Environment/Desktop
+URL:            http://www.mandrivalinux.com/
+
+Source0:        ia_ora-kde-%{version}.tar.bz2
+
+# [ia_ora] Fix automake 1.11 detection
+Patch1:		ia_ora-1.08-fix_automake_detection.patch
+# [ia_ora] Fix trinity directories detection
+Patch2:		ia_ora-1.08-fix_trinity_directories.patch
+
+Prefix:		%{_prefix}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
+
+Requires:	trinity-twin
+
+%description
+Mandriva theme for Trinity
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n ia_ora-kde-%{version}
+%patch1 -p1 -b .automake11
+%patch2 -p1 -b .trinity
+
+# 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" cvs
+
+
+%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 \
+  --enable-closure \
+  --disable-dependency-tracking \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-shared \
+  --disable-static \
+  --with-extra-includes=%{tde_includedir}/tqt
+
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+# Removes useless files
+%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
+%__rm -f %{?buildroot}%{tde_tdelibdir}/plugins/styles/*.a
+
+%clean
+%__rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kwin3_iaora.la
+%{tde_tdelibdir}/kwin3_iaora.so
+%{tde_tdelibdir}/kwin_iaora_config.la
+%{tde_tdelibdir}/kwin_iaora_config.so
+%{tde_tdelibdir}/plugins/styles/ia_ora.la
+%{tde_tdelibdir}/plugins/styles/ia_ora.so
+%{tde_datadir}/apps/kstyle/themes/ia_ora.themerc
+%{tde_datadir}/apps/kwin/iaora.desktop
+
+
+
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-2
+- Initial build for TDE 3.5.13.1
+
+* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-1
+- Initial version for TDE 3.5.13
+
+* Fri Aug 05 2011 Andrey Bondrov <bondrov@math.dvgu.ru> 1.0.8-9mib2011.0
+- Port to 2011
+
+* Sat Jul 10 2010 Andrey Bondrov <bondrov@math.dvgu.ru> 1.0.8-8mib2010.1
+- Rebuild for MIB users
+
+* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.0.8-8mvt2010.0
+- Rename package to avoid unwanted KDE4 upgrade
+- Merge packages in one kde-style package
+- Fix package group in spec file
+
+* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 1.0.8-7mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Thu Mar 26 2009 Helio Chissini de Castro <helio@mandriva.com> 1.0.8-6mdv2009.1
++ Revision: 361404
+- Bump to rebuild against cooker
+
+* Tue Nov 18 2008 Thierry Vignaud <tvignaud@mandriva.com> 1.0.8-5mdv2009.1
++ Revision: 304189
+- rebuild for new xcb
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 1.0.8-4mdv2009.0
++ Revision: 264680
+- rebuild early 2009.0 package (before pixel changes)
+
+* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1.0.8-2mdv2009.0
++ Revision: 204689
+- Move to /opt
+
+* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.8-1mdv2008.1
++ Revision: 175799
+- New release (1.0.8):
+   * Fix drawing of buttons when using mandriva color schemes
+   * Update color scheme names to match the new ones
+
+* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.7-1mdv2008.1
++ Revision: 173100
+- new release (1.0.7) fixing some drawing issues on applications that don't use
+  standard background colors (#33502)
+
+* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0.6-2mdv2008.1
++ Revision: 141786
+- rebuilt against openldap-2.4.7 libs
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Wed Sep 12 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.6-1mdv2008.0
++ Revision: 84626
+- new release: 1.0.6:
+   * Use the right color for the bottom line of menubar
+   * Remove some lines that were causing double borders at menubar and toolbar
+     ends
+   * Fix the bottom of toolbars: it was being drawn using the wrong color
+   * Use a flat background for status bars
+   * Add a minimum size for the scrollbar handle
+- new release: 1.0.5
+   * Use the widget style in all separators (#33260)
+   * Fixed popup menu item drawing on menus that have titles (#33287)
+
+* Thu Sep 06 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.4-1mdv2008.0
++ Revision: 81272
+- new version: 1.0.4
+   * Restore the old color themes (as they will be kept as alternatives)
+   * Properly mask the rounded borders and properly draw the region previously
+     masked
+   * Create fake rounded corners on menu items
+   * Reduced the button margin to get normal sized buttons (not giant ones)
+   * Make it possible to resize windows by the top border
+------------------------------------------------------------------------
+  r227235 | boiko | 2007-09-06 13:58:18 -0300 (Qui, 06 Set 2007) | 3 lines
+
+* Wed Sep 05 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.3-1mdv2008.0
++ Revision: 80378
+- new release: 1.0.3
+   * Implement highligh on hovering controls
+   * Threat scrollbar buttons as buttons (showing them lowered when the button
+     is pressed for example)
+   * Show the combo box button as pressed when the list is opened
+   * Removed Powerpack+ colors
+   * Changed Discovery/One to just One and adjusted colors
+   * Used more sane values when using ia_ora together with other KDE color
+     schemes
+- new release:
+   * fix gradient colors of menus (thanks Frederic Crozat for pointing that)
+   * implement correctly the combo box drawing according to the ia_ora spec
+   * Fix the text color of menubar items
+
+* Thu Aug 23 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.1-1mdv2008.0
++ Revision: 70685
+- new version: 1.0.1
+   * Replace the gradient code by the Plastik one (it is better written)
+   * Fix drawing of menubar items and popupmenu items (#30659)
+
+* Mon Jun 11 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.0-18mdv2008.0
++ Revision: 38004
+- REBUILD
+
+
+* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 1.0-17mdv2007.1
++ Revision: 147929
+- Fix theme
+
+* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 1.0-16mdv2007.1
++ Revision: 146479
+- Fix progressbar text color
+
+* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 1.0-15mdv2007.1
++ Revision: 134563
+- Fix style
+
+* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 1.0-14mdv2007.1
++ Revision: 133854
+- New update
+
+* Wed Feb 28 2007 Laurent Montel <lmontel@mandriva.com> 1.0-13mdv2007.1
++ Revision: 127097
+- New update
+
+* Wed Jan 24 2007 Laurent Montel <lmontel@mandriva.com> 1.0-12mdv2007.1
++ Revision: 112737
+- Fix theme
+
+* Tue Jan 02 2007 Laurent Montel <lmontel@mandriva.com> 1.0-11mdv2007.1
++ Revision: 103350
+- Update tarball
+
+* Mon Dec 11 2006 Laurent Montel <lmontel@mandriva.com> 1.0-10mdv2007.1
++ Revision: 94696
+- Rename spec file name too
+- Rename ia_ora to ia_ora-kde
+  Fix a lot of bug
+- Import ia_ora-kde
+
+* Sat Sep 16 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-9
+- Fix title bar
+
+* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-8
+- Fix handle
+
+* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-7
+- Fix toolbar color
+
+* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-6
+- Fix Combobox/Scrollbar/Checkbox and bidi mode
+
+* Tue Sep 12 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-5
+- Fix tabbar
+
+* Tue Sep 12 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-4
+- Fix scrollbar
+
+* Sun Sep 10 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-3
+- Improve style
+
+* Fri Sep 08 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-2
+- Some fixes
+
+* Tue Sep 05 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-1
+- Initial package
+
diff --git a/redhat/extras/style-ia-ora/trinity-style-ia-ora.spec b/redhat/extras/style-ia-ora/trinity-style-ia-ora-3.5.13.spec
index 430a1383a..430a1383a 100644
--- a/redhat/extras/style-ia-ora/trinity-style-ia-ora.spec
+++ b/redhat/extras/style-ia-ora/trinity-style-ia-ora-3.5.13.spec
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
index c266c9452..bf099f4a2 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
@@ -16,26 +16,5 @@ gpgcheck=0
 name=trinity-3.5.13-source
 #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
 mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
-enabled=1
-gpgcheck=0
-
-[trinity-extras]
-name=trinity-extras
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-$basearch.list
-enabled=1
-gpgcheck=0
-
-[trinity-extras-noarch]
-name=trinity-extras-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-noarch.list
-enabled=1
-gpgcheck=0
-
-[trinity-extras-source]
-name=trinity-extras-source
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-SRPMS.list
-enabled=1
+enabled=0
 gpgcheck=0
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index 78191625d..6f8312cdd 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -13,29 +13,8 @@ enabled=1
 gpgcheck=0
 
 [trinity-3.5.13-source]
-name=trinity-3.5.13-source
+name=trinity-3.5.13-noarch
 #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
 mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
-enabled=1
-gpgcheck=0
-
-[trinity-extras]
-name=trinity-extras
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-$basearch.list
-enabled=1
-gpgcheck=0
-
-[trinity-extras-noarch]
-name=trinity-extras-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-noarch.list
-enabled=1
-gpgcheck=0
-
-[trinity-extras-source]
-name=trinity-extras-source
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-SRPMS.list
-enabled=1
+enabled=0
 gpgcheck=0
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index f8124f641..238d1b8d5 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name:		trinity-desktop
-Version:	3.5.13
-Release:	6%{?dist}%{?_variant}
+Version:	3.5.13.1
+Release:	1%{?dist}%{?_variant}
 License:	GPL
 Summary:	Meta-package to install TDE
 Group:		User Interface/Desktops
@@ -42,6 +42,7 @@ Requires:	trinity-tdetoys >= %{version}
 Requires:	hal
 
 %if 0%{?rhel} || 0%{?fedora}
+# YUM configuration file
 Requires:	trinity-repo >= %{version}
 %endif
 
@@ -80,21 +81,37 @@ Requires:	trinity-tdewebdev >= %{version}
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
+# Some applications are disabled for now ...
+# Compiz-related stuff
+#Requires: trinity-compizconfig-backend-kconfig
+#Requires: trinity-desktop-effects-kde
+#Requires: trinity-fusion-icon
+
+# Obsolete l10n package
+#Requires: trinity-filelight-l10n
+
+# Not even an RPM package ...
+#Requires: trinity-konstruct
+
+# Debian/Ubuntu specific ...
+#Requires: trinity-adept
+
+# Future R14 packages
+#Requires: trinity-kvpnc
+#Requires: trinity-qt4-tqt-theme-engine
+
+# Warning, k9copy requires ffmpeg
+# Warning, kradio requires libmp3lame
 Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
 Requires: trinity-bibletime
-#Requires: trinity-compizconfig-backend-kconfig
-#Requires: trinity-desktop-effects-kde
 Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
-#Requires: trinity-filelight-l10n
-# Fusion-icon requires 'trinity-compizconfig-backend-kconfig'
-#Requires: trinity-fusion-icon
 Requires: trinity-gwenview
+Requires: trinity-gwenview-i18n
 Requires: trinity-k3b
-# Warning, k9copy requires ffmpeg
 Requires: trinity-k9copy
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
@@ -117,8 +134,6 @@ Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-kdmtheme
 Requires: trinity-keep
-Requires: trinity-kerry
-Requires: trinity-kgtk-qt3
 Requires: trinity-kile
 Requires: trinity-kima
 Requires: trinity-kio-locate
@@ -130,17 +145,13 @@ Requires: trinity-kmymoney
 Requires: trinity-knemo
 Requires: trinity-knetload
 Requires: trinity-knetstats
-Requires: trinity-knetworkmanager
 Requires: trinity-knights
 Requires: trinity-knowit
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
-#Requires: trinity-konstruct
 Requires: trinity-konversation
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-Requires: trinity-kpilot
-# Warning, kradio requires libmp3lame
 Requires: trinity-kradio
 Requires: trinity-krename
 Requires: trinity-krusader
@@ -150,14 +161,11 @@ Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
 Requires: trinity-ktorrent
-Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
-#Requires: trinity-kvpnc		# R14 only
 Requires: trinity-kwin-style-crystal
 Requires: trinity-piklab
 Requires: trinity-potracegui
-#Requires: trinity-qt4-tqt-theme-engine
 Requires: trinity-smartcardauth
 Requires: trinity-smb4k
 Requires: trinity-soundkonverter
@@ -165,19 +173,36 @@ Requires: trinity-tellico
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
+# Disabled applications for RHEL5
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 # On RHEL 5, HAL version is too old for kpowersave .
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
 Requires: trinity-kpowersave
+# On RHEL 5, GTK2 version is too old for GTK stuff ...
+Requires: trinity-gtk-qt-engine
+# On RHEL 5, lilypond is not available, so no rosegarden :'-(
+Requires: trinity-rosegarden
+# RHEL5: kpilot library is too old
+Requires: trinity-kpilot
 %endif
 
-# On RHEL 5, GTK2 version is too old for gtk-qt-engine.
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: trinity-gtk-qt-engine
+# This one causes several crashes .
+#Requires: trinity-kgtk-qt3
+
+# Disabled applications for OPENSUSE 12.2, Mageia 2
+%if 0%{?rhel} || 0%{?fedora} >= 15 || 0%{?mdkversion}
+# no imlib1.x library
+Requires: trinity-kuickshow
 %endif
 
-# On RHEL 5, lilypond is not available, so no rosegarden :'-(
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: trinity-rosegarden
+# RHEL, openSUSE 12: no Beagle library
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
+Requires: trinity-kerry
+%endif
+
+# RHEL 6 only: knetworkmanager8
+#  knetworkmanager9 is too unstable for now.
+%if 0%{?rhel} == 6
+Requires: trinity-knetworkmanager
 %endif
 
 %description applications
@@ -193,9 +218,10 @@ Summary:	Meta-package to install all extras (unofficial) TDE packages
 
 Requires:	trinity-akode
 Requires:	trinity-kasablanca
-Requires:	trinity-kdebluetooth
+#Requires:	trinity-kdebluetooth
+Requires:	trinity-kickoff-i18n
 Requires:	trinity-ksensors
-Requires:	trinity-style-ia-oa
+Requires:	trinity-style-ia-ora
 
 %description extras
 %{summary}
@@ -248,14 +274,15 @@ Summary:	Yum configuration files for Trinity
 %__sed %{SOURCE0} \
   -e 's/\$releasever/%{fedora}/g' \
   -e 's/-fedora/-f%{fedora}/g' \
-  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-f%{fedora}.repo
+  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
 %endif
 
 # RHEL repo file
+# $releasever is replaced with its value
 %if 0%{?rhel} > 0
 %__sed %{SOURCE1} \
   -e 's/\$releasever/%{rhel}/g' \
-  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
+  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo
 %endif
 
 %if 0%{?fedora} || 0%{?rhel}
@@ -263,6 +290,9 @@ Summary:	Yum configuration files for Trinity
 %endif
 
 %changelog
+* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Update to major version 3.5.13.1
+
 * Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
 - Add 'applications' subpackage
 
diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index c54b149d2..988a2d6a0 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -3,8 +3,6 @@
 %include fedora-live-base.ks
 repo --name=trinity --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/$basearch
 repo --name=trinity-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/noarch
-repo --name=trinity-extras --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/$basearch
-repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/noarch
 
 %packages
 
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index 6c926a25a..c53e55e23 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -26,7 +26,7 @@ trinity-k3b
 trinity-kaffeine
 trinity-kasablanca
 trinity-kbookreader
-trinity-kdebluetooth
+#trinity-kdebluetooth
 trinity-style-lipstik
 #trinity-kgtk-qt3
 trinity-kio-umountwrapper
diff --git a/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz b/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 6588028da..66b495c48 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -1,8 +1,10 @@
 %define _prefix /usr
 
+%define tde_bindir %{tde_prefix}/bin
+
 Name:		trinity-live
-Version:	3.5.13
-Release:	4%{?dist}
+Version:	3.5.13.1
+Release:	1%{?dist}
 License:	GPL
 Summary:	Trinity Spins
 Group:		Applications/System
@@ -45,7 +47,7 @@ cat <<EOF >openbox
 # This script is used by 'firstboot' only.
 # It allows to run TDE's kwin instead of openbox.
 
-export PATH=%{_bindir}:\${PATH}
+export PATH=%{tde_bindir}:\${PATH}
 export HOME=/root
 rm -rf \${HOME}/.DCOPserver*
 
@@ -73,6 +75,9 @@ EOF
 
 
 %changelog
+* Sun Oct 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
+
 * Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Updates with new split packages
author	Francois Andriot <francois.andriot@free.fr>	2012-10-21 19:23:00 +0200
committer	Francois Andriot <francois.andriot@free.fr>	2012-10-21 19:23:00 +0200
commit	59daf455b483742c6c47099652117074df37889a (patch)
tree	5271c465e9468df4e8fe1814bdb413164b40823e /redhat/extras
parent	7834467b40a454432c3f8d84b6b43e299afe4933 (diff)
download	tde-packaging-59daf455b483742c6c47099652117074df37889a.tar.gz tde-packaging-59daf455b483742c6c47099652117074df37889a.zip