summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.2.spec124
-rw-r--r--redhat/applications/basket/basket-3.5.13.2.spec51
-rw-r--r--redhat/applications/digikam/digikam-3.5.13.2.spec74
-rw-r--r--redhat/applications/filelight/filelight-3.5.13.2.spec51
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch14
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch18
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch102
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2.spec77
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec55
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec131
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec59
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.13.2.spec56
-rw-r--r--redhat/applications/kile/kile-3.5.13.2.spec51
-rw-r--r--redhat/applications/kima/kima-3.5.13.2.spec14
-rw-r--r--redhat/applications/kiosktool/kiosktool-3.5.13.2.spec70
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.2.spec86
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch19
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.2.spec93
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec272
-rw-r--r--redhat/applications/kpilot/kpilot-3.5.13.2.spec53
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.2.spec52
-rw-r--r--redhat/applications/rosegarden/rosegarden-3.5.13.2.spec89
-rw-r--r--redhat/applications/tdesvn/tdesvn-3.5.13.2.spec73
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch19
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.2-videodev.patch11
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.2.spec84
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.2.spec27
-rw-r--r--redhat/tdeadmin/tdeadmin-3.5.13.2.spec62
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch9489
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch136
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2.spec443
-rw-r--r--redhat/tdegames/tdegames-3.5.13.2.spec70
-rw-r--r--redhat/tdegraphics/tdegraphics-3.5.13.2.spec43
-rw-r--r--redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch976
-rw-r--r--redhat/tdelibs/tdelibs-3.5.13.2.spec156
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch250
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec115
-rw-r--r--redhat/tdenetwork/tdenetwork-3.5.13.2.spec98
-rw-r--r--redhat/tdepim/tdepim-3.5.13.2.spec32
-rw-r--r--redhat/tdesdk/tdesdk-3.5.13.2.spec27
-rw-r--r--redhat/tdeutils/tdeutils-3.5.13.2.spec46
-rw-r--r--redhat/tdevelop/tdevelop-3.5.13.2-fix_xdg_menu.patch30
-rw-r--r--redhat/tdevelop/tdevelop-3.5.13.2.spec44
43 files changed, 12525 insertions, 1317 deletions
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
index 01baf11e7..e3a183dd5 100644
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ b/redhat/applications/amarok/amarok-3.5.13.2.spec
@@ -1,13 +1,13 @@
# Basic package informations
-%define tdecomp amarok
-%define tdeversion 3.5.13.2
+%define tde_pkg amarok
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,43 +23,43 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: Media player
-Version: 1.4.10
-Release: 9%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: Media player
+Version: 1.4.10
+Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant}
-Group: Applications/Multimedia
-License: GPLv2+
+Group: Applications/Multimedia
+License: GPLv2+
Url: http://amarok.kde.org
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: trinity-konqueror-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-konqueror-devel >= %{tde_version}
-BuildRequires: alsa-lib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: esound-devel
-BuildRequires: gettext
+BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: esound-devel
+BuildRequires: gettext
BuildRequires: pcre-devel
-BuildRequires: taglib-devel
+BuildRequires: taglib-devel
-BuildRequires: libtool
+BuildRequires: libtool
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libtool-ltdl-devel
+BuildRequires: libtool-ltdl-devel
%endif
-BuildRequires: libusb-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: SDL-devel
-BuildRequires: taglib-devel
+BuildRequires: libusb-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
+BuildRequires: SDL-devel
+BuildRequires: taglib-devel
BuildRequires: sqlite-devel
# not used anymore, in favor of libvisual ? -- Rex
#{?fedora:BuildRequires: xmms-devel}
@@ -76,7 +76,7 @@ BuildRequires: dbus-devel
%if 0%{?rhel} == 4
BuildRequires: dbus-qt
%else
-BuildRequires: trinity-dbus-tqt-devel >= 3.5.13.2
+BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
%endif
# IFP support
@@ -84,7 +84,7 @@ BuildRequires: trinity-dbus-tqt-devel >= 3.5.13.2
%if 0%{?pclinuxos} == 0
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_ifp 1
-BuildRequires: libifp-devel
+BuildRequires: libifp-devel
%endif
%endif
@@ -100,34 +100,34 @@ BuildRequires: karma-sharp
# GPOD (ipod) support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gpod 1
-BuildRequires: libgpod-devel >= 0.4.2
+BuildRequires: libgpod-devel >= 0.4.2
%endif
# MTP players
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_mtp 1
-BuildRequires: libmtp-devel
-BuildRequires: libmusicbrainz-devel
+BuildRequires: libmtp-devel
+BuildRequires: libmusicbrainz-devel
%endif
# Creative Nomad Jukebox
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
%define with_njb 1
-BuildRequires: libnjb-devel
+BuildRequires: libnjb-devel
%endif
# VISUAL support
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_libvisual 1
-BuildRequires: libvisual-devel
+BuildRequires: libvisual-devel
%endif
# TUNEPIMP support
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
-BuildRequires: libtunepimp-devel
+BuildRequires: libtunepimp-devel
%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libtunepimp-devel
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+BuildRequires: libtunepimp-devel
%endif
# INOTIFY support
@@ -142,10 +142,10 @@ BuildRequires: %{_lib}inotifytools-devel
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
+BuildRequires: libxine-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
+BuildRequires: xine-lib-devel
%endif
%endif
@@ -168,10 +168,10 @@ BuildRequires: libmp4v2-devel
# ruby
BuildRequires: ruby
-BuildRequires: ruby-devel
+BuildRequires: ruby-devel
# To open the selected browser, works with Patch2
-Requires: xdg-utils
+Requires: xdg-utils
Requires(post): xdg-utils
Requires(postun): xdg-utils
@@ -193,7 +193,7 @@ Amarok is a multimedia player with:
%{tde_bindir}/amarok_proxy.rb
%{tde_datadir}/apps/amarok/
%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/kde/*.desktop
+%{tde_tdeappdir}/*.desktop
%{tde_datadir}/servicetypes/*.desktop
%{tde_datadir}/apps/profiles/amarok.profile.xml
%{tde_datadir}/config/amarokrc
@@ -281,11 +281,11 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
##########
%package ruby
-Summary: %{name} Ruby support
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Summary: %{name} Ruby support
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
# For dir ownership and some default plugins (lyrics)
-Requires: ruby
+Requires: ruby
%description ruby
%{summary}.
@@ -297,11 +297,11 @@ Requires: ruby
##########
%package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group: Applications/Multimedia
+Summary: Amarok konqueror (service menus, sidebar) support
+Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-konqueror
+Requires: %{name} = %{version}-%{release}
+Requires: trinity-konqueror
%description konqueror
%{summary}.
@@ -318,9 +318,9 @@ Requires: trinity-konqueror
%if 0%{?with_libvisual}
%package visualisation
-Summary: Visualisation plugins for Amarok
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Summary: Visualisation plugins for Amarok
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
# No plugins by default, we need libvisual-plugins
#Requires: libvisual-plugins
@@ -344,7 +344,7 @@ use any of xmms' visualisation plugins with Amarok.
##########
%prep
-%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 4
%patch3 -p1 -b .rhel4
%endif
@@ -370,12 +370,18 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
-DQT_LIBRARY_DIRS="${QTLIB:-${QTDIR}/%{_lib}}" \
+ \
%{?with_libvisual:-DWITH_LIBVISUAL=ON} \
-DWITH_KONQSIDEBAR=ON \
%{?with_xine:-DWITH_XINE=ON} \
@@ -394,6 +400,7 @@ cd build
%__make %{?_smp_mflags} || %__make
+
%install
%__rm -fr $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT -C build
@@ -405,7 +412,7 @@ cd build
%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
# Locales
-%find_lang amarok
+%find_lang %{tde_pkg}
# HTML
for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
@@ -423,6 +430,9 @@ done
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-9
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec
index 991e859e2..a175d11b5 100644
--- a/redhat/applications/basket/basket-3.5.13.2.spec
+++ b/redhat/applications/basket/basket-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define kdecomp basket
+%define tde_pkg basket
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -22,30 +23,30 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: Taking care of your ideas.
-Version: 1.0.3.1
-Release: 4%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: Taking care of your ideas.
+Version: 1.0.3.1
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: trinity-tdepim-devel >= 3.5.13.2
-BuildRequires: desktop-file-utils
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-tdepim-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
-BuildRequires: gpgme-devel
+BuildRequires: gpgme-devel
%description
This application is mainly an all-purpose notes taker. It provide several baskets where
@@ -63,7 +64,7 @@ baskets to HTML.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,6 +90,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--disable-rpath \
+ --disable-debug \
--with-extra-includes=%{tde_includedir}/tqt \
--disable-static
@@ -100,7 +102,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%find_lang %{kdecomp}
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
@@ -121,7 +123,7 @@ done
/sbin/ldconfig
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/basket
@@ -157,6 +159,9 @@ done
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
index 23cf5320e..8af183e1b 100644
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ b/redhat/applications/digikam/digikam-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define kdecomp digikam
+%define tde_pkg digikam
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -22,33 +23,33 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: digital photo management application for KDE [Trinity]
-Version: 0.9.6
-Release: 5%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: digital photo management application for TDE [Trinity]
+Version: 0.9.6
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+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)
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [Digikam] Revert PNG support to libpng12 (for RHEL4)
Patch1: digikam-3.5.13.2-fix_png12_support.patch
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-arts-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: trinity-libkexiv2-devel >= 3.5.13.2
-BuildRequires: trinity-libkdcraw-devel >= 3.5.13.2
-BuildRequires: trinity-libkipi-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-libkexiv2-devel >= %{tde_version}
+BuildRequires: trinity-libkdcraw-devel >= %{tde_version}
+BuildRequires: trinity-libkipi-devel >= %{tde_version}
%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: gphoto2-devel
%else
@@ -76,9 +77,9 @@ BuildRequires: libexiv2-devel
BuildRequires: exiv2-devel
%endif
-Requires: trinity-libkexiv2 >= 3.5.13.1
-Requires: trinity-libkdcraw >= 3.5.13.1
-Requires: trinity-libkipi >= 3.5.13.1
+Requires: trinity-libkexiv2 >= %{tde_version}
+Requires: trinity-libkdcraw >= %{tde_version}
+Requires: trinity-libkipi >= %{tde_version}
%description
An easy to use and powerful digital photo management
@@ -102,9 +103,9 @@ digiKam is based in part on the work of the Independent JPEG Group.
%package devel
-Group: Development/Libraries
-Summary: Development files for %{name}
-Requires: %{name} = %{version}
+Group: Development/Libraries
+Summary: Development files for %{name}
+Requires: %{name} = %{version}
%description devel
%{summary}
@@ -116,7 +117,7 @@ Requires: %{name} = %{version}
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 4
%patch1 -p1 -b .png12
%endif
@@ -146,9 +147,15 @@ export KDEDIR="%{tde_prefix}"
--datadir=%{tde_datadir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
- --with-extra-includes=%{tde_tdeincludedir}/tqt \
- --enable-closure
+ \
+ --with-extra-includes=%{tde_tdeincludedir}/tqt
%__make %{?_smp_mflags} || %__make
@@ -159,7 +166,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
-%find_lang %{kdecomp}
+%find_lang %{tde_pkg}
%clean
@@ -185,7 +192,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
/sbin/ldconfig || :
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/digikam
@@ -312,6 +319,9 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec
index 2223e626e..385d23417 100644
--- a/redhat/applications/filelight/filelight-3.5.13.2.spec
+++ b/redhat/applications/filelight/filelight-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define kdecomp filelight
+%define tde_pkg filelight
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -22,26 +23,26 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: Graphical disk usage display
-Version: 1.0
-Release: 6%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: Graphical disk usage display
+Version: 1.0
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+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)
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
Obsoletes: filelight-l10n < %{version}-%{release}
@@ -58,7 +59,7 @@ directories on your computer.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -84,7 +85,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
+ \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
@@ -95,7 +103,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%find_lang %{kdecomp} --with-kde
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
@@ -114,7 +122,7 @@ for f in crystalsvg hicolor ; do
done
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/filelight
@@ -136,6 +144,9 @@ done
%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
new file mode 100644
index 000000000..9fe3142a1
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
@@ -0,0 +1,14 @@
+--- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI 2013-07-29 21:52:57.859615464 +0200
++++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h 2013-07-29 21:57:19.206481299 +0200
+@@ -43,7 +43,11 @@
+ #else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
+ #endif
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 26, 0)
++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
++#else
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#endif
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
+ typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
+ #else
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..4dfb39787
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch
@@ -0,0 +1,18 @@
+--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200
++++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200
+@@ -21,6 +21,9 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#ifndef __MPEG2_INTERNAL_H__
++#define __MPEG2_INTERNAL_H__
++
+ /* macroblock modes */
+ #define MACROBLOCK_INTRA 1
+ #define MACROBLOCK_PATTERN 2
+@@ -298,3 +301,5 @@
+ extern mpeg2_mc_t mpeg2_mc_altivec;
+ extern mpeg2_mc_t mpeg2_mc_alpha;
+ extern mpeg2_mc_t mpeg2_mc_vis;
++
++#endif // __MPEG2_INTERNAL_H__
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch
new file mode 100644
index 000000000..0cf01006e
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch
@@ -0,0 +1,102 @@
+--- ./k9author/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9author/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -14,5 +14,5 @@
+ k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
+ k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
+ libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI)
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
+--- ./k9decmpeg/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9decmpeg/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -12,7 +12,7 @@
+ motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
+ mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
+ uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
+
+ noinst_HEADERS = k9decodethread.h k9plaympeg2.h
+--- ./k9devices/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9devices/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
+ $(HAL_INCS) $(K3B_INCS) $(all_includes)
+ METASOURCES = AUTO
+ libk9devices_la_LDFLAGS = $(all_libraries)
+--- ./k9Mplayer/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9Mplayer/Makefile.am 2013-07-28 20:05:20.857621477 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
+ METASOURCES = AUTO
+
+ noinst_LTLIBRARIES = libk9mplayer.la
+--- ./k9vamps/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./k9vamps/Makefile.am 2013-07-28 20:05:20.858621351 +0200
+@@ -7,6 +7,6 @@
+ noinst_LTLIBRARIES = libk9vamps.la
+ libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
+ k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libk9copy
+ noinst_HEADERS = k9requant.h ac.h k9fifo.h
+--- ./libdvdnav/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./libdvdnav/Makefile.am 2013-07-28 20:05:20.858621351 +0200
+@@ -11,4 +11,4 @@
+
+
+
+-INCLUDES = -I$(top_srcdir)/dvdread
++INCLUDES = -I/usr/include/dvdread
+--- ./libk9copy/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
++++ ./libk9copy/Makefile.am 2013-07-28 20:05:20.858621351 +0200
+@@ -24,6 +24,6 @@
+ k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
+
+
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
+ libk9copy_la_LDFLAGS = $(all_libraries)
+--- ./src/Makefile.am.dvdread 2013-07-28 20:05:20.855621729 +0200
++++ ./src/Makefile.am 2013-07-28 20:09:10.620642017 +0200
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
+ -I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes)
+
+@@ -35,7 +35,7 @@
+ $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
+ $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
+ $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
+- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
++ -ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
+
+ # this is where the desktop file will go
+ shelldesktopdir = $(kde_appsdir)/Utilities
+--- ./Makefile.am.ORI 2013-07-28 20:15:29.961786846 +0200
++++ ./Makefile.am 2013-07-28 20:15:43.375094511 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
++SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
+ po src
+
+ $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
+@@ -29,11 +29,3 @@
+
+ AM_CXXFLAGS = -O0 -g3
+
+-
+-
+-
+-
+-
+-
+-
+-INCLUDES = -I$(top_srcdir)/dvdread
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
index 537d72a3d..b77775b12 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
@@ -1,13 +1,13 @@
# Default version for this component
-%define tdecomp k9copy
-%define tdeversion 3.5.13.2
+%define tde_pkg k9copy
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -24,35 +24,38 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: DVD backup tool for Trinity
-Version: 1.2.3
-Release: 4%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: DVD backup tool for Trinity
+Version: 1.2.3
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: k9copy-3.5.13.2-fix_k3b_link.patch
+Patch1: k9copy-3.5.13.2-fix_k3b_link.patch
+Patch2: k9copy-3.5.13.2-ftbfs.patch
+Patch3: k9copy-3.5.13.2-use_external_dvdread.patch
+Patch4: k9copy-3.5.13.2-avcodec.patch
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: trinity-arts-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: trinity-k3b-devel
# Warning: the target distribution must have ffmpeg !
-BuildRequires: ffmpeg-devel
-Requires: ffmpeg
+BuildRequires: ffmpeg-devel
+Requires: ffmpeg
%description
k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
@@ -66,8 +69,14 @@ This is the Trinity version
%prep
-%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .dvdread
+%patch4 -p1 -b .avcodec
+
+# Removes internal dvdread headers
+%__rm -rf dvdread
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -80,7 +89,6 @@ This is the Trinity version
%__make -f "admin/Makefile.common"
-
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
@@ -90,16 +98,25 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
if [ -d /usr/include/ffmpeg ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
-
+
+# NOTICE: --enable-final causes FTBFS !
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
--disable-rpath \
+ \
--with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
+ \
+ --enable-k3bdevices
%__make %{?_smp_mflags} || %__make
@@ -109,7 +126,8 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -126,7 +144,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/k9copy
@@ -138,6 +156,9 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
index 3e9694e3d..e20eb6996 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
@@ -1,5 +1,6 @@
# Default version for this component
-%define kdecomp kaffeine-mozilla
+%define tde_pkg kaffeine-mozilla
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
@@ -23,29 +24,29 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version: 0.4.3.1
-Release: 4%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity]
+Version: 0.4.3.1
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Multimedia
+License: GPLv2+
+Group: Applications/Multimedia
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Fix 'nspr' includes location
Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
%if 0%{?suse_version}
@@ -57,14 +58,14 @@ BuildRequires: nspr-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xaw-devel
%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXaw-devel
%endif
Requires: trinity-kaffeine
%description
-This mozilla plugin launches kaffeine, the xine-based media player for KDE,
+This mozilla plugin launches kaffeine, the xine-based media player for TDE,
when a page containing a supported media format is loaded.
@@ -74,8 +75,7 @@ when a page containing a supported media format is loaded.
%prep
-unset QTDIR; . /etc/profile.d/qt3.sh
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .nspr
# Ugly hack to modify TQT include directory inside autoconf files.
@@ -90,17 +90,23 @@ unset QTDIR; . /etc/profile.d/qt3.sh
%build
+unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure \
- --prefix=%{_libdir}/mozilla
+ --prefix=%{_libdir}/mozilla \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --disable-rpath
%__make %{?_smp_mflags}
+
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
@@ -109,6 +115,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Remove useless filess
%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index cd0a75785..196e58419 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define kdecomp kaffeine
+%define tde_pkg kaffeine
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -21,55 +22,60 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: Xine-based media player
+Name: trinity-%{tde_pkg}
+Summary: Xine-based media player
-Version: 0.8.8
-Release: 5%{?dist}%{?_variant}
+Version: 0.8.8
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Multimedia
-URL: http://kaffeine.sourceforge.net/
+License: GPLv2+
+Group: Applications/Multimedia
+URL: http://kaffeine.sourceforge.net/
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: gettext
+
+# VORBIS support
BuildRequires: libvorbis-devel
-BuildRequires: libcdio-devel
+# CDDA support
+BuildRequires: libcdio-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libcdda-devel
-BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
-# dvb
-%if 0%{?pclinuxos} == 0
-BuildRequires: kernel-headers
%endif
-BuildRequires: libgstreamer-devel >= 0.10
-BuildRequires: libgstreamer-plugins-base-devel >= 0.10
-%else
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
+%endif
%if 0%{?suse_version} >= 1220
BuildRequires: libcdio-paranoia-devel
%endif
# X11 stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
+BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
+BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
+%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
-%else
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
BuildRequires: libXext-devel
BuildRequires: libXtst-devel
BuildRequires: libXinerama-devel
%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: libxcb-devel
%endif
-# dvb
+# GSTREAMER support
+%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gstreamer 1
BuildRequires: gstreamer-devel
%if 0%{?suse_version}
BuildRequires: gstreamer-0_10-plugins-base-devel
@@ -80,15 +86,14 @@ BuildRequires: gstreamer-plugins-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: gstreamer-plugins-base-devel >= 0.10
-BuildRequires: glibc-kernheaders
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libgstreamer-devel >= 0.10
+BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
%endif
-# xine-lib
+# XINE support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: libxine-devel
%endif
@@ -96,31 +101,41 @@ BuildRequires: libxine-devel
BuildRequires: xine-lib-devel
%endif
-# LAME
+# LAME support
%if 0%{?suse_version}
BuildRequires: libmp3lame-devel
%else
BuildRequires: lame-devel
%endif
+# WTF support
+%if 0%{?pclinuxos} == 0
+BuildRequires: kernel-headers
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: glibc-kernheaders
+%endif
+
Requires: %{name}-libs = %{version}-%{release}
%description
-Kaffeine is a xine-based media player for KDE. It plays back CDs,
+Kaffeine is a xine-based media player for TDE. It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats
supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
+Additionally, Kaffeine is fully integrated in TDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kaffeine
%{tde_libdir}/libkaffeinepart.so
%{tde_tdelibdir}/lib*.*
%{tde_datadir}/appl*/*/*.desktop
+%if 0%{?with_gstreamer}
%{tde_datadir}/apps/gstreamerpart/
+%endif
%{tde_datadir}/apps/kaffeine/
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_datadir}/apps/profiles/
@@ -144,10 +159,10 @@ update-desktop-database >& /dev/null ||:
##########
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: trinity-tdelibs-devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: trinity-tdelibs-devel
%description devel
%{summary}.
@@ -167,11 +182,11 @@ Requires: trinity-tdelibs-devel
##########
%package libs
-Summary: %{name} runtime libraries
-Group: System Environment/Libraries
+Summary: %{name} runtime libraries
+Group: System Environment/Libraries
# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
@@ -195,7 +210,7 @@ Requires: %{name} = %{version}-%{release}
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -221,16 +236,19 @@ export KDEDIR=%{tde_prefix}
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
+ \
+ --with-extra-includes=%{tde_includedir}/tqt \
+ \
--with-xinerama \
--with-gstreamer \
--with-lame \
- --with-extra-includes=%{tde_includedir}/tqt \
- --with-extra-libs=%{_prefix}/%{_lib} \
- --enable-closure \
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
--without-dvb \
%endif
@@ -246,23 +264,7 @@ export PATH="%{tde_bindir}:${PATH}"
## File lists
# locale's
-%find_lang %{kdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
+%find_lang %{tde_pkg}
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
@@ -272,7 +274,6 @@ rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
rm -rf $RPM_BUILD_ROOT
-
%changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
index c1fa65c21..c76b84f2b 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define kdecomp kdbusnotification
+%define tde_pkg kdbusnotification
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,37 +24,37 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: a DBUS notification service [Trinity]
+Name: trinity-%{tde_pkg}
+Summary: a DBUS notification service [Trinity]
-Version: 0.1
-Release: 4.1%{?dist}%{?_variant}
+Version: 0.1
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: kdbusnotification-14.0.0-fix_utf8.patch
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-arts-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: desktop-file-utils
-BuildRequires: gtk2-devel
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gtk2-devel
%if 0%{?suse_version}
-BuildRequires: dbus-1-glib-devel
+BuildRequires: dbus-1-glib-devel
%else
-BuildRequires: dbus-glib-devel
+BuildRequires: dbus-glib-devel
%endif
%description
@@ -67,7 +68,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .utf8
# Ugly hack to modify TQT include directory inside autoconf files.
@@ -93,9 +94,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
+ \
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
@@ -120,7 +127,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Sun Jul 21 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4.1
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5
- Fix UTF8 messages
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
index 0253cfa26..8fdcde01b 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp kdiff3
+%define tde_pkg kdiff3
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,27 +24,27 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version: 0.9.91
-Release: 6%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
+Version: 0.9.91
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-arts-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
%description
@@ -60,7 +61,7 @@ Unicode & UTF-8 support
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -86,9 +87,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
+ \
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
@@ -101,7 +108,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Unwanted files
%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
@@ -120,7 +127,7 @@ for f in hicolor locolor; do
done
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/kdiff3
@@ -140,6 +147,9 @@ done
%{tde_tdelibdir}/libkdiff3plugin.so
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-6
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec
index cba7e4f2d..be360bd6d 100644
--- a/redhat/applications/kile/kile-3.5.13.2.spec
+++ b/redhat/applications/kile/kile-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp kile
+%define tde_pkg kile
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,26 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: KDE Integrated LaTeX Environment [Trinity]
-Version: 2.0.2
-Release: 5%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: TDE Integrated LaTeX Environment [Trinity]
+Version: 2.0.2
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Publishing
+License: GPLv2+
+Group: Applications/Publishing
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -113,7 +114,7 @@ Kile can support large projects consisting of several smaller files.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -139,7 +140,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
+ \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
@@ -156,7 +164,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
@@ -173,7 +181,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kile
%{tde_tdeappdir}/kile.desktop
@@ -196,6 +204,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec
index 03068edbd..bbe41cc74 100644
--- a/redhat/applications/kima/kima-3.5.13.2.spec
+++ b/redhat/applications/kima/kima-3.5.13.2.spec
@@ -46,6 +46,13 @@ BuildRequires: trinity-tdebase-devel >= 3.5.13.2
BuildRequires: desktop-file-utils
BuildRequires: gettext
+# HAL support
+# On RHEL4, we do not use HAL (too old)
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_hal 1
+BuildRequires: hal-devel >= 0.4.8
+%endif
+
%description
This applet monitors various temperature,
@@ -85,7 +92,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
+ \
--with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
# SMP safe !
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
index 885e4131b..2d5d8bb0e 100644
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
+++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp kiosktool
+%define tde_pkg kiosktool
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,24 +24,24 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Version: 1.0
-Release: 4%{?dist}%{?_variant}
-Summary: tool to configure the TDE kiosk framework
+Name: trinity-%{tde_pkg}
+Version: 1.0
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Summary: tool to configure the TDE kiosk framework
-License: GPLv2+
-Group: Applications/Multimedia
+License: GPLv2+
+Group: Applications/Multimedia
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Source0: %{name}-3.5.13.2.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
+BuildRequires: gettext
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
%description
@@ -55,7 +56,7 @@ groups of users.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -82,14 +83,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
- --disable-rpath \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --enable-final \
--enable-closure \
- --with-extra-includes=%{tde_includedir}/tqt
+ --disable-rpath \
+ \
+ --with-extra-includes=%{tde_includedir}/tqt \
-
%__make %{?_smp_mflags}
@@ -98,25 +101,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
-## File lists
-# locale's
-%find_lang %{tdecomp}
-# 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
+%find_lang %{tde_pkg}
%clean
@@ -135,7 +120,7 @@ update-desktop-database >& /dev/null ||:
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{tde_bindir}/kiosktool
@@ -148,6 +133,9 @@ update-desktop-database >& /dev/null ||:
%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index c5d8f4b37..9ac088547 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp kmplayer
+%define tde_pkg kmplayer
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,30 +24,34 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: media player for Trinity
-Version: 0.10.0c
-Release: 5%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: media player for Trinity
+Version: 0.10.0c
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Multimedia
+License: GPLv2+
+Group: Applications/Multimedia
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://kmplayer.kde.org
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://kmplayer.kde.org
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-dbus-tqt-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+# DBUS support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+%endif
+# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: libgstreamer0.10-devel
@@ -54,24 +59,35 @@ BuildRequires: libgstreamer0.10-devel
BuildRequires: %{_lib}gstreamer0.10-devel
%endif
BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires: libxv-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} == 4
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: libXv-devel
%endif
%if 0%{?suse_version}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
-%if 0%{?suse_version} == 1140
-BuildRequires: xorg-x11-libXv-devel
-%else
+%endif
+
+# X11 stuff
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libxv-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
BuildRequires: libXv-devel
%endif
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires: xorg-x11-libXv-devel
%endif
-Requires: %{name}-base
+Requires: %{name}-base
%description
A basic audio/video viewer application for Trinity.
@@ -84,7 +100,7 @@ KMPlayer can:
* show backend player's console output
* launch ffserver (only 0.4.8 works) when viewing from a v4l device
* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
+* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
shortcut configure window
* Lots of configurable shortcuts. Highly recommended for the VDR keys
(if you have VDR) and volume increase/decrease
@@ -125,7 +141,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -152,11 +168,17 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
+ \
+ --with-extra-includes=%{tde_includedir}/tqt
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
@@ -164,7 +186,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
# Removes unwanted files
%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
@@ -191,7 +213,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || :
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
%{tde_bindir}/kmplayer
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..87e022f0f
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
@@ -0,0 +1,19 @@
+--- ./kmymoney2/widgets/Makefile.am.ftbfs 2013-06-06 19:37:02.000000000 +0200
++++ ./kmymoney2/widgets/Makefile.am 2013-07-28 18:58:51.406093917 +0200
+@@ -7,14 +7,14 @@
+ libwidgets_a_METASOURCES = AUTO
+
+ libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \
+-transactionsortoption.cpp transactionsortoption.ui \
++transactionsortoption.ui \
+ selectedtransaction.cpp
+
+ #libwidgets_a_SOURCES = kmymoneyregisterinvestment.cpp kmymoneyequity.cpp kmymoneyequitycompletion.cpp kmymoneycompletion.cpp kmymoneyequityselector.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneycurrencyselector.cpp kmymoneypriceview.cpp kmymoneypriceviewdecl.ui kschedulebriefwidget.ui kmymoneyaccountselector.cpp kmymoneyregisterloan.cpp kmymoneyregistersearch.cpp kmymoneybriefschedule.cpp kmymoneyscheduleddatetbl.cpp kmymoneydatetbl.cpp kmymoneyscheduledcalendar.cpp kmymoneycalendar.cpp kmymoneycalculator.cpp kmymoneycategory.cpp kmymoneypayee.cpp kmymoneytransactionform.cpp kmymoneyregistercheckings.cpp kmymoneyregister.cpp kmymoneycombo.cpp kmymoneyhlayout.cpp kmymoneylineedit.cpp kmymoneyedit.cpp kmymoneydateinput.cpp kmymoneyreportcontroldecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneyaccounttree.cpp kmymoneygpgconfigdecl.ui kmymoneygpgconfig.cpp kmymoneytitlelabel.cpp kguiutils.cpp kmymoneywizard.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp \
+ #register.cpp registeritem.cpp transaction.cpp transactionform.cpp transactioneditor.cpp transactioneditorcontainer.cpp kmymoneychecklistitem.cpp kmymoneylistviewitem.cpp kmymoneyforecastlistviewitem.cpp kmymoneyselector.cpp \
+ #transactionsortoption.ui
+
+-EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
++EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
+
+ # include the widgets that are available to 3rd party sw (e.g. plugins or
+ # Qt designer) here
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
index 5fa0965b2..0667d5ce0 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
@@ -1,5 +1,6 @@
# Default version for this component
-%define tdecomp kmymoney
+%define tde_pkg kmymoney
+%define tde_version 3.5.13.2
# Required for Mageia 2: removes the ldflag '--no-undefined'
%define _disable_ld_no_undefined 1
@@ -19,7 +20,7 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -36,24 +37,27 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: personal finance manager for TDE
+Name: trinity-%{tde_pkg}
+Summary: personal finance manager for TDE
-Version: 1.0.5
-Release: 4%{?dist}%{?_variant}
+Version: 1.0.5
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
-Source1: kmymoneytitlelabel.png
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: kmymoneytitlelabel.png
+
+# [kmymoney] Fix FTBFS
+Patch1: kmymoney-3.5.13.2-ftbfs.patch
# [kmymoney] Missing LDFLAGS causing FTBFS
Patch4: kmymoney-3.5.13-missing_ldflags.patch
@@ -61,10 +65,10 @@ Patch4: kmymoney-3.5.13-missing_ldflags.patch
# [kmymoney] Fix QT3 plugins directory location
Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-arts-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: recode
@@ -101,9 +105,9 @@ support.
%package common
-Summary: KMyMoney architecture independent files
-Group: Applications/Utilities
-Requires: %{name} == %{version}
+Summary: KMyMoney architecture independent files
+Group: Applications/Utilities
+Requires: %{name} == %{version}
%description common
This package contains architecture independent files needed for KMyMoney to
@@ -112,9 +116,9 @@ have '%{name}' package installed, you will hardly find this package useful.
%package devel
-Summary: KMyMoney development files
-Group: Development/Libraries
-Requires: %{name} == %{version}
+Summary: KMyMoney development files
+Group: Development/Libraries
+Requires: %{name} == %{version}
%description devel
This package contains development files needed for KMyMoney plugins.
@@ -126,7 +130,8 @@ This package contains development files needed for KMyMoney plugins.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .ftbfs
%if 0%{?mgaversion} || 0%{?mdkversion}
%patch5 -p1 -b .qtpluginsdir
%endif
@@ -165,6 +170,7 @@ export QTPLUGINS="%{_libdir}/qt3/plugins"
grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
%endif
+# NOTICE: --enable-final causes FTBFS !
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -173,9 +179,16 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
--disable-rpath \
+ \
--with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure \
+ \
%{?with_pdf:--enable-pdf-docs} %{?!with_pdf:--disable-pdf-docs} \
--enable-ofxplugin \
--enable-ofxbanking \
@@ -198,29 +211,9 @@ export QTPLUGINS=%{_libdir}/qt3/plugins
%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
- for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
- done
-fi
-
%find_lang kmymoney2
+
%clean
%__rm -rf %{buildroot}
@@ -241,6 +234,7 @@ for f in hicolor locolor Tango oxygen; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
+
%files
%defattr(-,root,root,-)
%{tde_bindir}/kmymoney
@@ -286,6 +280,9 @@ done
%{qt3pluginsdir}/designer/libkmymoney.so
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 610a50901..e942636bf 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -1,5 +1,6 @@
# Default version for this component
-%define tdecomp koffice
+%define tde_pkg koffice
+%define tde_version 3.5.13.2
# Required for Mageia 2: removes the ldflag '--no-undefined'
%define _disable_ld_no_undefined 1
@@ -9,7 +10,7 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -37,80 +38,80 @@
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-Name: trinity-%{tdecomp}
-Summary: An integrated office suite
-Version: 1.6.3
-Release: 7%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: An integrated office suite
+Version: 1.6.3
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-Group: Applications/Productivity
-License: GPLv2+
+Group: Applications/Productivity
+License: GPLv2+
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# BuildRequires: world-devel ;)
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdegraphics-devel >= 3.5.13.2
-BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= 3.5.13.2
-BuildRequires: automake libtool
-BuildRequires: fontconfig-devel
-BuildRequires: libart_lgpl-devel
-BuildRequires: libtiff-devel
-BuildRequires: libjpeg-devel
-BuildRequires: ImageMagick-devel
-BuildRequires: zlib-devel
-BuildRequires: openssl-devel
-BuildRequires: python-devel
-BuildRequires: pcre-devel
-BuildRequires: gettext-devel
-BuildRequires: mysql-devel
-BuildRequires: desktop-file-utils
-BuildRequires: perl
-BuildRequires: doxygen
-BuildRequires: aspell-devel
-BuildRequires: libxslt-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: libexif-devel
-BuildRequires: readline-devel
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdegraphics-devel >= %{tde_version}
+BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version}
+BuildRequires: automake libtool
+BuildRequires: fontconfig-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: libtiff-devel
+BuildRequires: libjpeg-devel
+BuildRequires: ImageMagick-devel
+BuildRequires: zlib-devel
+BuildRequires: openssl-devel
+BuildRequires: python-devel
+BuildRequires: pcre-devel
+BuildRequires: gettext-devel
+BuildRequires: mysql-devel
+BuildRequires: desktop-file-utils
+BuildRequires: perl
+BuildRequires: doxygen
+BuildRequires: aspell-devel
+BuildRequires: libxslt-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: libexif-devel
+BuildRequires: readline-devel
%if 0%{?suse_version}
BuildRequires: libbz2-devel
-BuildRequires: liblcms-devel
+BuildRequires: liblcms-devel
%else
-BuildRequires: bzip2-devel
-BuildRequires: lcms-devel
+BuildRequires: bzip2-devel
+BuildRequires: lcms-devel
-BuildRequires: libpaper-devel
+BuildRequires: libpaper-devel
%endif
# RUBY support
%if 0%{?with_ruby}
-BuildRequires: ruby ruby-devel >= 1.8.1
+BuildRequires: ruby ruby-devel >= 1.8.1
%endif
# FREETYPE support
%if 0%{?suse_version} == 1140
-BuildRequires: freetype2-devel
+BuildRequires: freetype2-devel
%else
-BuildRequires: freetype-devel
+BuildRequires: freetype-devel
%endif
# LIBPNG support
%if 0%{?mgaversion}
-BuildRequires: %{_lib}png-devel
+BuildRequires: %{_lib}png-devel
%endif
%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
-BuildRequires: %{_lib}png15-devel
+BuildRequires: %{_lib}png15-devel
%endif
%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel
%endif
# GRAPHICSMAGICK support
@@ -139,7 +140,7 @@ BuildRequires: libutempter-devel
# Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
%define with_postgresql 1
-BuildRequires: libpqxx-devel
+BuildRequires: libpqxx-devel
%endif
Obsoletes: trinity-libpqxx
@@ -150,10 +151,10 @@ Obsoletes: trinity-libwpd
# WV2 support
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}wv2-devel
+BuildRequires: %{_lib}wv2-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: wv2-devel
+BuildRequires: wv2-devel
%endif
# MESA support
@@ -162,11 +163,11 @@ BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: libGL-devel
+BuildRequires: libGL-devel
BuildRequires: libGLU-devel
%endif
%if 0%{?suse_version} >= 1220
-BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
@@ -180,13 +181,13 @@ BuildRequires: %{_lib}openjpeg-devel
BuildRequires: %{_lib}xi-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires: libXi-devel
+BuildRequires: libXi-devel
%endif
%if 0%{?suse_version} == 1140
-BuildRequires: libXi6-devel
+BuildRequires: libXi6-devel
%endif
%if 0%{?suse_version} >= 1220
-BuildRequires: libXi-devel
+BuildRequires: libXi-devel
%endif
@@ -196,25 +197,25 @@ KOffice is an integrated office suite.
##########
%package suite
-Summary: An integrated office suite
-Group: Applications/Productivity
+Summary: An integrated office suite
+Group: Applications/Productivity
Obsoletes: %{name} <= %{version}-%{release}
Obsoletes: %{name}-i18n < 4:%{version}
-Requires: %{name}-core = %{version}-%{release}
-Requires: %{name}-kword = %{version}-%{release}
-Requires: %{name}-kspread = %{version}-%{release}
-Requires: %{name}-kpresenter = %{version}-%{release}
-Requires: %{name}-kivio = %{version}-%{release}
-Requires: %{name}-karbon = %{version}-%{release}
-Requires: %{name}-kugar = %{version}-%{release}
-Requires: %{name}-kexi = %{version}-%{release}
-Requires: %{name}-kexi-driver-mysql = %{version}-%{release}
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-kword = %{version}-%{release}
+Requires: %{name}-kspread = %{version}-%{release}
+Requires: %{name}-kpresenter = %{version}-%{release}
+Requires: %{name}-kivio = %{version}-%{release}
+Requires: %{name}-karbon = %{version}-%{release}
+Requires: %{name}-kugar = %{version}-%{release}
+Requires: %{name}-kexi = %{version}-%{release}
+Requires: %{name}-kexi-driver-mysql = %{version}-%{release}
%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{version}-%{release}}
-Requires: %{name}-kchart = %{version}-%{release}
-Requires: %{name}-kformula = %{version}-%{release}
-Requires: %{name}-filters = %{version}-%{release}
-Requires: %{name}-kplato = %{version}-%{release}
-Requires: %{name}-chalk = %{version}-%{release}
+Requires: %{name}-kchart = %{version}-%{release}
+Requires: %{name}-kformula = %{version}-%{release}
+Requires: %{name}-filters = %{version}-%{release}
+Requires: %{name}-kplato = %{version}-%{release}
+Requires: %{name}-chalk = %{version}-%{release}
%description suite
KOffice is an integrated office suite.
@@ -225,10 +226,10 @@ KOffice is an integrated office suite.
##########
%package core
-Summary: Core support files for %{name}
-Group: Applications/Productivity
-Requires: %{name}-libs = %{version}-%{release}
-Requires: perl
+Summary: Core support files for %{name}
+Group: Applications/Productivity
+Requires: %{name}-libs = %{version}-%{release}
+Requires: perl
Conflicts: koffice-i18n < %{version}
%description core
@@ -317,11 +318,11 @@ fi
##########
%package libs
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
+Summary: Runtime libraries for %{name}
+Group: System Environment/Libraries
Conflicts: %{name} <= %{version}-%{release}
-Requires: trinity-kdelibs
-License: LGPLv2+
+Requires: trinity-kdelibs
+License: LGPLv2+
%description libs
%{summary}.
@@ -359,10 +360,10 @@ License: LGPLv2+
##########
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-License: LGPLv2+
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+License: LGPLv2+
%description devel
%{summary}.
@@ -379,9 +380,9 @@ License: LGPLv2+
##########
%package kword
-Summary: A frame-based word processor capable of professional standard documents
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A frame-based word processor capable of professional standard documents
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description kword
%{summary}.
@@ -413,9 +414,9 @@ update-desktop-database -q &> /dev/null ||:
##########
%package kspread
-Summary: A powerful spreadsheet application
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A powerful spreadsheet application
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description kspread
%{summary}.
@@ -450,9 +451,9 @@ Requires: %{name}-core = %{version}-%{release}
##########
%package kpresenter
-Summary: A full-featured presentation program
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A full-featured presentation program
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description kpresenter
%{summary}.
@@ -484,9 +485,9 @@ update-desktop-database -q &> /dev/null ||:
##########
%package kivio
-Summary: A flowcharting application
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A flowcharting application
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
Obsoletes: kivio < %{version}-%{release}
%description kivio
@@ -508,9 +509,9 @@ Obsoletes: kivio < %{version}-%{release}
##########
%package karbon
-Summary: A vector drawing application
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A vector drawing application
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description karbon
%{summary}.
@@ -539,9 +540,9 @@ Requires: %{name}-core = %{version}-%{release}
##########
%package kugar
-Summary: A tool for generating business quality reports
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A tool for generating business quality reports
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description kugar
%{summary}.
@@ -577,9 +578,9 @@ update-desktop-database -q &> /dev/null ||:
##########
%package kexi
-Summary: An integrated environment for managing data
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: An integrated environment for managing data
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%if 0%{?with_postgresql} == 0
Obsoletes: %{name}-kexi-driver-pgsql
@@ -631,9 +632,9 @@ update-desktop-database -q &> /dev/null ||:
##########
%package kexi-driver-mysql
-Summary: Mysql-driver for kexi
-Group: Applications/Productivity
-Requires: %{name}-kexi = %{version}-%{release}
+Summary: Mysql-driver for kexi
+Group: Applications/Productivity
+Requires: %{name}-kexi = %{version}-%{release}
%description kexi-driver-mysql
%{summary}.
@@ -650,9 +651,9 @@ Requires: %{name}-kexi = %{version}-%{release}
%if 0%{?with_postgresql}
%package kexi-driver-pgsql
-Summary: Postgresql driver for kexi
-Group: Applications/Productivity
-Requires: %{name}-kexi = %{version}-%{release}
+Summary: Postgresql driver for kexi
+Group: Applications/Productivity
+Requires: %{name}-kexi = %{version}-%{release}
%description kexi-driver-pgsql
%{summary}.
@@ -669,9 +670,9 @@ Requires: %{name}-kexi = %{version}-%{release}
##########
%package kchart
-Summary: An integrated graph and chart drawing tool
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: An integrated graph and chart drawing tool
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description kchart
%{summary}.
@@ -699,26 +700,26 @@ update-desktop-database -q &> /dev/null ||:
##########
%package kformula
-Summary: A powerful formula editor
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: A powerful formula editor
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: fonts-ttf-dejavu
%else
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-Requires: dejavu-lgc-sans-fonts
-Requires: lyx-cmex10-fonts
+Requires: dejavu-lgc-sans-fonts
+Requires: lyx-cmex10-fonts
%endif
%if 0%{?rhel} == 5
-Requires: dejavu-lgc-fonts
-Requires: lyx-cmex10-fonts
+Requires: dejavu-lgc-fonts
+Requires: lyx-cmex10-fonts
%endif
%if 0%{?suse_version} >= 1220
-Requires: dejavu-fonts
+Requires: dejavu-fonts
%endif
%if 0%{?suse_version} == 1140
-Requires: dejavu
+Requires: dejavu
%endif
%endif
@@ -738,9 +739,9 @@ Requires: dejavu
##########
%package filters
-Summary: Import and Export Filters for KOffice
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: Import and Export Filters for KOffice
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description filters
%{summary}.
@@ -808,9 +809,9 @@ Requires: %{name}-core = %{version}-%{release}
##########
%package kplato
-Summary: An integrated project management and planning tool
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
+Summary: An integrated project management and planning tool
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
%description kplato
%{summary}.
@@ -829,11 +830,11 @@ Requires: %{name}-core = %{version}-%{release}
##########
%package chalk
-Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group: Applications/Productivity
-Requires: %{name}-core = %{version}-%{release}
-Requires: %{name}-chalk-data = %{version}-%{release}
-Requires: %{name}-filters
+Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity]
+Group: Applications/Productivity
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-chalk-data = %{version}-%{release}
+Requires: %{name}-filters
%description chalk
Chalk is a painting and image editing application for KOffice. Chalk contains
@@ -1022,7 +1023,7 @@ update-desktop-database -q &> /dev/null ||:
%package chalk-data
Summary: data files for Chalk painting program [Trinity]
-Group: Applications/Productivity
+Group: Applications/Productivity
%description chalk-data
This package contains architecture-independent data files for Chalk,
@@ -1053,7 +1054,7 @@ This package is part of the TDE Office Suite.
##########
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013
%__cp /usr/share/automake-1.13/test-driver admin/
@@ -1097,6 +1098,7 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath --disable-dependency-tracking \
+ --disable-debug \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--with-pic --enable-shared --disable-static \
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
index 4cd596fd7..2e5385bf5 100644
--- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec
+++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp kpilot
+%define tde_pkg kpilot
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,38 +24,38 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: TDE Palm Pilot hot-sync tool
-Version: 0.7
-Release: 4%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: TDE Palm Pilot hot-sync tool
+Version: 0.7
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: pilot-link-devel
-BuildRequires: trinity-kdepim-devel
+BuildRequires: trinity-tdepim-devel >= %{tde_version}
%description
KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
+(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync
software does for Windows. KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their KDE counterparts.
+and synchronize the built-in applications with their TDE counterparts.
%if 0%{?suse_version} || 0%{?pclinuxos}
@@ -63,7 +64,7 @@ and synchronize the built-in applications with their KDE counterparts.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,7 +90,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
+ \
--with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
# SMP safe !
@@ -174,6 +182,9 @@ done
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
index 15be9e31d..daea3460d 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp kuickshow
+%define tde_pkg kuickshow
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,25 +24,25 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: Quick picture viewer for KDE
-Version: 0.8.13
-Release: 6%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: Quick picture viewer for TDE
+Version: 0.8.13
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion}
@@ -52,7 +53,7 @@ BuildRequires: imlib1-devel
%endif
%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
+Kuickshow is a picture viewer for TDE. It displays the directory structure,
displaying images as thumbnails.
Clicking on an image shows the image in its normal size.
@@ -63,7 +64,7 @@ Clicking on an image shows the image in its normal size.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,9 +90,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
+ \
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
@@ -123,7 +130,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/applications/*/*.desktop
%{tde_datadir}/apps/*/
%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{tdecomp}.so
+%{tde_libdir}/lib[kt]deinit_%{tde_pkg}.so
%{tde_libdir}/*.la
%{tde_tdelibdir}/*.so
%{tde_tdelibdir}/*.la
@@ -131,6 +138,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-7
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-6
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
index 22239302f..8e03ccf02 100644
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
+++ b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
@@ -1,5 +1,6 @@
# Default version for this component
-%define tdecomp rosegarden
+%define tde_pkg rosegarden
+%define tde_version 3.5.13.2
# Required for Mageia 2: removes the ldflag '--no-undefined'
%define _disable_ld_no_undefined 1
@@ -9,7 +10,7 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -26,34 +27,38 @@
%define _docdir %{tde_tdedocdir}
-Name: trinity-%{tdecomp}
-Summary: music editor and MIDI/audio sequencer [Trinity]
-Version: 1.7.0
-Release: 4%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: music editor and MIDI/audio sequencer [Trinity]
+Version: 1.7.0
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Multimedia
+License: GPLv2+
+Group: Applications/Multimedia
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.rosegardenmusic.com/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.rosegardenmusic.com/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: fftw-devel
-BuildRequires: dssi-devel
BuildRequires: liblo-devel
BuildRequires: fontconfig-devel
+# DSSI support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: dssi-devel
+%endif
+
# LRDF support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: liblrdf-devel
@@ -67,40 +72,40 @@ BuildRequires: jack-audio-connection-kit-devel
%endif
# LIRC support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
%define with_lirc 1
BuildRequires: lirc-devel
%endif
-Requires: lilypond
-Requires: perl-XML-Twig
+Requires: lilypond
+Requires: perl-XML-Twig
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires: libsndfile-progs
+Requires: libsndfile-progs
%else
%if 0%{?rhel}
-Requires: libsndfile
+Requires: libsndfile
%else
-Requires: libsndfile-utils
+Requires: libsndfile-utils
%endif
%endif
-Requires: %{name}-data == %{version}-%{release}
+Requires: %{name}-data == %{version}-%{release}
%description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
+Rosegarden is a TDE application which provides a mixed Audio/MIDI
sequencer (for playback and recording), a multi-track editor, music
editing using both piano-roll and score notation, MIDI file IO,
lilypond and Csound files export, etc.
%package data
-Group: Applications/Multimedia
-Requires: %{name} == %{version}-%{release}
-Summary: music editor and MIDI/audio sequencer data files [Trinity]
+Group: Applications/Multimedia
+Requires: %{name} == %{version}-%{release}
+Summary: music editor and MIDI/audio sequencer data files [Trinity]
%description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
+Rosegarden is a TDE application which provides a mixed Audio/MIDI
sequencer (for playback and recording), a multi-track editor, music
editing using both piano-roll and score notation, MIDI file IO,
lilypond and Csound files export, etc.
@@ -114,7 +119,7 @@ This package provides the data files necessary for running Rosegarden
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Hard-coded path to TQT binaries spotted !!!
%__sed -i CMakeLists.txt \
@@ -134,14 +139,20 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWANT_DEBUG=OFF \
+ -DWANT_FULLDBG=OFF \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DWANT_DEBUG=OFF \
- -DWANT_FULLDBG=OFF \
+ \
-DWANT_SOUND=ON \
-DWANT_JACK=ON \
-DWANT_DSSI=ON \
@@ -159,8 +170,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/*.a
+
+%find_lang %{tde_pkg}
-%find_lang %{tdecomp}
%clean
%__rm -rf %{buildroot}
@@ -189,7 +203,7 @@ done
%{tde_bindir}/rosegarden-project-package
%{tde_bindir}/rosegardensequencer
-%files data -f %{tdecomp}.lang
+%files data -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_tdeappdir}/rosegarden.desktop
%{tde_datadir}/apps/profiles/rosegarden.profile.xml
@@ -207,6 +221,9 @@ done
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-5
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
index 54a443726..b98cb94b4 100644
--- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
+++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp tdesvn
+%define tde_pkg tdesvn
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,26 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tdecomp}
-Summary: subversion client with tight KDE integration [Trinity]
-Version: 1.0.4
-Release: 5%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: subversion client with tight TDE integration [Trinity]
+Version: 1.0.4
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.elliptique.net/~ken/kima/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.elliptique.net/~ken/kima/
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -57,13 +58,13 @@ TDESvn is a graphical client for the subversion revision control
system (svn).
Besides offering common and advanced svn operations, it features
-a tight integration into KDE and can be embedded into other KDE
-applications like konqueror via the KDE component technology KParts.
+a tight integration into TDE and can be embedded into other TDE
+applications like konqueror via the TDE component technology KParts.
%package -n trinity-libsvnqt
-Group: Development/Libraries
-Summary: Qt wrapper library for subversion [Trinity]
+Group: Development/Libraries
+Summary: Qt wrapper library for subversion [Trinity]
%description -n trinity-libsvnqt
This package provides svnqt, a Qt wrapper library around the
@@ -73,11 +74,11 @@ It is based on the RapidSvn SvnCpp library, a subversion client API
written in C++.
%package -n trinity-libsvnqt-devel
-Group: Development/Libraries
-Requires: trinity-libsvnqt = %{version}-%{release}
-Requires: qt-devel
-Requires: subversion-devel
-Summary: Qt wrapper library for subversion (development files) [Trinity]
+Group: Development/Libraries
+Requires: trinity-libsvnqt = %{version}-%{release}
+Requires: qt-devel
+Requires: subversion-devel
+Summary: Qt wrapper library for subversion (development files) [Trinity]
%description -n trinity-libsvnqt-devel
This package contains the header files and symbolic links that developers
@@ -85,9 +86,9 @@ using svnqt will need.
%package tdeio-plugins
-Group: Development/Libraries
+Group: Development/Libraries
Conflicts: trinity-kdesdk-tdeio-plugins
-Summary: subversion I/O slaves for Trinity
+Summary: subversion I/O slaves for Trinity
Obsoletes: trinity-kdesvn-kio-plugins < %{version}-%{release}
Provides: trinity-kdesvn-kio-plugins = %{version}-%{release}
@@ -108,7 +109,7 @@ This package is part of tdesvn-trinity.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -141,6 +142,12 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
@@ -149,7 +156,6 @@ cd build
-DDATA_INSTALL_DIR=%{tde_datadir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
..
# SMP safe !
@@ -162,8 +168,6 @@ export PATH="%{_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot} -C build
-%find_lang kdesvn
-
# Installs SVN protocols as alternatives
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
@@ -176,6 +180,8 @@ export PATH="%{_bindir}:${PATH}"
%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
@@ -271,6 +277,9 @@ fi
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..5695d8fff
--- /dev/null
+++ b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
@@ -0,0 +1,19 @@
+--- trinity-tellico-3.5.13.2/src/barcode/barcode.cpp.ORI 2013-07-29 17:21:06.358915613 +0200
++++ trinity-tellico-3.5.13.2/src/barcode/barcode.cpp 2013-07-29 17:22:29.505126885 +0200
+@@ -172,14 +172,14 @@
+ for (int i = 0; i < 10; i++) {
+ TQCString temp;
+ temp.setNum( i );
+- fprintf( stderr, temp + " : " );
++ fprintf( stderr, "%s : ", *(temp) );
+ for (int j = 0; j < 13; j++) {
+ if (array[i][j][level] == -1)
+ fprintf( stderr, "x " );
+ else {
+ TQCString temp;
+ temp.setNum( array[i][j][level] );
+- fprintf( stderr, temp + " " );
++ fprintf( stderr, "%s ", *(temp) );
+ }
+ }
+ fprintf( stderr, "\n" );
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch b/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
new file mode 100644
index 000000000..261b24363
--- /dev/null
+++ b/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
@@ -0,0 +1,11 @@
+--- trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h.ORI 2013-07-28 22:22:41.390223800 +0200
++++ trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h 2013-07-28 22:23:10.085637439 +0200
+@@ -31,7 +31,7 @@
+ #endif
+
+ //#include <linux/videodev2.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+
+ #include <tqstring.h>
+ #include <tqimage.h>
diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec
index f28e3d813..59b542bdc 100644
--- a/redhat/applications/tellico/tellico-3.5.13.2.spec
+++ b/redhat/applications/tellico/tellico-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp tellico
+%define tde_pkg tellico
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,29 @@
%define _docdir %{tde_tdedocdir}
-Name: trinity-%{tdecomp}
-Summary: Icollection manager for books, videos, music [Trinity]
-Version: 1.3.2.1
-Release: 5%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: Icollection manager for books, videos, music [Trinity]
+Version: 1.3.2.1
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://periapsis.org/tellico/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://periapsis.org/tellico/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+Patch1: tellico-3.5.13.2-videodev.patch
+Patch2: tellico-3.5.13.2-ftbfs.patch
+
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -51,8 +55,16 @@ BuildRequires: yaz
BuildRequires: %{_lib}yaz-devel
%endif
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-scripts = %{version}-%{release}
+# V4L support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires: libv4l-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}v4l-devel
+%endif
+
+Requires: %{name}-data = %{version}-%{release}
+Requires: %{name}-scripts = %{version}-%{release}
%description
Tellico is a collection manager for TDE. It includes default collections for
@@ -70,8 +82,8 @@ It also makes it easy for other softwares to use the Tellico data.
%package data
-Group: Applications/Utilities
-Summary: collection manager for books, videos, music [data] [Trinity]
+Group: Applications/Utilities
+Summary: collection manager for books, videos, music [data] [Trinity]
%description data
Tellico is a collection manager for TDE. It includes default collections for
@@ -91,8 +103,8 @@ This package contains the architecture independent files, such data files and
documentation.
%package scripts
-Group: Applications/Utilities
-Summary: collection manager for books, videos, music [scripts] [Trinity]
+Group: Applications/Utilities
+Summary: collection manager for books, videos, music [scripts] [Trinity]
%description scripts
Tellico is a collection manager for TDE. It includes default collections for
@@ -119,7 +131,12 @@ as a separate package which can be updated through debian-volatile.
%prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+if [ -r /usr/include/libv4l1-videodev.h ]; then
+%patch1 -p1 -b .videodev
+fi
+%patch2 -p1 -b .ftbfs
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -137,6 +154,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning, --enable-final causes FTBFS §
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -145,8 +163,17 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
--disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt
+ \
+ --with-extra-includes=%{tde_includedir}/tqt \
+ \
+ --enable-webcam
%__make %{?_smp_mflags} || %__make
@@ -164,7 +191,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
%clean
@@ -180,7 +207,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/tellico
#%{tde_datadir}/pixmaps
@@ -217,6 +244,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-6
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-5
- Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
index 0c72fdc6c..37db1d0b6 100644
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.2.spec
@@ -3,6 +3,8 @@
%define _variant .opt
%endif
+%define tde_version 3.5.13.2
+
%define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
@@ -13,8 +15,8 @@
%define _docdir %{tde_datadir}/doc
Name: trinity-arts
-Version: 3.5.13.2
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: aRts (analog realtime synthesizer) - the TDE sound system
Group: System Environment/Daemons
@@ -29,7 +31,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kcmartsrc-pulseaudio
-BuildRequires: trinity-tqtinterface-devel >= %{version}
+BuildRequires: cmake >= 2.8
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel
@@ -97,7 +100,7 @@ Obsoletes: arts
%endif
%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
+arts (analog real-time synthesizer) is the sound system of TDE.
The principle of arts is to create/process sound using small modules which do
certain tasks. These may be create a waveform (oscillators), play samples,
@@ -205,20 +208,25 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
cd build
%endif
-%cmake \
+%cmake .. \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+ \
-DWITH_ALSA=ON \
-DWITH_AUDIOFILE=ON \
-DWITH_VORBIS=ON \
%{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
%{?with_esound:-DWITH_ESOUND=ON} \
- %{?with_jack:-DWITH_JACK=ON} \
- -DCMAKE_SKIP_RPATH=OFF \
- ..
+ %{?with_jack:-DWITH_JACK=ON}
%__make %{?_smp_mflags} || %__make
@@ -238,6 +246,9 @@ cd build
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/tdeadmin/tdeadmin-3.5.13.2.spec
index ce87dfa25..3687ce230 100644
--- a/redhat/tdeadmin/tdeadmin-3.5.13.2.spec
+++ b/redhat/tdeadmin/tdeadmin-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_sbindir %{tde_prefix}/sbin
%define tde_datadir %{tde_prefix}/share
@@ -21,7 +23,7 @@
Name: trinity-tdeadmin
Summary: Administrative tools for TDE
-Version: 3.5.13.2
+Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
@@ -400,24 +402,27 @@ if [ -d /usr/X11R6 ]; then
fi
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --sbindir=%{tde_sbindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --disable-rpath \
- --with-rpm \
- --with-pam=kde \
- --with-shadow \
- --with-private-groups \
- --enable-final \
- --enable-closure \
- --with-private-groups \
- --with-extra-includes=%{tde_includedir}/tqt
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --sbindir=%{tde_sbindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --disable-rpath \
+ \
+ --with-extra-includes=%{tde_includedir}/tqt \
+ \
+ --with-rpm \
+ --with-pam=kde \
+ --with-shadow \
+ --with-private-groups
%__make %{?_smp_mflags}
@@ -447,23 +452,6 @@ comps="kcron kdat knetworkconf kpackage ksysv kuser"
%endif
%endif
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}/$HTML_DIR ]; then
-for lang_dir in %{buildroot}/$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
- done
- popd
- fi
-done
-fi
-
# rpmdocs
for dir in $comps ; do
for file in AUTHORS ChangeLog README TODO ; do
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch
new file mode 100644
index 000000000..e176db423
--- /dev/null
+++ b/redhat/tdebase/tdebase-3.5.13.2-fix_xdg_menu.patch
@@ -0,0 +1,9489 @@
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/CMakeLists.txt trinity-tdebase-3.5.13.2/applnk/CMakeLists.txt
+--- trinity-tdebase-3.5.13.2/applnk.ORI/CMakeLists.txt 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/CMakeLists.txt 2013-07-28 15:47:19.313022892 +0200
+@@ -12,11 +12,11 @@
+ add_subdirectory( compat )
+
+ install( FILES
+- kde-settings.menu kde-information.menu kde-screensavers.menu
++ tde-settings.menu tde-information.menu tde-screensavers.menu
+ DESTINATION ${XDG_MENU_INSTALL_DIR} )
+
+ install( FILES
+- kde-essential.menu
++ tde-essential.menu
+ DESTINATION ${XDG_MENU_INSTALL_DIR}/applications-merged )
+
+ install( FILES
+@@ -25,27 +25,27 @@
+ RENAME .directory )
+
+ install( FILES
+- kde-main.directory kde-development.directory kde-editors.directory
+- kde-edutainment.directory kde-games-arcade.directory
+- kde-games-board.directory kde-games-card.directory
+- kde-games-kids.directory kde-games-roguelikes.directory
+- kde-games-strategy.directory kde-games.directory
+- kde-graphics.directory kde-information.directory
+- kde-internet-terminal.directory kde-internet.directory
+- kde-more.directory kde-multimedia.directory kde-office.directory
+- kde-science.directory kde-settings-accessibility.directory
+- kde-settings-components.directory kde-settings-desktop.directory
+- kde-settings-looknfeel.directory kde-settings-network.directory
+- kde-settings-peripherals.directory kde-settings-hardware.directory
+- kde-settings-power.directory kde-settings-security.directory
+- kde-settings-sound.directory kde-settings-system.directory
+- kde-settings-webbrowsing.directory kde-settings.directory
+- kde-settingsmenu.directory kde-system-screensavers.directory
+- kde-system-terminal.directory kde-system.directory
+- kde-toys.directory kde-unknown.directory
+- kde-utilities-xutils.directory kde-utilities.directory
+- kde-utilities-accessibility.directory kde-utilities-desktop.directory
+- kde-utilities-peripherals.directory kde-utilities-file.directory
+- kde-utilities-pim.directory kde-development-translation.directory
+- kde-development-webdevelopment.directory
++ tde-main.directory tde-development.directory tde-editors.directory
++ tde-edutainment.directory tde-games-arcade.directory
++ tde-games-board.directory tde-games-card.directory
++ tde-games-kids.directory tde-games-roguelikes.directory
++ tde-games-strategy.directory tde-games.directory
++ tde-graphics.directory tde-information.directory
++ tde-internet-terminal.directory tde-internet.directory
++ tde-more.directory tde-multimedia.directory tde-office.directory
++ tde-science.directory tde-settings-accessibility.directory
++ tde-settings-components.directory tde-settings-desktop.directory
++ tde-settings-looknfeel.directory tde-settings-network.directory
++ tde-settings-peripherals.directory tde-settings-hardware.directory
++ tde-settings-power.directory tde-settings-security.directory
++ tde-settings-sound.directory tde-settings-system.directory
++ tde-settings-webbrowsing.directory tde-settings.directory
++ tde-settingsmenu.directory tde-system-screensavers.directory
++ tde-system-terminal.directory tde-system.directory
++ tde-toys.directory tde-unknown.directory
++ tde-utilities-xutils.directory tde-utilities.directory
++ tde-utilities-accessibility.directory tde-utilities-desktop.directory
++ tde-utilities-peripherals.directory tde-utilities-file.directory
++ tde-utilities-pim.directory tde-development-translation.directory
++ tde-development-webdevelopment.directory
+ DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-development.directory trinity-tdebase-3.5.13.2/applnk/kde-development.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-development.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-development.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,89 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Development
+-Name[af]=Ontwikkeling
+-Name[ar]=تطوير
+-Name[az]=İnkişaf
+-Name[be]=Распрацоўка
+-Name[bg]=Разработка
+-Name[bn]=ডেভেলপমেন্ট
+-Name[br]=Diorren
+-Name[bs]=Programiranje
+-Name[ca]=Desenvolupament
+-Name[cs]=Vývoj
+-Name[csb]=Nôrzãdza programistów
+-Name[cy]=Datblygu
+-Name[da]=Udvikling
+-Name[de]=Entwicklung
+-Name[el]=Ανάπτυξη
+-Name[eo]=Programado
+-Name[es]=Desarrollo
+-Name[et]=Arendus
+-Name[eu]=Garapena
+-Name[fa]=توسعه
+-Name[fi]=Kehitystyökalut
+-Name[fo]=Menning
+-Name[fr]=Développement
+-Name[fy]=Untwikkelje
+-Name[ga]=Forbairt
+-Name[gl]=Desenvolvemento
+-Name[he]=פיתוח
+-Name[hi]=विकास
+-Name[hr]=Razvoj
+-Name[hsb]=Wuwiwanje
+-Name[hu]=Fejlesztőeszközök
+-Name[id]=Pembangun
+-Name[is]=Þróun
+-Name[it]=Sviluppo
+-Name[ja]=開発
+-Name[ka]=განვითარება
+-Name[kk]=Жетілдіру
+-Name[km]=ការ​អភិវឌ្ឍន៍
+-Name[ko]=개발
+-Name[lo]=ພັດທະນາໂປຣແກຣມ
+-Name[lt]=Programavimas
+-Name[lv]=Izstrāde
+-Name[mk]=Развој
+-Name[mn]=Хөгжүүлэл
+-Name[ms]=Pemaju
+-Name[mt]=Żvilupp
+-Name[nb]=Utvikling
+-Name[nds]=Utwickeln
+-Name[ne]=विकास
+-Name[nl]=Ontwikkeling
+-Name[nn]=Utvikling
+-Name[nso]=Thlabollogo
+-Name[oc]=Desvelopament
+-Name[pa]=ਵਿਕਾਸ
+-Name[pl]=Narzędzia programistów
+-Name[pt]=Desenvolvimento
+-Name[pt_BR]=Desenvolvimento
+-Name[ro]=Dezvoltare
+-Name[ru]=Разработка
+-Name[rw]=Iterambere
+-Name[se]=Ovdánahttin
+-Name[sk]=Vývoj
+-Name[sl]=Razvoj
+-Name[sr]=Развој
+-Name[sr@Latn]=Razvoj
+-Name[ss]=Kundlondlobala
+-Name[sv]=Utveckling
+-Name[ta]=உருவாக்கம்
+-Name[te]=డెవలప్మెంట్
+-Name[tg]=Такомул
+-Name[th]=พัฒนาโปรแกรม
+-Name[tr]=Geliştirme
+-Name[tt]=Citeşterü
+-Name[uk]=Розробка
+-Name[uz]=Tuzish
+-Name[uz@cyrillic]=Тузиш
+-Name[ven]=Nyaluwo
+-Name[vi]=Phát triển
+-Name[wa]=Programaedje
+-Name[xh]=Ubhekiso phambili
+-Name[zh_CN]=开发
+-Name[zh_TW]=程式開發
+-Name[zu]=Intuthuko
+-Icon=package_development
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-translation.directory trinity-tdebase-3.5.13.2/applnk/kde-development-translation.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-translation.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-development-translation.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,72 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Translation
+-Name[af]=Vertaling
+-Name[ar]=ترجمة
+-Name[be]=Пераклад
+-Name[bg]=Превод
+-Name[bn]=অনুবাদ
+-Name[br]=Troidigezh
+-Name[bs]=Prevođenje
+-Name[ca]=Traducció
+-Name[cs]=Překlad
+-Name[csb]=Dolmaczënk
+-Name[cy]=Cyfieithiad
+-Name[da]=Oversættelse
+-Name[de]=Übersetzung
+-Name[el]=Μετάφραση
+-Name[eo]=Traduko
+-Name[es]=Traducción
+-Name[et]=Tõlkimine
+-Name[eu]=Itzulpengintza
+-Name[fa]=ترجمه
+-Name[fi]=Käännös
+-Name[fr]=Traduction
+-Name[fy]=Oersetting
+-Name[ga]=Aistriúchán
+-Name[gl]=Tradución
+-Name[he]=תרגום
+-Name[hr]=Prijevod
+-Name[hu]=Fordítás
+-Name[id]=Terjemahan
+-Name[is]=Þýðing
+-Name[it]=Traduzione
+-Name[ja]=翻訳
+-Name[ka]=თარგმნა
+-Name[kk]=Аудару
+-Name[km]=ការបកប្រែ
+-Name[ko]=번역
+-Name[lt]=Vertimas
+-Name[mk]=Превод
+-Name[ms]=Terjemahan
+-Name[nb]=Oversettelse
+-Name[nds]=Översetten
+-Name[ne]=अनुवाद
+-Name[nl]=Vertaling
+-Name[nn]=Omsetjing
+-Name[pa]=ਅਨੁਵਾਦ
+-Name[pl]=Tłumaczenie
+-Name[pt]=Tradução
+-Name[pt_BR]=Tradução
+-Name[ro]=Traducere
+-Name[ru]=Локализация
+-Name[se]=Jorgalus
+-Name[sk]=Preklad
+-Name[sl]=Prevajanje
+-Name[sr]=Превод
+-Name[sr@Latn]=Prevod
+-Name[sv]=Översättning
+-Name[te]=అనువాదం
+-Name[tg]=Тарҷума
+-Name[th]=เครื่องมือแปลภาษา
+-Name[tr]=Çeviri
+-Name[uk]=Переклад
+-Name[uz]=Tarjima
+-Name[uz@cyrillic]=Таржима
+-Name[vi]=Dịch
+-Name[wa]=Ratournaedje
+-Name[zh_CN]=翻译
+-Name[zh_TW]=翻譯
+-Icon=locale
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-webdevelopment.directory trinity-tdebase-3.5.13.2/applnk/kde-development-webdevelopment.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-development-webdevelopment.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-development-webdevelopment.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,71 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Web Development
+-Name[af]=Web Ontwikkeling
+-Name[ar]=تطوير برامج للشبكة
+-Name[be]=Web-распрацоўка
+-Name[bg]=Уеб разработка
+-Name[bn]=ওয়েব ডেভেলপমেন্ট
+-Name[br]=Diorren gwiad
+-Name[bs]=Web programiranje
+-Name[ca]=Desenvolupament Web
+-Name[cs]=Webový vývoj
+-Name[csb]=Programòwanié WWW
+-Name[da]=Internet-udvikling
+-Name[de]=Web-Entwicklung
+-Name[el]=Δικτυακή ανάπτυξη
+-Name[eo]=Reta Programado
+-Name[es]=Desarrollo web
+-Name[et]=Veebiarendus
+-Name[eu]=Web garapena
+-Name[fa]=توسعۀ وب
+-Name[fi]=Webin kehitys
+-Name[fr]=Développement Internet
+-Name[fy]=Webûntwikkeling
+-Name[ga]=Forbairt Ghréasáin
+-Name[gl]=Desenvolvemento Web
+-Name[he]=פיתוח WEB
+-Name[hr]=Web razvoj
+-Name[hu]=Webes fejlesztőeszközök
+-Name[id]=Pengembangan Web
+-Name[is]=Vefhönnun
+-Name[it]=Sviluppo web
+-Name[ja]=ウェブ開発
+-Name[ka]=ვებ პროგრამირება
+-Name[kk]=Веб жобалау
+-Name[km]=ការបង្កើត​ទំព័រ​បណ្តាញ
+-Name[ko]=웹 개발
+-Name[lt]=Žiniatinklio programavimas
+-Name[mk]=Веб-развој
+-Name[ms]=Pembangunan Web
+-Name[nb]=Nettutvikling
+-Name[nds]=Nett-Utwickeln
+-Name[ne]=वेब विकास
+-Name[nl]=Webontwikkeling
+-Name[nn]=Nettutvikling
+-Name[pa]=ਵੈਬ ਵਿਕਾਸ
+-Name[pl]=Programowanie WWW
+-Name[pt]=Desenvolvimento Web
+-Name[pt_BR]=Desenvolvimento Web
+-Name[ro]=Dezvoltare web
+-Name[ru]=Веб-разработка
+-Name[se]=Fierpmádatovdánahttin
+-Name[sk]=Vývoj pre Web
+-Name[sl]=Spletni razvoj
+-Name[sr]=Веб развој
+-Name[sr@Latn]=Veb razvoj
+-Name[sv]=Webbutveckling
+-Name[te]=వెబ్ డెవలప్మెంట్
+-Name[tg]=Такомули Вэб
+-Name[th]=พัฒนาเว็บ
+-Name[tr]=Web Geliştirme
+-Name[uk]=Розробка веб-сторінок
+-Name[uz]=Veb uchun tuzish
+-Name[uz@cyrillic]=Веб учун тузиш
+-Name[vi]=Phát triển Mạng
+-Name[wa]=Programaedje waibe
+-Name[zh_CN]=Web 开发
+-Name[zh_TW]=網頁開發
+-Icon=package_network
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-editors.directory trinity-tdebase-3.5.13.2/applnk/kde-editors.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-editors.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-editors.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,85 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Editors
+-Name[af]=Redigeerders
+-Name[ar]=محرري النصوص
+-Name[az]=Editorlar
+-Name[be]=Рэдактары
+-Name[bg]=Редактори
+-Name[bn]=সম্পাদক
+-Name[br]=Aozerien
+-Name[bs]=Editori
+-Name[cs]=Editory
+-Name[csb]=Editorë
+-Name[cy]=Golygyddion
+-Name[da]=Editorer
+-Name[de]=Editoren
+-Name[el]=Επεξεργαστές
+-Name[eo]=Redaktiloj
+-Name[es]=Editores
+-Name[et]=Redaktorid
+-Name[eu]=Editoreak
+-Name[fa]=ویرایشگرها
+-Name[fi]=Editorit
+-Name[fo]=Ritlar
+-Name[fr]=Éditeurs de texte
+-Name[fy]=Bewurkers
+-Name[ga]=Eagarthóirí
+-Name[gl]=Editores
+-Name[he]=עורכים
+-Name[hi]=संपादक
+-Name[hr]=Uređivači
+-Name[hsb]=Wobdźěłanje teksta
+-Name[hu]=Szövegszerkesztők
+-Name[id]=Editor
+-Name[is]=Ritlar
+-Name[it]=Editor
+-Name[ja]=エディタ
+-Name[ka]=რედაქტორი
+-Name[kk]=Редакторлар
+-Name[km]=កម្មវិធី​និពន្ធ
+-Name[ko]=편집기
+-Name[lo]=ແກ້ໄຂແຟ້ມຂໍ້ຄວາມ
+-Name[lt]=Redaktoriai
+-Name[lv]=Redaktori
+-Name[mk]=Уредувачи
+-Name[mn]=Боловсруулагч
+-Name[ms]=Penyunting
+-Name[mt]=Edituri
+-Name[nb]=Skriveprogrammer
+-Name[nds]=Editoren
+-Name[ne]=सम्पादक
+-Name[nn]=Skriveprogram
+-Name[nso]=Bafetosi
+-Name[pa]=ਸੰਪਾਦਕ
+-Name[pl]=Edytory
+-Name[pt]=Editores
+-Name[pt_BR]=Editores
+-Name[ro]=Editoare
+-Name[ru]=Редакторы
+-Name[rw]=Muhinduzi
+-Name[se]=Čállinprográmmat
+-Name[sk]=Editory
+-Name[sl]=Urejevalniki
+-Name[sr]=Уређивачи
+-Name[sr@Latn]=Uređivači
+-Name[ss]=Bahleli
+-Name[sv]=Editorer
+-Name[ta]=தொகுப்பாளர்கள்
+-Name[te]=ఎడిటర్లు
+-Name[tg]=Таҳриргарон
+-Name[th]=โปรแกรมแก้ไขข้อความ
+-Name[tr]=Düzenleyiciler
+-Name[tt]=Tözätkeç
+-Name[uk]=Редактори
+-Name[uz]=Tahrirchilar
+-Name[uz@cyrillic]=Таҳрирчилар
+-Name[ven]=Vhasengulusi
+-Name[vi]=Trình biên tập
+-Name[wa]=Aspougneus d' tecse
+-Name[xh]=Abahleli
+-Name[zh_CN]=编辑器
+-Name[zh_TW]=編輯器
+-Name[zu]=Abalungisi
+-Icon=package_editors
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-edutainment.directory trinity-tdebase-3.5.13.2/applnk/kde-edutainment.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-edutainment.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-edutainment.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,86 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Edutainment
+-Name[af]=Opvoedkundig
+-Name[ar]=التعليم الترفيهي
+-Name[az]=Təhsil
+-Name[be]=Адукацыя
+-Name[bg]=Образование
+-Name[bn]=শিক্ষামূলক মনোরঞ্জন
+-Name[br]=Deskadurezh
+-Name[bs]=Zabava i obrazovanje
+-Name[ca]=Educació
+-Name[cs]=Škola hrou
+-Name[csb]=Ùczba ë edukacëjô
+-Name[cy]=Addifyrwch
+-Name[da]=Uddannelse
+-Name[de]=Lernprogramme
+-Name[el]=Εκπαίδευση
+-Name[eo]=Amuzedukado
+-Name[es]=Entretenimientos educativos
+-Name[et]=Haridus
+-Name[eu]=Jolastu eta ikasi
+-Name[fa]=سرگرمی آموزشی
+-Name[fi]=Opetusviihde
+-Name[fo]=Undirvísing og -hald
+-Name[fr]=Éducatif
+-Name[fy]=Edukatyf
+-Name[ga]=Oideachluichí
+-Name[gl]=Educación
+-Name[he]=לומדות
+-Name[hi]=खेल-खेल में सीखें
+-Name[hr]=Obrazovna zabava
+-Name[hsb]=Wuknjenje a hrajkanje
+-Name[hu]=Oktatóprogramok
+-Name[is]=Kennsluleikir
+-Name[it]=Istruzione divertente
+-Name[ja]=エデュテインメント
+-Name[ka]=სასწავლო
+-Name[kk]=Оқыту
+-Name[km]=ល្បែង​កំសាន្ត​បង្កើន​ចំណេះដឹង
+-Name[ko]=교육
+-Name[lo]=ການສຶກສາແສນມ່ວນຊື່ນ
+-Name[lt]=Mokomosios programos
+-Name[lv]=Izglītošana
+-Name[mk]=Едукација и забава
+-Name[mn]=Боловсролын програм
+-Name[ms]=Hiburan Mendidik
+-Name[mt]=Edukazzjoni u Divertiment
+-Name[nb]=Lek og lær
+-Name[nds]=Spelen & Lehren
+-Name[ne]=शिक्षा मनोरञ्जन
+-Name[nl]=Educatief
+-Name[nn]=Underhaldningslæring
+-Name[nso]=Boithabiso bja Thuto
+-Name[pa]=ਸਿੱਖਿਆ
+-Name[pl]=Nauka i rozrywka
+-Name[pt]=Educação/Entretenimento
+-Name[pt_BR]=Educativo
+-Name[ro]=Educațional
+-Name[ru]=Образование
+-Name[se]=Stoahkan ja oahppan
+-Name[sk]=Škola hrou
+-Name[sl]=Zabava in učenje
+-Name[sr]=Образовање
+-Name[sr@Latn]=Obrazovanje
+-Name[ss]=Infundvo-tfokotisa
+-Name[sv]=Utbildning
+-Name[ta]=கல்வி
+-Name[te]=ఎడ్యూటెన్మెంట్
+-Name[tg]=Омӯзиш
+-Name[th]=การศึกษาแสนสนุก
+-Name[tr]=Eğitim ve Eğlence
+-Name[tt]=Öyränü & Yal itü
+-Name[uk]=Освітні
+-Name[uz]=Oʻynab oʻrganish
+-Name[uz@cyrillic]=Ўйнаб ўрганиш
+-Name[ven]=Pfunzotakadza
+-Name[vi]=Học vui
+-Name[wa]=Sicole avou plaijhi
+-Name[xh]=Ufundiso
+-Name[zh_CN]=寓教于乐
+-Name[zh_TW]=教育和娛樂
+-Name[zu]=Ezemfundo
+-Icon=package_edutainment
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-essential.menu trinity-tdebase-3.5.13.2/applnk/kde-essential.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-essential.menu 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-essential.menu 1970-01-01 01:00:00.000000000 +0100
+@@ -1,27 +0,0 @@
+- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+- <!-- The following menus are hidden by default -->
+- <Menu>
+- <Name>Settings</Name>
+- <Directory>kde-settings.directory</Directory>
+- <MergeFile>../kde-settings.menu</MergeFile>
+- </Menu>
+- <Menu>
+- <Name>Information</Name>
+- <Directory>kde-information.directory</Directory>
+- <MergeFile>../kde-information.menu</MergeFile>
+- </Menu>
+- <Move>
+- <Old>Settings/Information</Old><New>Information</New>
+- </Move>
+- <Menu>
+- <Name>System</Name>
+- <Menu>
+- <Name>ScreenSavers</Name>
+- <Directory>kde-system-screensavers.directory</Directory>
+- <MergeFile>../kde-screensavers.menu</MergeFile>
+- </Menu>
+- </Menu>
+-</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-arcade.directory trinity-tdebase-3.5.13.2/applnk/kde-games-arcade.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-arcade.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games-arcade.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,74 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Arcade
+-Name[af]=Arkade
+-Name[ar]=ألعاب الــ Arcade
+-Name[az]=Əyləncə
+-Name[be]=Аркады
+-Name[bg]=Аркадни
+-Name[bn]=আর্কেড
+-Name[br]=C'hoarioù tavarn
+-Name[bs]=Arkade
+-Name[cs]=Arkády
+-Name[csb]=Chwatkòwé grë
+-Name[cy]=Arcêd
+-Name[da]=Arkade
+-Name[de]=Arkade
+-Name[eo]=Arkado
+-Name[et]=Võitlusmängud
+-Name[fa]=گذرگاه تاقدار
+-Name[fo]=Arkaduspøl
+-Name[fr]=Jeux d'arcade
+-Name[fy]=Arkade
+-Name[ga]=Stuara Siamsa
+-Name[he]=משחקי Arcade
+-Name[hi]=ऑर्केड
+-Name[hr]=Arkada
+-Name[hu]=Ügyességi játékok
+-Name[is]=Spilasalur
+-Name[ja]=アーケード
+-Name[kk]=Аркад ойындары
+-Name[km]=ធ្វើ​ដំណើរ
+-Name[ko]=아케이드
+-Name[lo]=ເກມອາເຄດ
+-Name[lt]=Arkada
+-Name[lv]=Arkāde
+-Name[mk]=Аркадни игри
+-Name[mn]=Сансар
+-Name[ms]=Arked
+-Name[mt]=Logħob tal-Arcades
+-Name[nb]=Arkade
+-Name[nds]=Speelhall
+-Name[ne]=आर्केड
+-Name[nn]=Arkade
+-Name[pa]=ਅਰਕਾਡੀ
+-Name[pl]=Gry zręcznościowe
+-Name[pt]=Arcada
+-Name[ro]=Aventuri
+-Name[ru]=Аркады
+-Name[rw]=Ikirongozi
+-Name[se]=Fearán
+-Name[sk]=Akčné hry
+-Name[sl]=Arkade
+-Name[sr]=Аркадне
+-Name[sr@Latn]=Arkadne
+-Name[sv]=Arkad
+-Name[ta]=ஆர்கேட்
+-Name[te]=ఆర్కేడ్
+-Name[tg]=Силсилаи бозиҳо
+-Name[th]=เกมอาเขต
+-Name[tr]=Oyun Makinesi
+-Name[tt]=Arkad
+-Name[uk]=Аркади
+-Name[uz]=Arkada
+-Name[uz@cyrillic]=Аркада
+-Name[ven]=Petea
+-Name[vi]=Mái vòm
+-Name[wa]=Årcåde
+-Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
+-Name[zh_CN]=街机
+-Name[zh_TW]=大型遊戲機遊戲
+-Name[zu]=Umhhume
+-Icon=package_games_arcade
+-X-KDE-SuppressGenericNames=Game,Arcade Game
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-board.directory trinity-tdebase-3.5.13.2/applnk/kde-games-board.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-board.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games-board.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,81 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Board Games
+-Name[af]=Bord Speletjies
+-Name[ar]=ألعاب الألواح
+-Name[az]=Lüvhə Oyunları
+-Name[be]=Настольныя гульні
+-Name[bg]=Игри на дъска
+-Name[bn]=বোর্ডের খেলা
+-Name[br]=C'hoarioù taolenn
+-Name[bs]=Igre na ploči
+-Name[ca]=Jocs de taula
+-Name[cs]=Deskové hry
+-Name[csb]=Planszowé grë
+-Name[cy]=Gemau Bwrdd
+-Name[da]=Brætspil
+-Name[de]=Brettspiele
+-Name[el]=Επιτραπέζια παιχνίδια
+-Name[eo]=Tabuloludoj
+-Name[es]=Juegos de tablero
+-Name[et]=Lauamängud
+-Name[eu]=Mahai jokoak
+-Name[fa]=بازیهای تخته
+-Name[fi]=Lautapelit
+-Name[fr]=Jeux de plateau
+-Name[fy]=Boardspultsjes
+-Name[ga]=Cluichí Cláir
+-Name[gl]=Xogos de Taboleiro
+-Name[he]=משחקי לוח
+-Name[hi]=बिसात के खेल
+-Name[hr]=Igre na ploči
+-Name[hsb]=Deskowe hry
+-Name[hu]=Táblajátékok
+-Name[id]=Permainan Papan
+-Name[is]=Borðleikir
+-Name[it]=Giochi da tavolo
+-Name[ja]=ボードゲーム
+-Name[ka]=მაგიდის თამაშები
+-Name[kk]=Үстел ойындары
+-Name[km]=ល្បែង​ក្ដារ
+-Name[ko]=보드 게임
+-Name[lt]=Stalo žaidimai
+-Name[lv]=Galda spēles
+-Name[mk]=Игри на табла
+-Name[mn]=Хөлөгт тоглоом
+-Name[ms]=Permainan 'Board'
+-Name[mt]=Logħob tal-boards
+-Name[nb]=Brettspill
+-Name[nds]=Brettspelen
+-Name[ne]=बोर्ड खेल
+-Name[nl]=Bordspellen
+-Name[nn]=Brettspel
+-Name[pa]=ਬੋਰਡ ਖੇਡਾਂ
+-Name[pl]=Gry planszowe
+-Name[pt]=Jogos de Tabuleiro
+-Name[pt_BR]=Jogos de Tabuleiro
+-Name[ro]=Jocuri de table
+-Name[ru]=Настольные игры
+-Name[rw]=Imikino y'Umuryango
+-Name[se]=Duolbbášspealut
+-Name[sk]=Stolové hry
+-Name[sl]=Namizne igre
+-Name[sr]=Игре на табли
+-Name[sr@Latn]=Igre na tabli
+-Name[sv]=Brädspel
+-Name[ta]=மேசை விளையாட்டுகள்
+-Name[te]=పలక ఆటలు
+-Name[tg]=Бозиҳои рӯимизӣ
+-Name[th]=เกมกระดาน
+-Name[tr]=Masaüstü Oyunları
+-Name[tt]=Östäl Uyını
+-Name[uk]=Ігри на дошці
+-Name[uz]=Stol oʻyinlari
+-Name[uz@cyrillic]=Стол ўйинлари
+-Name[vi]=Trò chơi bảng
+-Name[wa]=Djeus d' platea
+-Name[zh_CN]=棋类游戏
+-Name[zh_TW]=棋盤遊戲
+-Icon=package_games_board
+-X-KDE-SuppressGenericNames=Game,Board Game
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-card.directory trinity-tdebase-3.5.13.2/applnk/kde-games-card.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-card.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games-card.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,81 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Card Games
+-Name[af]=Kaart Speletjies
+-Name[ar]=ألعاب الورق
+-Name[az]=Kart Oyunları
+-Name[be]=Картавыя гульні
+-Name[bg]=Игри с карти
+-Name[bn]=তাসের খেলা
+-Name[br]=C'hoarioù Kartennoù
+-Name[bs]=Igre sa kartama
+-Name[ca]=Jocs de cartes
+-Name[cs]=Karetní hry
+-Name[csb]=Kartowé grë
+-Name[cy]=Gemau Cardiau
+-Name[da]=Kortspil
+-Name[de]=Kartenspiele
+-Name[el]=Παιχνίδια καρτών
+-Name[eo]=Kartludoj
+-Name[es]=Juegos de cartas
+-Name[et]=Kaardimängud
+-Name[eu]=Karta jokoak
+-Name[fa]=بازیهای کارت
+-Name[fi]=Korttipelit
+-Name[fr]=Jeux de cartes
+-Name[fy]=Kaartspultsjes
+-Name[ga]=Cluichí Cártaí
+-Name[gl]=Xogos de Cartas
+-Name[he]=משחקי קלפים
+-Name[hi]=ताश के खेल
+-Name[hr]=Igre s kartama
+-Name[hsb]=Kartowe hry
+-Name[hu]=Kártyajátékok
+-Name[id]=Permainan Kartu
+-Name[is]=Spilaleikir
+-Name[it]=Giochi di carte
+-Name[ja]=カードゲーム
+-Name[ka]=ბანქოს თამაშები
+-Name[kk]=Карта ойындары
+-Name[km]=ល្បែង​បៀរ
+-Name[ko]=카드 게임
+-Name[lt]=Kortų žaidimai
+-Name[lv]=Kāršu spēles
+-Name[mk]=Игри со карти
+-Name[mn]=Хөзрийн тоглоом
+-Name[ms]=Permainan Kad
+-Name[mt]=Logħob tal-Karti
+-Name[nb]=Kortspill
+-Name[nds]=Koortspelen
+-Name[ne]=कार्ड खेल
+-Name[nl]=Kaartspellen
+-Name[nn]=Kortspel
+-Name[pa]=ਤਾਸ਼ ਖੇਡਾਂ
+-Name[pl]=Gry karciane
+-Name[pt]=Jogos de Cartas
+-Name[pt_BR]=Jogos de Cartas
+-Name[ro]=Jocuri de cărți
+-Name[ru]=Карточные игры
+-Name[rw]=Imikino y'Ikarita
+-Name[se]=Goartaspealut
+-Name[sk]=Kartové hry
+-Name[sl]=Igre s kartami
+-Name[sr]=Игре са картама
+-Name[sr@Latn]=Igre sa kartama
+-Name[sv]=Kortspel
+-Name[ta]=சீட்டு விளையாட்டுகள்
+-Name[te]=పేక ఆటలు
+-Name[tg]=Бозиҳои корт
+-Name[th]=เกมไพ่ต่าง ๆ
+-Name[tr]=Kart Oyunları
+-Name[tt]=Kard Uyını
+-Name[uk]=Карткові ігри
+-Name[uz]=Qarta oʻyinlari
+-Name[uz@cyrillic]=Қарта ўйинлари
+-Name[vi]=Trò chơi thẻ
+-Name[wa]=Cwårdjeus
+-Name[zh_CN]=牌类游戏
+-Name[zh_TW]=紙牌遊戲
+-Icon=package_games_card
+-X-KDE-SuppressGenericNames=Game,Card Game
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games.directory trinity-tdebase-3.5.13.2/applnk/kde-games.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,89 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Games
+-Name[af]=Speletjies
+-Name[ar]=ألعاب
+-Name[az]=Oyunlar
+-Name[be]=Гульні
+-Name[bg]=Игри
+-Name[bn]=খেলা
+-Name[br]=C'hoarioù
+-Name[bs]=Igre
+-Name[ca]=Jocs
+-Name[cs]=Hry
+-Name[csb]=Grë
+-Name[cy]=Gemau
+-Name[da]=Spil
+-Name[de]=Spiele
+-Name[el]=Παιχνίδια
+-Name[eo]=Ludoj
+-Name[es]=Juegos
+-Name[et]=Mängud
+-Name[eu]=Jokoak
+-Name[fa]=بازیها
+-Name[fi]=Pelit
+-Name[fo]=Spøl
+-Name[fr]=Jeux
+-Name[fy]=Amusemint
+-Name[ga]=Cluichí
+-Name[gl]=Xogos
+-Name[he]=משחקים
+-Name[hi]=खेल
+-Name[hr]=Igre
+-Name[hsb]=Hry
+-Name[hu]=Játékok
+-Name[id]=Permainan
+-Name[is]=Leikir
+-Name[it]=Giochi
+-Name[ja]=ゲーム
+-Name[ka]=თამაშები
+-Name[kk]=Ойындар
+-Name[km]=ល្បែង
+-Name[ko]=게임
+-Name[lo]=ເກມ
+-Name[lt]=Žaidimai
+-Name[lv]=Spēles
+-Name[mk]=Игри
+-Name[mn]=Тоглоом
+-Name[ms]=Permainan
+-Name[mt]=Logħob
+-Name[nb]=Spill
+-Name[nds]=Spelen
+-Name[ne]=खेल
+-Name[nl]=Amusement
+-Name[nn]=Spel
+-Name[nso]=Dipapadi
+-Name[oc]=Jogs
+-Name[pa]=ਖੇਡਾਂ
+-Name[pl]=Gry
+-Name[pt]=Jogos
+-Name[pt_BR]=Jogos
+-Name[ro]=Jocuri
+-Name[ru]=Игры
+-Name[rw]=Imikino
+-Name[se]=Spealut
+-Name[sk]=Hry
+-Name[sl]=Igre
+-Name[sr]=Игре
+-Name[sr@Latn]=Igre
+-Name[ss]=Imidlalo
+-Name[sv]=Spel
+-Name[ta]=விளையாட்டுகள்
+-Name[te]=ఆటలు
+-Name[tg]=Бозиҳо
+-Name[th]=เกมส์
+-Name[tr]=Oyunlar
+-Name[tt]=Uyınnar
+-Name[uk]=Ігри
+-Name[uz]=Oʻyinlar
+-Name[uz@cyrillic]=Ўйинлар
+-Name[ven]=Mitambo
+-Name[vi]=Trò chơi
+-Name[wa]=Djeus
+-Name[xh]=Imidlalo
+-Name[zh_CN]=游戏
+-Name[zh_TW]=遊戲
+-Name[zu]=Imidlalo
+-Icon=package_games
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-kids.directory trinity-tdebase-3.5.13.2/applnk/kde-games-kids.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-kids.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games-kids.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,88 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Games for Kids
+-Name[af]=Kinder Speletjies
+-Name[ar]= ألعاب للأطفال
+-Name[az]=Uşaxlar Üçün Oyunlar
+-Name[be]=Дзіцячыя гульні
+-Name[bg]=Игри за деца
+-Name[bn]=বাচ্চাদের খেলা
+-Name[br]=C'hoarioù evit ar Bugale
+-Name[bs]=Igre za djecu
+-Name[ca]=Jocs per a nens
+-Name[cs]=Hry pro děti
+-Name[csb]=Grë dlô dzecë
+-Name[cy]=Gêmau ar gyfer Plant
+-Name[da]=Spil for børn
+-Name[de]=Spiele für Kinder
+-Name[el]=Παιχνίδια για παιδιά
+-Name[eo]=Ludoj por infanoj
+-Name[es]=Juegos para niños
+-Name[et]=Laste mängud
+-Name[eu]=Haur jokoak
+-Name[fa]=بازیهایی برای بچه‌ها
+-Name[fi]=Lasten pelit
+-Name[fo]=Spøl fyri børn
+-Name[fr]=Jeux pour les enfants
+-Name[fy]=Spultsjes foar bêrn
+-Name[ga]=Cluichí do Pháistí
+-Name[gl]=Xogos para Nenos
+-Name[he]=משחקים לילדים
+-Name[hi]=बच्चों के लिए खेल
+-Name[hr]=Igre za djecu
+-Name[hsb]=Hry za dźěći
+-Name[hu]=Játékok kicsiknek
+-Name[id]=Permainan Kanak-kanak
+-Name[is]=Leikir fyrir krakka
+-Name[it]=Giochi per bambini
+-Name[ja]=子供向けゲーム
+-Name[ka]=საბავშვო თამაშები
+-Name[kk]=Балалар ойындары
+-Name[km]=ល្បែង​សម្រាប់​កូន​ក្មេង
+-Name[ko]=어린이용 게임
+-Name[lo]=ເກມສຳລັບເດັກ
+-Name[lt]=Žaidimai vaikams
+-Name[lv]=Spēles bērniem
+-Name[mk]=Игри за деца
+-Name[mn]=Хүүхдийн тоглоом
+-Name[ms]=Permainan Kanak-kanak
+-Name[mt]=Logħob għat-tfal
+-Name[nb]=Spill for barn
+-Name[nds]=Spelen för Kinners
+-Name[ne]=केटाकेटीका लागि खेल
+-Name[nl]=spelletjes voor kinderen
+-Name[nn]=Barnespel
+-Name[nso]=Dipapadi tsa Bana
+-Name[pa]=ਬੱਚਿਆਂ ਲਈ ਖੇਡਾਂ
+-Name[pl]=Gry dla dzieci
+-Name[pt]=Jogos para Crianças
+-Name[pt_BR]=Jogos para Crianças
+-Name[ro]=Jocuri pentru copii
+-Name[ru]=Детские игры
+-Name[rw]=Imikino y'Abana
+-Name[se]=Mánáidspealut
+-Name[sk]=Hry pre deti
+-Name[sl]=Igre za otroke
+-Name[sr]=Игре за децу
+-Name[sr@Latn]=Igre za decu
+-Name[ss]=Imidlalo yebantfwana
+-Name[sv]=Spel för barn
+-Name[ta]=குழந்தைகளுக்கான விளையாட்டுகள்
+-Name[te]=పిల్లల ఆటలు
+-Name[tg]=Бозиҳои кӯдакона
+-Name[th]=เกมส์สำหรับเด็ก
+-Name[tr]=Çocuklar için Oyunlar
+-Name[tt]=Bala Uyını
+-Name[uk]=Ігри для дітей
+-Name[uz]=Kichkintoylar uchun oʻyinlar
+-Name[uz@cyrillic]=Кичкинтойлар учун ўйинлар
+-Name[ven]=Mitambo ya vhana
+-Name[vi]=Trò chơi cho Trẻ
+-Name[wa]=Djeus po ls efants
+-Name[xh]=Imidlalo Yabantwana
+-Name[zh_CN]=儿童游戏
+-Name[zh_TW]=小孩的遊戲
+-Name[zu]=Imidlalo yabantwana
+-Icon=package_games_kids
+-X-KDE-SuppressGenericNames=Game,Game for Children
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-roguelikes.directory trinity-tdebase-3.5.13.2/applnk/kde-games-roguelikes.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-roguelikes.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games-roguelikes.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,84 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Rogue-like Games
+-Name[af]=Rogue-tipe Speletjies
+-Name[ar]=ألعاب شبه Rogue
+-Name[az]=Rogue Bənzəri Oyunlar
+-Name[be]=Гульны Rogue
+-Name[bg]=Хазартни игри
+-Name[bn]=রোগ্ (Rogue)-এর মত খেলা
+-Name[br]=Ur c'hoari a seurt gant Rogue
+-Name[bs]=Rogue-like igre
+-Name[ca]=Jocs com el Rogue
+-Name[cs]=Hry podobné Rogue
+-Name[csb]=Gré z familëji Rogue
+-Name[cy]=Gemau sy'n debyg i Rogue
+-Name[da]=Rogue-lignende spil
+-Name[de]=Rogue-ähnliche Spiele
+-Name[el]=Παιχνίδια τύπου Rogue
+-Name[eo]=Filudoj
+-Name[es]=Juegos tipo Rogue
+-Name[et]=Rogue-laadsed mängud
+-Name[eu]=Rogue motako jokoak
+-Name[fa]=بازیهای شبیه Rogue
+-Name[fi]=Rogue-tyyliset pelit
+-Name[fo]=Rogue-lík spøl
+-Name[fr]=Jeux à la Rogue
+-Name[fy]=Soarte mei rogue spulstjes
+-Name[ga]=Cluichí cosúil le Rogue
+-Name[gl]=Xogos do estilo de Rogue
+-Name[he]=משחקים נוסח Rogue
+-Name[hi]=छलिया जैसे खेल
+-Name[hr]=Igre kao Rogue
+-Name[hsb]=Hry, podobne na Rogue
+-Name[hu]=Rogue-szerű játékok
+-Name[id]=Permainan ala Rogue
+-Name[is]=Skotleikir
+-Name[it]=Giochi in stile Rogue
+-Name[ja]=Rogue 風のゲーム
+-Name[ka]= Rogue ტიპის თამაშები
+-Name[kk]=Rogue-секілді ойындар
+-Name[lo]=ເກມຄ້າຍ Rogue
+-Name[lt]=Išdykėlio tipo žaidimai
+-Name[lv]=Rogue līdzīgas spēles
+-Name[mk]=Игри како Rogue
+-Name[mn]=Rogue-тоглоом
+-Name[ms]=Permainan ala Rogue
+-Name[mt]=Logħob bħal Rogue
+-Name[nb]=Rollespill
+-Name[nds]=Spelen so as Rogue
+-Name[ne]=रग-प्रकारको खेल
+-Name[nl]=Rogue-achtige spellen
+-Name[nn]=Rogue-aktige spel
+-Name[nso]=Dipapadi tsa Bokalatsane
+-Name[pa]=ਠੱਗ-ਵਰਗੀਆਂ ਖੇਡਾਂ
+-Name[pl]=Gry z rodziny Rogue
+-Name[pt]=Jogos tipo Rogue
+-Name[pt_BR]=Jogos parecidos com Rogue
+-Name[ro]=Jocuri violente
+-Name[ru]=Ролевые игры в стиле Rogue
+-Name[rw]=Imikino Ingunge-nka
+-Name[se]=Rogue-lágána spealut
+-Name[sk]=Hry v štýle Rogue
+-Name[sl]=Igre kot Rogue
+-Name[sr]=Игре налик на Rogue
+-Name[sr@Latn]=Igre nalik na Rogue
+-Name[ss]=I-Rogue-lefana nemidlalo
+-Name[sv]=Spel som liknar Rogue
+-Name[ta]=முரட்டுதனமான விளையாட்டுகள்
+-Name[te]=రోగ్ లాంటి ఆటలు
+-Name[tg]=Бозиҳои шабиявии Rogue
+-Name[th]=เกมส์คล้าย Rogue
+-Name[tr]=Rogue benzeri oyunlar
+-Name[tt]=Gizeş Uyını
+-Name[uk]=Ігри на кшталт Rogue
+-Name[uz]=Rogue oʻyiniga oʻxshash oʻyinlar
+-Name[uz@cyrillic]=Rogue ўйинига ўхшаш ўйинлар
+-Name[ven]=U fhura-sa Mitambo
+-Name[vi]=Trò chơi giống Rogue
+-Name[wa]=Djeus ki rshonnèt-st a «rogue»
+-Name[xh]=Imidlalo efana ne Rogue
+-Name[zh_CN]=恶作剧游戏
+-Name[zh_TW]=冒險類遊戲
+-Name[zu]=Imidlalo enjenge-Rogue
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-strategy.directory trinity-tdebase-3.5.13.2/applnk/kde-games-strategy.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-games-strategy.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-games-strategy.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,87 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Tactics & Strategy
+-Name[af]=Strategie & Taktiek
+-Name[ar]=الألعاب الميدانية و الإستراتجية
+-Name[az]=Strategiya & Taktika
+-Name[be]=Тактыка і стратэгія
+-Name[bg]=Стратегически игри
+-Name[bn]=কৌশল এবং পরিকল্পনা
+-Name[br]=Brezelekaouriezh ha kadouriezh
+-Name[bs]=Taktika i strategija
+-Name[ca]=Tàctiques i estratègia
+-Name[cs]=Taktické a strategické
+-Name[csb]=Takticzné ë strategiczné grë
+-Name[cy]=Tactegau & Strategaeth
+-Name[da]=Taktik & Strategi
+-Name[de]=Strategie & Taktik
+-Name[el]=Τακτική & Στρατηγική
+-Name[eo]=Taktikoj & Strategioj
+-Name[es]=Táctica y estrategia
+-Name[et]=Taktika ja strateegia
+-Name[eu]=Taktika eta estrategia
+-Name[fa]=راهکارها و راهبردها
+-Name[fi]=Taktiikka ja strategia
+-Name[fo]=Taktikkur og strategi
+-Name[fr]=Tactique et stratégie
+-Name[fy]=Taktysk en strategysk
+-Name[ga]=Beartaíocht agus Straitéisí
+-Name[gl]=Tácticas e Estratexia
+-Name[he]=טקטיקה ואסטרטגיה
+-Name[hi]=रणनीतिक और कौशल
+-Name[hr]=Taktika i strategija
+-Name[hsb]=Strategiske hry
+-Name[hu]=Taktikai és stratégiai
+-Name[id]=Taktik dan Strategi
+-Name[is]=Kænska & áræði
+-Name[it]=Tattica e strategia
+-Name[ja]=戦略 & 戦術
+-Name[ka]=ტაქტიკა & სტრატეგია
+-Name[kk]=Тактика және стратегия
+-Name[km]=ក្បួន & យុទ្ធសាស្ត្រ
+-Name[ko]=전략 및 전술
+-Name[lo]=ເກມກົນລະຍຸດແລະວາງແຜນ
+-Name[lt]=Taktika ir strategija
+-Name[lv]=Taktika & Stratēģija
+-Name[mk]=Тактика и стратегија
+-Name[mn]=Тактик & стратеги
+-Name[ms]=Strategi dan Taktik
+-Name[mt]=Tattika u Strateġija
+-Name[nb]=Taktikk og strategi
+-Name[nds]=Taktik & Strategie
+-Name[ne]=कौशल र रणनीति
+-Name[nl]=Tactiek en Strategie
+-Name[nn]=Taktikk og strategi
+-Name[nso]=Mekgwanakgwana & Tselathwii
+-Name[pa]=ਤਕਨੀਕੀ ਤੇ ਗਿਆਨ
+-Name[pl]=Gry taktyczne i strategiczne
+-Name[pt]=Tácticas e Estratégia
+-Name[pt_BR]=Táticas & Estratégias
+-Name[ro]=Tactică și strategie
+-Name[ru]=Стратегия
+-Name[rw]=Imigabo & Imigambi
+-Name[se]=Taktihkka ja strategiija
+-Name[sk]=Taktické a strategické
+-Name[sl]=Taktika in strategija
+-Name[sr]=Тактика и стратегија
+-Name[sr@Latn]=Taktika i strategija
+-Name[ss]=Masu & indlela yekwenta
+-Name[sv]=Taktik och strategi
+-Name[ta]=உத்திகளும் தந்திரங்களும்
+-Name[te]=యుక్తి & తంత్రాలు
+-Name[tg]=Бозиҳои стратегӣ
+-Name[th]=เกมกลยุทธ์และวางแผน
+-Name[tr]=Taktik ve Strateji
+-Name[tt]=Taktik & Strategi
+-Name[uk]=Тактика та стратегія
+-Name[uz]=Taktika va strategiya
+-Name[uz@cyrillic]=Тактика ва стратегия
+-Name[ven]=Madzhenele & Maitele
+-Name[vi]=Chiến thuật và Chiến lược
+-Name[wa]=Tactike eyet stratedjeye
+-Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
+-Name[zh_CN]=策略游戏
+-Name[zh_TW]=戰略及策略
+-Name[zu]=Amaqhinga & Iplani
+-Icon=package_games_strategy
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-graphics.directory trinity-tdebase-3.5.13.2/applnk/kde-graphics.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-graphics.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-graphics.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,89 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Graphics
+-Name[af]=Grafieka
+-Name[ar]=برامج رسم
+-Name[az]=Qrafika
+-Name[be]=Графіка
+-Name[bg]=Графика
+-Name[bn]=গ্রাফিক্স
+-Name[br]=Grafikoù
+-Name[bs]=Grafika
+-Name[ca]=Gràfics
+-Name[cs]=Grafika
+-Name[csb]=Grafika
+-Name[cy]=Graffeg
+-Name[da]=Grafik
+-Name[de]=Graphik
+-Name[el]=Γραφικά
+-Name[eo]=Grafiko
+-Name[es]=Gráficos
+-Name[et]=Graafika
+-Name[eu]=Grafikoak
+-Name[fa]=نگاره‌ها
+-Name[fi]=Grafiikka
+-Name[fo]=Teknindi
+-Name[fr]=Graphisme
+-Name[fy]=Grafysk
+-Name[ga]=Grafaic
+-Name[gl]=Gráficos
+-Name[he]=גרפיקה
+-Name[hi]=चित्रकारी
+-Name[hr]=Grafika
+-Name[hsb]=Grafika
+-Name[hu]=Grafikai programok
+-Name[id]=Grafis
+-Name[is]=Myndvinnsla
+-Name[it]=Grafica
+-Name[ja]=グラフィックス
+-Name[ka]=გრაფიკა
+-Name[kk]=Графика
+-Name[km]=ក្រាហ្វិក
+-Name[ko]=그래픽
+-Name[lo]=ກຣາບຟິກ
+-Name[lt]=Grafika
+-Name[lv]=Grafika
+-Name[mk]=Графика
+-Name[mn]=График
+-Name[ms]=Grafik
+-Name[mt]=Grafika
+-Name[nb]=Bilde
+-Name[nds]=Grafik
+-Name[ne]=ग्राफिक्स
+-Name[nl]=Grafisch
+-Name[nn]=Grafikk
+-Name[nso]=Di-Graphics
+-Name[oc]=Grafics
+-Name[pa]=ਚਿੱਤਰਕਲਾ
+-Name[pl]=Grafika
+-Name[pt]=Gráficos
+-Name[pt_BR]=Gráficos
+-Name[ro]=Grafică
+-Name[ru]=Графика
+-Name[rw]=Ibishushanyo
+-Name[se]=Grafihkka
+-Name[sk]=Grafika
+-Name[sl]=Grafika
+-Name[sr]=Графика
+-Name[sr@Latn]=Grafika
+-Name[ss]=Titfombe-mdvwebo
+-Name[sv]=Grafik
+-Name[ta]=சித்திரங்கள்
+-Name[te]=గ్రాఫిక్స్
+-Name[tg]=Графика
+-Name[th]=กราฟิก
+-Name[tr]=Grafik Programları
+-Name[tt]=Sızım
+-Name[uk]=Графіка
+-Name[uz]=Grafika
+-Name[uz@cyrillic]=Графика
+-Name[ven]=Dzigirafu
+-Name[vi]=Đồ hoạ
+-Name[wa]=Grafikes
+-Name[xh]=Imizobo
+-Name[zh_CN]=图像
+-Name[zh_TW]=圖形
+-Name[zu]=Imidwebo
+-Icon=package_graphics
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.directory trinity-tdebase-3.5.13.2/applnk/kde-information.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-information.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,87 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Information
+-Name[af]=Informasie
+-Name[ar]=معلومات
+-Name[az]=Mə'lumat
+-Name[be]=Інфармацыя
+-Name[bg]=Информация
+-Name[bn]=তথ্য
+-Name[br]=Titouroù
+-Name[bs]=Informacije
+-Name[ca]=Informació
+-Name[cs]=Informace
+-Name[csb]=Wëdowiédzô
+-Name[cy]=Gwybodaeth
+-Name[el]=Πληροφορίες
+-Name[eo]=Informoj
+-Name[es]=Información
+-Name[et]=Info
+-Name[eu]=Informazioa
+-Name[fa]=اطلاعات
+-Name[fi]=Järjestelmätiedot
+-Name[fo]=Upplýsingar
+-Name[fr]=Informations
+-Name[fy]=Ynformaasje
+-Name[ga]=Eolas
+-Name[gl]=Información
+-Name[he]=מידע
+-Name[hi]=जानकारी
+-Name[hr]=Podaci
+-Name[hsb]=Informacija
+-Name[hu]=Információ
+-Name[id]=Informasi
+-Name[is]=Upplýsingar
+-Name[it]=Informazioni
+-Name[ja]=情報
+-Name[ka]=ინფორმაცია
+-Name[kk]=Мәлімет
+-Name[km]=ព័ត៌មាន
+-Name[ko]=정보
+-Name[lo]=ຂໍ້ມູນຕ່າງໆ
+-Name[lt]=Informacija
+-Name[lv]=Informācija
+-Name[mk]=Информации
+-Name[mn]=Мэдээлэл
+-Name[ms]=Maklumat
+-Name[mt]=Informazzjoni
+-Name[nb]=Informasjon
+-Name[nds]=Informatschoon
+-Name[ne]=सूचना
+-Name[nl]=Informatie
+-Name[nn]=Informasjon
+-Name[nso]=Tshedimoso
+-Name[oc]=Infòrmacion
+-Name[pa]=ਜਾਣਕਾਰੀ
+-Name[pl]=Informacje
+-Name[pt]=Informação
+-Name[pt_BR]=Informação
+-Name[ro]=Informații
+-Name[ru]=Сведения
+-Name[rw]=Amakuru
+-Name[se]=Diehtu
+-Name[sk]=Informácie
+-Name[sl]=Informacije
+-Name[sr]=Информације
+-Name[sr@Latn]=Informacije
+-Name[ss]=Imininingwane
+-Name[ta]=தகவல்
+-Name[te]=సమాచారం
+-Name[tg]=Иттилоот
+-Name[th]=ข้อมูลต่างๆ
+-Name[tr]=Bilgi
+-Name[tt]=Beldermä
+-Name[uk]=Інформація
+-Name[uz]=Maʼlumot
+-Name[uz@cyrillic]=Маълумот
+-Name[ven]=Mafhungo
+-Name[vi]=Thông tin
+-Name[wa]=Informåcions
+-Name[xh]=Ulwazi
+-Name[zh_CN]=信息
+-Name[zh_TW]=資訊
+-Name[zu]=Ulwazi
+-Icon=hwinfo
+-X-KDE-BaseGroup=info
+-NoDisplay=true
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.menu trinity-tdebase-3.5.13.2/applnk/kde-information.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-information.menu 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-information.menu 1970-01-01 01:00:00.000000000 +0100
+@@ -1,10 +0,0 @@
+- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+- <Name>Information</Name>
+- <Directory>kde-information.directory</Directory>
+- <Include>
+- <Category>X-KDE-information</Category>
+- </Include>
+-</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet.directory trinity-tdebase-3.5.13.2/applnk/kde-internet.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-internet.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,48 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Internet
+-Name[ar]=الإنترنت
+-Name[az]=İnternet
+-Name[be]=Інтэрнэт
+-Name[bg]=Интернет
+-Name[bn]=ইন্টারনেট
+-Name[br]=Kenrouedad
+-Name[cy]=Rhyngrwyd
+-Name[el]=Διαδίκτυο
+-Name[eo]=Interreto
+-Name[fa]=اینترنت
+-Name[fy]=Ynternet
+-Name[ga]=Idirlíon
+-Name[he]=אינטרנט
+-Name[hi]=इंटरनेट
+-Name[is]=Internetið
+-Name[ja]=インターネット
+-Name[ka]=ინტერნეტი
+-Name[kk]=Интернет
+-Name[km]=អ៊ិនធឺណិត
+-Name[ko]=인터넷
+-Name[lt]=Internetas
+-Name[lv]=Internets
+-Name[mk]=Интернет
+-Name[mn]=Интернэт
+-Name[nb]=Internett
+-Name[ne]=इन्टरनेट
+-Name[nn]=Internett
+-Name[pa]=ਇੰਟਰਨੈੱਟ
+-Name[ru]=Интернет
+-Name[rw]=Interineti
+-Name[se]=Interneahtta
+-Name[sr]=Интернет
+-Name[ta]=இணையம்
+-Name[te]=ఇంటర్నెట్
+-Name[tg]=Интернет
+-Name[th]=อินเทอร์เน็ต
+-Name[tr]=İnternet
+-Name[tt]=Päräwez
+-Name[uk]=Інтернет
+-Name[uz@cyrillic]=Интернет
+-Name[wa]=Daegntoele
+-Name[zh_TW]=網際網路
+-Icon=package_network
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet-terminal.directory trinity-tdebase-3.5.13.2/applnk/kde-internet-terminal.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-internet-terminal.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-internet-terminal.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,88 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Terminal Applications
+-Name[af]=Terminaal Programme
+-Name[ar]=تطبيقات مطرافية
+-Name[az]=Terminal Proqramları
+-Name[be]=Тэрмінальныя праграмы
+-Name[bg]=Конзолни програми
+-Name[bn]=টার্মিনাল অ্যাপলিকেশন
+-Name[br]=Arloadoù an termenell
+-Name[bs]=Tekstualni programi
+-Name[ca]=Aplicacions de terminal
+-Name[cs]=Terminálové aplikace
+-Name[csb]=Programë terminala
+-Name[cy]=Cymhwysiadau Terfynell
+-Name[da]=Terminalprogrammer
+-Name[de]=Terminalprogramme
+-Name[el]=Εφαρμογές τερματικού
+-Name[eo]=Terminal-Aplikaĵoj
+-Name[es]=Aplicaciones de terminal
+-Name[et]=Terminali rakendused
+-Name[eu]=Terminaleko aplikazioak
+-Name[fa]=کاربردهای پایانه
+-Name[fi]=Päätesovellukset
+-Name[fo]=Tekstforrit
+-Name[fr]=Applications pour terminal
+-Name[fy]=Terminal-tapassingen
+-Name[ga]=Feidhmchláir Teirminéil
+-Name[gl]=Aplicacións de Terminal
+-Name[he]=יישומי מסוף
+-Name[hi]=टर्मिनल अनुप्रयोग
+-Name[hr]=Terminalske aplikacije
+-Name[hsb]=Programy za terminal
+-Name[hu]=Parancsértelmezők
+-Name[id]=Aplikasi Terminal
+-Name[is]=Skjáhermiforrit
+-Name[it]=Applicazioni terminale
+-Name[ja]=ターミナルアプリケーション
+-Name[ka]=კონსოლის პროგრამები
+-Name[kk]=Консоль қолданбалары
+-Name[km]=កម្មវិធី​ស្ថានីយ
+-Name[ko]=터미널 프로그램
+-Name[lo]=ໂປຣແກຣມເທີມີນໍ
+-Name[lt]=Terminalinės programos
+-Name[lv]=Termināla Aplikācijas
+-Name[mk]=Терминалски апликации
+-Name[mn]=Терминал-Програм
+-Name[ms]=Aplikasi Terminal
+-Name[mt]=Programmi tat-Terminal
+-Name[nb]=Terminalprogrammer
+-Name[nds]=Terminalprogrammen
+-Name[ne]=टर्मिनल अनुप्रयोग
+-Name[nl]=Terminal-toepassingen
+-Name[nn]=Terminalprogram
+-Name[nso]=Ditshumiso tsa Terminal
+-Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
+-Name[pl]=Programy terminala
+-Name[pt]=Aplicações de Terminal
+-Name[pt_BR]=Aplicativos de terminal
+-Name[ro]=Aplicații de terminal
+-Name[ru]=Консольные приложения
+-Name[rw]=Amaporogaramu Nkiriya
+-Name[se]=Terminálprográmmat
+-Name[sk]=Terminálové aplikácie
+-Name[sl]=Terminalski programi
+-Name[sr]=Терминалски програми
+-Name[sr@Latn]=Terminalski programi
+-Name[ss]=Ticelo tesikhungo
+-Name[sv]=Terminalprogram
+-Name[ta]=முனைய பயன்பாடுகள்
+-Name[te]=టర్మినల్ కార్యక్రమములు
+-Name[tg]=Барномаҳои консол
+-Name[th]=โปรแกรมเทอร์มินัล
+-Name[tr]=Uçbirim Uygulamaları
+-Name[tt]=Terminal Yazılımnarı
+-Name[uk]=Термінальні програми
+-Name[uz]=Terminal uchun dasturlar
+-Name[uz@cyrillic]=Терминал учун дастурлар
+-Name[ven]=Apulikhesheni ya Theminala
+-Name[vi]=Trình đầu cuối
+-Name[wa]=Programes terminås
+-Name[xh]=Izicelo Zesiphelo sendlela
+-Name[zh_CN]=终端应用程序
+-Name[zh_TW]=終端機程式
+-Name[zu]=Abayaleli bangaphandle
+-Icon=konsole
+-Version=1.0
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-main.directory trinity-tdebase-3.5.13.2/applnk/kde-main.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-main.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-main.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,80 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Icon=package
+-Name=KDE Menu
+-Name[af]=KDE Kieslys
+-Name[ar]=قائمة KDE
+-Name[az]=KDE Meyusu
+-Name[be]=Меню KDE
+-Name[bg]=Главно меню
+-Name[bn]=কে.ডি.ই. মেনু
+-Name[br]=Meuziad KDE
+-Name[bs]=KDE meni
+-Name[ca]=Menú de KDE
+-Name[cs]=Nabídka KDE
+-Name[csb]=KDE menu
+-Name[cy]=Dewislen KDE
+-Name[da]=KDE-Menu
+-Name[de]=KDE-Menü
+-Name[el]=Μενού KDE
+-Name[eo]=KDEa Menuo
+-Name[es]=Menú de KDE
+-Name[et]=KDE menüü
+-Name[eu]=KDE menua
+-Name[fa]=گزینگان KDE
+-Name[fi]=Valikko
+-Name[fr]=Menu de KDE
+-Name[fy]=KDE-menu
+-Name[ga]=Roghchlár KDE
+-Name[gl]=Menú de KDE
+-Name[he]=תפריט KDE
+-Name[hi]=केडीई मेन्यू
+-Name[hr]=KDE izbornik
+-Name[hsb]=KDE meni
+-Name[hu]=KDE menü
+-Name[id]=Menu KDE
+-Name[is]=KDE valmynd
+-Name[it]=Menu KDE
+-Name[ja]=KDE メニュー
+-Name[ka]=KDE მენიუ
+-Name[kk]=KDE мәзірі
+-Name[km]=ម៉ឺនុយ KDE
+-Name[ko]=KDE 메뉴
+-Name[lt]=KDE meniu
+-Name[lv]=KDE izvēlne
+-Name[mk]=KDE-мени
+-Name[mn]=КДЭ цэс
+-Name[ms]=Menu KDE
+-Name[mt]=Menu KDE
+-Name[nb]=KDE-meny
+-Name[nds]=KDE-Menü
+-Name[ne]=केडीई मेनु
+-Name[nl]=KDE-menu
+-Name[nn]=KDE-meny
+-Name[pa]=KDE ਮੇਨੂ
+-Name[pl]=Menu KDE
+-Name[pt]=Menu KDE
+-Name[pt_BR]=Menu do KDE
+-Name[ro]=Meniu KDE
+-Name[ru]=Меню KDE
+-Name[rw]=Ibikubiyemo bya KDE
+-Name[se]=KDE-fállu
+-Name[sk]=Menu KDE
+-Name[sl]=Meni KDE
+-Name[sr]=KDE мени
+-Name[sr@Latn]=KDE meni
+-Name[sv]=KDE-meny
+-Name[ta]=கேடியி பட்டி
+-Name[te]=కెడిఈ పట్టీ
+-Name[tg]=Менюи KDE
+-Name[th]=เมนู KDE
+-Name[tr]=KDE Menüsü
+-Name[tt]=KDE Saylağı
+-Name[uk]=Меню KDE
+-Name[uz]=KDE menyu
+-Name[uz@cyrillic]=KDE меню
+-Name[vi]=Thực đơn KDE
+-Name[wa]=Dressêye KDE
+-Name[zh_CN]=KDE 菜单
+-Name[zh_TW]=KDE 選單
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-more.directory trinity-tdebase-3.5.13.2/applnk/kde-more.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-more.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-more.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,79 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Icon=package
+-Name=More Applications
+-Name[af]=Meer Programme
+-Name[ar]=المزيد من التطبيقات
+-Name[az]=Daha Çox Proqram
+-Name[be]=Яшчэ праграмы
+-Name[bg]=Още програми
+-Name[bn]=আরো অ্যাপলিকেশন
+-Name[br]=Ar re all
+-Name[bs]=Još programa
+-Name[ca]=Més aplicacions
+-Name[cs]=Více aplikací
+-Name[csb]=Wicy programów
+-Name[cy]=Rhagor o Gymhwysiadau
+-Name[da]=Flere programmer
+-Name[de]=Weitere Programme
+-Name[el]=Περισσότερες εφαρμογές
+-Name[eo]=Pluaj aplikaĵoj
+-Name[es]=Más aplicaciones
+-Name[et]=Muud rakendused
+-Name[eu]=Aplikazio gehiago
+-Name[fa]=کاربردهای بیشتر
+-Name[fi]=Lisää sovelluksia
+-Name[fr]=Autres applications
+-Name[fy]=Mear programma's
+-Name[ga]=Feidhmchláir Breise
+-Name[gl]=Máis Aplicacións
+-Name[he]=עוד יישומים
+-Name[hi]=और अधिक अनुप्रयोग
+-Name[hr]=Više aplikacija
+-Name[hsb]=Wjace programow
+-Name[hu]=További alkalmazások
+-Name[id]=Aplikasi Lain
+-Name[is]=Fleiri forrit
+-Name[it]=Altri programmi
+-Name[ja]=その他のアプリケーション
+-Name[ka]=დამატებითი პროგრამები
+-Name[kk]=Басқа қолданбалар
+-Name[km]=កម្មវិធីបន្ថែម​ទៀត
+-Name[ko]=더 많은 프로그램
+-Name[lt]=Daugiau programų
+-Name[lv]=Vairāk aplikāciju
+-Name[mk]=Уште апликации
+-Name[ms]=Aplikasi Lain
+-Name[mt]=Programmi KDE
+-Name[nb]=Flere programmer
+-Name[nds]=Mehr Programmen
+-Name[ne]=धेरै अनुप्रयोग
+-Name[nl]=Meer programma's
+-Name[nn]=Fleire program
+-Name[pa]=ਹੋਰ ਕਾਰਜ
+-Name[pl]=Więcej programów
+-Name[pt]=Mais Aplicações
+-Name[pt_BR]=Mais Aplicativos
+-Name[ro]=Alte aplicații
+-Name[ru]=Дополнительные приложения
+-Name[rw]=Amaporogaramu Arenze
+-Name[se]=Eanet prográmmat
+-Name[sk]=Ďalšie aplikácie
+-Name[sl]=Več programov
+-Name[sr]=Још програма
+-Name[sr@Latn]=Još programa
+-Name[sv]=Fler program
+-Name[ta]=அதிக பயன்பாடுகள்
+-Name[te]=మరికొన్ని కార్యక్రమములు
+-Name[tg]=Барномаҳои иловагӣ
+-Name[th]=แอพพลิเคชันอื่นๆ
+-Name[tr]=Daha Fazla Uygulama
+-Name[tt]=Başqa Yazılımnar
+-Name[uk]=Інші програми
+-Name[uz]=Boshqa dasturlar
+-Name[uz@cyrillic]=Бошқа дастурлар
+-Name[vi]=Ứng dụng Thêm nữa
+-Name[wa]=Co ds ôtes programes
+-Name[zh_CN]=更多应用程序
+-Name[zh_TW]=更多應用程式
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-multimedia.directory trinity-tdebase-3.5.13.2/applnk/kde-multimedia.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-multimedia.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-multimedia.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,65 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Multimedia
+-Name[ar]=الوسائط المتعددة
+-Name[az]=Multimediya
+-Name[be]=Мультымедыя
+-Name[bg]=Мултимедия
+-Name[bn]=মাল্টিমিডিয়া
+-Name[br]=Liesvedia
+-Name[bs]=Multimedija
+-Name[ca]=Multimèdia
+-Name[cs]=Multimédia
+-Name[csb]=Mùltimedia
+-Name[cy]=Amlgyfryngau
+-Name[da]=Multimedie
+-Name[el]=Πολυμέσα
+-Name[eo]=Plurmedio
+-Name[et]=Multimeedia
+-Name[fa]=چند رسانه‌ای
+-Name[fo]=Fleirmiðla
+-Name[fr]=Multimédia
+-Name[ga]=Ilmheáin
+-Name[he]=מולטימדיה
+-Name[hi]=मल्टीमीडिया
+-Name[hr]=Multimedija
+-Name[hsb]=Multimedije
+-Name[hu]=Multimédia
+-Name[is]=Margmiðlun
+-Name[ja]=マルチメディア
+-Name[ka]=მულტიმედია
+-Name[kk]=Мультимедиа
+-Name[km]=ពហុព័ត៌មាន
+-Name[ko]=멀티미디어
+-Name[lo]=ເມົາຕິມີເດຍ
+-Name[lv]=Multimēdija
+-Name[mk]=Мултимедија
+-Name[mn]=Мултимедиа
+-Name[ne]=मल्टिमिडिया
+-Name[nso]=Media wa Bontshi
+-Name[pa]=ਮਲਟੀਮੀਡਿਆ
+-Name[pt]=Multimédia
+-Name[pt_BR]=Multimídia
+-Name[ru]=Мультимедиа
+-Name[rw]=Mutwaramakuru
+-Name[sk]=Multimédiá
+-Name[sl]=Večpredstavnost
+-Name[sr]=Мултимедија
+-Name[sr@Latn]=Multimedija
+-Name[ss]=Tinhlobonhlobo-tetindzaba
+-Name[ta]=பல்லூடகம்
+-Name[te]=బహుళ మాద్యమం
+-Name[tg]=Мултимедия
+-Name[th]=มัลติมีเดีย
+-Name[tr]=Çokluortam
+-Name[uk]=Мультимедіа
+-Name[uz@cyrillic]=Мултимедиа
+-Name[ven]=Zwimwumwusi
+-Name[vi]=Đa phương tiện
+-Name[xh]=Iindlela ezininzi zokwenza
+-Name[zh_CN]=多媒体
+-Name[zh_TW]=多媒體
+-Name[zu]=Onozindaba abaningi
+-Icon=package_multimedia
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-office.directory trinity-tdebase-3.5.13.2/applnk/kde-office.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-office.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-office.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,86 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Office
+-Name[af]=Kantoor
+-Name[ar]=المكتب
+-Name[az]=Offis
+-Name[be]=Офіс
+-Name[bg]=Офис
+-Name[bn]=অফিস
+-Name[br]=Burev
+-Name[bs]=Uredske aplikacije
+-Name[ca]=Oficina
+-Name[cs]=Kancelář
+-Name[csb]=Biuro
+-Name[cy]=Swyddfa
+-Name[da]=Kontor
+-Name[de]=Büroprogramme
+-Name[el]=Γραφείο
+-Name[eo]=Laborejo
+-Name[es]=Oficina
+-Name[et]=Kontoritöö
+-Name[eu]=Bulegoa
+-Name[fa]=اداره
+-Name[fi]=Toimisto-ohjelmat
+-Name[fo]=Skrivstova
+-Name[fr]=Bureautique
+-Name[fy]=Kantoartapassingen
+-Name[ga]=Oifig
+-Name[gl]=Ofimática
+-Name[he]=יישומים משרדיים
+-Name[hi]=कार्यालय
+-Name[hr]=Ured
+-Name[hsb]=Běrowowe programy
+-Name[hu]=Irodai alkalmazások
+-Name[is]=Skrifstofuforrit
+-Name[it]=Ufficio
+-Name[ja]=オフィス
+-Name[ka]=ოფისი
+-Name[kk]=Офис
+-Name[km]=ការិយាល័យ
+-Name[ko]=사무용 도구
+-Name[lo]=ໂປຣແກຣມຊຸດສຳນັກງານ
+-Name[lt]=Biuro programos
+-Name[lv]=Birojs
+-Name[mk]=Канцеларија
+-Name[mn]=Албан програм
+-Name[ms]=Pejabat
+-Name[mt]=Uffiċċju
+-Name[nb]=Kontor
+-Name[nds]=Kontoor
+-Name[ne]=कार्यालय
+-Name[nl]=Kantoortoepassingen
+-Name[nn]=Kontor
+-Name[nso]=Ofisi
+-Name[oc]=Burèu
+-Name[pa]=ਦਫ਼ਤਰ
+-Name[pl]=Biuro
+-Name[pt]=Escritório
+-Name[pt_BR]=Escritório
+-Name[ro]=Aplicații birotică
+-Name[ru]=Офис
+-Name[rw]=Ofise
+-Name[se]=Kántuvra
+-Name[sk]=Kancelária
+-Name[sl]=Pisarna
+-Name[ss]=Lihhovisi
+-Name[sv]=Kontorsprogram
+-Name[ta]=அலுவலகம்
+-Name[te]=కార్యాలయము
+-Name[tg]=Офис
+-Name[th]=โปรแกรมชุดสำนักงาน
+-Name[tr]=Ofis
+-Name[tt]=Eşxänä
+-Name[uk]=Офіс
+-Name[uz]=Idora uchun dasturlar
+-Name[uz@cyrillic]=Идора учун дастурлар
+-Name[ven]=Ofisi
+-Name[vi]=Văn phòng
+-Name[wa]=Buro
+-Name[xh]=Ofisi
+-Name[zh_CN]=办公
+-Name[zh_TW]=辦公軟體
+-Name[zu]=Ihhofisi
+-Icon=package_wordprocessing
+-SortOrder=koshell.desktop,kword.desktop,kspread.desktop,kpresenter.desktop
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-science.directory trinity-tdebase-3.5.13.2/applnk/kde-science.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-science.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-science.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,80 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Icon=kcmdf
+-Name=Science & Math
+-Name[af]=Wetenskap & Wiskunde
+-Name[ar]=العلوم و الرياضيات
+-Name[az]=Elm və Riyaziyyat
+-Name[be]=Навука і матэматыка
+-Name[bg]=Математика
+-Name[bn]=বিজ্ঞান এবং গণিত
+-Name[br]=Skiant ha Jedoniel
+-Name[bs]=Nauka i matematika
+-Name[ca]=Ciència i Matemàtiques
+-Name[cs]=Věda a matematika
+-Name[csb]=Ùczbòwé
+-Name[cy]=Gwyddoniaeth a Mathemateg
+-Name[da]=Naturvidenskab & matematik
+-Name[de]=Wissenschaft & Mathematik
+-Name[el]=Επιστήμη & Μαθηματικά
+-Name[en_GB]=Science & Maths
+-Name[eo]=Scienco kaj Matematiko
+-Name[es]=Ciencia y matemáticas
+-Name[et]=Teadus
+-Name[eu]=Zientzia eta matematikaa
+-Name[fa]=علوم و ریاضی
+-Name[fi]=Tiede ja matematiikka
+-Name[fr]=Science et mathématiques
+-Name[fy]=Wittenskiplik en wiskunde
+-Name[ga]=Eolaíocht & Matamaitic
+-Name[gl]=Ciencia e Matemáticas
+-Name[he]=מדע ומתמטיקה
+-Name[hi]=विज्ञान और गणित
+-Name[hr]=Znanost i matematika
+-Name[hsb]=Matematika & Wědomosć
+-Name[hu]=Tudományok, matematika
+-Name[id]=Ilmu Pengetahuan & Matematika
+-Name[is]=Vísindi og stærðfræði
+-Name[it]=Scienza e matematica
+-Name[ja]=サイエンス & 数学
+-Name[ka]=მეცნიერება და მათემატიკა
+-Name[kk]=Ғылыми және математикалық
+-Name[km]=វិទ្យាសាស្ត្រ & គណិតវិទ្យា
+-Name[ko]=과학과 수학
+-Name[lt]=Mokslas ir matematika
+-Name[lv]=Zinātne un Matemātika
+-Name[mk]=Наука и математика
+-Name[ms]=Matematik & Sains
+-Name[mt]=Xjenza u Matematika
+-Name[nb]=Vitenskap og matematikk
+-Name[nds]=Wetenschap & Mathematik
+-Name[ne]=विज्ञान र गणीत
+-Name[nl]=Wetenschap en wiskunde
+-Name[nn]=Vitskap og matematikk
+-Name[pa]=ਵਿਗਿਆਨ ਤੇ ਗਣਿਤ
+-Name[pl]=Naukowe
+-Name[pt]=Ciência e Matemática
+-Name[pt_BR]=Ciências & Matemática
+-Name[ro]=Știință și matematică
+-Name[ru]=Наука
+-Name[rw]=Ikoranabuhanga & Imibare
+-Name[se]=Dieđa ja matematihkka
+-Name[sk]=Veda
+-Name[sl]=Znanost in matematika
+-Name[sr]=Наука и математика
+-Name[sr@Latn]=Nauka i matematika
+-Name[sv]=Vetenskap och matematik
+-Name[ta]=அறிவியல் & கணிதம்
+-Name[te]=విజ్ఞానం & గణితం
+-Name[tg]=Илм ва математика
+-Name[th]=วิทยาศาสตร์และคณิตศาสตร์
+-Name[tr]=Bilim ve Matematik
+-Name[tt]=Fän & Sanaw
+-Name[uk]=Наука і математика
+-Name[uz]=Fan va Matematika
+-Name[uz@cyrillic]=Фан ва Математика
+-Name[vi]=Khoa học & Toán học
+-Name[wa]=Siyinces et matematikes
+-Name[zh_CN]=科学和数学
+-Name[zh_TW]=科學與數學
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-screensavers.menu trinity-tdebase-3.5.13.2/applnk/kde-screensavers.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-screensavers.menu 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-screensavers.menu 1970-01-01 01:00:00.000000000 +0100
+@@ -1,10 +0,0 @@
+- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+- <Name>ScreenSavers</Name>
+- <Directory>kde-system-screensavers.directory</Directory>
+- <Include>
+- <Category>X-KDE-ScreenSaver</Category>
+- </Include>
+-</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-accessibility.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-accessibility.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-accessibility.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-accessibility.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,85 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Regional & Accessibility
+-Name[af]=Streek & Toeganklikheid
+-Name[ar]=الإقليمي وتسهيل الوصول
+-Name[az]=Regional Qurğular & Yetişmə Qabiliyyəti
+-Name[be]=Рэгіянальныя настаўленні і даступнасць
+-Name[bg]=Локализация
+-Name[bn]=আঞ্চলিক এবং সহায়ক প্রযুক্তি
+-Name[br]=Rannvro hag Haezadusted
+-Name[bs]=Regionalno i pristupačnost
+-Name[ca]=Regional i accessibilitat
+-Name[cs]=Místní zvyklosti a zpřístupnění
+-Name[csb]=Òbéńdowé ë przistãpnosc
+-Name[cy]=Rhanbarthol & Hygyrchedd
+-Name[da]=Region & Tilgængelighed
+-Name[de]=Regionaleinstellungen & Zugangshilfen
+-Name[el]=Περιοχή & Προσιτότητα
+-Name[eo]=Regiono & Alirebleco
+-Name[es]=Regional y accesibilidad
+-Name[et]=Hõlbustus
+-Name[eu]=Eskualdea eta erabilerraztasuna
+-Name[fa]=منطقه‌ای و دستیابی‌پذیری
+-Name[fi]=Alueellisuus ja käytettävyys
+-Name[fr]=Régionalisation et accessibilité
+-Name[fy]=Regio en tagonklikens
+-Name[ga]=Réigiúnach agus Insroichteacht
+-Name[gl]=Rexional e Acesibilidade
+-Name[he]=הגדרות אזוריות ונגישות
+-Name[hi]=क्षेत्रीय व भाषायी पहुँच
+-Name[hr]=Regionalnost i pristupačnost
+-Name[hsb]=Kraj & Přistupnosć
+-Name[hu]=Nyelv, kezelési segítség
+-Name[is]=Svæðisbundnar stillingar og aðgengi
+-Name[it]=Regionali e Accesso facilitato
+-Name[ja]=地域 & アクセシビリティ
+-Name[ka]=რეგიონალური და სეპციალური შესაძლებლობები
+-Name[kk]=Жергілікті және Арнаулы мүмкіндіктер
+-Name[km]=តំបន់ & មធ្យោបាយ​ងាយស្រួល
+-Name[ko]=지역과 내게 필요한 설정
+-Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
+-Name[lt]=Regionai bei prieinamumas
+-Name[lv]=Reģionāls un Pieejamība
+-Name[mk]=Регионалност и пристапливост
+-Name[mn]=Бүслүүр-тохируулга & Хэрэглэх тохь
+-Name[ms]=Pemudahcapai & Tetapan Tempatan
+-Name[mt]=Reġjonali u Aċċessibiltà
+-Name[nb]=Regionalt og tilgjengelighet
+-Name[nds]=Regioon & Behinnertenhülp
+-Name[ne]=क्षेत्रीय र पहुँचयोग्य
+-Name[nl]=Regio en toegankelijkheid
+-Name[nn]=Regional og tilgjenge
+-Name[nso]=Ya Naga & Tsenelo
+-Name[pa]=ਖੇਤਰੀ ਅਤੇ ਸਹੂਲਤਾਂ
+-Name[pl]=Regionalne i dostępność
+-Name[pt]=Regional e Acessibilidade
+-Name[pt_BR]=Regional & Acessibilidade
+-Name[ro]=Regional și accesibilitate
+-Name[ru]=Региональные и специальные возможности
+-Name[rw]=By'agace & Ukugerwaho
+-Name[se]=Báikkálaš ja álkkibut geavaheapmi
+-Name[sk]=Prístupnosť a regionálne nastavenie
+-Name[sl]=Regionalnost in dostopnost
+-Name[sr]=Регија и приступачност
+-Name[sr@Latn]=Regija i pristupačnost
+-Name[ss]=Kutfolakala kalula & kwesifundza
+-Name[sv]=Region och handikappstöd
+-Name[ta]=நாடும் & அணுகலும்
+-Name[te]=ప్రాంతియతా & అందుబాటు
+-Name[tg]=Имкониятҳои минтақавӣ
+-Name[th]=เขตพื้นที่และการใช้งาน
+-Name[tr]=Bölgesel ve Erişilebilirlik
+-Name[tt]=Cirläşterü & İreşülek
+-Name[uk]=Локалізація та доступність
+-Name[uz]=Regional va qulayliklar
+-Name[uz@cyrillic]=Регионал ва қулайликлар
+-Name[ven]=U Dzhenea ha vhupo
+-Name[vi]=Hỗ trợ quốc tế & Hỗ trợ người tàn tật
+-Name[wa]=Redjonå & Accessibilité
+-Name[xh]=Ummandla & Nofumaneko
+-Name[zh_CN]=区域和辅助功能
+-Name[zh_TW]=區域性與易用性
+-Name[zu]=Okwesifunda & Igunya lokungena
+-Icon=locale
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-components.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-components.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-components.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-components.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,85 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=KDE Components
+-Name[af]=KDE Komponente
+-Name[ar]=مكوّنات KDE
+-Name[az]=KDE Tərkib Hissələri
+-Name[be]=Кампаненты KDE
+-Name[bg]=Компоненти
+-Name[bn]=কে.ডি.ই-র বিভিন্ন উপাদান
+-Name[br]=Parzhioù KDE
+-Name[bs]=KDE komponente
+-Name[ca]=Components del KDE
+-Name[cs]=Komponenty KDE
+-Name[csb]=Dzéle KDE
+-Name[cy]= Cydrannau KDE
+-Name[da]=KDE-komponenter
+-Name[de]=KDE-Komponenten
+-Name[el]=Συστατικά του KDE
+-Name[eo]=KDEaj komponentoj
+-Name[es]=Componentes de KDE
+-Name[et]=KDE komponendid
+-Name[eu]=KDE osagaiak
+-Name[fa]=مؤلفه‌های KDE
+-Name[fi]=KDE-komponentit
+-Name[fr]=Composants de KDE
+-Name[fy]=KDE-compeninten
+-Name[ga]=Comhpháirteanna KDE
+-Name[gl]=Compoñentes de KDE
+-Name[he]=רכיבי KDE
+-Name[hi]=केडीई के घटक
+-Name[hr]=KDE komponente
+-Name[hsb]=KDE-komponenty
+-Name[hu]=KDE-komponensek
+-Name[id]=Komponen KDE
+-Name[is]=KDE einingar
+-Name[it]=Componenti di KDE
+-Name[ja]=KDE コンポーネント
+-Name[ka]=KDE კომპონენტები
+-Name[kk]=KDE компоненттер
+-Name[km]=សមាសភាគ KDE
+-Name[ko]=KDE 구성요소
+-Name[lo]=ຄອມໂພເນນຂອງ KDE
+-Name[lt]=KDE komponentai
+-Name[lv]=KDE Komponentes
+-Name[mk]=Компоненти на KDE
+-Name[mn]=КДЭ-Бүрэлдхүүнүүд
+-Name[ms]=Komponen KDE
+-Name[nb]=KDE-komponenter
+-Name[nds]=KDE-Komponenten
+-Name[ne]=KDE अवयव
+-Name[nl]=KDE-componenten
+-Name[nn]=KDE-komponent
+-Name[nso]=Dikagare tsa KDE
+-Name[pa]=KDE ਭਾਗ
+-Name[pl]=Składniki KDE
+-Name[pt]=Componentes do KDE
+-Name[pt_BR]=Componentes do KDE
+-Name[ro]=Componente KDE
+-Name[ru]=Компоненты
+-Name[rw]=Inyangingo za KDE
+-Name[se]=KDE-oasit
+-Name[sk]=Komponenty KDE
+-Name[sl]=Komponente KDE
+-Name[sr]=KDE компоненте
+-Name[sr@Latn]=KDE komponente
+-Name[ss]=Tincenye te KDE
+-Name[sv]=KDE-komponenter
+-Name[ta]=KDE கூறுகள்
+-Name[te]=కెడిఈ అంశాలు
+-Name[tg]=Қисматҳои KDE
+-Name[th]=ส่วนประกอบของ KDE
+-Name[tr]=KDE Bileşenleri
+-Name[tt]=KDE Öleşläre
+-Name[uk]=Компоненти KDE
+-Name[uz]=KDE komponentlari
+-Name[uz@cyrillic]=KDE компонентлари
+-Name[ven]=Zwipida zwa KDE
+-Name[vi]=Thành phần của KDE
+-Name[wa]=Componints di KDE
+-Name[xh]=Izinto ze KDE
+-Name[zh_CN]=KDE 组件
+-Name[zh_TW]=KDE 元件
+-Name[zu]= Amalunga e-KDE
+-Icon=blockdevice
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-desktop.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-desktop.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-desktop.directory 2013-07-28 15:44:30.820668728 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-desktop.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,80 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Desktop
+-Name[af]=Werkskerm
+-Name[ar]=سطح المكتب
+-Name[az]=Masa Üstü
+-Name[be]=Працоўны стол
+-Name[bg]=Работен плот
+-Name[bn]=ডেস্কটপ
+-Name[br]=Gorretaol
+-Name[bs]=Radna površina
+-Name[ca]=Escriptori
+-Name[cs]=Pracovní plocha
+-Name[csb]=Pùlt
+-Name[cy]=Penbwrdd
+-Name[de]=Arbeitsfläche
+-Name[el]=Επιφάνεια εργασίας
+-Name[eo]=Tabulo
+-Name[es]=Escritorio
+-Name[et]=Töölaud
+-Name[eu]=Mahaigaina
+-Name[fa]=رومیزی
+-Name[fi]=Työpöytä
+-Name[fo]=Skriviborð
+-Name[fr]=Bureau
+-Name[fy]=Buroblêd
+-Name[ga]=Deasc
+-Name[gl]=Escritorio
+-Name[he]=שולחן עבודה
+-Name[hi]=डेस्कटॉप
+-Name[hr]=Radna površina
+-Name[hsb]=Dźěłowy powjerch
+-Name[hu]=Munkaasztal
+-Name[is]=Skjáborð
+-Name[ja]=デスクトップ
+-Name[ka]=სამუშაო დაფა
+-Name[kk]=Жұмыс үстелі
+-Name[km]=ផ្ទៃតុ
+-Name[ko]=데스크톱
+-Name[lo]=ພື້ນທີ່ເຮັດວງກ
+-Name[lt]=Darbastalis
+-Name[lv]=Darbvirsma
+-Name[mk]=Работна површина
+-Name[mn]=Ажлын тавцан
+-Name[ms]=Ruang Kerja
+-Name[nb]=Skrivebord
+-Name[nds]=Schriefdisch
+-Name[ne]=डेस्कटप
+-Name[nl]=Bureaublad
+-Name[nn]=Skrivebord
+-Name[oc]=BurèU
+-Name[pa]=ਵੇਹੜਾ
+-Name[pl]=Pulpit
+-Name[pt]=Ambiente de Trabalho
+-Name[pt_BR]=Área de Trabalho
+-Name[ru]=Рабочий стол
+-Name[rw]=Ibiro
+-Name[se]=Čállinbeavdi
+-Name[sk]=Plocha
+-Name[sl]=Namizje
+-Name[sr]=Радна површина
+-Name[sr@Latn]=Radna površina
+-Name[ss]=Desktop
+-Name[sv]=Skrivbord
+-Name[ta]=மேல்மேசை
+-Name[te]=రంగస్ఠలం
+-Name[tg]=Мизи корӣ
+-Name[th]=พื้นที่ทำงาน
+-Name[tr]=Masaüstü
+-Name[tt]=Östäl
+-Name[uk]=Стільниця
+-Name[uz]=Ish stoli
+-Name[uz@cyrillic]=Иш столи
+-Name[ven]=Desikithopo
+-Name[vi]=Màn hình nền
+-Name[wa]=Sicribanne
+-Name[zh_CN]=桌面
+-Name[zh_TW]=桌面
+-Icon=desktop
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.directory trinity-tdebase-3.5.13.2/applnk/kde-settings.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,88 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Settings-Modules
+-Name[af]=Instel-Modules
+-Name[ar]=الوحدات النمطية للتعيينات
+-Name[az]=Qurğu Modulları
+-Name[be]=Модулі настаўлення
+-Name[bg]=Контролен център
+-Name[bn]=সেটিংস-মডিউল
+-Name[br]=Kefluniadur-molladoù
+-Name[bs]=Postavke-Moduli
+-Name[ca]=Mòduls de paràmetres
+-Name[cs]=Moduly nastavení
+-Name[csb]=Ùstôw - mòdułë
+-Name[cy]=Modiwlau Gosodiadau
+-Name[da]=Indstillingsmoduler
+-Name[de]=Einstellungsmodule
+-Name[el]=Ρυθμίσεις-Αρθρώματα
+-Name[eo]=Agordomoduloj
+-Name[es]=Módulos de preferencias
+-Name[et]=Seadistuste moodulid
+-Name[eu]=Ezarpenak-moduluak
+-Name[fa]=پیمانه‌های تنظیمات
+-Name[fi]=Asetusmoduulit
+-Name[fo]=Uppsetingarpartar
+-Name[fr]=Modules de configuration
+-Name[fy]=Ynstellingsmodules
+-Name[ga]=Modúil Socraithe
+-Name[gl]=Módulos de Opcións
+-Name[he]=מודולי הגדרות
+-Name[hi]=विन्यास-मॉड्यूल्स
+-Name[hr]=Postavke-Moduli
+-Name[hsb]=Nastajenja -module
+-Name[hu]=Beállítómodulok
+-Name[is]=Stillingareiningar
+-Name[it]=Moduli impostazioni
+-Name[ja]=設定モジュール
+-Name[ka]=მოდულები
+-Name[kk]=Модульдер
+-Name[km]=ការ​កំណត់​ម៉ូឌុល
+-Name[ko]=설정-모듈
+-Name[lo]=ຕັ້ງຄ່າໂມດູນ
+-Name[lt]=Parinkčių moduliai
+-Name[lv]=Parametru moduļi
+-Name[mk]=Модули за поставувања
+-Name[mn]=Тохируулга-горим
+-Name[ms]=Tetapan Modul
+-Name[mt]=Moduli tas-settings
+-Name[nb]=Innstillingsmoduler
+-Name[nds]=Instellen-Modulen
+-Name[ne]=सेटिङ-मोड्युल
+-Name[nl]=Configuratiemodules
+-Name[nn]=Innstillingsmodular
+-Name[nso]=Diripa tsa Dipeakanyo
+-Name[pa]=ਸੈਟਿੰਗ-ਮੋਡੀਊਲ
+-Name[pl]=Ustawienia - moduły
+-Name[pt]=Módulos de Preferências
+-Name[pt_BR]=Módulos de Configuração
+-Name[ro]=Module de configurare
+-Name[ru]=Модули
+-Name[rw]=Amagenamiterere-Ibice
+-Name[se]=Heivehusmoduvllat
+-Name[sk]=Moduly nastavenia
+-Name[sl]=Nastavitveni moduli
+-Name[sr]=Поставке-модули
+-Name[sr@Latn]=Postavke-moduli
+-Name[ss]=Kuhleleka kwetahluko
+-Name[sv]=Inställningsmoduler
+-Name[ta]=அமைப்புகள்-பகுதிகள்
+-Name[te]=అమరికలు-మాడ్యూళ్లు
+-Name[tg]=Модулҳо
+-Name[th]=โมดูลการตั้งค่า
+-Name[tr]=Modül Ayarları
+-Name[tt]=Caylaw-Modullar
+-Name[uk]=Модулі параметрів
+-Name[uz]=Mslamalar modullari
+-Name[uz@cyrillic]=Мсламалар модуллари
+-Name[ven]=Modulu wa mavhekanyele
+-Name[vi]=Thiết lập Mô đun
+-Name[wa]=Apontiaedjes des modules
+-Name[xh]=Izicwangciso-Iminqongo wokulinganisela
+-Name[zh_CN]=设置模块
+-Name[zh_TW]=設定模組
+-Name[zu]=Izingxenye-zezilungiselelo
+-NoDisplay=true
+-Icon=package_settings
+-X-KDE-BaseGroup=settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-hardware.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-hardware.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-hardware.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-hardware.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,59 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Hardware
+-Name[af]=Hardeware
+-Name[ar]=العتاد
+-Name[be]=Апаратнае забеспячэнне
+-Name[bg]=Хардуер
+-Name[bn]=হার্ডওয়্যার
+-Name[br]=Periantel
+-Name[bs]=Hardver
+-Name[csb]=Nôrzãdza
+-Name[cy]=Caledwedd
+-Name[el]=Υλικό
+-Name[eo]=Aparataro
+-Name[et]=Riistvara
+-Name[fa]=سخت‌افزار
+-Name[fi]=Laitteisto
+-Name[fr]=Matériel
+-Name[ga]=Crua-Earraí
+-Name[he]=חומרה
+-Name[hr]=Hardver
+-Name[hu]=Hardver
+-Name[id]=Perangkat Keras
+-Name[is]=Vélbúnaður
+-Name[ja]=ハードウェア
+-Name[ka]=მოწყობილობები
+-Name[kk]=Жабдықтар
+-Name[km]=ផ្នែក​រឹង
+-Name[ko]=하드웨어
+-Name[lt]=Aparatinė įranga
+-Name[mk]=Хардвер
+-Name[ms]=Perkakasan
+-Name[nb]=Maskinvare
+-Name[ne]=हार्डवेयर
+-Name[nn]=Maskinvare
+-Name[pa]=ਜੰਤਰ
+-Name[pl]=Sprzęt
+-Name[ru]=Оборудование
+-Name[rw]=Icyuma
+-Name[se]=Mašiidnagálvu
+-Name[sl]=Strojna oprema
+-Name[sr]=Хардвер
+-Name[sr@Latn]=Hardver
+-Name[sv]=Hårdvara
+-Name[ta]=வன்பொருள்
+-Name[te]=హార్డ్ వేర్
+-Name[tg]=Сахтафзор
+-Name[th]=อุปกรณ์ภายในเครื่อง
+-Name[tr]=Donanım
+-Name[tt]=Cıhazlar
+-Name[uk]=Обладнання
+-Name[uz]=Asbob-uskunalar
+-Name[uz@cyrillic]=Асбоб-ускуналар
+-Name[vi]=Phần cứng
+-Name[wa]=Éndjolreye
+-Name[zh_CN]=硬件
+-Name[zh_TW]=硬體
+-Icon=input_devices_settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-looknfeel.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-looknfeel.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-looknfeel.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-looknfeel.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,86 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Appearance & Themes
+-Name[af]=Voorkoms & Temas
+-Name[ar]=المظهر و السمات
+-Name[az]=Görünüş & Örtüklər
+-Name[be]=Вонкавы выгляд і тэмы
+-Name[bg]=Външен вид
+-Name[bn]=চেহারা এবং থীম
+-Name[br]=Neuziadur ha gizioù
+-Name[bs]=Izgled i teme
+-Name[ca]=Aparença i temes
+-Name[cs]=Vzhled a motivy
+-Name[csb]=Wëzdrzatk ë témë
+-Name[cy]=Golwg a Themau
+-Name[da]=Udseende & Temaer
+-Name[de]=Erscheinungsbild
+-Name[el]=Εμφάνιση & Θέματα
+-Name[eo]=Aspekto & Etosoj
+-Name[es]=Aspecto y temas
+-Name[et]=Välimus ja teemad
+-Name[eu]=Itxura eta gaiak
+-Name[fa]=ظاهر و چهره‌ها
+-Name[fi]=Ulkonäkö ja teemat
+-Name[fr]=Apparence et thèmes
+-Name[fy]=Uterlik en tema's
+-Name[ga]=Cuma agus Téamaí
+-Name[gl]=Apariencia e Temas
+-Name[he]=מראה וערכות נושא
+-Name[hi]=शक्ल-सूरत एवं प्रसंग
+-Name[hr]=Izgled i teme
+-Name[hsb]=Napohlad & Temy
+-Name[hu]=Megjelenés, témák
+-Name[id]=Penampilan dan Tema
+-Name[is]=Viðmót og útlit
+-Name[it]=Aspetto e Temi
+-Name[ja]=外観 & テーマ
+-Name[ka]=გარეგნობა და თემები
+-Name[kk]=Көрініс пен нақыштар
+-Name[km]=រូបរាង & ស្បែក
+-Name[ko]=모양과 테마
+-Name[lo]=ຝັຣງເສດສ໌
+-Name[lt]=Išvaizda ir temos
+-Name[lv]=Izskats un Tēmas
+-Name[mk]=Изглед и теми
+-Name[mn]=Харагдалт & хэлбэр
+-Name[ms]=Tema dan Penampilan
+-Name[mt]=Apparenza u Temi
+-Name[nb]=Utseende og temaer
+-Name[nds]=Utsehn & Muster
+-Name[ne]=दृश्य र विषयवस्तु
+-Name[nl]=Uiterlijk en thema's
+-Name[nn]=Utsjånad og tema
+-Name[nso]=Ponagalo & Melaetsa
+-Name[pa]=ਦਿੱਖ ਅਤੇ ਸਰੂਪ
+-Name[pl]=Wygląd i motywy
+-Name[pt]=Aparência e Temas
+-Name[pt_BR]=Aparência & Temas
+-Name[ro]=Aspect și tematici
+-Name[ru]=Внешний вид и темы
+-Name[rw]=Imigaragarire & Insanganyamatsiko
+-Name[se]=Fárda ja fáttát
+-Name[sk]=Vzhľad a témy
+-Name[sl]=Videz in teme
+-Name[sr]=Изглед и теме
+-Name[sr@Latn]=Izgled i teme
+-Name[ss]=Kubukeka & kwendzikimba
+-Name[sv]=Utseende och teman
+-Name[ta]=தோற்றம் & உருக்கரு
+-Name[te]=రూపం ఇంకా వైవిద్యాంశాలు
+-Name[tg]=Намуди зоҳирӣ ва услуб
+-Name[th]=รูปแบบและชุดตกแต่ง
+-Name[tr]=Görünüm ve Temalar
+-Name[tt]=Küreneş & Tışlaw
+-Name[uk]=Вигляд та теми
+-Name[uz]=Tashqi koʻrinishi va mavzular
+-Name[uz@cyrillic]=Ташқи кўриниши ва мавзулар
+-Name[ven]=Mbonalelo & Dzithero
+-Name[vi]=Diện mạo & Sắc thái
+-Name[wa]=Rivnance & Tinmes
+-Name[xh]=Ubonakalo Nemixholo
+-Name[zh_CN]=外观和主题
+-Name[zh_TW]=外觀與主題
+-Name[zu]=Ukubukeka & Izingqikithi
+-Icon=looknfeel
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.menu trinity-tdebase-3.5.13.2/applnk/kde-settings.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings.menu 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings.menu 1970-01-01 01:00:00.000000000 +0100
+@@ -1,91 +0,0 @@
+- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+- <Name>Settings</Name>
+- <Menu>
+- <Name>Accessibility</Name>
+- <Directory>kde-settings-accessibility.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-accessibility</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Components</Name>
+- <Directory>kde-settings-components.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-components</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Desktop</Name>
+- <Directory>kde-settings-desktop.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-desktop</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>LookNFeel</Name>
+- <Directory>kde-settings-looknfeel.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-looknfeel</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Network</Name>
+- <Directory>kde-settings-network.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-network</Category>
+- </Include>
+- <Menu>
+- <Name>WebBrowsing</Name>
+- <Directory>kde-settings-webbrowsing.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-webbrowsing</Category>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Peripherals</Name>
+- <Directory>kde-settings-peripherals.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-peripherals</Category>
+- <Category>X-KDE-settings-hardware</Category>
+- </Include>
+- <Menu>
+- <Name>Information</Name>
+- <Directory>kde-settings-information.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-information</Category>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>PowerControl</Name>
+- <Directory>kde-settings-power.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-power</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Security</Name>
+- <Directory>kde-settings-security.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-security</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Sound</Name>
+- <Directory>kde-settings-sound.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-sound</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>System</Name>
+- <Directory>kde-settings-system.directory</Directory>
+- <Include>
+- <Category>X-KDE-settings-system</Category>
+- </Include>
+- </Menu>
+-</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settingsmenu.directory trinity-tdebase-3.5.13.2/applnk/kde-settingsmenu.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settingsmenu.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settingsmenu.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,78 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Settings
+-Name[af]=Instellings
+-Name[ar]=التعيينات
+-Name[az]=Qurğular
+-Name[be]=Настаўленні
+-Name[bg]=Настройки
+-Name[bn]=সেটিংস
+-Name[br]=Dibarzhoù
+-Name[bs]=Postavke
+-Name[ca]=Preferències
+-Name[cs]=Nastavení
+-Name[csb]=Ùstôw
+-Name[cy]=Gosodiadau
+-Name[da]=Opsætning
+-Name[de]=Einstellungen
+-Name[el]=Ρυθμίσεις
+-Name[eo]=Agordo
+-Name[es]=Preferencias
+-Name[et]=Seadistused
+-Name[eu]=Ezarpenak
+-Name[fa]=تنظیمات
+-Name[fi]=Asetukset
+-Name[fr]=Configuration
+-Name[fy]=Ynstellings
+-Name[ga]=Socruithe
+-Name[gl]=Opcións
+-Name[he]=הגדרות
+-Name[hi]=विन्यास
+-Name[hr]=Postavke
+-Name[hsb]=Nastajenja
+-Name[hu]=Beállítások
+-Name[is]=Stillingar
+-Name[it]=Impostazioni
+-Name[ja]=設定
+-Name[ka]=პარამეტრები
+-Name[kk]=Параметрлері
+-Name[km]=ការ​កំណត់
+-Name[ko]=설정
+-Name[lt]=Parinktys
+-Name[lv]=Parametri
+-Name[mk]=Поставувања
+-Name[mn]=Тохируулга
+-Name[ms]=Tempatan
+-Name[nb]=Innstillinger
+-Name[nds]=Instellen
+-Name[ne]=सेटिङ
+-Name[nl]=Instellingen
+-Name[nn]=Innstillingar
+-Name[pa]=ਸੈਟਿੰਗ
+-Name[pl]=Ustawienia
+-Name[pt]=Configuração
+-Name[pt_BR]=Configurações
+-Name[ro]=Setări
+-Name[ru]=Настройка
+-Name[rw]=Amagenamiterere
+-Name[se]=Heivehusat
+-Name[sk]=Nastavenia
+-Name[sl]=Nastavitve
+-Name[sr]=Поставке
+-Name[sr@Latn]=Postavke
+-Name[sv]=Inställningar
+-Name[ta]=அமைப்புகள்
+-Name[te]=అమరికలు
+-Name[tg]=Танзимот
+-Name[th]=ตั้งค่าต่างๆ
+-Name[tr]=Ayarlar
+-Name[tt]=Caylaw
+-Name[uk]=Параметри
+-Name[uz]=Moslamalar
+-Name[uz@cyrillic]=Мосламалар
+-Name[vi]=Thiết lập
+-Name[wa]=Apontiaedjes
+-Name[zh_CN]=设置
+-Name[zh_TW]=設定
+-Icon=package_settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-network.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-network.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-network.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-network.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,86 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Internet & Network
+-Name[af]=Internet & Netwerk
+-Name[ar]=الإنترنت و الشبكة
+-Name[az]=İnternet & Şəbəkə
+-Name[be]=Інтэрнэт і сетка
+-Name[bg]=Интернет и мрежа
+-Name[bn]=ইন্টারনেট এবং নেটওয়ার্ক
+-Name[br]=Kenrouedad ha Rouedad
+-Name[bs]=Internet i mreža
+-Name[ca]=Internet i xarxa
+-Name[cs]=Internet a síť
+-Name[csb]=Internet ë séc
+-Name[cy]=Rhyngrwyd & Rhwydwaith
+-Name[da]=Internet & Netværk
+-Name[de]=Internet & Netzwerk
+-Name[el]=Διαδίκτυο & Δίκτυο
+-Name[eo]=Reto & Interreto
+-Name[es]=Internet y Red
+-Name[et]=Internet ja võrk
+-Name[eu]=Internet eta sarea
+-Name[fa]=اینترنت و شبکه
+-Name[fi]=Internet ja verkko
+-Name[fr]=Internet et réseau
+-Name[fy]=Ynternet en netwurk
+-Name[ga]=Idirlíon agus Líonra
+-Name[gl]=Internet e Rede
+-Name[he]=אינטרנט ורשתות
+-Name[hi]=इंटरनेट तथा नेटवर्क
+-Name[hr]=Internet i mreža
+-Name[hsb]=Internet & Syć
+-Name[hu]=Hálózat, internet
+-Name[id]=Internet dan Jaringan
+-Name[is]=Staðarnet og Internetið
+-Name[it]=Internet e Rete
+-Name[ja]=インターネット & ネットワーク
+-Name[ka]=ქსელი და ინტერნეტი
+-Name[kk]=Интернет және желі
+-Name[km]=អ៊ិនធឺណិត & បណ្ដាញ
+-Name[ko]=인터넷과 네트워크
+-Name[lo]=ອີນເຕີເນັດ
+-Name[lt]=Internetas ir tinklas
+-Name[lv]=Internets un Tīkli
+-Name[mk]=Интернет и мрежи
+-Name[mn]=Интернэт & Сүлжээ
+-Name[ms]=Internet & Jaringan
+-Name[mt]=Internet u Network
+-Name[nb]=Internett og nettverk
+-Name[nds]=Internet & Nettwark
+-Name[ne]=इन्टरनेट र सञ्जाल
+-Name[nl]=Internet en netwerk
+-Name[nn]=Internett og nettverk
+-Name[nso]=Internet & Kgokagano
+-Name[pa]=ਇੰਟਰਨੈੱਟ ਅਤੇ ਨੈੱਟਵਰਕ
+-Name[pl]=Internet i sieć
+-Name[pt]=Internet e Rede
+-Name[pt_BR]=Internet & Rede
+-Name[ro]=Internet și rețea
+-Name[ru]=Сеть и Интернет
+-Name[rw]=Interineti & Urusobemiyoboro
+-Name[se]=Interneahtta ja fierpmádat
+-Name[sk]=Internet a sieť
+-Name[sl]=Internet in omrežje
+-Name[sr]=Интернет и мрежа
+-Name[sr@Latn]=Internet i mreža
+-Name[ss]=Internet & luchungechunge
+-Name[sv]=Internet och nätverk
+-Name[ta]=இணையம் & வலையமைப்பு
+-Name[te]=ఇంటర్నెట్ & నెట్వర్క్
+-Name[tg]=Интернет ва шабақа
+-Name[th]=อินเทอร์เน็ตและเครือข่าย
+-Name[tr]=İnternet ve Ağ Ayarları
+-Name[tt]=Päräwez & Çeltär
+-Name[uk]=Інтернет та мережа
+-Name[uz]=Internet va tarmoq
+-Name[uz@cyrillic]=Интернет ва тармоқ
+-Name[ven]=Inthanete & Vhukwamani
+-Name[vi]=Internet & Mạng
+-Name[wa]=Rantoele & Daegntoele
+-Name[xh]=Internet & Nomsebenzi womnatha
+-Name[zh_CN]=Internet 和网络
+-Name[zh_TW]=網路
+-Name[zu]=Internet & Uxhumano olusakazekile
+-Icon=network
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-peripherals.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-peripherals.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-peripherals.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-peripherals.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,87 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Peripherals
+-Name[af]=Randapperatuur
+-Name[ar]=الأجهزة المحيطية
+-Name[az]=Avadanlıq
+-Name[be]=Перыферыя
+-Name[bg]=Периферия
+-Name[bn]=পেরিফেরাল
+-Name[br]=Trobarzhelloù
+-Name[bs]=Vanjski uređaji
+-Name[ca]=Perifèrics
+-Name[cs]=Periférie
+-Name[csb]=Periferëjné ùrzãdzenia
+-Name[cy]=Perifferolion
+-Name[da]=Tilkoblinger
+-Name[de]=Angeschlossene Geräte
+-Name[el]=Περιφερειακά
+-Name[eo]=Periferaĵoj
+-Name[es]=Periféricos
+-Name[et]=Välisseadmed
+-Name[eu]=Periferikoak
+-Name[fa]=وسایل جانبی
+-Name[fi]=Laitteet
+-Name[fo]=Úteindir
+-Name[fr]=Périphériques
+-Name[fy]=Râneapparaten
+-Name[ga]=Forimeallaigh
+-Name[gl]=Periféricos
+-Name[he]=ציוד היקפי
+-Name[hi]=सहायक पुरजे
+-Name[hr]=Periferni uređaji
+-Name[hsb]=Periferija
+-Name[hu]=Perifériák
+-Name[is]=Jaðartæki
+-Name[it]=Periferiche
+-Name[ja]=周辺機器
+-Name[ka]=პერიფერიული
+-Name[kk]=Периферия
+-Name[km]=គ្រឿង​កុំព្យូទ័រ
+-Name[ko]=주변 장치
+-Name[lo]=ອຸປະກອນຕໍ່ພວງ
+-Name[lt]=Periferija
+-Name[lv]=Perifērija
+-Name[mk]=Периферни уреди
+-Name[mn]=Залгаатай төхөөрөмжүүд
+-Name[ms]=Perkakasan
+-Name[mt]=Apparat
+-Name[nb]=Tilleggsenheter
+-Name[nds]=Reedschappen
+-Name[ne]=परिवृत्तीय
+-Name[nl]=Randapparaten
+-Name[nn]=Tilleggseiningar
+-Name[nso]=Ditswelantle
+-Name[oc]=Periferics
+-Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
+-Name[pl]=Urządzenia peryferyjne
+-Name[pt]=Periféricos
+-Name[pt_BR]=Periféricos
+-Name[ro]=Periferice
+-Name[ru]=Периферия
+-Name[rw]=Ibyinyuma
+-Name[se]=Ovttadagat
+-Name[sk]=Periférie
+-Name[sl]=Strojni dodatki
+-Name[sr]=Периферије
+-Name[sr@Latn]=Periferije
+-Name[ss]=Ema-peripherals
+-Name[sv]=Kringutrustning
+-Name[ta]=கருவிகள்
+-Name[te]=పరికరాలు
+-Name[tg]=Дастгоҳҳои лозимӣ
+-Name[th]=อุปกรณ์ต่อพ่วง
+-Name[tr]=Çevre Birimleri
+-Name[tt]=Cıhazlar
+-Name[uk]=Периферійні пристрої
+-Name[uz]=Ulangan uskunalar
+-Name[uz@cyrillic]=Уланган ускуналар
+-Name[ven]=Dzipheriferala
+-Name[vi]=Thiết bị ngoại vi
+-Name[wa]=Periferikes
+-Name[xh]=Iilayini zomda
+-Name[zh_CN]=外设
+-Name[zh_TW]=週邊設備
+-Name[zu]=Imixhantela
+-Icon=input_devices_settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-power.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-power.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-power.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-power.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,88 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Power Control
+-Name[af]=Krag Beheer
+-Name[ar]=التحكّم بالطّاقة
+-Name[az]=Güc İdarəsi
+-Name[be]=Кіраванне сілкаваннем
+-Name[bg]=Електрозахранване
+-Name[bn]=পাওয়ার নিয়ন্ত্রণ
+-Name[br]=Renadur ar gremm
+-Name[bs]=Ušteda energije
+-Name[ca]=Control d'energia
+-Name[cs]=Správa napájení
+-Name[csb]=Kòntrola sëłë
+-Name[cy]=Rheoli Pŵer
+-Name[da]=Strømstyring
+-Name[de]=Energiekontrolle
+-Name[el]=Έλεγχος ισχύος
+-Name[eo]=Elektrostirilo
+-Name[es]=Control de energía
+-Name[et]=Voolutarve
+-Name[eu]=Energia kontrola
+-Name[fa]=کنترل توان
+-Name[fi]=Virranhallinta
+-Name[fo]=Orkustýring
+-Name[fr]=Contrôle de l'énergie
+-Name[fy]=Enerzjybehear
+-Name[ga]=Rialú Cumhachta
+-Name[gl]=Control da Enerxéa
+-Name[he]=צריכת חשמל
+-Name[hi]=बिज़ली नियंत्रण
+-Name[hr]=Ušteda energije
+-Name[hsb]=Milina
+-Name[hu]=Energiakezelés
+-Name[id]=Kontrol Power
+-Name[is]=Orkustilling
+-Name[it]=Controllo energia
+-Name[ja]=電源管理
+-Name[ka]=კვების კონტროლი
+-Name[kk]=Қуаттандыруды бақылау
+-Name[km]=ការ​ត្រួត​ពិនិត្យ​ថាមពល
+-Name[ko]=전원 관리
+-Name[lo]=ຄວບຄຸມການໃຊ້ພະລັງງານ
+-Name[lt]=Energijos kontrolė
+-Name[lv]=Energo Kontrole
+-Name[mk]=Контрола на енергија
+-Name[mn]=Энергийн удирдлага
+-Name[ms]=Kawalan Kuasa
+-Name[mt]=Kontroll tal-konsum
+-Name[nb]=Strømkontroll
+-Name[nds]=Stroomkuntrull
+-Name[ne]=शक्ति नियन्त्रण
+-Name[nl]=Energiebeheer
+-Name[nn]=Straumkontroll
+-Name[nso]=Taolo ya Matla
+-Name[oc]=Contròle d'alimentacion
+-Name[pa]=ਊਰਜਾ ਕੰਟਰੋਲ
+-Name[pl]=Zasilanie
+-Name[pt]=Controlo de Energia
+-Name[pt_BR]=Controle de Energia
+-Name[ro]=Control energie
+-Name[ru]=Управление питанием
+-Name[rw]=Igenzura ry'Umuriro
+-Name[se]=El-rávdnje stivren
+-Name[sk]=Ovládanie spotreby
+-Name[sl]=Nadzor energije
+-Name[sr]=Контрола енергије
+-Name[sr@Latn]=Kontrola energije
+-Name[ss]=Kulawulwa kwemlilo
+-Name[sv]=Strömsparfunktion
+-Name[ta]=மின்னோட்ட கட்டுப்பாடு
+-Name[te]=విద్యుత్ నియంత్రణ
+-Name[tg]=Идораи қувваи барқ
+-Name[th]=ควบคุมการใช้พลังงาน
+-Name[tr]=Güç Denetimi
+-Name[tt]=Qüät İdäräse
+-Name[uk]=Керування живленням
+-Name[uz]=Elektr taʼminotni boshqarish
+-Name[uz@cyrillic]=Электр таъминотни бошқариш
+-Name[ven]=Ndanguli ya maanda
+-Name[vi]=Điều khiển Nguồn điện
+-Name[wa]=Controle di l' alimintåcion
+-Name[xh]=Ulawulo Lwamandla
+-Name[zh_CN]=电源控制
+-Name[zh_TW]=電源控制
+-Name[zu]=Ukulawulwa kwamandla
+-Icon=energy
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-security.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-security.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-security.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-security.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,86 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Security & Privacy
+-Name[af]=Sekuriteit & Privaatheid
+-Name[ar]=الأمن و السرية
+-Name[az]=Təhlükəsizlik & Gizlilik
+-Name[be]=Бяспека і прыватнасць
+-Name[bg]=Поверителност
+-Name[bn]=নিরাপত্তা এবং গোপনীয়তা
+-Name[br]=Surentez ha buhez prevez
+-Name[bs]=Sigurnost i privatnost
+-Name[ca]=Seguretat i privacitat
+-Name[cs]=Bezpečnost a soukromí
+-Name[csb]=Bezpiek ë priwatnosc
+-Name[cy]=Diogelwch & Preifatrwydd
+-Name[da]=Sikkerhed & Private data
+-Name[de]=Sicherheit & Privatsphäre
+-Name[el]=Ασφάλεια & Προσωπικό απόρρητο
+-Name[eo]=Sekureco & Privateco
+-Name[es]=Seguridad y privacidad
+-Name[et]=Turvalisus ja privaatsus
+-Name[eu]=Segurtasuna eta pribatutasuna
+-Name[fa]=امنیت و محرمانگی
+-Name[fi]=Turvallisuus ja yksityisyys
+-Name[fr]=Sécurité et confidentialité
+-Name[fy]=Privacy en befeiliging
+-Name[ga]=Slándáil agus Príobháideachas
+-Name[gl]=Seguridade e Privacidade
+-Name[he]=אבטחה ופרטיות
+-Name[hi]=सुरक्षा तथा गोपनीयता
+-Name[hr]=Sigurnost i privatnost
+-Name[hsb]=Wěstosć & Anonymnosć
+-Name[hu]=Adatvédelem
+-Name[id]=Keamanan & Privasi
+-Name[is]=Öryggi og einkamál
+-Name[it]=Sicurezza e Privacy
+-Name[ja]=セキュリティ & プライバシー
+-Name[ka]=დაცვა და კონფიდენციალურობა
+-Name[kk]=Қауіпсіздік
+-Name[km]=សុវត្ថិភាព & ភាព​ឯកជន
+-Name[ko]=보안과 사생활
+-Name[lo]=ຄວາມປອດໄພ & ຄວາມເປັນສ່ວນຕົວ
+-Name[lt]=Saugumas ir privatumas
+-Name[lv]=Drošība un Privātums
+-Name[mk]=Безбедност и приватност
+-Name[mn]=Хамгаалалт & Амгалан
+-Name[ms]=Sekuriti dan Privasi
+-Name[mt]=Sigurtà u Privatezza
+-Name[nb]=Sikkerhet og personvern
+-Name[nds]=Sekerheit & Privaatrebeet
+-Name[ne]=सुरक्षा र गोपनीयता
+-Name[nl]=Privacy en beveiliging
+-Name[nn]=Tryggleik og privatliv
+-Name[nso]=Tshireletso & Bosephiri
+-Name[pa]=ਸੁਰੱਖਿਆ ਅਤੇ ਰਹੱਸ
+-Name[pl]=Bezpieczeństwo i prywatność
+-Name[pt]=Segurança e Privacidade
+-Name[pt_BR]=Segurança & Privacidade
+-Name[ro]=Securitate și confidențialitate
+-Name[ru]=Безопасность и конфиденциальность
+-Name[rw]=Umutekano & Umwihariko
+-Name[se]=Sihkkarvuohta ja iežassuodjaleapmi
+-Name[sk]=Zabezpečenie a súkromie
+-Name[sl]=Varnost in zasebnost
+-Name[sr]=Безбедност и приватност
+-Name[sr@Latn]=Bezbednost i privatnost
+-Name[ss]=Kuphepha & ngasese
+-Name[sv]=Säkerhet och integritet
+-Name[ta]=பாதுகாப்பு & தனித்துவம்
+-Name[te]=భద్రత & ప్రైవసి
+-Name[tg]=Амният ва махфинокӣ
+-Name[th]=ความปลอดภัยและความเป็นส่วนตัว
+-Name[tr]=Güvenlik ve Gizlilik
+-Name[tt]=İminlek & Xosusílıq
+-Name[uk]=Безпека та приватність
+-Name[uz]=Xavfsizlik va shaxsiy maʼlumot
+-Name[uz@cyrillic]=Хавфсизлик ва шахсий маълумот
+-Name[ven]=Vhutsireledzi & Tshiphiri
+-Name[vi]=Bảo mật & Sự riêng tư
+-Name[wa]=Såvrité & Privaceye
+-Name[xh]=Ukhuseleko & Nobunikazi
+-Name[zh_CN]=安全和隐私
+-Name[zh_TW]=安全性與私密性
+-Name[zu]=Ukuvikeleka & Ingasese
+-Icon=password
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-sound.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-sound.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-sound.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-sound.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,85 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Sound & Multimedia
+-Name[af]=Klank & Multimedia
+-Name[ar]=الصوت و الوسائط المتعددة
+-Name[az]=Səs & Multimediya
+-Name[be]=Гук і мультымедыя
+-Name[bg]=Мултимедия
+-Name[bn]=শব্দ ও মাল্টিমিডিয়া
+-Name[br]=Son & Liesvedia
+-Name[bs]=Zvuk i multimedija
+-Name[ca]=So i multimèdia
+-Name[cs]=Zvuk a multimédia
+-Name[csb]=Zwãk ë mùltimedia
+-Name[cy]=Sain & Amlgyfryngau
+-Name[da]=Lyd & Multimedie
+-Name[el]=Ήχος & Πολυμέσα
+-Name[eo]=Sono & Plurmedio
+-Name[es]=Sonidos y multimedia
+-Name[et]=Heli ja multimeedia
+-Name[eu]=Soinua eta multimedia
+-Name[fa]=صوت و چند رسانه‌ای
+-Name[fi]=Ääni ja multimedia
+-Name[fr]=Son et multimédia
+-Name[fy]=Lûd en multimedia
+-Name[ga]=Fuaim agus Ilmheáin
+-Name[gl]=Son e Multimedia
+-Name[he]=צליל ומולטימדיה
+-Name[hi]=ध्वनि व मल्टीमीडिया
+-Name[hr]=Zvuk i multimedija
+-Name[hsb]=Zwuk & Multimedia
+-Name[hu]=Hang, multimédia
+-Name[id]=Efek Suara & Multimedia
+-Name[is]=Hljóð og margmiðlun
+-Name[it]=Suono e Multimedia
+-Name[ja]=サウンド & マルチメディア
+-Name[ka]=ხმა და მეულტიმედია
+-Name[kk]=Дыбыс пен мультимедиа
+-Name[km]=សំឡេង & ពហុព័ត៌មាន
+-Name[ko]=소리와 멀티미디어
+-Name[lo]=ເມົາຕິມີເດຍ
+-Name[lt]=Garsas ir daugialypė terpė
+-Name[lv]=Skaņa un Multimēdija
+-Name[mk]=Звук и мултимедија
+-Name[mn]=Дуу & Мултимедиа
+-Name[ms]=Bunyi & Multimedia
+-Name[mt]=Ħsejjes u Multimedia
+-Name[nb]=Lyd og multimedia
+-Name[nds]=Kläng & Multimedia
+-Name[ne]=ध्वनि र मल्टिमिडिया
+-Name[nl]=Geluid en multimedia
+-Name[nn]=Lyd og multimedia
+-Name[nso]=Modumo & Media wa Bontshi
+-Name[pa]=ਅਵਾਜ਼ ਅਤੇ ਮਲਟੀਮੀਡਿਆ
+-Name[pl]=Dźwięk i multimedia
+-Name[pt]=Som e Multimédia
+-Name[pt_BR]=Som & Multimídia
+-Name[ro]=Sunet și multimedia
+-Name[ru]=Звук и мультимедиа
+-Name[rw]=Ijwi & Mutwaramakuru
+-Name[se]=Jietna ja multimedia
+-Name[sk]=Zvuk a multimédiá
+-Name[sl]=Zvok in večpredstavnost
+-Name[sr]=Звук и мултимедија
+-Name[sr@Latn]=Zvuk i multimedija
+-Name[ss]=Umsindvo & tinhlobonhlobo-tetindzaba
+-Name[sv]=Ljud och multimedia
+-Name[ta]=ஒலி & பல்லூடகம்
+-Name[te]=శబ్దం & మల్టీ మీడియా
+-Name[tg]=Садо ва мултимедия
+-Name[th]=เสียงและมัลติมีเดีย
+-Name[tr]=Ses ve Çokluortam
+-Name[tt]=Tawış & Multimedia
+-Name[uk]=Звук та мультимедіа
+-Name[uz]=Tovush va multimedia
+-Name[uz@cyrillic]=Товуш ва мултимедиа
+-Name[ven]=Mubvumo & Zwimwumwusi
+-Name[vi]=Âm nhạc & Đa phương tiện
+-Name[wa]=Son & Multimedia
+-Name[xh]=Isandi & Multimedia
+-Name[zh_CN]=声音和多媒体
+-Name[zh_TW]=聲音與多媒體
+-Name[zu]=Umsindo & Onozindaba abaningi
+-Icon=multimedia
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-system.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-system.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-system.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-system.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,84 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=System Administration
+-Name[af]=Stelsel Administrasie
+-Name[ar]=إدارة النّظام
+-Name[az]=Sistem İdarəsi
+-Name[be]=Сістэмнае адміністраванне
+-Name[bg]=Администрация
+-Name[bn]=সিস্টেম অ্যাডমিনস্ট্রেশন
+-Name[br]=Melestradur ar Reizhiad
+-Name[bs]=Administracija sistema
+-Name[ca]=Administració del sistema
+-Name[cs]=Správa systému
+-Name[csb]=Sprôwianié systemã
+-Name[cy]=Gweinyddiaith Cysawd
+-Name[da]=Systemadministration
+-Name[de]=Systemverwaltung
+-Name[el]=Διαχείριση συστήματος
+-Name[eo]=Sistemadministrado
+-Name[es]=Administración del sistema
+-Name[et]=Süsteemi administreerimine
+-Name[eu]=Sistemaren kudeaketa
+-Name[fa]=سرپرستی سیستم
+-Name[fi]=Järjestelmänhallinta
+-Name[fr]=Administration du système
+-Name[fy]=Systeembehear
+-Name[ga]=Riarachán Córais
+-Name[gl]=Administración do Sistema
+-Name[he]=מנהל המערכת
+-Name[hi]=तंत्र प्रशासन
+-Name[hr]=Administracija sustava
+-Name[hsb]=Zarjadowanje systema
+-Name[hu]=Rendszeradminisztráció
+-Name[id]=Administrasi Sistem
+-Name[is]=Kerfisstjórnun
+-Name[it]=Amministrazione di sistema
+-Name[ja]=システム管理
+-Name[ka]=სისტემის ადმინისტრირება
+-Name[kk]=Жүйе әкімшілігі
+-Name[km]=ការ​គ្រប់គ្រង​ប្រព័ន្ធ
+-Name[ko]=시스템 관리
+-Name[lo]=SAM -ສຳລັບຜູ້ເບິ່ງແຍງລະບົບ
+-Name[lt]=Sistemos administravimas
+-Name[lv]=Sistēmas Administrācija
+-Name[mk]=Системска администрација
+-Name[mn]=Систем-Зохион байгуулалт
+-Name[ms]= Pengurusan Sistem
+-Name[mt]=Amministrazzjoni tas-Sistema
+-Name[nb]=Systemadministrasjon
+-Name[nds]=Systeempleeg
+-Name[ne]=प्रणाली प्रशासक
+-Name[nl]=Systeembeheer
+-Name[nn]=Systemadministrasjon
+-Name[pa]=ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਨ
+-Name[pl]=Administracja systemu
+-Name[pt]=Administração do Sistema
+-Name[pt_BR]=Administração do Sistema
+-Name[ro]=Administrare sistem
+-Name[ru]=Системное администрирование
+-Name[rw]=Ubuyobozi bwa Sisitemu
+-Name[se]=Vuogádathálddašeapmi
+-Name[sk]=Správa systému
+-Name[sl]=Sistemsko upravljanje
+-Name[sr]=Администрација система
+-Name[sr@Latn]=Administracija sistema
+-Name[sv]=Systemadministration
+-Name[ta]=கணினி-நிர்வாகம்
+-Name[te]=వ్యవస్థ నిర్వహణ
+-Name[tg]=Идоракунии система
+-Name[th]=การดูแลระบบ
+-Name[tr]=Sistem Yönetimi
+-Name[tt]=Sanaq İdäräse
+-Name[uk]=Адміністрування системи
+-Name[uz]=Tizimni boshqarish
+-Name[uz@cyrillic]=Тизимни бошқариш
+-Name[ven]=Kulangulele kwa Maitele
+-Name[vi]=Quản lý Hệ thống
+-Name[wa]=Manaedjmint do sistinme
+-Name[xh]=Umphathi Wendlela yokusebenza
+-Name[zh_CN]=系统管理
+-Name[zh_TW]=系統管理
+-Name[zu]=Ukugcinwa kwe-sistimu
+-Icon=kcmsystem
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-webbrowsing.directory trinity-tdebase-3.5.13.2/applnk/kde-settings-webbrowsing.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-settings-webbrowsing.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-settings-webbrowsing.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,85 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Web Browser
+-Name[af]=Web Blaaier
+-Name[ar]=متصفح الشبكة
+-Name[az]=Veb Səyyahı
+-Name[be]=Вандроўнік па Сеціве
+-Name[bg]=Уеб браузър
+-Name[bn]=ওয়েব ব্রাউজার
+-Name[br]=Furcher an Internet
+-Name[bs]=Web preglednik
+-Name[ca]=Navegació Web
+-Name[cs]=Prohlížeč Webu
+-Name[csb]=Przezérnik WWW
+-Name[cy]=Porydd Gwê
+-Name[da]=Browser
+-Name[de]=Webbrowser
+-Name[el]=Περιηγητής ιστού
+-Name[eo]=TTT-legilo
+-Name[es]=Navegador Web
+-Name[et]=Veebilehitseja
+-Name[eu]=Web arakatzailea
+-Name[fa]=مرورگر وب‌‌
+-Name[fi]=WWW-selain
+-Name[fo]=Vevlesari
+-Name[fr]=Navigateur web
+-Name[fy]=Webblêder
+-Name[ga]=Brabhsálaí Lín
+-Name[gl]=Navegador Web
+-Name[he]=דפדפן
+-Name[hi]=वेब ब्राउज़र
+-Name[hr]=Web preglednik
+-Name[hsb]=Web-browser
+-Name[hu]=Webböngésző
+-Name[id]=Peselancar Web
+-Name[is]=Vafri
+-Name[it]=Navigazione Web
+-Name[ja]=ウェブブラウザ
+-Name[ka]=ვებ ბრაუზერი
+-Name[kk]=Веб шолғыш
+-Name[km]=កម្មវិធី​រុករក​បណ្ដាញ
+-Name[ko]=웹 브라우저
+-Name[lo]=ຮງກເບິ່ງຖານເບິ່ງຂໍ້ມູນ
+-Name[lt]=Žiniatinklio naršyklė
+-Name[lv]=Tīmekļa Pārlūks
+-Name[mk]=Веб-прелистувач
+-Name[mn]=Вэб-Хөтөч
+-Name[ms]=Pelayar Web
+-Name[nb]=Nettleser
+-Name[nds]=Nettkieker
+-Name[ne]=वेब ब्राउजर
+-Name[nl]=Webbrowser
+-Name[nn]=Nettlesar
+-Name[nso]=Seinyakisi sa Web
+-Name[pa]=ਵੈਬ ਝਲਕਾਰਾ
+-Name[pl]=Przeglądarka WWW
+-Name[pt]=Navegação Web
+-Name[pt_BR]=Navegador Web
+-Name[ro]=Navigator de web
+-Name[ru]=Браузер
+-Name[rw]=Mucukumbuzi Rubuga
+-Name[se]=Fierpmádatlogan
+-Name[sk]=Webový prehliadač
+-Name[sl]=Spletni brskalnik
+-Name[sr]=Веб прегледач
+-Name[sr@Latn]=Veb pregledač
+-Name[ss]=Ibrawuza ye-Web
+-Name[sv]=Webbläsning
+-Name[ta]=வலை உலாவி
+-Name[te]=వెబ్ బ్రౌజర్
+-Name[tg]=Намоишгари Веб
+-Name[th]=เว็บเบราว์เซอร์
+-Name[tr]=Web Tarayıcı
+-Name[uk]=Навігатор Тенет
+-Name[uz]=Veb-brauzer
+-Name[uz@cyrillic]=Веб-браузер
+-Name[ven]=Burausa ya Web
+-Name[vi]=Trình duyệt Mạng
+-Name[wa]=Betchteu waibe
+-Name[xh]=Umkhangeli zincwadi we Web
+-Name[zh_CN]=Web 浏览器
+-Name[zh_TW]=網頁瀏覽器
+-Name[zu]=Umcingi we-Web
+-Icon=konqueror
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-system.directory trinity-tdebase-3.5.13.2/applnk/kde-system.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-system.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-system.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,81 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=System
+-Name[af]=Stelsel
+-Name[ar]=النظام
+-Name[az]=Sistem
+-Name[be]=Сістэма
+-Name[bg]=Система
+-Name[bn]=সিস্টেম
+-Name[br]=Reizhiad
+-Name[bs]=Sistem
+-Name[ca]=Sistema
+-Name[cs]=Systém
+-Name[csb]=Systema
+-Name[cy]=Cysawd
+-Name[el]=Σύστημα
+-Name[eo]=Sistemo
+-Name[es]=Sistema
+-Name[et]=Süsteem
+-Name[eu]=Sistema
+-Name[fa]=سیستم
+-Name[fi]=Järjestelmä
+-Name[fo]=Kervi
+-Name[fr]=Système
+-Name[fy]=Systeem
+-Name[ga]=Córas
+-Name[gl]=Sistema
+-Name[he]=מערכת
+-Name[hi]=तंत्र
+-Name[hr]=Sustav
+-Name[hu]=Rendszer
+-Name[id]=Sistem
+-Name[is]=Kerfi
+-Name[it]=Sistema
+-Name[ja]=システム
+-Name[ka]=სისტემა
+-Name[kk]=Жүйелік
+-Name[km]=ប្រព័ន្ធ
+-Name[ko]=시스템
+-Name[lo]=ຈັດການລະບົບ
+-Name[lt]=Sistema
+-Name[lv]=Sistēma
+-Name[mk]=Систем
+-Name[mn]=Систем
+-Name[ms]=Sistem
+-Name[mt]=Sistema
+-Name[nds]=Systeem
+-Name[ne]=प्रणाली
+-Name[nl]=Systeem
+-Name[oc]=Sistemo
+-Name[pa]=ਸਿਸਟਮ
+-Name[pt]=Sistema
+-Name[pt_BR]=Sistema
+-Name[ro]=Sistem
+-Name[ru]=Система
+-Name[rw]=Sisitemu
+-Name[se]=Vuogádat
+-Name[sk]=Systém
+-Name[sl]=Sistem
+-Name[sr]=Систем
+-Name[sr@Latn]=Sistem
+-Name[ss]=Umshini
+-Name[ta]=அமைப்பு
+-Name[te]=వ్యవస్థ
+-Name[tg]=Система
+-Name[th]=ระบบ
+-Name[tr]=Sistem
+-Name[tt]=Sistem
+-Name[uk]=Система
+-Name[uz]=Tizim
+-Name[uz@cyrillic]=Тизим
+-Name[ven]=Maitele
+-Name[vi]=Hệ thống
+-Name[wa]=Sistinme
+-Name[xh]=Indlela esestyenziswayo
+-Name[zh_CN]=系统
+-Name[zh_TW]=系統
+-Name[zu]=Isistimu
+-Icon=package_system
+-
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-screensavers.directory trinity-tdebase-3.5.13.2/applnk/kde-system-screensavers.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-screensavers.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-system-screensavers.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,171 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Screen Savers
+-Name[af]=Skerm Bewaarders
+-Name[ar]=مدخري الشاشة
+-Name[az]=Ekran Qoruyucuları
+-Name[be]=Зберагальнікі экрана
+-Name[bg]=Предпазители на екрана
+-Name[bn]=স্ক্রীন সেভার
+-Name[br]=Damanterien Skramm
+-Name[bs]=Zaštita ekrana (screensaver)
+-Name[ca]=Salvapantalles
+-Name[cs]=Šetřiče obrazovky
+-Name[csb]=Wëgaszôcz ekranu
+-Name[cy]=Arbedyddion Sgrîn
+-Name[da]=Pauseskærme
+-Name[de]=Bildschirmschoner
+-Name[el]=Προφύλαξη οθόνης
+-Name[eo]=Ekrankurtenoj
+-Name[es]=Salvapantallas
+-Name[et]=Ekraanisäästjad
+-Name[eu]=Pantaila babesleak
+-Name[fa]=محافظهای صفحه نمایش
+-Name[fi]=Näytönsäästäjät
+-Name[fo]=Skíggjaspararir
+-Name[fr]=Écrans de veille
+-Name[fy]=Skermbefeiliging
+-Name[ga]=Spárálaithe Scáileáin
+-Name[gl]=Protectores de Pantalla
+-Name[he]=שומרי מסך
+-Name[hi]=स्क्रीन सेवर
+-Name[hr]=Zaštita zaslona
+-Name[hsb]=Škitaki za wobrazowku
+-Name[hu]=Képernyővédő
+-Name[is]=Skjásvæfur
+-Name[it]=Salvaschermi
+-Name[ja]=スクリーンセーバー
+-Name[kk]=Экран сақтаушылары
+-Name[km]=ធាតុ​សង្គ្រោះ​អេក្រង់
+-Name[ko]=화면 보호기
+-Name[lo]=ໂປຣແກຣມຮັກສາຫນ້າຈໍ
+-Name[lt]=Ekrano Užsklandos
+-Name[lv]=Ekrāna saudzetāji
+-Name[mk]=Екрански чувари
+-Name[mn]=Дэлгэц гамнагч
+-Name[ms]=Penghias Skrin
+-Name[nb]=Pauseskjerme
+-Name[nds]=Pausschirm
+-Name[ne]=स्क्रिनसेभर
+-Name[nl]=Schermbeveiliging
+-Name[nn]=Pauseskjermar
+-Name[nso]=Diboloki tsa Pontsho
+-Name[oc]=Salvador d'ecrans
+-Name[pa]=ਸਕਰੀਨ-ਸੇਵਰ
+-Name[pl]=Wygaszacze ekranu
+-Name[pt]=Protectores de Ecrã
+-Name[pt_BR]=Protetores de tela
+-Name[ro]=Protecții de ecran
+-Name[ru]=Хранители экрана
+-Name[rw]=Mugaragaza Ukubamaso
+-Name[se]=Šearbmasiestejeaddjit
+-Name[sk]=Šetriče obrazovky
+-Name[sl]=Ohranjevalniki zaslona
+-Name[sr]=Чувари екрана
+-Name[sr@Latn]=Čuvari ekrana
+-Name[ss]=Sigcini-skrini
+-Name[sv]=Skärmsläckare
+-Name[ta]=திரை காப்பாளர்கள்
+-Name[te]= స్క్రీన్ సేవర్లు
+-Name[tg]=Пардаи экран
+-Name[th]=โปรแกรมรักษาหน้าจอ
+-Name[tr]=Ekran Koruyucular
+-Name[tt]=Küräk Saqlağıçı
+-Name[uk]=Зберігачі екрана
+-Name[uz]=Ekran saqlovchilari
+-Name[uz@cyrillic]=Экран сақловчилари
+-Name[ven]=Tshivhulungi tsha Tshikirini
+-Name[vi]=Trình bảo vệ màn hình
+-Name[wa]=Sipårgneus di waitroûle
+-Name[xh]=Abagcini Bekhusi
+-Name[zh_CN]=屏幕保护程序
+-Name[zh_TW]=螢幕保護程式
+-Name[zu]=Abagcini Besikrini
+-Icon=kscreensaver
+-X-KDE-BaseGroup=screensavers
+-
+-Comment=Screen saver demos
+-Comment[af]=Skerm bewaarder demonstrasies
+-Comment[ar]=عروض توضيحية لمدخر الشاشة
+-Comment[az]=Ekran Qoruyucu Demoları
+-Comment[be]=Дэманстрацыі зберагальніка экрана
+-Comment[bg]=Демо на предпазителите на екрана
+-Comment[bn]=স্ক্রীন সেভার ডেমো
+-Comment[br]=Diskouezadur damanterien skramm
+-Comment[bs]=Demonstracije zaštite ekrana
+-Comment[ca]=Demos de salvapantalles
+-Comment[cs]=Ukázky šetřičů obrazovky
+-Comment[csb]=Pòdzérk wëgaszôcza ekranu
+-Comment[cy]=Arddangosfeydd arbedyddion sgrîn
+-Comment[da]=Pauseskærm-demoer
+-Comment[de]=Demos zu Bildschirmschonern
+-Comment[el]=Επίδειξη προφύλαξης οθόνης
+-Comment[eo]=Demonstro de la ekrankurtenoj
+-Comment[es]=Demostraciones del salvapantallas
+-Comment[et]=Ekraanisäästjate demod
+-Comment[eu]=Pantaila babesle demoak
+-Comment[fa]=نمایشهای صفحه کلید
+-Comment[fi]=Näytönsäästäjien mallit
+-Comment[fo]=Skíggjaspararadømi
+-Comment[fr]=Démonstrations d'écrans de veille
+-Comment[fy]=Skermbefeiligingdemo's
+-Comment[ga]=Taispeántais na spárálaithe scáileáin
+-Comment[gl]=Demostracións dos protectores de pantalla
+-Comment[he]=הדגמות של שומרי מסך
+-Comment[hi]=स्क्रीन सेवर डेमोस
+-Comment[hr]=Demonstracije zaštite zaslona
+-Comment[hsb]=demonstrowanje škitakow za wobrazowku
+-Comment[hu]=Képernyővédő-demók
+-Comment[id]=Demo screen saver
+-Comment[is]=Skjásvæfukynningar
+-Comment[it]=Anteprime dei salvaschermi
+-Comment[ja]=スクリーンセーバーのデモ
+-Comment[kk]=Экран сақтаушыны таңдау
+-Comment[km]=បង្ហាញ​ធាតុ​សង្គ្រោះ​អេក្រង់​សាក​មើល
+-Comment[ko]=화면 보호기 데모
+-Comment[lo]=ຕົວຢ່າງໂປຣແກຣມຮັກສາຫນ້າຈໍ
+-Comment[lt]=Ekrano užsklandos demonstracija
+-Comment[lv]=Ekrāna saudzētāja demoversijas
+-Comment[mk]=Демоа на екрански чувари
+-Comment[mn]=Дэлгэц гамнагчийн үзүүлэн
+-Comment[ms]=Contoh penghias skrin
+-Comment[mt]=Wirjiet ta' screen savers
+-Comment[nb]=Pauseskjerm-demoer
+-Comment[nds]=Pausschirmen utproberen
+-Comment[ne]=स्क्रिनसेभर डेमो
+-Comment[nl]=Schermbeveiligingdemo's
+-Comment[nn]=Pauseskjerm-demoar
+-Comment[nso]=Di-demo tsa seboloki sa pontsho
+-Comment[oc]=Demonstracions dèu salvador d'ecran
+-Comment[pa]=ਸਕਰੀਨ-ਸੇਵਰ ਝਲਕ
+-Comment[pl]=Podgląd wygaszacza ekranu
+-Comment[pt]=Demonstrações de protectores de ecrã
+-Comment[pt_BR]=Amostras de protetores de tela
+-Comment[ro]=Demonstrații pentru protecții de ecran
+-Comment[ru]=Просмотр хранителей экрана
+-Comment[rw]=Amayerekana ya Mugaragaza Ukubamaso
+-Comment[se]=Šearbmasiestejeaddji demonstrašuvnnat.
+-Comment[sk]=Demo šetričov obrazovky
+-Comment[sl]=Predstavitve ohranjevalnikov zaslona
+-Comment[sr]=Демои чуварâ екрана
+-Comment[sr@Latn]=Demoi čuvarâ ekrana
+-Comment[ss]=Kukhonjiswa kwesigcini skrini
+-Comment[sv]=Demonstration av skärmsläckare
+-Comment[ta]=திரை காத்தலின் விளக்கக் காட்சிகள்
+-Comment[te]=స్క్రీన్ సేవర్ డెమొలు
+-Comment[tg]=Намоиши пардаи экран
+-Comment[th]=ตัวอย่างโปรแกรมรักษาหน้าจอ
+-Comment[tr]=Ekran koruyucu tanıtımları
+-Comment[tt]=Küräksaqçı sınawları
+-Comment[uk]=Демонстрації зберігачів екрана
+-Comment[uz]=Ekran saqlovchilar namunalari
+-Comment[uz@cyrillic]=Экран сақловчилар намуналари
+-Comment[ven]=Demo ya tshivhulungi tsha tshikirini
+-Comment[vi]=Thử trình bảo vệ màn hình
+-Comment[wa]=Sipårgneus di waitroûle di saye
+-Comment[xh]=Demos zomgcini wekhusi
+-Comment[zh_CN]=屏幕保护程序演示
+-Comment[zh_TW]=螢幕保護程式展示
+-Comment[zu]=Imiboniso yezigcini zikrini
+-NoDisplay=true
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-terminal.directory trinity-tdebase-3.5.13.2/applnk/kde-system-terminal.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-system-terminal.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-system-terminal.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,88 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Terminal Applications
+-Name[af]=Terminaal Programme
+-Name[ar]=تطبيقات مطرافية
+-Name[az]=Terminal Proqramları
+-Name[be]=Тэрмінальныя праграмы
+-Name[bg]=Конзолни програми
+-Name[bn]=টার্মিনাল অ্যাপলিকেশন
+-Name[br]=Arloadoù an termenell
+-Name[bs]=Tekstualni programi
+-Name[ca]=Aplicacions de terminal
+-Name[cs]=Terminálové aplikace
+-Name[csb]=Programë terminala
+-Name[cy]=Cymhwysiadau Terfynell
+-Name[da]=Terminalprogrammer
+-Name[de]=Terminalprogramme
+-Name[el]=Εφαρμογές τερματικού
+-Name[eo]=Terminal-Aplikaĵoj
+-Name[es]=Aplicaciones de terminal
+-Name[et]=Terminali rakendused
+-Name[eu]=Terminaleko aplikazioak
+-Name[fa]=کاربردهای پایانه
+-Name[fi]=Päätesovellukset
+-Name[fo]=Tekstforrit
+-Name[fr]=Applications pour terminal
+-Name[fy]=Terminal-tapassingen
+-Name[ga]=Feidhmchláir Teirminéil
+-Name[gl]=Aplicacións de Terminal
+-Name[he]=יישומי מסוף
+-Name[hi]=टर्मिनल अनुप्रयोग
+-Name[hr]=Terminalske aplikacije
+-Name[hsb]=Programy za terminal
+-Name[hu]=Parancsértelmezők
+-Name[id]=Aplikasi Terminal
+-Name[is]=Skjáhermiforrit
+-Name[it]=Applicazioni terminale
+-Name[ja]=ターミナルアプリケーション
+-Name[ka]=კონსოლის პროგრამები
+-Name[kk]=Консоль қолданбалары
+-Name[km]=កម្មវិធី​ស្ថានីយ
+-Name[ko]=터미널 프로그램
+-Name[lo]=ໂປຣແກຣມເທີມີນໍ
+-Name[lt]=Terminalinės programos
+-Name[lv]=Termināla Aplikācijas
+-Name[mk]=Терминалски апликации
+-Name[mn]=Терминал-Програм
+-Name[ms]=Aplikasi Terminal
+-Name[mt]=Programmi tat-Terminal
+-Name[nb]=Terminalprogrammer
+-Name[nds]=Terminalprogrammen
+-Name[ne]=टर्मिनल अनुप्रयोग
+-Name[nl]=Terminal-toepassingen
+-Name[nn]=Terminalprogram
+-Name[nso]=Ditshumiso tsa Terminal
+-Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
+-Name[pl]=Programy terminala
+-Name[pt]=Aplicações de Terminal
+-Name[pt_BR]=Aplicativos de terminal
+-Name[ro]=Aplicații de terminal
+-Name[ru]=Консольные приложения
+-Name[rw]=Amaporogaramu Nkiriya
+-Name[se]=Terminálprográmmat
+-Name[sk]=Terminálové aplikácie
+-Name[sl]=Terminalski programi
+-Name[sr]=Терминалски програми
+-Name[sr@Latn]=Terminalski programi
+-Name[ss]=Ticelo tesikhungo
+-Name[sv]=Terminalprogram
+-Name[ta]=முனைய பயன்பாடுகள்
+-Name[te]=టర్మినల్ కార్యక్రమములు
+-Name[tg]=Барномаҳои консол
+-Name[th]=โปรแกรมเทอร์มินัล
+-Name[tr]=Uçbirim Uygulamaları
+-Name[tt]=Terminal Yazılımnarı
+-Name[uk]=Термінальні програми
+-Name[uz]=Terminal uchun dasturlar
+-Name[uz@cyrillic]=Терминал учун дастурлар
+-Name[ven]=Apulikhesheni ya Theminala
+-Name[vi]=Trình đầu cuối
+-Name[wa]=Programes terminås
+-Name[xh]=Izicelo Zesiphelo sendlela
+-Name[zh_CN]=终端应用程序
+-Name[zh_TW]=終端機程式
+-Name[zu]=Abayaleli bangaphandle
+-Icon=konsole
+-Version=1.0
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-toys.directory trinity-tdebase-3.5.13.2/applnk/kde-toys.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-toys.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-toys.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,88 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Toys
+-Name[af]=Speelgoed
+-Name[ar]=الألعاب
+-Name[az]=Oyuncaqlar
+-Name[be]=Цацкі
+-Name[bg]=Играчки
+-Name[bn]=খেলনা
+-Name[br]=C'hoarielloù
+-Name[bs]=Igračke
+-Name[ca]=Joguines
+-Name[cs]=Hračky
+-Name[csb]=Zôbôwczi
+-Name[cy]=Tegannau
+-Name[da]=Legetøj
+-Name[de]=Kleinigkeiten
+-Name[el]=Παιχνιδάκια
+-Name[eo]=Amuzaĵoj
+-Name[es]=Ocio
+-Name[et]=Mänguasjad
+-Name[eu]=Jolasak
+-Name[fa]=سرگرمیها
+-Name[fi]=Lelut
+-Name[fo]=Leiku
+-Name[fr]=Petits outils
+-Name[fy]=Boartersguod
+-Name[ga]=Áilleagáin
+-Name[gl]=Entretementos
+-Name[he]=צעצועים
+-Name[hi]=खिलौने
+-Name[hr]=Igračke
+-Name[hsb]=Hrajki
+-Name[hu]=Mütyürkék
+-Name[id]=Mainan
+-Name[is]=Leikföng
+-Name[it]=Giochini
+-Name[ja]=アクセサリ
+-Name[ka]=სათამაშოები
+-Name[kk]=Ойын-сауықтар
+-Name[km]=ប្រដាប់​ក្មេង​លេង
+-Name[ko]=장난감
+-Name[lo]=ຂອງເຫລັ້ນ
+-Name[lt]=Žaislai
+-Name[lv]=Rotaļlietas
+-Name[mk]=Играчки
+-Name[mn]=Наадгай
+-Name[ms]=Permainan
+-Name[mt]=Ġugarelli
+-Name[nb]=Leketøy
+-Name[nds]=Speelkraam
+-Name[ne]=खेलौना
+-Name[nl]=Speelgoed
+-Name[nn]=Leiker
+-Name[nso]=Dibapadisane
+-Name[oc]=Joguines
+-Name[pa]=ਖਿਡੌਣੇ
+-Name[pl]=Zabawa
+-Name[pt]=Diversão
+-Name[pt_BR]=Brinquedos
+-Name[ro]=Jucării
+-Name[ru]=Развлечения
+-Name[rw]=Ibikinisho
+-Name[se]=Stohkosat
+-Name[sk]=Hračky
+-Name[sl]=Igrače
+-Name[sr]=Играчке
+-Name[sr@Latn]=Igračke
+-Name[ss]=Kwekudlalisa
+-Name[sv]=Leksaker
+-Name[ta]=பொம்மைகள்
+-Name[te]=ఆట వస్తువులు
+-Name[tg]=Бозичаҳои шавқовар
+-Name[th]=ของเล่นสนุกๆ
+-Name[tr]=Eğlence
+-Name[tt]=Uyınnar
+-Name[uk]=Іграшки
+-Name[uz]=Oʻyinchoqlar
+-Name[uz@cyrillic]=Ўйинчоқлар
+-Name[ven]=Zwautambisa vhana
+-Name[vi]=Đồ chơi
+-Name[wa]=Amuzmints
+-Name[xh]=Izinto zokudlala
+-Name[zh_CN]=玩具
+-Name[zh_TW]=玩具
+-Name[zu]=Amathoyizi
+-Icon=package_toys
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-unknown.directory trinity-tdebase-3.5.13.2/applnk/kde-unknown.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-unknown.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-unknown.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,76 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Lost & Found
+-Name[af]=Verlore & Gevind
+-Name[ar]=فُقد ووُجد
+-Name[az]=İtirdim və Tapdım
+-Name[be]=Згубленыя і знойдзеныя
+-Name[bg]=Разни
+-Name[bn]=হারানো প্রাপ্তি
+-Name[br]=Kollet & kavet
+-Name[bs]=Izgubljeno/nađeno
+-Name[ca]=Perdut i trobat
+-Name[cs]=Ztráty a nálezy
+-Name[csb]=Zgùbione ë nalazłé
+-Name[cy]=Colledig a Chanfyddedig
+-Name[da]=Glemte sager
+-Name[de]=Nicht zuzuordnen
+-Name[el]=Χάθηκαν & Βρέθηκαν
+-Name[eo]=Perdita kaj trovita
+-Name[es]=Objetos perdidos
+-Name[et]=Tundmatud
+-Name[eu]=Galdu eta aurkitutakoak
+-Name[fa]=گم‌شده و یافته‌شده
+-Name[fi]=Hävinneet ja löydetyt
+-Name[fr]=Objets trouvés
+-Name[fy]=Wat oer is
+-Name[ga]=Caillte agus Aimsithe
+-Name[gl]=Outros
+-Name[he]=אבדות
+-Name[hi]=खोया/पाया
+-Name[hr]=Izgubljeno-nađeno
+-Name[hsb]=Pytane & Namakane
+-Name[hu]=Ismeretlen
+-Name[is]=Tapað & fundið
+-Name[it]=Oggetti smarriti
+-Name[kk]=Жоғалып табылғандар
+-Name[km]=បាត់ & រកឃើញ
+-Name[ko]=기타 프로그램
+-Name[lt]=Pamesta ir rasta
+-Name[lv]=Pazudis & Atrasts
+-Name[mk]=Изгубено-најдено
+-Name[mn]=Алдагдал & Олдолт
+-Name[ms]=Hilang & Jumpa
+-Name[mt]=Mitlufin u Misjuba
+-Name[nb]=Tapt og funnet
+-Name[nds]=Passt narms sünst
+-Name[ne]=हराएका र फेला परेका
+-Name[nl]=Overig
+-Name[nn]=Tapt og funne
+-Name[pa]=ਗੁਆਚੇ ਤੇ ਲੱਭੇ
+-Name[pl]=Zgubione i znalezione
+-Name[pt]=Perdidos e Achados
+-Name[pt_BR]=Achados & Perdidos
+-Name[ro]=Pierdute și regăsite
+-Name[ru]=Камера хранения
+-Name[rw]=Byabuze & Byabonetse
+-Name[se]=Láhppon ja gávdnon
+-Name[sk]=Straty a nálezy
+-Name[sl]=Izgubljeno in najdeno
+-Name[sr]=Изгубљено-нађено
+-Name[sr@Latn]=Izgubljeno-nađeno
+-Name[sv]=Hittegods
+-Name[ta]=இழந்த & கிடைத்த
+-Name[te]=పోయినవి & దొరికినవి
+-Name[tg]=Ҷустуҷӯй
+-Name[th]=หาไม่เจอดูที่นี่
+-Name[tr]=Kayıplar ve Bulunanlar
+-Name[tt]=Yuğaltu & Tabu
+-Name[uk]=Загублено та знайдено
+-Name[uz]=Nomaʼlum
+-Name[uz@cyrillic]=Номаълум
+-Name[vi]=Mất & Tìm
+-Name[wa]=Pierdous & rtrovés
+-Name[zh_CN]=未知类别
+-Icon=help
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-accessibility.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-accessibility.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-accessibility.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-accessibility.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,148 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Accessibility
+-Name[af]=Toeganklikheid
+-Name[ar]=تسهيل الوصول
+-Name[az]=Yetişmə Qabiliyyəti
+-Name[be]=Даступнасць
+-Name[bg]=Равностоен достъп
+-Name[bn]=সহায়ক প্রযুক্তি
+-Name[br]=Haezadusted
+-Name[bs]=Pristupačnost
+-Name[ca]=Accessibilitat
+-Name[cs]=Zpřístupnění
+-Name[csb]=Pòmòce przistãpù
+-Name[cy]=Hygyrchedd
+-Name[da]=Tilgængelighed
+-Name[de]=Zugangshilfen
+-Name[el]=Προσιτότητα
+-Name[eo]=Alirebleco
+-Name[es]=Accesibilidad
+-Name[et]=Hõlbustus
+-Name[eu]=Erabilerraztasuna
+-Name[fa]=دستیابی‌پذیری
+-Name[fi]=Helppokäyttötoiminnot
+-Name[fr]=Accessibilité
+-Name[fy]=Tagonklikens
+-Name[ga]=Inrochtaineacht
+-Name[gl]=Accesibilidade
+-Name[he]=נגישות
+-Name[hi]=पहुँच
+-Name[hr]=Pristupačnost
+-Name[hu]=Kezelési segítség
+-Name[id]=Aksesibiliti
+-Name[is]=Aðgengi
+-Name[it]=Accessibilità
+-Name[ja]=アクセシビリティ
+-Name[ka]=სპეციალური შესაძლბლობები
+-Name[kk]=Арнайы мүмкіндіктер
+-Name[km]=ភាព​អាច​ចូល​ដំណើរការ​បាន
+-Name[ko]=내게 필요한 설정
+-Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
+-Name[lt]=Prieinamumas
+-Name[lv]=Pieejamība
+-Name[mk]=Пристапливост
+-Name[mn]=Хэрэглэх тохь
+-Name[ms]=Kebolehcapaian
+-Name[mt]=Aċċessibiltà
+-Name[nb]=Tilgjengelighet
+-Name[nds]=Behinnertenhülp
+-Name[ne]=पहुँचता
+-Name[nl]=Toegankelijkheid
+-Name[nn]=Tilgjenge
+-Name[nso]=Botsenelo
+-Name[oc]=Accessibilitat
+-Name[pa]=ਸਹੂਲਤਾਂ
+-Name[pl]=Dostępność
+-Name[pt]=Acessibilidade
+-Name[pt_BR]=Acessibilidade
+-Name[ro]=Accesibilitate
+-Name[ru]=Специальные возможности
+-Name[rw]=Ukugerwaho
+-Name[se]=Álkkibut geavaheapmi
+-Name[sk]=Prístupnosť
+-Name[sl]=Dostopnost
+-Name[sr]=Приступачност
+-Name[sr@Latn]=Pristupačnost
+-Name[ss]=Kutfolakala kalula
+-Name[sv]=Handikappstöd
+-Name[ta]=அணுகல்
+-Name[te]=అందుబాటు
+-Name[tg]=Имконпазирӣ
+-Name[th]=ตัวช่วยในการใช้งาน
+-Name[tr]=Erişilebilirlik
+-Name[tt]=Qulaylıq
+-Name[uk]=Доступність
+-Name[uz]=Qulayliklar
+-Name[uz@cyrillic]=Қулайликлар
+-Name[ven]=Dzheneaho
+-Name[vi]=Hỗ trợ người tàn tật
+-Name[wa]=Accessibilité
+-Name[xh]=Unikezelo
+-Name[zh_CN]=辅助
+-Name[zh_TW]=無障礙輔助
+-Name[zu]=Ukungena
+-Icon=access
+-Comment=Accessibility
+-Comment[af]=Toeganklikheid
+-Comment[be]=Даступнасць
+-Comment[bg]=Равностоен достъп
+-Comment[bn]=সহায়ক প্রযুক্তি
+-Comment[br]=Haezadusted
+-Comment[bs]=Pristupačnost
+-Comment[ca]=Accessibilitat
+-Comment[cs]=Zpřístupnění
+-Comment[csb]=Pòmòce przistãpù
+-Comment[cy]=Hygyrchedd
+-Comment[da]=Tilgængelighed
+-Comment[de]=Zugangshilfen
+-Comment[el]=Προσβασιμότητα
+-Comment[eo]=Alirebleco
+-Comment[es]=Accesibilidad
+-Comment[et]=Hõlbustus
+-Comment[eu]=Erabilerraztasuna
+-Comment[fa]=دستیابی‌پذیری
+-Comment[fi]=Helppokäyttöisyys
+-Comment[fr]=Accessibilité
+-Comment[fy]=Tagonklikens
+-Comment[ga]=Inrochtaineacht
+-Comment[gl]=Accesibilidade
+-Comment[he]=נגישות
+-Comment[hr]=Pristupačnost
+-Comment[hu]=Kezelési segítség
+-Comment[is]=Aðgengi
+-Comment[it]=Accessibilità
+-Comment[ja]=アクセシビリティ
+-Comment[kk]=Арнайы мүмкіндіктер
+-Comment[km]=មធ្យោបាយ​ងាយស្រួល
+-Comment[ko]=내게 필요한 설정
+-Comment[mk]=Пристапливост
+-Comment[ms]=Kebolehcapaian
+-Comment[nb]=Tilgjengelighet
+-Comment[nds]=Behinnertenhülp
+-Comment[ne]=पहुँचता
+-Comment[nl]=Toegankelijkheid
+-Comment[nn]=Tilgjenge
+-Comment[pa]=ਸਹੂਲਤਾਂ
+-Comment[pl]=Dostępność
+-Comment[pt]=Acessibilidade
+-Comment[pt_BR]=Acessibilidade
+-Comment[ro]=Accesibilitate
+-Comment[ru]=Специальные возможности
+-Comment[sk]=Prístupnosť
+-Comment[sl]=Dostopnost
+-Comment[sr]=Приступачност
+-Comment[sr@Latn]=Pristupačnost
+-Comment[sv]=Handikappstöd
+-Comment[te]=అందుబాటు
+-Comment[tg]=Имконпазирӣ
+-Comment[th]=ตัวช่วยให้ใช้งานสะดวกขึ้น
+-Comment[tr]=Erişilebilirlik
+-Comment[uk]=Доступність
+-Comment[uz]=Qulayliklar
+-Comment[uz@cyrillic]=Қулайликлар
+-Comment[vi]=Hỗ trợ người tàn tật
+-Comment[wa]=Accessibilité
+-Comment[zh_CN]=辅助
+-Comment[zh_TW]=無障礙輔助
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-desktop.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-desktop.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-desktop.directory 2013-07-28 15:44:30.820668728 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-desktop.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,141 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Desktop
+-Name[af]=Werkskerm
+-Name[ar]=سطح المكتب
+-Name[az]=Masa Üstü
+-Name[be]=Працоўны стол
+-Name[bg]=Работен плот
+-Name[bn]=ডেস্কটপ
+-Name[br]=Gorretaol
+-Name[bs]=Radna površina
+-Name[ca]=Escriptori
+-Name[cs]=Pracovní plocha
+-Name[csb]=Pùlt
+-Name[cy]=Penbwrdd
+-Name[de]=Arbeitsfläche
+-Name[el]=Επιφάνεια εργασίας
+-Name[eo]=Tabulo
+-Name[es]=Escritorio
+-Name[et]=Töölaud
+-Name[eu]=Mahaigaina
+-Name[fa]=رومیزی
+-Name[fi]=Työpöytä
+-Name[fo]=Skriviborð
+-Name[fr]=Bureau
+-Name[fy]=Buroblêd
+-Name[ga]=Deasc
+-Name[gl]=Escritorio
+-Name[he]=שולחן עבודה
+-Name[hi]=डेस्कटॉप
+-Name[hr]=Radna površina
+-Name[hsb]=Dźěłowy powjerch
+-Name[hu]=Munkaasztal
+-Name[is]=Skjáborð
+-Name[ja]=デスクトップ
+-Name[ka]=სამუშაო დაფა
+-Name[kk]=Жұмыс үстелі
+-Name[km]=ផ្ទៃតុ
+-Name[ko]=데스크톱
+-Name[lo]=ພື້ນທີ່ເຮັດວງກ
+-Name[lt]=Darbastalis
+-Name[lv]=Darbvirsma
+-Name[mk]=Работна површина
+-Name[mn]=Ажлын тавцан
+-Name[ms]=Ruang Kerja
+-Name[nb]=Skrivebord
+-Name[nds]=Schriefdisch
+-Name[ne]=डेस्कटप
+-Name[nl]=Bureaublad
+-Name[nn]=Skrivebord
+-Name[oc]=BurèU
+-Name[pa]=ਵੇਹੜਾ
+-Name[pl]=Pulpit
+-Name[pt]=Ambiente de Trabalho
+-Name[pt_BR]=Área de Trabalho
+-Name[ru]=Рабочий стол
+-Name[rw]=Ibiro
+-Name[se]=Čállinbeavdi
+-Name[sk]=Plocha
+-Name[sl]=Namizje
+-Name[sr]=Радна површина
+-Name[sr@Latn]=Radna površina
+-Name[ss]=Desktop
+-Name[sv]=Skrivbord
+-Name[ta]=மேல்மேசை
+-Name[te]=రంగస్ఠలం
+-Name[tg]=Мизи корӣ
+-Name[th]=พื้นที่ทำงาน
+-Name[tr]=Masaüstü
+-Name[tt]=Östäl
+-Name[uk]=Стільниця
+-Name[uz]=Ish stoli
+-Name[uz@cyrillic]=Иш столи
+-Name[ven]=Desikithopo
+-Name[vi]=Màn hình nền
+-Name[wa]=Sicribanne
+-Name[zh_CN]=桌面
+-Name[zh_TW]=桌面
+-Icon=desktop
+-Comment=Desktop
+-Comment[af]=Werkskerm
+-Comment[ar]=سطح المكتب
+-Comment[be]=Працоўны стол
+-Comment[bg]=Работен плот
+-Comment[bn]=ডেস্কটপ
+-Comment[br]=Burev
+-Comment[ca]=Escriptori
+-Comment[cs]=Pracovní plocha
+-Comment[csb]=Pùlt
+-Comment[cy]=Penbwrdd
+-Comment[de]=KDE-Arbeitsfläche
+-Comment[el]=Επιφάνεια εργασίας
+-Comment[eo]=KDEa labortablo
+-Comment[es]=Escritorio
+-Comment[et]=Töölaud
+-Comment[eu]=Mahaigaina
+-Comment[fa]=رومیزی
+-Comment[fi]=Työpöytä
+-Comment[fr]=Bureau
+-Comment[fy]=Buroblêd
+-Comment[ga]=Deasc
+-Comment[gl]=Escritorio
+-Comment[he]=שולחן העבודה
+-Comment[hr]=Radna površina
+-Comment[hu]=Munkaasztal
+-Comment[is]=Skjáborð
+-Comment[ja]=デスクトップ
+-Comment[ka]=სამუშაო დაფა
+-Comment[kk]=Үстел
+-Comment[km]=ផ្ទៃតុ
+-Comment[ko]=데스크톱
+-Comment[lt]=Darbastalis
+-Comment[mk]=Работна површина
+-Comment[nb]=Skrivebord
+-Comment[nds]=Schriefdisch
+-Comment[ne]=डेस्कटप
+-Comment[nl]=Bureaublad
+-Comment[nn]=Skrivebord
+-Comment[pa]=ਵੇਹੜਾ
+-Comment[pl]=Pulpit
+-Comment[pt]=Ecrã
+-Comment[pt_BR]=Área de Trabalho
+-Comment[ru]=Рабочий стол
+-Comment[se]=Čállinbeavdi
+-Comment[sk]=Pracovná plocha
+-Comment[sl]=Namizje
+-Comment[sr]=Радна површина
+-Comment[sr@Latn]=Radna površina
+-Comment[sv]=Skrivbord
+-Comment[te]=రంగస్థలం
+-Comment[tg]=Мизи корӣ
+-Comment[th]=พื้นที่หน้าจอ
+-Comment[tr]=Masaüstü
+-Comment[uk]=Стільниця
+-Comment[uz]=Ish stoli
+-Comment[uz@cyrillic]=Иш столи
+-Comment[vi]=Màn hình nền
+-Comment[wa]=Sicribanne
+-Comment[zh_CN]=桌面
+-Comment[zh_TW]=桌面
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,170 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Utilities
+-Name[af]=Nutsprogramme
+-Name[ar]=عدة التشغيل
+-Name[az]=Tə'minatlar
+-Name[be]=Службовыя праграмы
+-Name[bg]=Инструменти
+-Name[bn]=আনুষঙ্গিক
+-Name[br]=Mavegoù
+-Name[bs]=Korisni programi
+-Name[ca]=Utilitats
+-Name[cs]=Nástroje
+-Name[csb]=Nôrzãdza
+-Name[cy]=Defnyddioldebau
+-Name[da]=Redskaber
+-Name[de]=Dienstprogramme
+-Name[el]=Εργαλεία
+-Name[eo]=Utilaĵoj
+-Name[es]=Utilidades
+-Name[et]=Utiliidid
+-Name[eu]=Tresnak
+-Name[fa]=برنامه‌های سودمند
+-Name[fi]=Apuohjelmat
+-Name[fo]=Hentleikar
+-Name[fr]=Utilitaires
+-Name[fy]=Helpmiddelen
+-Name[ga]=Uirlisí
+-Name[gl]=Utilidades
+-Name[he]=כלים
+-Name[hi]=यूटिलिटीज़
+-Name[hr]=Alati
+-Name[hsb]=Pomocniki
+-Name[hu]=Segédprogramok
+-Name[is]=Nytjatól
+-Name[it]=Accessori
+-Name[ja]=ユーティリティ
+-Name[ka]=ხელსაწყოები
+-Name[kk]=Утилиталары
+-Name[km]=ឧបករណ៍
+-Name[ko]=유틸리티
+-Name[lo]=ໃຊ້ປະໂຫຍດ
+-Name[lt]=Pagalbininkai
+-Name[lv]=Utilītas
+-Name[mk]=Алатки
+-Name[mn]=Хэрэгсэл програмууд
+-Name[ms]=Utiliti
+-Name[mt]=Utilitajiet
+-Name[nb]=Verktøy
+-Name[nds]=Warktüüch
+-Name[ne]=युटिलिटी
+-Name[nl]=Hulpmiddelen
+-Name[nn]=Verktøy
+-Name[nso]=Didiriswa
+-Name[oc]=Utilitats
+-Name[pa]=ਸਹੂਲਤ
+-Name[pl]=Narzędzia
+-Name[pt]=Utilitários
+-Name[pt_BR]=Utilitários
+-Name[ro]=Utilitare
+-Name[ru]=Служебные
+-Name[rw]=Nkemurabibazo
+-Name[se]=Reaiddut
+-Name[sk]=Nástroje
+-Name[sl]=Potrebščine
+-Name[sr]=Алати
+-Name[sr@Latn]=Alati
+-Name[ss]=Kwekusetjentiswa
+-Name[sv]=Verktyg
+-Name[ta]=கருவிகள்
+-Name[te]=సౌలభ్యాలు
+-Name[tg]=Лавозимот
+-Name[th]=โปรแกรมอรรถประโยชน์
+-Name[tr]=Yardımcı Programlar
+-Name[tt]=Faydalıq
+-Name[uk]=Утиліти
+-Name[uz]=Vositalar
+-Name[uz@cyrillic]=Воситалар
+-Name[ven]=Zwishumiswa
+-Name[vi]=Các tiện ích
+-Name[wa]=Usteyes
+-Name[xh]=Izinto eziluncedo
+-Name[zh_CN]=实用工具
+-Name[zh_TW]=實用工具
+-Name[zu]=Izisebenzi
+-Icon=package_utilities
+-Comment=Utilities
+-Comment[af]=Nutsprogramme
+-Comment[ar]=عدّة التشغيل
+-Comment[az]=Tə'minatlar
+-Comment[be]=Службовыя праграмы
+-Comment[bg]=Помощни програми
+-Comment[bn]=প্রায়শই কাজে লাগে এমন কিছু প্রোগ্রাম
+-Comment[br]=Mavegoù
+-Comment[bs]=Korisni programi
+-Comment[ca]=Utilitats
+-Comment[cs]=Nástroje
+-Comment[csb]=Nôrzãdza
+-Comment[cy]= Defnyddioldebau
+-Comment[da]=Redskaber
+-Comment[de]=Dienstprogramme
+-Comment[el]=Εργαλεία
+-Comment[eo]=Utilaĵoj
+-Comment[es]=Utilidades
+-Comment[et]=Utiliidid
+-Comment[eu]=Tresnak
+-Comment[fa]=برنامه‌های سودمند
+-Comment[fi]=Apuohjelmat
+-Comment[fo]=Hentleikar
+-Comment[fr]=Utilitaires
+-Comment[fy]=Helpmiddelen
+-Comment[ga]=Uirlisí
+-Comment[gl]=Utilidades
+-Comment[he]=כלים
+-Comment[hi]=यूटिलिटीज़
+-Comment[hr]=Alati
+-Comment[hsb]=Pomocne programy
+-Comment[hu]=Segédprogramok
+-Comment[is]=Ýmis nytsamleg áhöld
+-Comment[it]=Accessori
+-Comment[ja]=ユーティリティ
+-Comment[ka]=ხელსაწყოები
+-Comment[kk]=Утилиталары
+-Comment[km]=ឧបករណ៍
+-Comment[ko]=유틸리티
+-Comment[lo]=ໂປຣແກຣມໃຊ້ໃຫ້ເປັນປະໂຫຍດ
+-Comment[lt]=Pagalbininkai
+-Comment[lv]=Utilītas
+-Comment[mk]=Алатки
+-Comment[mn]=Хэрэгсэл програмууд
+-Comment[ms]=Utiliti
+-Comment[mt]=Utilitajiet
+-Comment[nb]=Verktøy
+-Comment[nds]=Hülpprogrammen
+-Comment[ne]=युटिलिटी
+-Comment[nl]=Hulpmiddelen
+-Comment[nn]=Verktøy
+-Comment[nso]=Didiriswa
+-Comment[oc]=Utilitats
+-Comment[pa]=ਸਹੂਲਤ
+-Comment[pl]=Narzędzia
+-Comment[pt]=Utilitários
+-Comment[pt_BR]=Utilitários
+-Comment[ro]=Utilitare
+-Comment[ru]=Различные утилиты
+-Comment[rw]=Nkemurabibazo
+-Comment[se]=Reaiddut
+-Comment[sk]=Nástroje
+-Comment[sl]=Potrebščine
+-Comment[sr]=Алати
+-Comment[sr@Latn]=Alati
+-Comment[ss]=Kwekusetjentiswa
+-Comment[sv]=Verktyg
+-Comment[ta]=கருவிகள்
+-Comment[te]=సౌలభ్యాలు
+-Comment[tg]=Лавозимоти гуногун
+-Comment[th]=โปรแกรมอรรถประโยชน์
+-Comment[tr]=Yardımcı Programlar
+-Comment[tt]=Faydalıqlar
+-Comment[uk]=Утиліти
+-Comment[uz]=Vositalar
+-Comment[uz@cyrillic]=Воситалар
+-Comment[ven]=Zwishumiswa
+-Comment[vi]=Các tiện ích
+-Comment[wa]=Usteyes
+-Comment[xh]=Izinto eziluncedo
+-Comment[zh_CN]=实用工具
+-Comment[zh_TW]=實用工具
+-Comment[zu]=Izisebenzi
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-file.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-file.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-file.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-file.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,139 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=File
+-Name[af]=Lêer
+-Name[ar]=الملف
+-Name[be]=Файл
+-Name[bg]=Файл
+-Name[bn]=ফাইল
+-Name[br]=Restr
+-Name[bs]=Datoteka
+-Name[ca]=Fitxer
+-Name[cs]=Soubor
+-Name[csb]=Lopk
+-Name[cy]=Ffeil
+-Name[da]=Fil
+-Name[de]=Datei
+-Name[el]=Αρχείο
+-Name[eo]=Dosiero
+-Name[es]=Archivo
+-Name[et]=Fail
+-Name[eu]=Fitxategia
+-Name[fa]=پرونده
+-Name[fi]=Tiedosto
+-Name[fr]=Fichier
+-Name[fy]=Triem
+-Name[ga]=Comhad
+-Name[gl]=Ficheiro
+-Name[he]=קובץ
+-Name[hr]=Datoteka
+-Name[hu]=Fájl
+-Name[id]=Berkas
+-Name[is]=Skrá
+-Name[ja]=ファイル
+-Name[ka]=ფაილი
+-Name[kk]=Файл
+-Name[km]=ឯកសារ
+-Name[ko]=파일
+-Name[ku]=Pel
+-Name[lt]=Byla
+-Name[mk]=Датотека
+-Name[ms]=Fail
+-Name[nb]=Fil
+-Name[nds]=Datei
+-Name[ne]=फाइल
+-Name[nl]=Bestand
+-Name[nn]=Fil
+-Name[pa]=ਫਾਇਲ
+-Name[pl]=Plik
+-Name[pt]=Ficheiro
+-Name[pt_BR]=Arquivo
+-Name[ro]=Fișier
+-Name[ru]=Работа с файлами
+-Name[rw]=Idosiye
+-Name[se]=Fiila
+-Name[sk]=Súbor
+-Name[sl]=Datoteke
+-Name[sr]=Фајл
+-Name[sr@Latn]=Fajl
+-Name[sv]=Fil
+-Name[te]=దస్త్రం
+-Name[tg]=Файл
+-Name[th]=แฟ้ม
+-Name[tr]=Dosya
+-Name[uk]=Файл
+-Name[uz]=Fayl
+-Name[uz@cyrillic]=Файл
+-Name[vi]=Tập tin
+-Name[wa]=Fitchî
+-Name[zh_CN]=文件
+-Name[zh_TW]=檔案
+-Icon=kfm
+-Comment=File
+-Comment[af]=Lêer
+-Comment[ar]=الملف
+-Comment[be]=Файл
+-Comment[bg]=Файл
+-Comment[bn]=ফাইল
+-Comment[br]=Restr
+-Comment[bs]=Datoteka
+-Comment[ca]=Fitxer
+-Comment[cs]=Soubor
+-Comment[csb]=Lopk
+-Comment[cy]=Ffeil
+-Comment[da]=Fil
+-Comment[de]=Datei
+-Comment[el]=Αρχείο
+-Comment[eo]=Dosiero
+-Comment[es]=Archivo
+-Comment[et]=Fail
+-Comment[eu]=Fitxategia
+-Comment[fa]=پرونده
+-Comment[fi]=Tiedosto
+-Comment[fr]=Fichier
+-Comment[fy]=Triem
+-Comment[ga]=Comhad
+-Comment[gl]=Ficheiro
+-Comment[he]=קובץ
+-Comment[hr]=Datoteka
+-Comment[hu]=Fájl
+-Comment[id]=Berkas
+-Comment[is]=Skrá
+-Comment[ja]=ファイル
+-Comment[ka]=ფაილი
+-Comment[kk]=Файл
+-Comment[km]=ឯកសារ
+-Comment[ko]=글꼴 파일
+-Comment[ku]=Pel
+-Comment[lt]=Byla
+-Comment[mk]=Датотека
+-Comment[ms]=Fail
+-Comment[nb]=Fil
+-Comment[nds]=Datei
+-Comment[ne]=फाइल
+-Comment[nl]=Bestand
+-Comment[nn]=Fil
+-Comment[pa]=ਫਾਇਲ
+-Comment[pl]=Plik
+-Comment[pt]=Ficheiro
+-Comment[pt_BR]=Arquivo
+-Comment[ro]=Fișier
+-Comment[ru]=Работа с файлами
+-Comment[se]=Fiila
+-Comment[sk]=Súbor
+-Comment[sl]=Datoteke
+-Comment[sr]=Фајл
+-Comment[sr@Latn]=Fajl
+-Comment[sv]=Fil
+-Comment[te]=దస్త్రం
+-Comment[tg]=Файл
+-Comment[th]=แฟ้ม
+-Comment[tr]=Dosya
+-Comment[uk]=Файл
+-Comment[uz]=Fayl
+-Comment[uz@cyrillic]=Файл
+-Comment[vi]=Tập tin
+-Comment[wa]=Fitchî
+-Comment[zh_CN]=文件
+-Comment[zh_TW]=檔案
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-peripherals.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-peripherals.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-peripherals.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-peripherals.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,149 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=Peripherals
+-Name[af]=Randapperatuur
+-Name[ar]=الأجهزة المحيطية
+-Name[az]=Avadanlıq
+-Name[be]=Перыферыя
+-Name[bg]=Периферия
+-Name[bn]=পেরিফেরাল
+-Name[br]=Trobarzhelloù
+-Name[bs]=Vanjski uređaji
+-Name[ca]=Perifèrics
+-Name[cs]=Periférie
+-Name[csb]=Periferëjné ùrzãdzenia
+-Name[cy]=Perifferolion
+-Name[da]=Tilkoblinger
+-Name[de]=Angeschlossene Geräte
+-Name[el]=Περιφερειακά
+-Name[eo]=Periferaĵoj
+-Name[es]=Periféricos
+-Name[et]=Välisseadmed
+-Name[eu]=Periferikoak
+-Name[fa]=وسایل جانبی
+-Name[fi]=Laitteet
+-Name[fo]=Úteindir
+-Name[fr]=Périphériques
+-Name[fy]=Râneapparaten
+-Name[ga]=Forimeallaigh
+-Name[gl]=Periféricos
+-Name[he]=ציוד היקפי
+-Name[hi]=सहायक पुरजे
+-Name[hr]=Periferni uređaji
+-Name[hsb]=Periferija
+-Name[hu]=Perifériák
+-Name[is]=Jaðartæki
+-Name[it]=Periferiche
+-Name[ja]=周辺機器
+-Name[ka]=პერიფერიული
+-Name[kk]=Периферия
+-Name[km]=គ្រឿង​កុំព្យូទ័រ
+-Name[ko]=주변 장치
+-Name[lo]=ອຸປະກອນຕໍ່ພວງ
+-Name[lt]=Periferija
+-Name[lv]=Perifērija
+-Name[mk]=Периферни уреди
+-Name[mn]=Залгаатай төхөөрөмжүүд
+-Name[ms]=Perkakasan
+-Name[mt]=Apparat
+-Name[nb]=Tilleggsenheter
+-Name[nds]=Reedschappen
+-Name[ne]=परिवृत्तीय
+-Name[nl]=Randapparaten
+-Name[nn]=Tilleggseiningar
+-Name[nso]=Ditswelantle
+-Name[oc]=Periferics
+-Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
+-Name[pl]=Urządzenia peryferyjne
+-Name[pt]=Periféricos
+-Name[pt_BR]=Periféricos
+-Name[ro]=Periferice
+-Name[ru]=Периферия
+-Name[rw]=Ibyinyuma
+-Name[se]=Ovttadagat
+-Name[sk]=Periférie
+-Name[sl]=Strojni dodatki
+-Name[sr]=Периферије
+-Name[sr@Latn]=Periferije
+-Name[ss]=Ema-peripherals
+-Name[sv]=Kringutrustning
+-Name[ta]=கருவிகள்
+-Name[te]=పరికరాలు
+-Name[tg]=Дастгоҳҳои лозимӣ
+-Name[th]=อุปกรณ์ต่อพ่วง
+-Name[tr]=Çevre Birimleri
+-Name[tt]=Cıhazlar
+-Name[uk]=Периферійні пристрої
+-Name[uz]=Ulangan uskunalar
+-Name[uz@cyrillic]=Уланган ускуналар
+-Name[ven]=Dzipheriferala
+-Name[vi]=Thiết bị ngoại vi
+-Name[wa]=Periferikes
+-Name[xh]=Iilayini zomda
+-Name[zh_CN]=外设
+-Name[zh_TW]=週邊設備
+-Name[zu]=Imixhantela
+-Icon=input_devices_settings
+-Comment=Peripherals
+-Comment[af]=Randapparatuur
+-Comment[be]=Перыферыя
+-Comment[bg]=Периферия
+-Comment[bn]=পেরিফেরাল
+-Comment[br]=Trobarzhelloù
+-Comment[bs]=Vanjski uređaji
+-Comment[ca]=Perifèrics
+-Comment[cs]=Periférie
+-Comment[csb]=Periferëjné ùrzãdzenia
+-Comment[cy]=Perifferolion
+-Comment[da]=Tilkoblinger
+-Comment[de]=Angeschlossene Geräte
+-Comment[el]=Περιφερειακά
+-Comment[eo]=Periferaĵoj
+-Comment[es]=Periféricos
+-Comment[et]=Välisseadmed
+-Comment[eu]=Periferikoak
+-Comment[fa]=وسایل جانبی
+-Comment[fi]=Oheislaitteet
+-Comment[fr]=Périphériques
+-Comment[fy]=Râneapparaten
+-Comment[ga]=Forimeallaigh
+-Comment[gl]=Periféricos
+-Comment[he]=ציוד היקפי
+-Comment[hr]=Periferni uređaji
+-Comment[hu]=Perifériák
+-Comment[is]=Jaðartæki
+-Comment[it]=Periferiche
+-Comment[ja]=周辺機器
+-Comment[kk]=Периферия
+-Comment[km]=គ្រឿង​កុំព្យូទ័រ
+-Comment[ko]=주변 장치
+-Comment[mk]=Периферни уреди
+-Comment[ms]=Persisian
+-Comment[nb]=Tikoblede enheter
+-Comment[nds]=Reedschappen
+-Comment[ne]=परिवृतिय
+-Comment[nl]=Randapparaten
+-Comment[nn]=Tilleggseiningar
+-Comment[pa]=ਜੰਤਰ
+-Comment[pl]=Urządzenia peryferyjne
+-Comment[pt]=Periféricos
+-Comment[pt_BR]=Periféricos
+-Comment[ro]=Periferice
+-Comment[ru]=Периферия
+-Comment[sk]=Periférie
+-Comment[sl]=Strojni dodatki
+-Comment[sr]=Периферије
+-Comment[sr@Latn]=Periferije
+-Comment[sv]=Kringutrustning
+-Comment[te]=పరికరాలు
+-Comment[tg]=Дастгоҳҳои лозимӣ
+-Comment[th]=อุปกรณ์ต่อพ่วง
+-Comment[tr]=Çevre Birimleri
+-Comment[uk]=Периферійні
+-Comment[uz]=Ulangan uskunalar
+-Comment[uz@cyrillic]=Уланган ускуналар
+-Comment[vi]=Thiết bị ngoại vi
+-Comment[wa]=Éndjins
+-Comment[zh_CN]=外设
+-Comment[zh_TW]=週邊設備
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-pim.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-pim.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-pim.directory 2013-07-28 15:44:30.820668728 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-pim.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,45 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=PIM
+-Name[ar]=مدبِر المعلومات الشخصي
+-Name[be]=Кіраўнік персанальнай інфармацыі
+-Name[bn]=পি-আই-এম
+-Name[csb]=Priwatnô wëdowiédzô
+-Name[eo]=PCI
+-Name[he]=ניהול מידע אישי
+-Name[ne]=पी आई एम
+-Name[pl]=Informacje osobiste
+-Name[ro]=Manager de Informații Personale
+-Name[ru]=Персональная информация
+-Name[se]=Peršuvnnalaš diehtogieđahalli
+-Name[sl]=Osebni podatki
+-Name[sv]=Personlig information
+-Name[te]=పిఐఎం
+-Name[th]=ตัวจัดการข้อมูลส่วนตัว
+-Name[uk]=Керування інформацією
+-Name[zh_CN]=个人信息管理
+-Icon=korganizer
+-Comment=PIM
+-Comment[af]=Persoonlike Informasie Bestuurder
+-Comment[ar]=مدبر المعلومات الشخصي
+-Comment[be]=Кіраўнік персанальнай інфармацыі
+-Comment[bn]=পি-আই-এম
+-Comment[csb]=Sprôwianie priwatną wëdowiédzą
+-Comment[de]=Persönliches Informationsmanagement
+-Comment[eo]=PCI
+-Comment[fy]=Persoanlike Ynformaasje Behear
+-Comment[he]=ניהול מידע אישי
+-Comment[kk]=Дербес ақпарат менеджері
+-Comment[ne]=पी आई एम
+-Comment[nl]=Persoonlijke Informatie Management
+-Comment[pl]=Zarządzanie informacjami osobistymi
+-Comment[ro]=Manager de Informații Personale
+-Comment[ru]=Управление личной информацией (PIM)
+-Comment[se]=Peršuvnnalaš diehtogieđahalli
+-Comment[sl]=Osebni podatki
+-Comment[sv]=Personlig informationshantering
+-Comment[te]=పిఐఎం
+-Comment[th]=สำหรับจัดการข้อมูลส่วนตัว เช่น เบอร์โทรศัพท์, ที่อยู่
+-Comment[uk]=Керування особистою інформацією (PIM)
+-Comment[zh_CN]=个人信息管理
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-xutils.directory trinity-tdebase-3.5.13.2/applnk/kde-utilities-xutils.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/kde-utilities-xutils.directory 2013-07-28 15:44:30.821668706 +0200
++++ trinity-tdebase-3.5.13.2/applnk/kde-utilities-xutils.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,166 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Directory
+-Name=X-Utilities
+-Name[ar]=عدة X
+-Name[az]=X Tə'minatları
+-Name[be]=Службовыя праграмы X
+-Name[bg]=Инструменти за X
+-Name[bn]=এক্স-উইটিলিটি
+-Name[br]=Mavegoù X
+-Name[ca]=Utilitats de X
+-Name[cs]=Nástroje X
+-Name[csb]=X - nôrzãdza
+-Name[cy]=Defnyddioldebau-X
+-Name[da]=X-Redskaber
+-Name[de]=X-Dienstprogramme
+-Name[el]=Εργαλεία-X
+-Name[eo]=X-Utilaĵoj
+-Name[es]=Utilidades-X
+-Name[et]=X'i utiliidid
+-Name[eu]=X-tresnak
+-Name[fa]=برنامه‌های سودمند X
+-Name[fi]=X-Apuohjelmat
+-Name[fo]=Hentleikar til X
+-Name[fr]=Utilitaires X
+-Name[fy]=Grafyske helpprogramma's
+-Name[ga]=Uirlisí X
+-Name[gl]=Utilidades das X
+-Name[he]=כלי X
+-Name[hi]=एक्स-यूटिलिटीज़
+-Name[hr]=X-alati
+-Name[hsb]=Pomocniki za X
+-Name[hu]=X segédprogramok
+-Name[is]=X Tól
+-Name[it]=Programmi di X
+-Name[ja]=X-ユーティリティ
+-Name[ka]= X-ხელსაწყოები
+-Name[kk]=X-утилиталар
+-Name[km]=ឧបករណ៍-X
+-Name[ko]=X 유틸리티
+-Name[lo]=ໃຊ້ປະໂຫຍດ์ X
+-Name[lt]=X pagalbininkai
+-Name[lv]=X Utilītas
+-Name[mk]=X-алатки
+-Name[mn]=X-Хэрэгслүүд
+-Name[ms]=Utiliti X
+-Name[mt]=Utilitajiet tal-X
+-Name[nb]=X-verktøy
+-Name[nds]=X-Warktüüch
+-Name[ne]=X-युटिलिटी
+-Name[nl]=Grafische hulpprogramma's
+-Name[nn]=X-verktøy
+-Name[nso]=X-Didiriswa
+-Name[pa]=X-ਸਹੂਲਤ
+-Name[pl]=Narzędzia dla X
+-Name[pt]=Utilitários do X
+-Name[pt_BR]=Utilitários X
+-Name[ro]=Utilitare X
+-Name[ru]=Утилиты X
+-Name[rw]=X-Nkemurabibazo
+-Name[se]=X-reaiddut
+-Name[sk]=Nastroje pre X
+-Name[sl]=Potrebščine za X
+-Name[sr]=X-алати
+-Name[sr@Latn]=X-alati
+-Name[ss]=Kwekusetjentiswa-X
+-Name[sv]=X-verktyg
+-Name[ta]=X-கருவிகள்
+-Name[te]=ఎక్స్-సౌలభ్యాలు
+-Name[tg]=Лавозимотҳои X
+-Name[th]=โปรแกรมอรรถประโยชน์ X
+-Name[tr]=X Yardımcı Programları
+-Name[tt]=X-Faydalıq
+-Name[uk]=Утиліти X Window
+-Name[uz]=X uchun vositalar
+-Name[uz@cyrillic]=X учун воситалар
+-Name[ven]=Zwishumiswa-X
+-Name[vi]=Tiện ích X
+-Name[wa]=Usteyes X
+-Name[xh]=Izinto eziluncedo ze-X
+-Name[zh_CN]=X 实用工具
+-Name[zh_TW]=X-實用工具
+-Name[zu]=Izisebenzi ze-X
+-Icon=xapp
+-Comment=X Window Utilities
+-Comment[af]=X Window Nutsprogramme
+-Comment[ar]=عدة نوافذ X
+-Comment[az]=X Window Tə'minatları
+-Comment[be]=Службовыя праграмы X Window
+-Comment[bg]=Помощни програми за сървъра X
+-Comment[bn]=এক্স উইণ্ডো সিস্টেম সম্বন্ধিত নানা প্রোগ্রাম
+-Comment[br]=Mavegoù X Window
+-Comment[bs]=Korisni X Window programi
+-Comment[ca]=Utilitats de X Window System
+-Comment[cs]=Nástroje X Window
+-Comment[csb]=Nôrzãdza dlô systemë X Window
+-Comment[cy]=Defnyddioldebau Ffenestr X
+-Comment[da]=X-Window redskaber
+-Comment[de]=X-Window-Dienstprogramme
+-Comment[el]=Εργαλεία των X Windows
+-Comment[eo]=Utilaĵoj por la X-Fenestrosistemo
+-Comment[es]=Utilidades X Window
+-Comment[et]=X Window utiliidid
+-Comment[eu]=X Window tresnak
+-Comment[fa]=برنامه‌های سودمند پنجرۀ X
+-Comment[fi]=X Window -apuohjelmat
+-Comment[fo]=Hentleikar til X
+-Comment[fr]=Utilitaires X-Window
+-Comment[fy]=X Window-helpprogramma's
+-Comment[ga]=Uirlisí Fuinneoga X
+-Comment[gl]=Utilidades das X Window
+-Comment[he]=כלים של X Window
+-Comment[hi]=एक्स विंडो यूटिलिटीज़
+-Comment[hr]=Alati X prozora
+-Comment[hsb]=Pomocne programy za X11
+-Comment[hu]=X Window segédprogramok
+-Comment[is]=X gluggatól
+-Comment[it]=Programmi di X Window
+-Comment[ja]=X ウィンドウユーティリティ
+-Comment[ka]=X Window–ს ხელსაწყოები
+-Comment[kk]=X Window утилиталары
+-Comment[km]=ឧបករណ៍ X Window
+-Comment[ko]=X 윈도 유틸리티
+-Comment[lo]=ໂປຣແກຣມໃຊ້ໂຫຍດຂອງ X
+-Comment[lt]=X Window pagalbininkai
+-Comment[lv]=X logu utilītas
+-Comment[mk]=Алатки за X Window
+-Comment[mn]=X-Виндов-хэрэгсэл програмууд
+-Comment[ms]=Utiliti Tetingkap X
+-Comment[mt]=Utilitajiet tal-XWindows
+-Comment[nb]=Verktøy for X-window
+-Comment[nds]=Hülpprogrammen för X-Finstern
+-Comment[ne]=X सञ्झ्याल युटिलिटी
+-Comment[nl]=X Window-hulpprogramma's
+-Comment[nn]=X Window-verktøy
+-Comment[nso]=Didiriswa tsa X Window
+-Comment[pa]=X Window ਸਹੂਲਤਾਂ
+-Comment[pl]=Narzędzia dla systemu XWindow
+-Comment[pt]=Utilitários do X Window
+-Comment[pt_BR]=Utilitários do X Window
+-Comment[ro]=Utilitare X Window
+-Comment[ru]=Утилиты X Window
+-Comment[rw]=Nkemurabibazo Idirishya X
+-Comment[se]=X Window-reaiddut
+-Comment[sk]=Nástroje pre X Window
+-Comment[sl]=Potrebščine za X Window
+-Comment[sr]=X Window алати
+-Comment[sr@Latn]=X Window alati
+-Comment[ss]=X kwekusetjentiswa kweliwindi
+-Comment[sv]=X-window-verktyg
+-Comment[ta]=X-சாளர கருவிகள்
+-Comment[te]=ఎక్స్ విండో సౌలభ్యాలు
+-Comment[tg]=Лавозимотҳои Х Window
+-Comment[th]=โปรแกรมอรรถประโยชน์ของ X
+-Comment[tr]=X Yardımcı Programları
+-Comment[tt]=X Window Faydalığı
+-Comment[uk]=Утиліти системи X Window
+-Comment[uz]=X Windows vositalari
+-Comment[uz@cyrillic]=X Windows воситалари
+-Comment[ven]=Zwishumiswa zwa X window
+-Comment[vi]=Các tiện ích của X window
+-Comment[wa]=Usteyes pol sistinme grafike X11
+-Comment[xh]=X Windows Izinto eziluncedo
+-Comment[zh_CN]=X Window 实用工具
+-Comment[zh_TW]=X 視窗實用工具
+-Comment[zu]=Izisebenzi ze-X Window
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/Makefile.am trinity-tdebase-3.5.13.2/applnk/Makefile.am
+--- trinity-tdebase-3.5.13.2/applnk.ORI/Makefile.am 2013-07-28 15:44:30.820668728 +0200
++++ trinity-tdebase-3.5.13.2/applnk/Makefile.am 2013-07-28 15:47:19.313022892 +0200
+@@ -1,58 +1,58 @@
+ SUBDIRS = compat
+
+-xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
++xdg_menu_DATA = tde-settings.menu tde-information.menu tde-screensavers.menu
+
+-xdg_mergedmenu_DATA = kde-essential.menu
++xdg_mergedmenu_DATA = tde-essential.menu
+ xdg_mergedmenudir = $(xdg_menudir)/applications-merged
+
+ xdg_directory_DATA = \
+-kde-main.directory \
+-kde-development.directory \
+-kde-editors.directory \
+-kde-edutainment.directory \
+-kde-games-arcade.directory \
+-kde-games-board.directory \
+-kde-games-card.directory \
+-kde-games-kids.directory \
+-kde-games-roguelikes.directory \
+-kde-games-strategy.directory \
+-kde-games.directory \
+-kde-graphics.directory \
+-kde-information.directory \
+-kde-internet-terminal.directory \
+-kde-internet.directory \
+-kde-more.directory \
+-kde-multimedia.directory \
+-kde-office.directory \
+-kde-science.directory \
+-kde-settings-accessibility.directory \
+-kde-settings-components.directory \
+-kde-settings-desktop.directory \
+-kde-settings-looknfeel.directory \
+-kde-settings-network.directory \
+-kde-settings-peripherals.directory \
+-kde-settings-hardware.directory \
+-kde-settings-power.directory \
+-kde-settings-security.directory \
+-kde-settings-sound.directory \
+-kde-settings-system.directory \
+-kde-settings-webbrowsing.directory \
+-kde-settings.directory \
+-kde-settingsmenu.directory \
+-kde-system-screensavers.directory \
+-kde-system-terminal.directory \
+-kde-system.directory \
+-kde-toys.directory \
+-kde-unknown.directory \
+-kde-utilities-xutils.directory \
+-kde-utilities.directory \
+-kde-utilities-accessibility.directory \
+-kde-utilities-desktop.directory \
+-kde-utilities-peripherals.directory \
+-kde-utilities-file.directory \
+-kde-utilities-pim.directory \
+-kde-development-translation.directory \
+-kde-development-webdevelopment.directory
++tde-main.directory \
++tde-development.directory \
++tde-editors.directory \
++tde-edutainment.directory \
++tde-games-arcade.directory \
++tde-games-board.directory \
++tde-games-card.directory \
++tde-games-kids.directory \
++tde-games-roguelikes.directory \
++tde-games-strategy.directory \
++tde-games.directory \
++tde-graphics.directory \
++tde-information.directory \
++tde-internet-terminal.directory \
++tde-internet.directory \
++tde-more.directory \
++tde-multimedia.directory \
++tde-office.directory \
++tde-science.directory \
++tde-settings-accessibility.directory \
++tde-settings-components.directory \
++tde-settings-desktop.directory \
++tde-settings-looknfeel.directory \
++tde-settings-network.directory \
++tde-settings-peripherals.directory \
++tde-settings-hardware.directory \
++tde-settings-power.directory \
++tde-settings-security.directory \
++tde-settings-sound.directory \
++tde-settings-system.directory \
++tde-settings-webbrowsing.directory \
++tde-settings.directory \
++tde-settingsmenu.directory \
++tde-system-screensavers.directory \
++tde-system-terminal.directory \
++tde-system.directory \
++tde-toys.directory \
++tde-unknown.directory \
++tde-utilities-xutils.directory \
++tde-utilities.directory \
++tde-utilities-accessibility.directory \
++tde-utilities-desktop.directory \
++tde-utilities-peripherals.directory \
++tde-utilities-file.directory \
++tde-utilities-pim.directory \
++tde-development-translation.directory \
++tde-development-webdevelopment.directory
+
+ install-data-local:
+ for file in `cat $(srcdir)/old_desktop_files` ; do \
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-development.directory trinity-tdebase-3.5.13.2/applnk/tde-development.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-development.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-development.directory 2013-07-28 15:47:19.313022892 +0200
+@@ -0,0 +1,89 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Development
++Name[af]=Ontwikkeling
++Name[ar]=تطوير
++Name[az]=İnkişaf
++Name[be]=Распрацоўка
++Name[bg]=Разработка
++Name[bn]=ডেভেলপমেন্ট
++Name[br]=Diorren
++Name[bs]=Programiranje
++Name[ca]=Desenvolupament
++Name[cs]=Vývoj
++Name[csb]=Nôrzãdza programistów
++Name[cy]=Datblygu
++Name[da]=Udvikling
++Name[de]=Entwicklung
++Name[el]=Ανάπτυξη
++Name[eo]=Programado
++Name[es]=Desarrollo
++Name[et]=Arendus
++Name[eu]=Garapena
++Name[fa]=توسعه
++Name[fi]=Kehitystyökalut
++Name[fo]=Menning
++Name[fr]=Développement
++Name[fy]=Untwikkelje
++Name[ga]=Forbairt
++Name[gl]=Desenvolvemento
++Name[he]=פיתוח
++Name[hi]=विकास
++Name[hr]=Razvoj
++Name[hsb]=Wuwiwanje
++Name[hu]=Fejlesztőeszközök
++Name[id]=Pembangun
++Name[is]=Þróun
++Name[it]=Sviluppo
++Name[ja]=開発
++Name[ka]=განვითარება
++Name[kk]=Жетілдіру
++Name[km]=ការ​អភិវឌ្ឍន៍
++Name[ko]=개발
++Name[lo]=ພັດທະນາໂປຣແກຣມ
++Name[lt]=Programavimas
++Name[lv]=Izstrāde
++Name[mk]=Развој
++Name[mn]=Хөгжүүлэл
++Name[ms]=Pemaju
++Name[mt]=Żvilupp
++Name[nb]=Utvikling
++Name[nds]=Utwickeln
++Name[ne]=विकास
++Name[nl]=Ontwikkeling
++Name[nn]=Utvikling
++Name[nso]=Thlabollogo
++Name[oc]=Desvelopament
++Name[pa]=ਵਿਕਾਸ
++Name[pl]=Narzędzia programistów
++Name[pt]=Desenvolvimento
++Name[pt_BR]=Desenvolvimento
++Name[ro]=Dezvoltare
++Name[ru]=Разработка
++Name[rw]=Iterambere
++Name[se]=Ovdánahttin
++Name[sk]=Vývoj
++Name[sl]=Razvoj
++Name[sr]=Развој
++Name[sr@Latn]=Razvoj
++Name[ss]=Kundlondlobala
++Name[sv]=Utveckling
++Name[ta]=உருவாக்கம்
++Name[te]=డెవలప్మెంట్
++Name[tg]=Такомул
++Name[th]=พัฒนาโปรแกรม
++Name[tr]=Geliştirme
++Name[tt]=Citeşterü
++Name[uk]=Розробка
++Name[uz]=Tuzish
++Name[uz@cyrillic]=Тузиш
++Name[ven]=Nyaluwo
++Name[vi]=Phát triển
++Name[wa]=Programaedje
++Name[xh]=Ubhekiso phambili
++Name[zh_CN]=开发
++Name[zh_TW]=程式開發
++Name[zu]=Intuthuko
++Icon=package_development
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-translation.directory trinity-tdebase-3.5.13.2/applnk/tde-development-translation.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-translation.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-development-translation.directory 2013-07-28 15:47:19.314022870 +0200
+@@ -0,0 +1,72 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Translation
++Name[af]=Vertaling
++Name[ar]=ترجمة
++Name[be]=Пераклад
++Name[bg]=Превод
++Name[bn]=অনুবাদ
++Name[br]=Troidigezh
++Name[bs]=Prevođenje
++Name[ca]=Traducció
++Name[cs]=Překlad
++Name[csb]=Dolmaczënk
++Name[cy]=Cyfieithiad
++Name[da]=Oversættelse
++Name[de]=Übersetzung
++Name[el]=Μετάφραση
++Name[eo]=Traduko
++Name[es]=Traducción
++Name[et]=Tõlkimine
++Name[eu]=Itzulpengintza
++Name[fa]=ترجمه
++Name[fi]=Käännös
++Name[fr]=Traduction
++Name[fy]=Oersetting
++Name[ga]=Aistriúchán
++Name[gl]=Tradución
++Name[he]=תרגום
++Name[hr]=Prijevod
++Name[hu]=Fordítás
++Name[id]=Terjemahan
++Name[is]=Þýðing
++Name[it]=Traduzione
++Name[ja]=翻訳
++Name[ka]=თარგმნა
++Name[kk]=Аудару
++Name[km]=ការបកប្រែ
++Name[ko]=번역
++Name[lt]=Vertimas
++Name[mk]=Превод
++Name[ms]=Terjemahan
++Name[nb]=Oversettelse
++Name[nds]=Översetten
++Name[ne]=अनुवाद
++Name[nl]=Vertaling
++Name[nn]=Omsetjing
++Name[pa]=ਅਨੁਵਾਦ
++Name[pl]=Tłumaczenie
++Name[pt]=Tradução
++Name[pt_BR]=Tradução
++Name[ro]=Traducere
++Name[ru]=Локализация
++Name[se]=Jorgalus
++Name[sk]=Preklad
++Name[sl]=Prevajanje
++Name[sr]=Превод
++Name[sr@Latn]=Prevod
++Name[sv]=Översättning
++Name[te]=అనువాదం
++Name[tg]=Тарҷума
++Name[th]=เครื่องมือแปลภาษา
++Name[tr]=Çeviri
++Name[uk]=Переклад
++Name[uz]=Tarjima
++Name[uz@cyrillic]=Таржима
++Name[vi]=Dịch
++Name[wa]=Ratournaedje
++Name[zh_CN]=翻译
++Name[zh_TW]=翻譯
++Icon=locale
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-webdevelopment.directory trinity-tdebase-3.5.13.2/applnk/tde-development-webdevelopment.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-development-webdevelopment.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-development-webdevelopment.directory 2013-07-28 15:47:19.314022870 +0200
+@@ -0,0 +1,71 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Web Development
++Name[af]=Web Ontwikkeling
++Name[ar]=تطوير برامج للشبكة
++Name[be]=Web-распрацоўка
++Name[bg]=Уеб разработка
++Name[bn]=ওয়েব ডেভেলপমেন্ট
++Name[br]=Diorren gwiad
++Name[bs]=Web programiranje
++Name[ca]=Desenvolupament Web
++Name[cs]=Webový vývoj
++Name[csb]=Programòwanié WWW
++Name[da]=Internet-udvikling
++Name[de]=Web-Entwicklung
++Name[el]=Δικτυακή ανάπτυξη
++Name[eo]=Reta Programado
++Name[es]=Desarrollo web
++Name[et]=Veebiarendus
++Name[eu]=Web garapena
++Name[fa]=توسعۀ وب
++Name[fi]=Webin kehitys
++Name[fr]=Développement Internet
++Name[fy]=Webûntwikkeling
++Name[ga]=Forbairt Ghréasáin
++Name[gl]=Desenvolvemento Web
++Name[he]=פיתוח WEB
++Name[hr]=Web razvoj
++Name[hu]=Webes fejlesztőeszközök
++Name[id]=Pengembangan Web
++Name[is]=Vefhönnun
++Name[it]=Sviluppo web
++Name[ja]=ウェブ開発
++Name[ka]=ვებ პროგრამირება
++Name[kk]=Веб жобалау
++Name[km]=ការបង្កើត​ទំព័រ​បណ្តាញ
++Name[ko]=웹 개발
++Name[lt]=Žiniatinklio programavimas
++Name[mk]=Веб-развој
++Name[ms]=Pembangunan Web
++Name[nb]=Nettutvikling
++Name[nds]=Nett-Utwickeln
++Name[ne]=वेब विकास
++Name[nl]=Webontwikkeling
++Name[nn]=Nettutvikling
++Name[pa]=ਵੈਬ ਵਿਕਾਸ
++Name[pl]=Programowanie WWW
++Name[pt]=Desenvolvimento Web
++Name[pt_BR]=Desenvolvimento Web
++Name[ro]=Dezvoltare web
++Name[ru]=Веб-разработка
++Name[se]=Fierpmádatovdánahttin
++Name[sk]=Vývoj pre Web
++Name[sl]=Spletni razvoj
++Name[sr]=Веб развој
++Name[sr@Latn]=Veb razvoj
++Name[sv]=Webbutveckling
++Name[te]=వెబ్ డెవలప్మెంట్
++Name[tg]=Такомули Вэб
++Name[th]=พัฒนาเว็บ
++Name[tr]=Web Geliştirme
++Name[uk]=Розробка веб-сторінок
++Name[uz]=Veb uchun tuzish
++Name[uz@cyrillic]=Веб учун тузиш
++Name[vi]=Phát triển Mạng
++Name[wa]=Programaedje waibe
++Name[zh_CN]=Web 开发
++Name[zh_TW]=網頁開發
++Icon=package_network
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-editors.directory trinity-tdebase-3.5.13.2/applnk/tde-editors.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-editors.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-editors.directory 2013-07-28 15:47:19.314022870 +0200
+@@ -0,0 +1,85 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Editors
++Name[af]=Redigeerders
++Name[ar]=محرري النصوص
++Name[az]=Editorlar
++Name[be]=Рэдактары
++Name[bg]=Редактори
++Name[bn]=সম্পাদক
++Name[br]=Aozerien
++Name[bs]=Editori
++Name[cs]=Editory
++Name[csb]=Editorë
++Name[cy]=Golygyddion
++Name[da]=Editorer
++Name[de]=Editoren
++Name[el]=Επεξεργαστές
++Name[eo]=Redaktiloj
++Name[es]=Editores
++Name[et]=Redaktorid
++Name[eu]=Editoreak
++Name[fa]=ویرایشگرها
++Name[fi]=Editorit
++Name[fo]=Ritlar
++Name[fr]=Éditeurs de texte
++Name[fy]=Bewurkers
++Name[ga]=Eagarthóirí
++Name[gl]=Editores
++Name[he]=עורכים
++Name[hi]=संपादक
++Name[hr]=Uređivači
++Name[hsb]=Wobdźěłanje teksta
++Name[hu]=Szövegszerkesztők
++Name[id]=Editor
++Name[is]=Ritlar
++Name[it]=Editor
++Name[ja]=エディタ
++Name[ka]=რედაქტორი
++Name[kk]=Редакторлар
++Name[km]=កម្មវិធី​និពន្ធ
++Name[ko]=편집기
++Name[lo]=ແກ້ໄຂແຟ້ມຂໍ້ຄວາມ
++Name[lt]=Redaktoriai
++Name[lv]=Redaktori
++Name[mk]=Уредувачи
++Name[mn]=Боловсруулагч
++Name[ms]=Penyunting
++Name[mt]=Edituri
++Name[nb]=Skriveprogrammer
++Name[nds]=Editoren
++Name[ne]=सम्पादक
++Name[nn]=Skriveprogram
++Name[nso]=Bafetosi
++Name[pa]=ਸੰਪਾਦਕ
++Name[pl]=Edytory
++Name[pt]=Editores
++Name[pt_BR]=Editores
++Name[ro]=Editoare
++Name[ru]=Редакторы
++Name[rw]=Muhinduzi
++Name[se]=Čállinprográmmat
++Name[sk]=Editory
++Name[sl]=Urejevalniki
++Name[sr]=Уређивачи
++Name[sr@Latn]=Uređivači
++Name[ss]=Bahleli
++Name[sv]=Editorer
++Name[ta]=தொகுப்பாளர்கள்
++Name[te]=ఎడిటర్లు
++Name[tg]=Таҳриргарон
++Name[th]=โปรแกรมแก้ไขข้อความ
++Name[tr]=Düzenleyiciler
++Name[tt]=Tözätkeç
++Name[uk]=Редактори
++Name[uz]=Tahrirchilar
++Name[uz@cyrillic]=Таҳрирчилар
++Name[ven]=Vhasengulusi
++Name[vi]=Trình biên tập
++Name[wa]=Aspougneus d' tecse
++Name[xh]=Abahleli
++Name[zh_CN]=编辑器
++Name[zh_TW]=編輯器
++Name[zu]=Abalungisi
++Icon=package_editors
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-edutainment.directory trinity-tdebase-3.5.13.2/applnk/tde-edutainment.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-edutainment.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-edutainment.directory 2013-07-28 15:47:19.314022870 +0200
+@@ -0,0 +1,86 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Edutainment
++Name[af]=Opvoedkundig
++Name[ar]=التعليم الترفيهي
++Name[az]=Təhsil
++Name[be]=Адукацыя
++Name[bg]=Образование
++Name[bn]=শিক্ষামূলক মনোরঞ্জন
++Name[br]=Deskadurezh
++Name[bs]=Zabava i obrazovanje
++Name[ca]=Educació
++Name[cs]=Škola hrou
++Name[csb]=Ùczba ë edukacëjô
++Name[cy]=Addifyrwch
++Name[da]=Uddannelse
++Name[de]=Lernprogramme
++Name[el]=Εκπαίδευση
++Name[eo]=Amuzedukado
++Name[es]=Entretenimientos educativos
++Name[et]=Haridus
++Name[eu]=Jolastu eta ikasi
++Name[fa]=سرگرمی آموزشی
++Name[fi]=Opetusviihde
++Name[fo]=Undirvísing og -hald
++Name[fr]=Éducatif
++Name[fy]=Edukatyf
++Name[ga]=Oideachluichí
++Name[gl]=Educación
++Name[he]=לומדות
++Name[hi]=खेल-खेल में सीखें
++Name[hr]=Obrazovna zabava
++Name[hsb]=Wuknjenje a hrajkanje
++Name[hu]=Oktatóprogramok
++Name[is]=Kennsluleikir
++Name[it]=Istruzione divertente
++Name[ja]=エデュテインメント
++Name[ka]=სასწავლო
++Name[kk]=Оқыту
++Name[km]=ល្បែង​កំសាន្ត​បង្កើន​ចំណេះដឹង
++Name[ko]=교육
++Name[lo]=ການສຶກສາແສນມ່ວນຊື່ນ
++Name[lt]=Mokomosios programos
++Name[lv]=Izglītošana
++Name[mk]=Едукација и забава
++Name[mn]=Боловсролын програм
++Name[ms]=Hiburan Mendidik
++Name[mt]=Edukazzjoni u Divertiment
++Name[nb]=Lek og lær
++Name[nds]=Spelen & Lehren
++Name[ne]=शिक्षा मनोरञ्जन
++Name[nl]=Educatief
++Name[nn]=Underhaldningslæring
++Name[nso]=Boithabiso bja Thuto
++Name[pa]=ਸਿੱਖਿਆ
++Name[pl]=Nauka i rozrywka
++Name[pt]=Educação/Entretenimento
++Name[pt_BR]=Educativo
++Name[ro]=Educațional
++Name[ru]=Образование
++Name[se]=Stoahkan ja oahppan
++Name[sk]=Škola hrou
++Name[sl]=Zabava in učenje
++Name[sr]=Образовање
++Name[sr@Latn]=Obrazovanje
++Name[ss]=Infundvo-tfokotisa
++Name[sv]=Utbildning
++Name[ta]=கல்வி
++Name[te]=ఎడ్యూటెన్మెంట్
++Name[tg]=Омӯзиш
++Name[th]=การศึกษาแสนสนุก
++Name[tr]=Eğitim ve Eğlence
++Name[tt]=Öyränü & Yal itü
++Name[uk]=Освітні
++Name[uz]=Oʻynab oʻrganish
++Name[uz@cyrillic]=Ўйнаб ўрганиш
++Name[ven]=Pfunzotakadza
++Name[vi]=Học vui
++Name[wa]=Sicole avou plaijhi
++Name[xh]=Ufundiso
++Name[zh_CN]=寓教于乐
++Name[zh_TW]=教育和娛樂
++Name[zu]=Ezemfundo
++Icon=package_edutainment
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-essential.menu trinity-tdebase-3.5.13.2/applnk/tde-essential.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-essential.menu 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-essential.menu 2013-07-28 15:47:19.314022870 +0200
+@@ -0,0 +1,27 @@
++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++ <!-- The following menus are hidden by default -->
++ <Menu>
++ <Name>Settings</Name>
++ <Directory>tde-settings.directory</Directory>
++ <MergeFile>../tde-settings.menu</MergeFile>
++ </Menu>
++ <Menu>
++ <Name>Information</Name>
++ <Directory>tde-information.directory</Directory>
++ <MergeFile>../tde-information.menu</MergeFile>
++ </Menu>
++ <Move>
++ <Old>Settings/Information</Old><New>Information</New>
++ </Move>
++ <Menu>
++ <Name>System</Name>
++ <Menu>
++ <Name>ScreenSavers</Name>
++ <Directory>tde-system-screensavers.directory</Directory>
++ <MergeFile>../tde-screensavers.menu</MergeFile>
++ </Menu>
++ </Menu>
++</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-arcade.directory trinity-tdebase-3.5.13.2/applnk/tde-games-arcade.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-arcade.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games-arcade.directory 2013-07-28 15:47:19.314022870 +0200
+@@ -0,0 +1,74 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Arcade
++Name[af]=Arkade
++Name[ar]=ألعاب الــ Arcade
++Name[az]=Əyləncə
++Name[be]=Аркады
++Name[bg]=Аркадни
++Name[bn]=আর্কেড
++Name[br]=C'hoarioù tavarn
++Name[bs]=Arkade
++Name[cs]=Arkády
++Name[csb]=Chwatkòwé grë
++Name[cy]=Arcêd
++Name[da]=Arkade
++Name[de]=Arkade
++Name[eo]=Arkado
++Name[et]=Võitlusmängud
++Name[fa]=گذرگاه تاقدار
++Name[fo]=Arkaduspøl
++Name[fr]=Jeux d'arcade
++Name[fy]=Arkade
++Name[ga]=Stuara Siamsa
++Name[he]=משחקי Arcade
++Name[hi]=ऑर्केड
++Name[hr]=Arkada
++Name[hu]=Ügyességi játékok
++Name[is]=Spilasalur
++Name[ja]=アーケード
++Name[kk]=Аркад ойындары
++Name[km]=ធ្វើ​ដំណើរ
++Name[ko]=아케이드
++Name[lo]=ເກມອາເຄດ
++Name[lt]=Arkada
++Name[lv]=Arkāde
++Name[mk]=Аркадни игри
++Name[mn]=Сансар
++Name[ms]=Arked
++Name[mt]=Logħob tal-Arcades
++Name[nb]=Arkade
++Name[nds]=Speelhall
++Name[ne]=आर्केड
++Name[nn]=Arkade
++Name[pa]=ਅਰਕਾਡੀ
++Name[pl]=Gry zręcznościowe
++Name[pt]=Arcada
++Name[ro]=Aventuri
++Name[ru]=Аркады
++Name[rw]=Ikirongozi
++Name[se]=Fearán
++Name[sk]=Akčné hry
++Name[sl]=Arkade
++Name[sr]=Аркадне
++Name[sr@Latn]=Arkadne
++Name[sv]=Arkad
++Name[ta]=ஆர்கேட்
++Name[te]=ఆర్కేడ్
++Name[tg]=Силсилаи бозиҳо
++Name[th]=เกมอาเขต
++Name[tr]=Oyun Makinesi
++Name[tt]=Arkad
++Name[uk]=Аркади
++Name[uz]=Arkada
++Name[uz@cyrillic]=Аркада
++Name[ven]=Petea
++Name[vi]=Mái vòm
++Name[wa]=Årcåde
++Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
++Name[zh_CN]=街机
++Name[zh_TW]=大型遊戲機遊戲
++Name[zu]=Umhhume
++Icon=package_games_arcade
++X-KDE-SuppressGenericNames=Game,Arcade Game
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-board.directory trinity-tdebase-3.5.13.2/applnk/tde-games-board.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-board.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games-board.directory 2013-07-28 15:47:19.315022849 +0200
+@@ -0,0 +1,81 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Board Games
++Name[af]=Bord Speletjies
++Name[ar]=ألعاب الألواح
++Name[az]=Lüvhə Oyunları
++Name[be]=Настольныя гульні
++Name[bg]=Игри на дъска
++Name[bn]=বোর্ডের খেলা
++Name[br]=C'hoarioù taolenn
++Name[bs]=Igre na ploči
++Name[ca]=Jocs de taula
++Name[cs]=Deskové hry
++Name[csb]=Planszowé grë
++Name[cy]=Gemau Bwrdd
++Name[da]=Brætspil
++Name[de]=Brettspiele
++Name[el]=Επιτραπέζια παιχνίδια
++Name[eo]=Tabuloludoj
++Name[es]=Juegos de tablero
++Name[et]=Lauamängud
++Name[eu]=Mahai jokoak
++Name[fa]=بازیهای تخته
++Name[fi]=Lautapelit
++Name[fr]=Jeux de plateau
++Name[fy]=Boardspultsjes
++Name[ga]=Cluichí Cláir
++Name[gl]=Xogos de Taboleiro
++Name[he]=משחקי לוח
++Name[hi]=बिसात के खेल
++Name[hr]=Igre na ploči
++Name[hsb]=Deskowe hry
++Name[hu]=Táblajátékok
++Name[id]=Permainan Papan
++Name[is]=Borðleikir
++Name[it]=Giochi da tavolo
++Name[ja]=ボードゲーム
++Name[ka]=მაგიდის თამაშები
++Name[kk]=Үстел ойындары
++Name[km]=ល្បែង​ក្ដារ
++Name[ko]=보드 게임
++Name[lt]=Stalo žaidimai
++Name[lv]=Galda spēles
++Name[mk]=Игри на табла
++Name[mn]=Хөлөгт тоглоом
++Name[ms]=Permainan 'Board'
++Name[mt]=Logħob tal-boards
++Name[nb]=Brettspill
++Name[nds]=Brettspelen
++Name[ne]=बोर्ड खेल
++Name[nl]=Bordspellen
++Name[nn]=Brettspel
++Name[pa]=ਬੋਰਡ ਖੇਡਾਂ
++Name[pl]=Gry planszowe
++Name[pt]=Jogos de Tabuleiro
++Name[pt_BR]=Jogos de Tabuleiro
++Name[ro]=Jocuri de table
++Name[ru]=Настольные игры
++Name[rw]=Imikino y'Umuryango
++Name[se]=Duolbbášspealut
++Name[sk]=Stolové hry
++Name[sl]=Namizne igre
++Name[sr]=Игре на табли
++Name[sr@Latn]=Igre na tabli
++Name[sv]=Brädspel
++Name[ta]=மேசை விளையாட்டுகள்
++Name[te]=పలక ఆటలు
++Name[tg]=Бозиҳои рӯимизӣ
++Name[th]=เกมกระดาน
++Name[tr]=Masaüstü Oyunları
++Name[tt]=Östäl Uyını
++Name[uk]=Ігри на дошці
++Name[uz]=Stol oʻyinlari
++Name[uz@cyrillic]=Стол ўйинлари
++Name[vi]=Trò chơi bảng
++Name[wa]=Djeus d' platea
++Name[zh_CN]=棋类游戏
++Name[zh_TW]=棋盤遊戲
++Icon=package_games_board
++X-KDE-SuppressGenericNames=Game,Board Game
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-card.directory trinity-tdebase-3.5.13.2/applnk/tde-games-card.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-card.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games-card.directory 2013-07-28 15:47:19.315022849 +0200
+@@ -0,0 +1,81 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Card Games
++Name[af]=Kaart Speletjies
++Name[ar]=ألعاب الورق
++Name[az]=Kart Oyunları
++Name[be]=Картавыя гульні
++Name[bg]=Игри с карти
++Name[bn]=তাসের খেলা
++Name[br]=C'hoarioù Kartennoù
++Name[bs]=Igre sa kartama
++Name[ca]=Jocs de cartes
++Name[cs]=Karetní hry
++Name[csb]=Kartowé grë
++Name[cy]=Gemau Cardiau
++Name[da]=Kortspil
++Name[de]=Kartenspiele
++Name[el]=Παιχνίδια καρτών
++Name[eo]=Kartludoj
++Name[es]=Juegos de cartas
++Name[et]=Kaardimängud
++Name[eu]=Karta jokoak
++Name[fa]=بازیهای کارت
++Name[fi]=Korttipelit
++Name[fr]=Jeux de cartes
++Name[fy]=Kaartspultsjes
++Name[ga]=Cluichí Cártaí
++Name[gl]=Xogos de Cartas
++Name[he]=משחקי קלפים
++Name[hi]=ताश के खेल
++Name[hr]=Igre s kartama
++Name[hsb]=Kartowe hry
++Name[hu]=Kártyajátékok
++Name[id]=Permainan Kartu
++Name[is]=Spilaleikir
++Name[it]=Giochi di carte
++Name[ja]=カードゲーム
++Name[ka]=ბანქოს თამაშები
++Name[kk]=Карта ойындары
++Name[km]=ល្បែង​បៀរ
++Name[ko]=카드 게임
++Name[lt]=Kortų žaidimai
++Name[lv]=Kāršu spēles
++Name[mk]=Игри со карти
++Name[mn]=Хөзрийн тоглоом
++Name[ms]=Permainan Kad
++Name[mt]=Logħob tal-Karti
++Name[nb]=Kortspill
++Name[nds]=Koortspelen
++Name[ne]=कार्ड खेल
++Name[nl]=Kaartspellen
++Name[nn]=Kortspel
++Name[pa]=ਤਾਸ਼ ਖੇਡਾਂ
++Name[pl]=Gry karciane
++Name[pt]=Jogos de Cartas
++Name[pt_BR]=Jogos de Cartas
++Name[ro]=Jocuri de cărți
++Name[ru]=Карточные игры
++Name[rw]=Imikino y'Ikarita
++Name[se]=Goartaspealut
++Name[sk]=Kartové hry
++Name[sl]=Igre s kartami
++Name[sr]=Игре са картама
++Name[sr@Latn]=Igre sa kartama
++Name[sv]=Kortspel
++Name[ta]=சீட்டு விளையாட்டுகள்
++Name[te]=పేక ఆటలు
++Name[tg]=Бозиҳои корт
++Name[th]=เกมไพ่ต่าง ๆ
++Name[tr]=Kart Oyunları
++Name[tt]=Kard Uyını
++Name[uk]=Карткові ігри
++Name[uz]=Qarta oʻyinlari
++Name[uz@cyrillic]=Қарта ўйинлари
++Name[vi]=Trò chơi thẻ
++Name[wa]=Cwårdjeus
++Name[zh_CN]=牌类游戏
++Name[zh_TW]=紙牌遊戲
++Icon=package_games_card
++X-KDE-SuppressGenericNames=Game,Card Game
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games.directory trinity-tdebase-3.5.13.2/applnk/tde-games.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games.directory 2013-07-28 15:47:19.315022849 +0200
+@@ -0,0 +1,89 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Games
++Name[af]=Speletjies
++Name[ar]=ألعاب
++Name[az]=Oyunlar
++Name[be]=Гульні
++Name[bg]=Игри
++Name[bn]=খেলা
++Name[br]=C'hoarioù
++Name[bs]=Igre
++Name[ca]=Jocs
++Name[cs]=Hry
++Name[csb]=Grë
++Name[cy]=Gemau
++Name[da]=Spil
++Name[de]=Spiele
++Name[el]=Παιχνίδια
++Name[eo]=Ludoj
++Name[es]=Juegos
++Name[et]=Mängud
++Name[eu]=Jokoak
++Name[fa]=بازیها
++Name[fi]=Pelit
++Name[fo]=Spøl
++Name[fr]=Jeux
++Name[fy]=Amusemint
++Name[ga]=Cluichí
++Name[gl]=Xogos
++Name[he]=משחקים
++Name[hi]=खेल
++Name[hr]=Igre
++Name[hsb]=Hry
++Name[hu]=Játékok
++Name[id]=Permainan
++Name[is]=Leikir
++Name[it]=Giochi
++Name[ja]=ゲーム
++Name[ka]=თამაშები
++Name[kk]=Ойындар
++Name[km]=ល្បែង
++Name[ko]=게임
++Name[lo]=ເກມ
++Name[lt]=Žaidimai
++Name[lv]=Spēles
++Name[mk]=Игри
++Name[mn]=Тоглоом
++Name[ms]=Permainan
++Name[mt]=Logħob
++Name[nb]=Spill
++Name[nds]=Spelen
++Name[ne]=खेल
++Name[nl]=Amusement
++Name[nn]=Spel
++Name[nso]=Dipapadi
++Name[oc]=Jogs
++Name[pa]=ਖੇਡਾਂ
++Name[pl]=Gry
++Name[pt]=Jogos
++Name[pt_BR]=Jogos
++Name[ro]=Jocuri
++Name[ru]=Игры
++Name[rw]=Imikino
++Name[se]=Spealut
++Name[sk]=Hry
++Name[sl]=Igre
++Name[sr]=Игре
++Name[sr@Latn]=Igre
++Name[ss]=Imidlalo
++Name[sv]=Spel
++Name[ta]=விளையாட்டுகள்
++Name[te]=ఆటలు
++Name[tg]=Бозиҳо
++Name[th]=เกมส์
++Name[tr]=Oyunlar
++Name[tt]=Uyınnar
++Name[uk]=Ігри
++Name[uz]=Oʻyinlar
++Name[uz@cyrillic]=Ўйинлар
++Name[ven]=Mitambo
++Name[vi]=Trò chơi
++Name[wa]=Djeus
++Name[xh]=Imidlalo
++Name[zh_CN]=游戏
++Name[zh_TW]=遊戲
++Name[zu]=Imidlalo
++Icon=package_games
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-kids.directory trinity-tdebase-3.5.13.2/applnk/tde-games-kids.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-kids.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games-kids.directory 2013-07-28 15:47:19.315022849 +0200
+@@ -0,0 +1,88 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Games for Kids
++Name[af]=Kinder Speletjies
++Name[ar]= ألعاب للأطفال
++Name[az]=Uşaxlar Üçün Oyunlar
++Name[be]=Дзіцячыя гульні
++Name[bg]=Игри за деца
++Name[bn]=বাচ্চাদের খেলা
++Name[br]=C'hoarioù evit ar Bugale
++Name[bs]=Igre za djecu
++Name[ca]=Jocs per a nens
++Name[cs]=Hry pro děti
++Name[csb]=Grë dlô dzecë
++Name[cy]=Gêmau ar gyfer Plant
++Name[da]=Spil for børn
++Name[de]=Spiele für Kinder
++Name[el]=Παιχνίδια για παιδιά
++Name[eo]=Ludoj por infanoj
++Name[es]=Juegos para niños
++Name[et]=Laste mängud
++Name[eu]=Haur jokoak
++Name[fa]=بازیهایی برای بچه‌ها
++Name[fi]=Lasten pelit
++Name[fo]=Spøl fyri børn
++Name[fr]=Jeux pour les enfants
++Name[fy]=Spultsjes foar bêrn
++Name[ga]=Cluichí do Pháistí
++Name[gl]=Xogos para Nenos
++Name[he]=משחקים לילדים
++Name[hi]=बच्चों के लिए खेल
++Name[hr]=Igre za djecu
++Name[hsb]=Hry za dźěći
++Name[hu]=Játékok kicsiknek
++Name[id]=Permainan Kanak-kanak
++Name[is]=Leikir fyrir krakka
++Name[it]=Giochi per bambini
++Name[ja]=子供向けゲーム
++Name[ka]=საბავშვო თამაშები
++Name[kk]=Балалар ойындары
++Name[km]=ល្បែង​សម្រាប់​កូន​ក្មេង
++Name[ko]=어린이용 게임
++Name[lo]=ເກມສຳລັບເດັກ
++Name[lt]=Žaidimai vaikams
++Name[lv]=Spēles bērniem
++Name[mk]=Игри за деца
++Name[mn]=Хүүхдийн тоглоом
++Name[ms]=Permainan Kanak-kanak
++Name[mt]=Logħob għat-tfal
++Name[nb]=Spill for barn
++Name[nds]=Spelen för Kinners
++Name[ne]=केटाकेटीका लागि खेल
++Name[nl]=spelletjes voor kinderen
++Name[nn]=Barnespel
++Name[nso]=Dipapadi tsa Bana
++Name[pa]=ਬੱਚਿਆਂ ਲਈ ਖੇਡਾਂ
++Name[pl]=Gry dla dzieci
++Name[pt]=Jogos para Crianças
++Name[pt_BR]=Jogos para Crianças
++Name[ro]=Jocuri pentru copii
++Name[ru]=Детские игры
++Name[rw]=Imikino y'Abana
++Name[se]=Mánáidspealut
++Name[sk]=Hry pre deti
++Name[sl]=Igre za otroke
++Name[sr]=Игре за децу
++Name[sr@Latn]=Igre za decu
++Name[ss]=Imidlalo yebantfwana
++Name[sv]=Spel för barn
++Name[ta]=குழந்தைகளுக்கான விளையாட்டுகள்
++Name[te]=పిల్లల ఆటలు
++Name[tg]=Бозиҳои кӯдакона
++Name[th]=เกมส์สำหรับเด็ก
++Name[tr]=Çocuklar için Oyunlar
++Name[tt]=Bala Uyını
++Name[uk]=Ігри для дітей
++Name[uz]=Kichkintoylar uchun oʻyinlar
++Name[uz@cyrillic]=Кичкинтойлар учун ўйинлар
++Name[ven]=Mitambo ya vhana
++Name[vi]=Trò chơi cho Trẻ
++Name[wa]=Djeus po ls efants
++Name[xh]=Imidlalo Yabantwana
++Name[zh_CN]=儿童游戏
++Name[zh_TW]=小孩的遊戲
++Name[zu]=Imidlalo yabantwana
++Icon=package_games_kids
++X-KDE-SuppressGenericNames=Game,Game for Children
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-roguelikes.directory trinity-tdebase-3.5.13.2/applnk/tde-games-roguelikes.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-roguelikes.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games-roguelikes.directory 2013-07-28 15:47:19.315022849 +0200
+@@ -0,0 +1,84 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Rogue-like Games
++Name[af]=Rogue-tipe Speletjies
++Name[ar]=ألعاب شبه Rogue
++Name[az]=Rogue Bənzəri Oyunlar
++Name[be]=Гульны Rogue
++Name[bg]=Хазартни игри
++Name[bn]=রোগ্ (Rogue)-এর মত খেলা
++Name[br]=Ur c'hoari a seurt gant Rogue
++Name[bs]=Rogue-like igre
++Name[ca]=Jocs com el Rogue
++Name[cs]=Hry podobné Rogue
++Name[csb]=Gré z familëji Rogue
++Name[cy]=Gemau sy'n debyg i Rogue
++Name[da]=Rogue-lignende spil
++Name[de]=Rogue-ähnliche Spiele
++Name[el]=Παιχνίδια τύπου Rogue
++Name[eo]=Filudoj
++Name[es]=Juegos tipo Rogue
++Name[et]=Rogue-laadsed mängud
++Name[eu]=Rogue motako jokoak
++Name[fa]=بازیهای شبیه Rogue
++Name[fi]=Rogue-tyyliset pelit
++Name[fo]=Rogue-lík spøl
++Name[fr]=Jeux à la Rogue
++Name[fy]=Soarte mei rogue spulstjes
++Name[ga]=Cluichí cosúil le Rogue
++Name[gl]=Xogos do estilo de Rogue
++Name[he]=משחקים נוסח Rogue
++Name[hi]=छलिया जैसे खेल
++Name[hr]=Igre kao Rogue
++Name[hsb]=Hry, podobne na Rogue
++Name[hu]=Rogue-szerű játékok
++Name[id]=Permainan ala Rogue
++Name[is]=Skotleikir
++Name[it]=Giochi in stile Rogue
++Name[ja]=Rogue 風のゲーム
++Name[ka]= Rogue ტიპის თამაშები
++Name[kk]=Rogue-секілді ойындар
++Name[lo]=ເກມຄ້າຍ Rogue
++Name[lt]=Išdykėlio tipo žaidimai
++Name[lv]=Rogue līdzīgas spēles
++Name[mk]=Игри како Rogue
++Name[mn]=Rogue-тоглоом
++Name[ms]=Permainan ala Rogue
++Name[mt]=Logħob bħal Rogue
++Name[nb]=Rollespill
++Name[nds]=Spelen so as Rogue
++Name[ne]=रग-प्रकारको खेल
++Name[nl]=Rogue-achtige spellen
++Name[nn]=Rogue-aktige spel
++Name[nso]=Dipapadi tsa Bokalatsane
++Name[pa]=ਠੱਗ-ਵਰਗੀਆਂ ਖੇਡਾਂ
++Name[pl]=Gry z rodziny Rogue
++Name[pt]=Jogos tipo Rogue
++Name[pt_BR]=Jogos parecidos com Rogue
++Name[ro]=Jocuri violente
++Name[ru]=Ролевые игры в стиле Rogue
++Name[rw]=Imikino Ingunge-nka
++Name[se]=Rogue-lágána spealut
++Name[sk]=Hry v štýle Rogue
++Name[sl]=Igre kot Rogue
++Name[sr]=Игре налик на Rogue
++Name[sr@Latn]=Igre nalik na Rogue
++Name[ss]=I-Rogue-lefana nemidlalo
++Name[sv]=Spel som liknar Rogue
++Name[ta]=முரட்டுதனமான விளையாட்டுகள்
++Name[te]=రోగ్ లాంటి ఆటలు
++Name[tg]=Бозиҳои шабиявии Rogue
++Name[th]=เกมส์คล้าย Rogue
++Name[tr]=Rogue benzeri oyunlar
++Name[tt]=Gizeş Uyını
++Name[uk]=Ігри на кшталт Rogue
++Name[uz]=Rogue oʻyiniga oʻxshash oʻyinlar
++Name[uz@cyrillic]=Rogue ўйинига ўхшаш ўйинлар
++Name[ven]=U fhura-sa Mitambo
++Name[vi]=Trò chơi giống Rogue
++Name[wa]=Djeus ki rshonnèt-st a «rogue»
++Name[xh]=Imidlalo efana ne Rogue
++Name[zh_CN]=恶作剧游戏
++Name[zh_TW]=冒險類遊戲
++Name[zu]=Imidlalo enjenge-Rogue
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-strategy.directory trinity-tdebase-3.5.13.2/applnk/tde-games-strategy.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-games-strategy.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-games-strategy.directory 2013-07-28 15:47:19.315022849 +0200
+@@ -0,0 +1,87 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Tactics & Strategy
++Name[af]=Strategie & Taktiek
++Name[ar]=الألعاب الميدانية و الإستراتجية
++Name[az]=Strategiya & Taktika
++Name[be]=Тактыка і стратэгія
++Name[bg]=Стратегически игри
++Name[bn]=কৌশল এবং পরিকল্পনা
++Name[br]=Brezelekaouriezh ha kadouriezh
++Name[bs]=Taktika i strategija
++Name[ca]=Tàctiques i estratègia
++Name[cs]=Taktické a strategické
++Name[csb]=Takticzné ë strategiczné grë
++Name[cy]=Tactegau & Strategaeth
++Name[da]=Taktik & Strategi
++Name[de]=Strategie & Taktik
++Name[el]=Τακτική & Στρατηγική
++Name[eo]=Taktikoj & Strategioj
++Name[es]=Táctica y estrategia
++Name[et]=Taktika ja strateegia
++Name[eu]=Taktika eta estrategia
++Name[fa]=راهکارها و راهبردها
++Name[fi]=Taktiikka ja strategia
++Name[fo]=Taktikkur og strategi
++Name[fr]=Tactique et stratégie
++Name[fy]=Taktysk en strategysk
++Name[ga]=Beartaíocht agus Straitéisí
++Name[gl]=Tácticas e Estratexia
++Name[he]=טקטיקה ואסטרטגיה
++Name[hi]=रणनीतिक और कौशल
++Name[hr]=Taktika i strategija
++Name[hsb]=Strategiske hry
++Name[hu]=Taktikai és stratégiai
++Name[id]=Taktik dan Strategi
++Name[is]=Kænska & áræði
++Name[it]=Tattica e strategia
++Name[ja]=戦略 & 戦術
++Name[ka]=ტაქტიკა & სტრატეგია
++Name[kk]=Тактика және стратегия
++Name[km]=ក្បួន & យុទ្ធសាស្ត្រ
++Name[ko]=전략 및 전술
++Name[lo]=ເກມກົນລະຍຸດແລະວາງແຜນ
++Name[lt]=Taktika ir strategija
++Name[lv]=Taktika & Stratēģija
++Name[mk]=Тактика и стратегија
++Name[mn]=Тактик & стратеги
++Name[ms]=Strategi dan Taktik
++Name[mt]=Tattika u Strateġija
++Name[nb]=Taktikk og strategi
++Name[nds]=Taktik & Strategie
++Name[ne]=कौशल र रणनीति
++Name[nl]=Tactiek en Strategie
++Name[nn]=Taktikk og strategi
++Name[nso]=Mekgwanakgwana & Tselathwii
++Name[pa]=ਤਕਨੀਕੀ ਤੇ ਗਿਆਨ
++Name[pl]=Gry taktyczne i strategiczne
++Name[pt]=Tácticas e Estratégia
++Name[pt_BR]=Táticas & Estratégias
++Name[ro]=Tactică și strategie
++Name[ru]=Стратегия
++Name[rw]=Imigabo & Imigambi
++Name[se]=Taktihkka ja strategiija
++Name[sk]=Taktické a strategické
++Name[sl]=Taktika in strategija
++Name[sr]=Тактика и стратегија
++Name[sr@Latn]=Taktika i strategija
++Name[ss]=Masu & indlela yekwenta
++Name[sv]=Taktik och strategi
++Name[ta]=உத்திகளும் தந்திரங்களும்
++Name[te]=యుక్తి & తంత్రాలు
++Name[tg]=Бозиҳои стратегӣ
++Name[th]=เกมกลยุทธ์และวางแผน
++Name[tr]=Taktik ve Strateji
++Name[tt]=Taktik & Strategi
++Name[uk]=Тактика та стратегія
++Name[uz]=Taktika va strategiya
++Name[uz@cyrillic]=Тактика ва стратегия
++Name[ven]=Madzhenele & Maitele
++Name[vi]=Chiến thuật và Chiến lược
++Name[wa]=Tactike eyet stratedjeye
++Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
++Name[zh_CN]=策略游戏
++Name[zh_TW]=戰略及策略
++Name[zu]=Amaqhinga & Iplani
++Icon=package_games_strategy
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-graphics.directory trinity-tdebase-3.5.13.2/applnk/tde-graphics.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-graphics.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-graphics.directory 2013-07-28 15:47:19.316022827 +0200
+@@ -0,0 +1,89 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Graphics
++Name[af]=Grafieka
++Name[ar]=برامج رسم
++Name[az]=Qrafika
++Name[be]=Графіка
++Name[bg]=Графика
++Name[bn]=গ্রাফিক্স
++Name[br]=Grafikoù
++Name[bs]=Grafika
++Name[ca]=Gràfics
++Name[cs]=Grafika
++Name[csb]=Grafika
++Name[cy]=Graffeg
++Name[da]=Grafik
++Name[de]=Graphik
++Name[el]=Γραφικά
++Name[eo]=Grafiko
++Name[es]=Gráficos
++Name[et]=Graafika
++Name[eu]=Grafikoak
++Name[fa]=نگاره‌ها
++Name[fi]=Grafiikka
++Name[fo]=Teknindi
++Name[fr]=Graphisme
++Name[fy]=Grafysk
++Name[ga]=Grafaic
++Name[gl]=Gráficos
++Name[he]=גרפיקה
++Name[hi]=चित्रकारी
++Name[hr]=Grafika
++Name[hsb]=Grafika
++Name[hu]=Grafikai programok
++Name[id]=Grafis
++Name[is]=Myndvinnsla
++Name[it]=Grafica
++Name[ja]=グラフィックス
++Name[ka]=გრაფიკა
++Name[kk]=Графика
++Name[km]=ក្រាហ្វិក
++Name[ko]=그래픽
++Name[lo]=ກຣາບຟິກ
++Name[lt]=Grafika
++Name[lv]=Grafika
++Name[mk]=Графика
++Name[mn]=График
++Name[ms]=Grafik
++Name[mt]=Grafika
++Name[nb]=Bilde
++Name[nds]=Grafik
++Name[ne]=ग्राफिक्स
++Name[nl]=Grafisch
++Name[nn]=Grafikk
++Name[nso]=Di-Graphics
++Name[oc]=Grafics
++Name[pa]=ਚਿੱਤਰਕਲਾ
++Name[pl]=Grafika
++Name[pt]=Gráficos
++Name[pt_BR]=Gráficos
++Name[ro]=Grafică
++Name[ru]=Графика
++Name[rw]=Ibishushanyo
++Name[se]=Grafihkka
++Name[sk]=Grafika
++Name[sl]=Grafika
++Name[sr]=Графика
++Name[sr@Latn]=Grafika
++Name[ss]=Titfombe-mdvwebo
++Name[sv]=Grafik
++Name[ta]=சித்திரங்கள்
++Name[te]=గ్రాఫిక్స్
++Name[tg]=Графика
++Name[th]=กราฟิก
++Name[tr]=Grafik Programları
++Name[tt]=Sızım
++Name[uk]=Графіка
++Name[uz]=Grafika
++Name[uz@cyrillic]=Графика
++Name[ven]=Dzigirafu
++Name[vi]=Đồ hoạ
++Name[wa]=Grafikes
++Name[xh]=Imizobo
++Name[zh_CN]=图像
++Name[zh_TW]=圖形
++Name[zu]=Imidwebo
++Icon=package_graphics
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.directory trinity-tdebase-3.5.13.2/applnk/tde-information.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-information.directory 2013-07-28 15:47:19.316022827 +0200
+@@ -0,0 +1,87 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Information
++Name[af]=Informasie
++Name[ar]=معلومات
++Name[az]=Mə'lumat
++Name[be]=Інфармацыя
++Name[bg]=Информация
++Name[bn]=তথ্য
++Name[br]=Titouroù
++Name[bs]=Informacije
++Name[ca]=Informació
++Name[cs]=Informace
++Name[csb]=Wëdowiédzô
++Name[cy]=Gwybodaeth
++Name[el]=Πληροφορίες
++Name[eo]=Informoj
++Name[es]=Información
++Name[et]=Info
++Name[eu]=Informazioa
++Name[fa]=اطلاعات
++Name[fi]=Järjestelmätiedot
++Name[fo]=Upplýsingar
++Name[fr]=Informations
++Name[fy]=Ynformaasje
++Name[ga]=Eolas
++Name[gl]=Información
++Name[he]=מידע
++Name[hi]=जानकारी
++Name[hr]=Podaci
++Name[hsb]=Informacija
++Name[hu]=Információ
++Name[id]=Informasi
++Name[is]=Upplýsingar
++Name[it]=Informazioni
++Name[ja]=情報
++Name[ka]=ინფორმაცია
++Name[kk]=Мәлімет
++Name[km]=ព័ត៌មាន
++Name[ko]=정보
++Name[lo]=ຂໍ້ມູນຕ່າງໆ
++Name[lt]=Informacija
++Name[lv]=Informācija
++Name[mk]=Информации
++Name[mn]=Мэдээлэл
++Name[ms]=Maklumat
++Name[mt]=Informazzjoni
++Name[nb]=Informasjon
++Name[nds]=Informatschoon
++Name[ne]=सूचना
++Name[nl]=Informatie
++Name[nn]=Informasjon
++Name[nso]=Tshedimoso
++Name[oc]=Infòrmacion
++Name[pa]=ਜਾਣਕਾਰੀ
++Name[pl]=Informacje
++Name[pt]=Informação
++Name[pt_BR]=Informação
++Name[ro]=Informații
++Name[ru]=Сведения
++Name[rw]=Amakuru
++Name[se]=Diehtu
++Name[sk]=Informácie
++Name[sl]=Informacije
++Name[sr]=Информације
++Name[sr@Latn]=Informacije
++Name[ss]=Imininingwane
++Name[ta]=தகவல்
++Name[te]=సమాచారం
++Name[tg]=Иттилоот
++Name[th]=ข้อมูลต่างๆ
++Name[tr]=Bilgi
++Name[tt]=Beldermä
++Name[uk]=Інформація
++Name[uz]=Maʼlumot
++Name[uz@cyrillic]=Маълумот
++Name[ven]=Mafhungo
++Name[vi]=Thông tin
++Name[wa]=Informåcions
++Name[xh]=Ulwazi
++Name[zh_CN]=信息
++Name[zh_TW]=資訊
++Name[zu]=Ulwazi
++Icon=hwinfo
++X-KDE-BaseGroup=info
++NoDisplay=true
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.menu trinity-tdebase-3.5.13.2/applnk/tde-information.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-information.menu 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-information.menu 2013-07-28 15:47:19.316022827 +0200
+@@ -0,0 +1,10 @@
++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++ <Name>Information</Name>
++ <Directory>tde-information.directory</Directory>
++ <Include>
++ <Category>X-KDE-information</Category>
++ </Include>
++</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet.directory trinity-tdebase-3.5.13.2/applnk/tde-internet.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-internet.directory 2013-07-28 15:47:19.316022827 +0200
+@@ -0,0 +1,48 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Internet
++Name[ar]=الإنترنت
++Name[az]=İnternet
++Name[be]=Інтэрнэт
++Name[bg]=Интернет
++Name[bn]=ইন্টারনেট
++Name[br]=Kenrouedad
++Name[cy]=Rhyngrwyd
++Name[el]=Διαδίκτυο
++Name[eo]=Interreto
++Name[fa]=اینترنت
++Name[fy]=Ynternet
++Name[ga]=Idirlíon
++Name[he]=אינטרנט
++Name[hi]=इंटरनेट
++Name[is]=Internetið
++Name[ja]=インターネット
++Name[ka]=ინტერნეტი
++Name[kk]=Интернет
++Name[km]=អ៊ិនធឺណិត
++Name[ko]=인터넷
++Name[lt]=Internetas
++Name[lv]=Internets
++Name[mk]=Интернет
++Name[mn]=Интернэт
++Name[nb]=Internett
++Name[ne]=इन्टरनेट
++Name[nn]=Internett
++Name[pa]=ਇੰਟਰਨੈੱਟ
++Name[ru]=Интернет
++Name[rw]=Interineti
++Name[se]=Interneahtta
++Name[sr]=Интернет
++Name[ta]=இணையம்
++Name[te]=ఇంటర్నెట్
++Name[tg]=Интернет
++Name[th]=อินเทอร์เน็ต
++Name[tr]=İnternet
++Name[tt]=Päräwez
++Name[uk]=Інтернет
++Name[uz@cyrillic]=Интернет
++Name[wa]=Daegntoele
++Name[zh_TW]=網際網路
++Icon=package_network
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet-terminal.directory trinity-tdebase-3.5.13.2/applnk/tde-internet-terminal.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-internet-terminal.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-internet-terminal.directory 2013-07-28 15:47:19.316022827 +0200
+@@ -0,0 +1,88 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Terminal Applications
++Name[af]=Terminaal Programme
++Name[ar]=تطبيقات مطرافية
++Name[az]=Terminal Proqramları
++Name[be]=Тэрмінальныя праграмы
++Name[bg]=Конзолни програми
++Name[bn]=টার্মিনাল অ্যাপলিকেশন
++Name[br]=Arloadoù an termenell
++Name[bs]=Tekstualni programi
++Name[ca]=Aplicacions de terminal
++Name[cs]=Terminálové aplikace
++Name[csb]=Programë terminala
++Name[cy]=Cymhwysiadau Terfynell
++Name[da]=Terminalprogrammer
++Name[de]=Terminalprogramme
++Name[el]=Εφαρμογές τερματικού
++Name[eo]=Terminal-Aplikaĵoj
++Name[es]=Aplicaciones de terminal
++Name[et]=Terminali rakendused
++Name[eu]=Terminaleko aplikazioak
++Name[fa]=کاربردهای پایانه
++Name[fi]=Päätesovellukset
++Name[fo]=Tekstforrit
++Name[fr]=Applications pour terminal
++Name[fy]=Terminal-tapassingen
++Name[ga]=Feidhmchláir Teirminéil
++Name[gl]=Aplicacións de Terminal
++Name[he]=יישומי מסוף
++Name[hi]=टर्मिनल अनुप्रयोग
++Name[hr]=Terminalske aplikacije
++Name[hsb]=Programy za terminal
++Name[hu]=Parancsértelmezők
++Name[id]=Aplikasi Terminal
++Name[is]=Skjáhermiforrit
++Name[it]=Applicazioni terminale
++Name[ja]=ターミナルアプリケーション
++Name[ka]=კონსოლის პროგრამები
++Name[kk]=Консоль қолданбалары
++Name[km]=កម្មវិធី​ស្ថានីយ
++Name[ko]=터미널 프로그램
++Name[lo]=ໂປຣແກຣມເທີມີນໍ
++Name[lt]=Terminalinės programos
++Name[lv]=Termināla Aplikācijas
++Name[mk]=Терминалски апликации
++Name[mn]=Терминал-Програм
++Name[ms]=Aplikasi Terminal
++Name[mt]=Programmi tat-Terminal
++Name[nb]=Terminalprogrammer
++Name[nds]=Terminalprogrammen
++Name[ne]=टर्मिनल अनुप्रयोग
++Name[nl]=Terminal-toepassingen
++Name[nn]=Terminalprogram
++Name[nso]=Ditshumiso tsa Terminal
++Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
++Name[pl]=Programy terminala
++Name[pt]=Aplicações de Terminal
++Name[pt_BR]=Aplicativos de terminal
++Name[ro]=Aplicații de terminal
++Name[ru]=Консольные приложения
++Name[rw]=Amaporogaramu Nkiriya
++Name[se]=Terminálprográmmat
++Name[sk]=Terminálové aplikácie
++Name[sl]=Terminalski programi
++Name[sr]=Терминалски програми
++Name[sr@Latn]=Terminalski programi
++Name[ss]=Ticelo tesikhungo
++Name[sv]=Terminalprogram
++Name[ta]=முனைய பயன்பாடுகள்
++Name[te]=టర్మినల్ కార్యక్రమములు
++Name[tg]=Барномаҳои консол
++Name[th]=โปรแกรมเทอร์มินัล
++Name[tr]=Uçbirim Uygulamaları
++Name[tt]=Terminal Yazılımnarı
++Name[uk]=Термінальні програми
++Name[uz]=Terminal uchun dasturlar
++Name[uz@cyrillic]=Терминал учун дастурлар
++Name[ven]=Apulikhesheni ya Theminala
++Name[vi]=Trình đầu cuối
++Name[wa]=Programes terminås
++Name[xh]=Izicelo Zesiphelo sendlela
++Name[zh_CN]=终端应用程序
++Name[zh_TW]=終端機程式
++Name[zu]=Abayaleli bangaphandle
++Icon=konsole
++Version=1.0
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-main.directory trinity-tdebase-3.5.13.2/applnk/tde-main.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-main.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-main.directory 2013-07-28 15:47:19.316022827 +0200
+@@ -0,0 +1,80 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Icon=package
++Name=KDE Menu
++Name[af]=KDE Kieslys
++Name[ar]=قائمة KDE
++Name[az]=KDE Meyusu
++Name[be]=Меню KDE
++Name[bg]=Главно меню
++Name[bn]=কে.ডি.ই. মেনু
++Name[br]=Meuziad KDE
++Name[bs]=KDE meni
++Name[ca]=Menú de KDE
++Name[cs]=Nabídka KDE
++Name[csb]=KDE menu
++Name[cy]=Dewislen KDE
++Name[da]=KDE-Menu
++Name[de]=KDE-Menü
++Name[el]=Μενού KDE
++Name[eo]=KDEa Menuo
++Name[es]=Menú de KDE
++Name[et]=KDE menüü
++Name[eu]=KDE menua
++Name[fa]=گزینگان KDE
++Name[fi]=Valikko
++Name[fr]=Menu de KDE
++Name[fy]=KDE-menu
++Name[ga]=Roghchlár KDE
++Name[gl]=Menú de KDE
++Name[he]=תפריט KDE
++Name[hi]=केडीई मेन्यू
++Name[hr]=KDE izbornik
++Name[hsb]=KDE meni
++Name[hu]=KDE menü
++Name[id]=Menu KDE
++Name[is]=KDE valmynd
++Name[it]=Menu KDE
++Name[ja]=KDE メニュー
++Name[ka]=KDE მენიუ
++Name[kk]=KDE мәзірі
++Name[km]=ម៉ឺនុយ KDE
++Name[ko]=KDE 메뉴
++Name[lt]=KDE meniu
++Name[lv]=KDE izvēlne
++Name[mk]=KDE-мени
++Name[mn]=КДЭ цэс
++Name[ms]=Menu KDE
++Name[mt]=Menu KDE
++Name[nb]=KDE-meny
++Name[nds]=KDE-Menü
++Name[ne]=केडीई मेनु
++Name[nl]=KDE-menu
++Name[nn]=KDE-meny
++Name[pa]=KDE ਮੇਨੂ
++Name[pl]=Menu KDE
++Name[pt]=Menu KDE
++Name[pt_BR]=Menu do KDE
++Name[ro]=Meniu KDE
++Name[ru]=Меню KDE
++Name[rw]=Ibikubiyemo bya KDE
++Name[se]=KDE-fállu
++Name[sk]=Menu KDE
++Name[sl]=Meni KDE
++Name[sr]=KDE мени
++Name[sr@Latn]=KDE meni
++Name[sv]=KDE-meny
++Name[ta]=கேடியி பட்டி
++Name[te]=కెడిఈ పట్టీ
++Name[tg]=Менюи KDE
++Name[th]=เมนู KDE
++Name[tr]=KDE Menüsü
++Name[tt]=KDE Saylağı
++Name[uk]=Меню KDE
++Name[uz]=KDE menyu
++Name[uz@cyrillic]=KDE меню
++Name[vi]=Thực đơn KDE
++Name[wa]=Dressêye KDE
++Name[zh_CN]=KDE 菜单
++Name[zh_TW]=KDE 選單
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-more.directory trinity-tdebase-3.5.13.2/applnk/tde-more.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-more.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-more.directory 2013-07-28 15:47:19.317022805 +0200
+@@ -0,0 +1,79 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Icon=package
++Name=More Applications
++Name[af]=Meer Programme
++Name[ar]=المزيد من التطبيقات
++Name[az]=Daha Çox Proqram
++Name[be]=Яшчэ праграмы
++Name[bg]=Още програми
++Name[bn]=আরো অ্যাপলিকেশন
++Name[br]=Ar re all
++Name[bs]=Još programa
++Name[ca]=Més aplicacions
++Name[cs]=Více aplikací
++Name[csb]=Wicy programów
++Name[cy]=Rhagor o Gymhwysiadau
++Name[da]=Flere programmer
++Name[de]=Weitere Programme
++Name[el]=Περισσότερες εφαρμογές
++Name[eo]=Pluaj aplikaĵoj
++Name[es]=Más aplicaciones
++Name[et]=Muud rakendused
++Name[eu]=Aplikazio gehiago
++Name[fa]=کاربردهای بیشتر
++Name[fi]=Lisää sovelluksia
++Name[fr]=Autres applications
++Name[fy]=Mear programma's
++Name[ga]=Feidhmchláir Breise
++Name[gl]=Máis Aplicacións
++Name[he]=עוד יישומים
++Name[hi]=और अधिक अनुप्रयोग
++Name[hr]=Više aplikacija
++Name[hsb]=Wjace programow
++Name[hu]=További alkalmazások
++Name[id]=Aplikasi Lain
++Name[is]=Fleiri forrit
++Name[it]=Altri programmi
++Name[ja]=その他のアプリケーション
++Name[ka]=დამატებითი პროგრამები
++Name[kk]=Басқа қолданбалар
++Name[km]=កម្មវិធីបន្ថែម​ទៀត
++Name[ko]=더 많은 프로그램
++Name[lt]=Daugiau programų
++Name[lv]=Vairāk aplikāciju
++Name[mk]=Уште апликации
++Name[ms]=Aplikasi Lain
++Name[mt]=Programmi KDE
++Name[nb]=Flere programmer
++Name[nds]=Mehr Programmen
++Name[ne]=धेरै अनुप्रयोग
++Name[nl]=Meer programma's
++Name[nn]=Fleire program
++Name[pa]=ਹੋਰ ਕਾਰਜ
++Name[pl]=Więcej programów
++Name[pt]=Mais Aplicações
++Name[pt_BR]=Mais Aplicativos
++Name[ro]=Alte aplicații
++Name[ru]=Дополнительные приложения
++Name[rw]=Amaporogaramu Arenze
++Name[se]=Eanet prográmmat
++Name[sk]=Ďalšie aplikácie
++Name[sl]=Več programov
++Name[sr]=Још програма
++Name[sr@Latn]=Još programa
++Name[sv]=Fler program
++Name[ta]=அதிக பயன்பாடுகள்
++Name[te]=మరికొన్ని కార్యక్రమములు
++Name[tg]=Барномаҳои иловагӣ
++Name[th]=แอพพลิเคชันอื่นๆ
++Name[tr]=Daha Fazla Uygulama
++Name[tt]=Başqa Yazılımnar
++Name[uk]=Інші програми
++Name[uz]=Boshqa dasturlar
++Name[uz@cyrillic]=Бошқа дастурлар
++Name[vi]=Ứng dụng Thêm nữa
++Name[wa]=Co ds ôtes programes
++Name[zh_CN]=更多应用程序
++Name[zh_TW]=更多應用程式
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-multimedia.directory trinity-tdebase-3.5.13.2/applnk/tde-multimedia.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-multimedia.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-multimedia.directory 2013-07-28 15:47:19.317022805 +0200
+@@ -0,0 +1,65 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Multimedia
++Name[ar]=الوسائط المتعددة
++Name[az]=Multimediya
++Name[be]=Мультымедыя
++Name[bg]=Мултимедия
++Name[bn]=মাল্টিমিডিয়া
++Name[br]=Liesvedia
++Name[bs]=Multimedija
++Name[ca]=Multimèdia
++Name[cs]=Multimédia
++Name[csb]=Mùltimedia
++Name[cy]=Amlgyfryngau
++Name[da]=Multimedie
++Name[el]=Πολυμέσα
++Name[eo]=Plurmedio
++Name[et]=Multimeedia
++Name[fa]=چند رسانه‌ای
++Name[fo]=Fleirmiðla
++Name[fr]=Multimédia
++Name[ga]=Ilmheáin
++Name[he]=מולטימדיה
++Name[hi]=मल्टीमीडिया
++Name[hr]=Multimedija
++Name[hsb]=Multimedije
++Name[hu]=Multimédia
++Name[is]=Margmiðlun
++Name[ja]=マルチメディア
++Name[ka]=მულტიმედია
++Name[kk]=Мультимедиа
++Name[km]=ពហុព័ត៌មាន
++Name[ko]=멀티미디어
++Name[lo]=ເມົາຕິມີເດຍ
++Name[lv]=Multimēdija
++Name[mk]=Мултимедија
++Name[mn]=Мултимедиа
++Name[ne]=मल्टिमिडिया
++Name[nso]=Media wa Bontshi
++Name[pa]=ਮਲਟੀਮੀਡਿਆ
++Name[pt]=Multimédia
++Name[pt_BR]=Multimídia
++Name[ru]=Мультимедиа
++Name[rw]=Mutwaramakuru
++Name[sk]=Multimédiá
++Name[sl]=Večpredstavnost
++Name[sr]=Мултимедија
++Name[sr@Latn]=Multimedija
++Name[ss]=Tinhlobonhlobo-tetindzaba
++Name[ta]=பல்லூடகம்
++Name[te]=బహుళ మాద్యమం
++Name[tg]=Мултимедия
++Name[th]=มัลติมีเดีย
++Name[tr]=Çokluortam
++Name[uk]=Мультимедіа
++Name[uz@cyrillic]=Мултимедиа
++Name[ven]=Zwimwumwusi
++Name[vi]=Đa phương tiện
++Name[xh]=Iindlela ezininzi zokwenza
++Name[zh_CN]=多媒体
++Name[zh_TW]=多媒體
++Name[zu]=Onozindaba abaningi
++Icon=package_multimedia
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-office.directory trinity-tdebase-3.5.13.2/applnk/tde-office.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-office.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-office.directory 2013-07-28 15:47:19.317022805 +0200
+@@ -0,0 +1,86 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Office
++Name[af]=Kantoor
++Name[ar]=المكتب
++Name[az]=Offis
++Name[be]=Офіс
++Name[bg]=Офис
++Name[bn]=অফিস
++Name[br]=Burev
++Name[bs]=Uredske aplikacije
++Name[ca]=Oficina
++Name[cs]=Kancelář
++Name[csb]=Biuro
++Name[cy]=Swyddfa
++Name[da]=Kontor
++Name[de]=Büroprogramme
++Name[el]=Γραφείο
++Name[eo]=Laborejo
++Name[es]=Oficina
++Name[et]=Kontoritöö
++Name[eu]=Bulegoa
++Name[fa]=اداره
++Name[fi]=Toimisto-ohjelmat
++Name[fo]=Skrivstova
++Name[fr]=Bureautique
++Name[fy]=Kantoartapassingen
++Name[ga]=Oifig
++Name[gl]=Ofimática
++Name[he]=יישומים משרדיים
++Name[hi]=कार्यालय
++Name[hr]=Ured
++Name[hsb]=Běrowowe programy
++Name[hu]=Irodai alkalmazások
++Name[is]=Skrifstofuforrit
++Name[it]=Ufficio
++Name[ja]=オフィス
++Name[ka]=ოფისი
++Name[kk]=Офис
++Name[km]=ការិយាល័យ
++Name[ko]=사무용 도구
++Name[lo]=ໂປຣແກຣມຊຸດສຳນັກງານ
++Name[lt]=Biuro programos
++Name[lv]=Birojs
++Name[mk]=Канцеларија
++Name[mn]=Албан програм
++Name[ms]=Pejabat
++Name[mt]=Uffiċċju
++Name[nb]=Kontor
++Name[nds]=Kontoor
++Name[ne]=कार्यालय
++Name[nl]=Kantoortoepassingen
++Name[nn]=Kontor
++Name[nso]=Ofisi
++Name[oc]=Burèu
++Name[pa]=ਦਫ਼ਤਰ
++Name[pl]=Biuro
++Name[pt]=Escritório
++Name[pt_BR]=Escritório
++Name[ro]=Aplicații birotică
++Name[ru]=Офис
++Name[rw]=Ofise
++Name[se]=Kántuvra
++Name[sk]=Kancelária
++Name[sl]=Pisarna
++Name[ss]=Lihhovisi
++Name[sv]=Kontorsprogram
++Name[ta]=அலுவலகம்
++Name[te]=కార్యాలయము
++Name[tg]=Офис
++Name[th]=โปรแกรมชุดสำนักงาน
++Name[tr]=Ofis
++Name[tt]=Eşxänä
++Name[uk]=Офіс
++Name[uz]=Idora uchun dasturlar
++Name[uz@cyrillic]=Идора учун дастурлар
++Name[ven]=Ofisi
++Name[vi]=Văn phòng
++Name[wa]=Buro
++Name[xh]=Ofisi
++Name[zh_CN]=办公
++Name[zh_TW]=辦公軟體
++Name[zu]=Ihhofisi
++Icon=package_wordprocessing
++SortOrder=koshell.desktop,kword.desktop,kspread.desktop,kpresenter.desktop
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-science.directory trinity-tdebase-3.5.13.2/applnk/tde-science.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-science.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-science.directory 2013-07-28 15:47:19.317022805 +0200
+@@ -0,0 +1,80 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Icon=kcmdf
++Name=Science & Math
++Name[af]=Wetenskap & Wiskunde
++Name[ar]=العلوم و الرياضيات
++Name[az]=Elm və Riyaziyyat
++Name[be]=Навука і матэматыка
++Name[bg]=Математика
++Name[bn]=বিজ্ঞান এবং গণিত
++Name[br]=Skiant ha Jedoniel
++Name[bs]=Nauka i matematika
++Name[ca]=Ciència i Matemàtiques
++Name[cs]=Věda a matematika
++Name[csb]=Ùczbòwé
++Name[cy]=Gwyddoniaeth a Mathemateg
++Name[da]=Naturvidenskab & matematik
++Name[de]=Wissenschaft & Mathematik
++Name[el]=Επιστήμη & Μαθηματικά
++Name[en_GB]=Science & Maths
++Name[eo]=Scienco kaj Matematiko
++Name[es]=Ciencia y matemáticas
++Name[et]=Teadus
++Name[eu]=Zientzia eta matematikaa
++Name[fa]=علوم و ریاضی
++Name[fi]=Tiede ja matematiikka
++Name[fr]=Science et mathématiques
++Name[fy]=Wittenskiplik en wiskunde
++Name[ga]=Eolaíocht & Matamaitic
++Name[gl]=Ciencia e Matemáticas
++Name[he]=מדע ומתמטיקה
++Name[hi]=विज्ञान और गणित
++Name[hr]=Znanost i matematika
++Name[hsb]=Matematika & Wědomosć
++Name[hu]=Tudományok, matematika
++Name[id]=Ilmu Pengetahuan & Matematika
++Name[is]=Vísindi og stærðfræði
++Name[it]=Scienza e matematica
++Name[ja]=サイエンス & 数学
++Name[ka]=მეცნიერება და მათემატიკა
++Name[kk]=Ғылыми және математикалық
++Name[km]=វិទ្យាសាស្ត្រ & គណិតវិទ្យា
++Name[ko]=과학과 수학
++Name[lt]=Mokslas ir matematika
++Name[lv]=Zinātne un Matemātika
++Name[mk]=Наука и математика
++Name[ms]=Matematik & Sains
++Name[mt]=Xjenza u Matematika
++Name[nb]=Vitenskap og matematikk
++Name[nds]=Wetenschap & Mathematik
++Name[ne]=विज्ञान र गणीत
++Name[nl]=Wetenschap en wiskunde
++Name[nn]=Vitskap og matematikk
++Name[pa]=ਵਿਗਿਆਨ ਤੇ ਗਣਿਤ
++Name[pl]=Naukowe
++Name[pt]=Ciência e Matemática
++Name[pt_BR]=Ciências & Matemática
++Name[ro]=Știință și matematică
++Name[ru]=Наука
++Name[rw]=Ikoranabuhanga & Imibare
++Name[se]=Dieđa ja matematihkka
++Name[sk]=Veda
++Name[sl]=Znanost in matematika
++Name[sr]=Наука и математика
++Name[sr@Latn]=Nauka i matematika
++Name[sv]=Vetenskap och matematik
++Name[ta]=அறிவியல் & கணிதம்
++Name[te]=విజ్ఞానం & గణితం
++Name[tg]=Илм ва математика
++Name[th]=วิทยาศาสตร์และคณิตศาสตร์
++Name[tr]=Bilim ve Matematik
++Name[tt]=Fän & Sanaw
++Name[uk]=Наука і математика
++Name[uz]=Fan va Matematika
++Name[uz@cyrillic]=Фан ва Математика
++Name[vi]=Khoa học & Toán học
++Name[wa]=Siyinces et matematikes
++Name[zh_CN]=科学和数学
++Name[zh_TW]=科學與數學
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-screensavers.menu trinity-tdebase-3.5.13.2/applnk/tde-screensavers.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-screensavers.menu 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-screensavers.menu 2013-07-28 15:47:19.317022805 +0200
+@@ -0,0 +1,10 @@
++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++ <Name>ScreenSavers</Name>
++ <Directory>tde-system-screensavers.directory</Directory>
++ <Include>
++ <Category>X-KDE-ScreenSaver</Category>
++ </Include>
++</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-accessibility.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-accessibility.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-accessibility.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-accessibility.directory 2013-07-28 15:47:19.318022784 +0200
+@@ -0,0 +1,85 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Regional & Accessibility
++Name[af]=Streek & Toeganklikheid
++Name[ar]=الإقليمي وتسهيل الوصول
++Name[az]=Regional Qurğular & Yetişmə Qabiliyyəti
++Name[be]=Рэгіянальныя настаўленні і даступнасць
++Name[bg]=Локализация
++Name[bn]=আঞ্চলিক এবং সহায়ক প্রযুক্তি
++Name[br]=Rannvro hag Haezadusted
++Name[bs]=Regionalno i pristupačnost
++Name[ca]=Regional i accessibilitat
++Name[cs]=Místní zvyklosti a zpřístupnění
++Name[csb]=Òbéńdowé ë przistãpnosc
++Name[cy]=Rhanbarthol & Hygyrchedd
++Name[da]=Region & Tilgængelighed
++Name[de]=Regionaleinstellungen & Zugangshilfen
++Name[el]=Περιοχή & Προσιτότητα
++Name[eo]=Regiono & Alirebleco
++Name[es]=Regional y accesibilidad
++Name[et]=Hõlbustus
++Name[eu]=Eskualdea eta erabilerraztasuna
++Name[fa]=منطقه‌ای و دستیابی‌پذیری
++Name[fi]=Alueellisuus ja käytettävyys
++Name[fr]=Régionalisation et accessibilité
++Name[fy]=Regio en tagonklikens
++Name[ga]=Réigiúnach agus Insroichteacht
++Name[gl]=Rexional e Acesibilidade
++Name[he]=הגדרות אזוריות ונגישות
++Name[hi]=क्षेत्रीय व भाषायी पहुँच
++Name[hr]=Regionalnost i pristupačnost
++Name[hsb]=Kraj & Přistupnosć
++Name[hu]=Nyelv, kezelési segítség
++Name[is]=Svæðisbundnar stillingar og aðgengi
++Name[it]=Regionali e Accesso facilitato
++Name[ja]=地域 & アクセシビリティ
++Name[ka]=რეგიონალური და სეპციალური შესაძლებლობები
++Name[kk]=Жергілікті және Арнаулы мүмкіндіктер
++Name[km]=តំបន់ & មធ្យោបាយ​ងាយស្រួល
++Name[ko]=지역과 내게 필요한 설정
++Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
++Name[lt]=Regionai bei prieinamumas
++Name[lv]=Reģionāls un Pieejamība
++Name[mk]=Регионалност и пристапливост
++Name[mn]=Бүслүүр-тохируулга & Хэрэглэх тохь
++Name[ms]=Pemudahcapai & Tetapan Tempatan
++Name[mt]=Reġjonali u Aċċessibiltà
++Name[nb]=Regionalt og tilgjengelighet
++Name[nds]=Regioon & Behinnertenhülp
++Name[ne]=क्षेत्रीय र पहुँचयोग्य
++Name[nl]=Regio en toegankelijkheid
++Name[nn]=Regional og tilgjenge
++Name[nso]=Ya Naga & Tsenelo
++Name[pa]=ਖੇਤਰੀ ਅਤੇ ਸਹੂਲਤਾਂ
++Name[pl]=Regionalne i dostępność
++Name[pt]=Regional e Acessibilidade
++Name[pt_BR]=Regional & Acessibilidade
++Name[ro]=Regional și accesibilitate
++Name[ru]=Региональные и специальные возможности
++Name[rw]=By'agace & Ukugerwaho
++Name[se]=Báikkálaš ja álkkibut geavaheapmi
++Name[sk]=Prístupnosť a regionálne nastavenie
++Name[sl]=Regionalnost in dostopnost
++Name[sr]=Регија и приступачност
++Name[sr@Latn]=Regija i pristupačnost
++Name[ss]=Kutfolakala kalula & kwesifundza
++Name[sv]=Region och handikappstöd
++Name[ta]=நாடும் & அணுகலும்
++Name[te]=ప్రాంతియతా & అందుబాటు
++Name[tg]=Имкониятҳои минтақавӣ
++Name[th]=เขตพื้นที่และการใช้งาน
++Name[tr]=Bölgesel ve Erişilebilirlik
++Name[tt]=Cirläşterü & İreşülek
++Name[uk]=Локалізація та доступність
++Name[uz]=Regional va qulayliklar
++Name[uz@cyrillic]=Регионал ва қулайликлар
++Name[ven]=U Dzhenea ha vhupo
++Name[vi]=Hỗ trợ quốc tế & Hỗ trợ người tàn tật
++Name[wa]=Redjonå & Accessibilité
++Name[xh]=Ummandla & Nofumaneko
++Name[zh_CN]=区域和辅助功能
++Name[zh_TW]=區域性與易用性
++Name[zu]=Okwesifunda & Igunya lokungena
++Icon=locale
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-components.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-components.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-components.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-components.directory 2013-07-28 15:47:19.318022784 +0200
+@@ -0,0 +1,85 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=KDE Components
++Name[af]=KDE Komponente
++Name[ar]=مكوّنات KDE
++Name[az]=KDE Tərkib Hissələri
++Name[be]=Кампаненты KDE
++Name[bg]=Компоненти
++Name[bn]=কে.ডি.ই-র বিভিন্ন উপাদান
++Name[br]=Parzhioù KDE
++Name[bs]=KDE komponente
++Name[ca]=Components del KDE
++Name[cs]=Komponenty KDE
++Name[csb]=Dzéle KDE
++Name[cy]= Cydrannau KDE
++Name[da]=KDE-komponenter
++Name[de]=KDE-Komponenten
++Name[el]=Συστατικά του KDE
++Name[eo]=KDEaj komponentoj
++Name[es]=Componentes de KDE
++Name[et]=KDE komponendid
++Name[eu]=KDE osagaiak
++Name[fa]=مؤلفه‌های KDE
++Name[fi]=KDE-komponentit
++Name[fr]=Composants de KDE
++Name[fy]=KDE-compeninten
++Name[ga]=Comhpháirteanna KDE
++Name[gl]=Compoñentes de KDE
++Name[he]=רכיבי KDE
++Name[hi]=केडीई के घटक
++Name[hr]=KDE komponente
++Name[hsb]=KDE-komponenty
++Name[hu]=KDE-komponensek
++Name[id]=Komponen KDE
++Name[is]=KDE einingar
++Name[it]=Componenti di KDE
++Name[ja]=KDE コンポーネント
++Name[ka]=KDE კომპონენტები
++Name[kk]=KDE компоненттер
++Name[km]=សមាសភាគ KDE
++Name[ko]=KDE 구성요소
++Name[lo]=ຄອມໂພເນນຂອງ KDE
++Name[lt]=KDE komponentai
++Name[lv]=KDE Komponentes
++Name[mk]=Компоненти на KDE
++Name[mn]=КДЭ-Бүрэлдхүүнүүд
++Name[ms]=Komponen KDE
++Name[nb]=KDE-komponenter
++Name[nds]=KDE-Komponenten
++Name[ne]=KDE अवयव
++Name[nl]=KDE-componenten
++Name[nn]=KDE-komponent
++Name[nso]=Dikagare tsa KDE
++Name[pa]=KDE ਭਾਗ
++Name[pl]=Składniki KDE
++Name[pt]=Componentes do KDE
++Name[pt_BR]=Componentes do KDE
++Name[ro]=Componente KDE
++Name[ru]=Компоненты
++Name[rw]=Inyangingo za KDE
++Name[se]=KDE-oasit
++Name[sk]=Komponenty KDE
++Name[sl]=Komponente KDE
++Name[sr]=KDE компоненте
++Name[sr@Latn]=KDE komponente
++Name[ss]=Tincenye te KDE
++Name[sv]=KDE-komponenter
++Name[ta]=KDE கூறுகள்
++Name[te]=కెడిఈ అంశాలు
++Name[tg]=Қисматҳои KDE
++Name[th]=ส่วนประกอบของ KDE
++Name[tr]=KDE Bileşenleri
++Name[tt]=KDE Öleşläre
++Name[uk]=Компоненти KDE
++Name[uz]=KDE komponentlari
++Name[uz@cyrillic]=KDE компонентлари
++Name[ven]=Zwipida zwa KDE
++Name[vi]=Thành phần của KDE
++Name[wa]=Componints di KDE
++Name[xh]=Izinto ze KDE
++Name[zh_CN]=KDE 组件
++Name[zh_TW]=KDE 元件
++Name[zu]= Amalunga e-KDE
++Icon=blockdevice
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-desktop.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-desktop.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-desktop.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-desktop.directory 2013-07-28 15:47:19.318022784 +0200
+@@ -0,0 +1,80 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Desktop
++Name[af]=Werkskerm
++Name[ar]=سطح المكتب
++Name[az]=Masa Üstü
++Name[be]=Працоўны стол
++Name[bg]=Работен плот
++Name[bn]=ডেস্কটপ
++Name[br]=Gorretaol
++Name[bs]=Radna površina
++Name[ca]=Escriptori
++Name[cs]=Pracovní plocha
++Name[csb]=Pùlt
++Name[cy]=Penbwrdd
++Name[de]=Arbeitsfläche
++Name[el]=Επιφάνεια εργασίας
++Name[eo]=Tabulo
++Name[es]=Escritorio
++Name[et]=Töölaud
++Name[eu]=Mahaigaina
++Name[fa]=رومیزی
++Name[fi]=Työpöytä
++Name[fo]=Skriviborð
++Name[fr]=Bureau
++Name[fy]=Buroblêd
++Name[ga]=Deasc
++Name[gl]=Escritorio
++Name[he]=שולחן עבודה
++Name[hi]=डेस्कटॉप
++Name[hr]=Radna površina
++Name[hsb]=Dźěłowy powjerch
++Name[hu]=Munkaasztal
++Name[is]=Skjáborð
++Name[ja]=デスクトップ
++Name[ka]=სამუშაო დაფა
++Name[kk]=Жұмыс үстелі
++Name[km]=ផ្ទៃតុ
++Name[ko]=데스크톱
++Name[lo]=ພື້ນທີ່ເຮັດວງກ
++Name[lt]=Darbastalis
++Name[lv]=Darbvirsma
++Name[mk]=Работна површина
++Name[mn]=Ажлын тавцан
++Name[ms]=Ruang Kerja
++Name[nb]=Skrivebord
++Name[nds]=Schriefdisch
++Name[ne]=डेस्कटप
++Name[nl]=Bureaublad
++Name[nn]=Skrivebord
++Name[oc]=BurèU
++Name[pa]=ਵੇਹੜਾ
++Name[pl]=Pulpit
++Name[pt]=Ambiente de Trabalho
++Name[pt_BR]=Área de Trabalho
++Name[ru]=Рабочий стол
++Name[rw]=Ibiro
++Name[se]=Čállinbeavdi
++Name[sk]=Plocha
++Name[sl]=Namizje
++Name[sr]=Радна површина
++Name[sr@Latn]=Radna površina
++Name[ss]=Desktop
++Name[sv]=Skrivbord
++Name[ta]=மேல்மேசை
++Name[te]=రంగస్ఠలం
++Name[tg]=Мизи корӣ
++Name[th]=พื้นที่ทำงาน
++Name[tr]=Masaüstü
++Name[tt]=Östäl
++Name[uk]=Стільниця
++Name[uz]=Ish stoli
++Name[uz@cyrillic]=Иш столи
++Name[ven]=Desikithopo
++Name[vi]=Màn hình nền
++Name[wa]=Sicribanne
++Name[zh_CN]=桌面
++Name[zh_TW]=桌面
++Icon=desktop
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.directory trinity-tdebase-3.5.13.2/applnk/tde-settings.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings.directory 2013-07-28 15:47:19.318022784 +0200
+@@ -0,0 +1,88 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Settings-Modules
++Name[af]=Instel-Modules
++Name[ar]=الوحدات النمطية للتعيينات
++Name[az]=Qurğu Modulları
++Name[be]=Модулі настаўлення
++Name[bg]=Контролен център
++Name[bn]=সেটিংস-মডিউল
++Name[br]=Kefluniadur-molladoù
++Name[bs]=Postavke-Moduli
++Name[ca]=Mòduls de paràmetres
++Name[cs]=Moduly nastavení
++Name[csb]=Ùstôw - mòdułë
++Name[cy]=Modiwlau Gosodiadau
++Name[da]=Indstillingsmoduler
++Name[de]=Einstellungsmodule
++Name[el]=Ρυθμίσεις-Αρθρώματα
++Name[eo]=Agordomoduloj
++Name[es]=Módulos de preferencias
++Name[et]=Seadistuste moodulid
++Name[eu]=Ezarpenak-moduluak
++Name[fa]=پیمانه‌های تنظیمات
++Name[fi]=Asetusmoduulit
++Name[fo]=Uppsetingarpartar
++Name[fr]=Modules de configuration
++Name[fy]=Ynstellingsmodules
++Name[ga]=Modúil Socraithe
++Name[gl]=Módulos de Opcións
++Name[he]=מודולי הגדרות
++Name[hi]=विन्यास-मॉड्यूल्स
++Name[hr]=Postavke-Moduli
++Name[hsb]=Nastajenja -module
++Name[hu]=Beállítómodulok
++Name[is]=Stillingareiningar
++Name[it]=Moduli impostazioni
++Name[ja]=設定モジュール
++Name[ka]=მოდულები
++Name[kk]=Модульдер
++Name[km]=ការ​កំណត់​ម៉ូឌុល
++Name[ko]=설정-모듈
++Name[lo]=ຕັ້ງຄ່າໂມດູນ
++Name[lt]=Parinkčių moduliai
++Name[lv]=Parametru moduļi
++Name[mk]=Модули за поставувања
++Name[mn]=Тохируулга-горим
++Name[ms]=Tetapan Modul
++Name[mt]=Moduli tas-settings
++Name[nb]=Innstillingsmoduler
++Name[nds]=Instellen-Modulen
++Name[ne]=सेटिङ-मोड्युल
++Name[nl]=Configuratiemodules
++Name[nn]=Innstillingsmodular
++Name[nso]=Diripa tsa Dipeakanyo
++Name[pa]=ਸੈਟਿੰਗ-ਮੋਡੀਊਲ
++Name[pl]=Ustawienia - moduły
++Name[pt]=Módulos de Preferências
++Name[pt_BR]=Módulos de Configuração
++Name[ro]=Module de configurare
++Name[ru]=Модули
++Name[rw]=Amagenamiterere-Ibice
++Name[se]=Heivehusmoduvllat
++Name[sk]=Moduly nastavenia
++Name[sl]=Nastavitveni moduli
++Name[sr]=Поставке-модули
++Name[sr@Latn]=Postavke-moduli
++Name[ss]=Kuhleleka kwetahluko
++Name[sv]=Inställningsmoduler
++Name[ta]=அமைப்புகள்-பகுதிகள்
++Name[te]=అమరికలు-మాడ్యూళ్లు
++Name[tg]=Модулҳо
++Name[th]=โมดูลการตั้งค่า
++Name[tr]=Modül Ayarları
++Name[tt]=Caylaw-Modullar
++Name[uk]=Модулі параметрів
++Name[uz]=Mslamalar modullari
++Name[uz@cyrillic]=Мсламалар модуллари
++Name[ven]=Modulu wa mavhekanyele
++Name[vi]=Thiết lập Mô đun
++Name[wa]=Apontiaedjes des modules
++Name[xh]=Izicwangciso-Iminqongo wokulinganisela
++Name[zh_CN]=设置模块
++Name[zh_TW]=設定模組
++Name[zu]=Izingxenye-zezilungiselelo
++NoDisplay=true
++Icon=package_settings
++X-KDE-BaseGroup=settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-hardware.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-hardware.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-hardware.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-hardware.directory 2013-07-28 15:47:19.318022784 +0200
+@@ -0,0 +1,59 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Hardware
++Name[af]=Hardeware
++Name[ar]=العتاد
++Name[be]=Апаратнае забеспячэнне
++Name[bg]=Хардуер
++Name[bn]=হার্ডওয়্যার
++Name[br]=Periantel
++Name[bs]=Hardver
++Name[csb]=Nôrzãdza
++Name[cy]=Caledwedd
++Name[el]=Υλικό
++Name[eo]=Aparataro
++Name[et]=Riistvara
++Name[fa]=سخت‌افزار
++Name[fi]=Laitteisto
++Name[fr]=Matériel
++Name[ga]=Crua-Earraí
++Name[he]=חומרה
++Name[hr]=Hardver
++Name[hu]=Hardver
++Name[id]=Perangkat Keras
++Name[is]=Vélbúnaður
++Name[ja]=ハードウェア
++Name[ka]=მოწყობილობები
++Name[kk]=Жабдықтар
++Name[km]=ផ្នែក​រឹង
++Name[ko]=하드웨어
++Name[lt]=Aparatinė įranga
++Name[mk]=Хардвер
++Name[ms]=Perkakasan
++Name[nb]=Maskinvare
++Name[ne]=हार्डवेयर
++Name[nn]=Maskinvare
++Name[pa]=ਜੰਤਰ
++Name[pl]=Sprzęt
++Name[ru]=Оборудование
++Name[rw]=Icyuma
++Name[se]=Mašiidnagálvu
++Name[sl]=Strojna oprema
++Name[sr]=Хардвер
++Name[sr@Latn]=Hardver
++Name[sv]=Hårdvara
++Name[ta]=வன்பொருள்
++Name[te]=హార్డ్ వేర్
++Name[tg]=Сахтафзор
++Name[th]=อุปกรณ์ภายในเครื่อง
++Name[tr]=Donanım
++Name[tt]=Cıhazlar
++Name[uk]=Обладнання
++Name[uz]=Asbob-uskunalar
++Name[uz@cyrillic]=Асбоб-ускуналар
++Name[vi]=Phần cứng
++Name[wa]=Éndjolreye
++Name[zh_CN]=硬件
++Name[zh_TW]=硬體
++Icon=input_devices_settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-looknfeel.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-looknfeel.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-looknfeel.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-looknfeel.directory 2013-07-28 15:47:19.319022762 +0200
+@@ -0,0 +1,86 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Appearance & Themes
++Name[af]=Voorkoms & Temas
++Name[ar]=المظهر و السمات
++Name[az]=Görünüş & Örtüklər
++Name[be]=Вонкавы выгляд і тэмы
++Name[bg]=Външен вид
++Name[bn]=চেহারা এবং থীম
++Name[br]=Neuziadur ha gizioù
++Name[bs]=Izgled i teme
++Name[ca]=Aparença i temes
++Name[cs]=Vzhled a motivy
++Name[csb]=Wëzdrzatk ë témë
++Name[cy]=Golwg a Themau
++Name[da]=Udseende & Temaer
++Name[de]=Erscheinungsbild
++Name[el]=Εμφάνιση & Θέματα
++Name[eo]=Aspekto & Etosoj
++Name[es]=Aspecto y temas
++Name[et]=Välimus ja teemad
++Name[eu]=Itxura eta gaiak
++Name[fa]=ظاهر و چهره‌ها
++Name[fi]=Ulkonäkö ja teemat
++Name[fr]=Apparence et thèmes
++Name[fy]=Uterlik en tema's
++Name[ga]=Cuma agus Téamaí
++Name[gl]=Apariencia e Temas
++Name[he]=מראה וערכות נושא
++Name[hi]=शक्ल-सूरत एवं प्रसंग
++Name[hr]=Izgled i teme
++Name[hsb]=Napohlad & Temy
++Name[hu]=Megjelenés, témák
++Name[id]=Penampilan dan Tema
++Name[is]=Viðmót og útlit
++Name[it]=Aspetto e Temi
++Name[ja]=外観 & テーマ
++Name[ka]=გარეგნობა და თემები
++Name[kk]=Көрініс пен нақыштар
++Name[km]=រូបរាង & ស្បែក
++Name[ko]=모양과 테마
++Name[lo]=ຝັຣງເສດສ໌
++Name[lt]=Išvaizda ir temos
++Name[lv]=Izskats un Tēmas
++Name[mk]=Изглед и теми
++Name[mn]=Харагдалт & хэлбэр
++Name[ms]=Tema dan Penampilan
++Name[mt]=Apparenza u Temi
++Name[nb]=Utseende og temaer
++Name[nds]=Utsehn & Muster
++Name[ne]=दृश्य र विषयवस्तु
++Name[nl]=Uiterlijk en thema's
++Name[nn]=Utsjånad og tema
++Name[nso]=Ponagalo & Melaetsa
++Name[pa]=ਦਿੱਖ ਅਤੇ ਸਰੂਪ
++Name[pl]=Wygląd i motywy
++Name[pt]=Aparência e Temas
++Name[pt_BR]=Aparência & Temas
++Name[ro]=Aspect și tematici
++Name[ru]=Внешний вид и темы
++Name[rw]=Imigaragarire & Insanganyamatsiko
++Name[se]=Fárda ja fáttát
++Name[sk]=Vzhľad a témy
++Name[sl]=Videz in teme
++Name[sr]=Изглед и теме
++Name[sr@Latn]=Izgled i teme
++Name[ss]=Kubukeka & kwendzikimba
++Name[sv]=Utseende och teman
++Name[ta]=தோற்றம் & உருக்கரு
++Name[te]=రూపం ఇంకా వైవిద్యాంశాలు
++Name[tg]=Намуди зоҳирӣ ва услуб
++Name[th]=รูปแบบและชุดตกแต่ง
++Name[tr]=Görünüm ve Temalar
++Name[tt]=Küreneş & Tışlaw
++Name[uk]=Вигляд та теми
++Name[uz]=Tashqi koʻrinishi va mavzular
++Name[uz@cyrillic]=Ташқи кўриниши ва мавзулар
++Name[ven]=Mbonalelo & Dzithero
++Name[vi]=Diện mạo & Sắc thái
++Name[wa]=Rivnance & Tinmes
++Name[xh]=Ubonakalo Nemixholo
++Name[zh_CN]=外观和主题
++Name[zh_TW]=外觀與主題
++Name[zu]=Ukubukeka & Izingqikithi
++Icon=looknfeel
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.menu trinity-tdebase-3.5.13.2/applnk/tde-settings.menu
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings.menu 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings.menu 2013-07-28 15:47:19.319022762 +0200
+@@ -0,0 +1,91 @@
++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++ <Name>Settings</Name>
++ <Menu>
++ <Name>Accessibility</Name>
++ <Directory>tde-settings-accessibility.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-accessibility</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Components</Name>
++ <Directory>tde-settings-components.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-components</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Desktop</Name>
++ <Directory>tde-settings-desktop.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-desktop</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>LookNFeel</Name>
++ <Directory>tde-settings-looknfeel.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-looknfeel</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Network</Name>
++ <Directory>tde-settings-network.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-network</Category>
++ </Include>
++ <Menu>
++ <Name>WebBrowsing</Name>
++ <Directory>tde-settings-webbrowsing.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-webbrowsing</Category>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Peripherals</Name>
++ <Directory>tde-settings-peripherals.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-peripherals</Category>
++ <Category>X-KDE-settings-hardware</Category>
++ </Include>
++ <Menu>
++ <Name>Information</Name>
++ <Directory>tde-settings-information.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-information</Category>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>PowerControl</Name>
++ <Directory>tde-settings-power.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-power</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Security</Name>
++ <Directory>tde-settings-security.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-security</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Sound</Name>
++ <Directory>tde-settings-sound.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-sound</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>System</Name>
++ <Directory>tde-settings-system.directory</Directory>
++ <Include>
++ <Category>X-KDE-settings-system</Category>
++ </Include>
++ </Menu>
++</Menu>
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settingsmenu.directory trinity-tdebase-3.5.13.2/applnk/tde-settingsmenu.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settingsmenu.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settingsmenu.directory 2013-07-28 15:47:19.319022762 +0200
+@@ -0,0 +1,78 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Settings
++Name[af]=Instellings
++Name[ar]=التعيينات
++Name[az]=Qurğular
++Name[be]=Настаўленні
++Name[bg]=Настройки
++Name[bn]=সেটিংস
++Name[br]=Dibarzhoù
++Name[bs]=Postavke
++Name[ca]=Preferències
++Name[cs]=Nastavení
++Name[csb]=Ùstôw
++Name[cy]=Gosodiadau
++Name[da]=Opsætning
++Name[de]=Einstellungen
++Name[el]=Ρυθμίσεις
++Name[eo]=Agordo
++Name[es]=Preferencias
++Name[et]=Seadistused
++Name[eu]=Ezarpenak
++Name[fa]=تنظیمات
++Name[fi]=Asetukset
++Name[fr]=Configuration
++Name[fy]=Ynstellings
++Name[ga]=Socruithe
++Name[gl]=Opcións
++Name[he]=הגדרות
++Name[hi]=विन्यास
++Name[hr]=Postavke
++Name[hsb]=Nastajenja
++Name[hu]=Beállítások
++Name[is]=Stillingar
++Name[it]=Impostazioni
++Name[ja]=設定
++Name[ka]=პარამეტრები
++Name[kk]=Параметрлері
++Name[km]=ការ​កំណត់
++Name[ko]=설정
++Name[lt]=Parinktys
++Name[lv]=Parametri
++Name[mk]=Поставувања
++Name[mn]=Тохируулга
++Name[ms]=Tempatan
++Name[nb]=Innstillinger
++Name[nds]=Instellen
++Name[ne]=सेटिङ
++Name[nl]=Instellingen
++Name[nn]=Innstillingar
++Name[pa]=ਸੈਟਿੰਗ
++Name[pl]=Ustawienia
++Name[pt]=Configuração
++Name[pt_BR]=Configurações
++Name[ro]=Setări
++Name[ru]=Настройка
++Name[rw]=Amagenamiterere
++Name[se]=Heivehusat
++Name[sk]=Nastavenia
++Name[sl]=Nastavitve
++Name[sr]=Поставке
++Name[sr@Latn]=Postavke
++Name[sv]=Inställningar
++Name[ta]=அமைப்புகள்
++Name[te]=అమరికలు
++Name[tg]=Танзимот
++Name[th]=ตั้งค่าต่างๆ
++Name[tr]=Ayarlar
++Name[tt]=Caylaw
++Name[uk]=Параметри
++Name[uz]=Moslamalar
++Name[uz@cyrillic]=Мосламалар
++Name[vi]=Thiết lập
++Name[wa]=Apontiaedjes
++Name[zh_CN]=设置
++Name[zh_TW]=設定
++Icon=package_settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-network.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-network.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-network.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-network.directory 2013-07-28 15:47:19.319022762 +0200
+@@ -0,0 +1,86 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Internet & Network
++Name[af]=Internet & Netwerk
++Name[ar]=الإنترنت و الشبكة
++Name[az]=İnternet & Şəbəkə
++Name[be]=Інтэрнэт і сетка
++Name[bg]=Интернет и мрежа
++Name[bn]=ইন্টারনেট এবং নেটওয়ার্ক
++Name[br]=Kenrouedad ha Rouedad
++Name[bs]=Internet i mreža
++Name[ca]=Internet i xarxa
++Name[cs]=Internet a síť
++Name[csb]=Internet ë séc
++Name[cy]=Rhyngrwyd & Rhwydwaith
++Name[da]=Internet & Netværk
++Name[de]=Internet & Netzwerk
++Name[el]=Διαδίκτυο & Δίκτυο
++Name[eo]=Reto & Interreto
++Name[es]=Internet y Red
++Name[et]=Internet ja võrk
++Name[eu]=Internet eta sarea
++Name[fa]=اینترنت و شبکه
++Name[fi]=Internet ja verkko
++Name[fr]=Internet et réseau
++Name[fy]=Ynternet en netwurk
++Name[ga]=Idirlíon agus Líonra
++Name[gl]=Internet e Rede
++Name[he]=אינטרנט ורשתות
++Name[hi]=इंटरनेट तथा नेटवर्क
++Name[hr]=Internet i mreža
++Name[hsb]=Internet & Syć
++Name[hu]=Hálózat, internet
++Name[id]=Internet dan Jaringan
++Name[is]=Staðarnet og Internetið
++Name[it]=Internet e Rete
++Name[ja]=インターネット & ネットワーク
++Name[ka]=ქსელი და ინტერნეტი
++Name[kk]=Интернет және желі
++Name[km]=អ៊ិនធឺណិត & បណ្ដាញ
++Name[ko]=인터넷과 네트워크
++Name[lo]=ອີນເຕີເນັດ
++Name[lt]=Internetas ir tinklas
++Name[lv]=Internets un Tīkli
++Name[mk]=Интернет и мрежи
++Name[mn]=Интернэт & Сүлжээ
++Name[ms]=Internet & Jaringan
++Name[mt]=Internet u Network
++Name[nb]=Internett og nettverk
++Name[nds]=Internet & Nettwark
++Name[ne]=इन्टरनेट र सञ्जाल
++Name[nl]=Internet en netwerk
++Name[nn]=Internett og nettverk
++Name[nso]=Internet & Kgokagano
++Name[pa]=ਇੰਟਰਨੈੱਟ ਅਤੇ ਨੈੱਟਵਰਕ
++Name[pl]=Internet i sieć
++Name[pt]=Internet e Rede
++Name[pt_BR]=Internet & Rede
++Name[ro]=Internet și rețea
++Name[ru]=Сеть и Интернет
++Name[rw]=Interineti & Urusobemiyoboro
++Name[se]=Interneahtta ja fierpmádat
++Name[sk]=Internet a sieť
++Name[sl]=Internet in omrežje
++Name[sr]=Интернет и мрежа
++Name[sr@Latn]=Internet i mreža
++Name[ss]=Internet & luchungechunge
++Name[sv]=Internet och nätverk
++Name[ta]=இணையம் & வலையமைப்பு
++Name[te]=ఇంటర్నెట్ & నెట్వర్క్
++Name[tg]=Интернет ва шабақа
++Name[th]=อินเทอร์เน็ตและเครือข่าย
++Name[tr]=İnternet ve Ağ Ayarları
++Name[tt]=Päräwez & Çeltär
++Name[uk]=Інтернет та мережа
++Name[uz]=Internet va tarmoq
++Name[uz@cyrillic]=Интернет ва тармоқ
++Name[ven]=Inthanete & Vhukwamani
++Name[vi]=Internet & Mạng
++Name[wa]=Rantoele & Daegntoele
++Name[xh]=Internet & Nomsebenzi womnatha
++Name[zh_CN]=Internet 和网络
++Name[zh_TW]=網路
++Name[zu]=Internet & Uxhumano olusakazekile
++Icon=network
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-peripherals.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-peripherals.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-peripherals.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-peripherals.directory 2013-07-28 15:47:19.319022762 +0200
+@@ -0,0 +1,87 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Peripherals
++Name[af]=Randapperatuur
++Name[ar]=الأجهزة المحيطية
++Name[az]=Avadanlıq
++Name[be]=Перыферыя
++Name[bg]=Периферия
++Name[bn]=পেরিফেরাল
++Name[br]=Trobarzhelloù
++Name[bs]=Vanjski uređaji
++Name[ca]=Perifèrics
++Name[cs]=Periférie
++Name[csb]=Periferëjné ùrzãdzenia
++Name[cy]=Perifferolion
++Name[da]=Tilkoblinger
++Name[de]=Angeschlossene Geräte
++Name[el]=Περιφερειακά
++Name[eo]=Periferaĵoj
++Name[es]=Periféricos
++Name[et]=Välisseadmed
++Name[eu]=Periferikoak
++Name[fa]=وسایل جانبی
++Name[fi]=Laitteet
++Name[fo]=Úteindir
++Name[fr]=Périphériques
++Name[fy]=Râneapparaten
++Name[ga]=Forimeallaigh
++Name[gl]=Periféricos
++Name[he]=ציוד היקפי
++Name[hi]=सहायक पुरजे
++Name[hr]=Periferni uređaji
++Name[hsb]=Periferija
++Name[hu]=Perifériák
++Name[is]=Jaðartæki
++Name[it]=Periferiche
++Name[ja]=周辺機器
++Name[ka]=პერიფერიული
++Name[kk]=Периферия
++Name[km]=គ្រឿង​កុំព្យូទ័រ
++Name[ko]=주변 장치
++Name[lo]=ອຸປະກອນຕໍ່ພວງ
++Name[lt]=Periferija
++Name[lv]=Perifērija
++Name[mk]=Периферни уреди
++Name[mn]=Залгаатай төхөөрөмжүүд
++Name[ms]=Perkakasan
++Name[mt]=Apparat
++Name[nb]=Tilleggsenheter
++Name[nds]=Reedschappen
++Name[ne]=परिवृत्तीय
++Name[nl]=Randapparaten
++Name[nn]=Tilleggseiningar
++Name[nso]=Ditswelantle
++Name[oc]=Periferics
++Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
++Name[pl]=Urządzenia peryferyjne
++Name[pt]=Periféricos
++Name[pt_BR]=Periféricos
++Name[ro]=Periferice
++Name[ru]=Периферия
++Name[rw]=Ibyinyuma
++Name[se]=Ovttadagat
++Name[sk]=Periférie
++Name[sl]=Strojni dodatki
++Name[sr]=Периферије
++Name[sr@Latn]=Periferije
++Name[ss]=Ema-peripherals
++Name[sv]=Kringutrustning
++Name[ta]=கருவிகள்
++Name[te]=పరికరాలు
++Name[tg]=Дастгоҳҳои лозимӣ
++Name[th]=อุปกรณ์ต่อพ่วง
++Name[tr]=Çevre Birimleri
++Name[tt]=Cıhazlar
++Name[uk]=Периферійні пристрої
++Name[uz]=Ulangan uskunalar
++Name[uz@cyrillic]=Уланган ускуналар
++Name[ven]=Dzipheriferala
++Name[vi]=Thiết bị ngoại vi
++Name[wa]=Periferikes
++Name[xh]=Iilayini zomda
++Name[zh_CN]=外设
++Name[zh_TW]=週邊設備
++Name[zu]=Imixhantela
++Icon=input_devices_settings
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-power.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-power.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-power.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-power.directory 2013-07-28 15:47:19.319022762 +0200
+@@ -0,0 +1,88 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Power Control
++Name[af]=Krag Beheer
++Name[ar]=التحكّم بالطّاقة
++Name[az]=Güc İdarəsi
++Name[be]=Кіраванне сілкаваннем
++Name[bg]=Електрозахранване
++Name[bn]=পাওয়ার নিয়ন্ত্রণ
++Name[br]=Renadur ar gremm
++Name[bs]=Ušteda energije
++Name[ca]=Control d'energia
++Name[cs]=Správa napájení
++Name[csb]=Kòntrola sëłë
++Name[cy]=Rheoli Pŵer
++Name[da]=Strømstyring
++Name[de]=Energiekontrolle
++Name[el]=Έλεγχος ισχύος
++Name[eo]=Elektrostirilo
++Name[es]=Control de energía
++Name[et]=Voolutarve
++Name[eu]=Energia kontrola
++Name[fa]=کنترل توان
++Name[fi]=Virranhallinta
++Name[fo]=Orkustýring
++Name[fr]=Contrôle de l'énergie
++Name[fy]=Enerzjybehear
++Name[ga]=Rialú Cumhachta
++Name[gl]=Control da Enerxéa
++Name[he]=צריכת חשמל
++Name[hi]=बिज़ली नियंत्रण
++Name[hr]=Ušteda energije
++Name[hsb]=Milina
++Name[hu]=Energiakezelés
++Name[id]=Kontrol Power
++Name[is]=Orkustilling
++Name[it]=Controllo energia
++Name[ja]=電源管理
++Name[ka]=კვების კონტროლი
++Name[kk]=Қуаттандыруды бақылау
++Name[km]=ការ​ត្រួត​ពិនិត្យ​ថាមពល
++Name[ko]=전원 관리
++Name[lo]=ຄວບຄຸມການໃຊ້ພະລັງງານ
++Name[lt]=Energijos kontrolė
++Name[lv]=Energo Kontrole
++Name[mk]=Контрола на енергија
++Name[mn]=Энергийн удирдлага
++Name[ms]=Kawalan Kuasa
++Name[mt]=Kontroll tal-konsum
++Name[nb]=Strømkontroll
++Name[nds]=Stroomkuntrull
++Name[ne]=शक्ति नियन्त्रण
++Name[nl]=Energiebeheer
++Name[nn]=Straumkontroll
++Name[nso]=Taolo ya Matla
++Name[oc]=Contròle d'alimentacion
++Name[pa]=ਊਰਜਾ ਕੰਟਰੋਲ
++Name[pl]=Zasilanie
++Name[pt]=Controlo de Energia
++Name[pt_BR]=Controle de Energia
++Name[ro]=Control energie
++Name[ru]=Управление питанием
++Name[rw]=Igenzura ry'Umuriro
++Name[se]=El-rávdnje stivren
++Name[sk]=Ovládanie spotreby
++Name[sl]=Nadzor energije
++Name[sr]=Контрола енергије
++Name[sr@Latn]=Kontrola energije
++Name[ss]=Kulawulwa kwemlilo
++Name[sv]=Strömsparfunktion
++Name[ta]=மின்னோட்ட கட்டுப்பாடு
++Name[te]=విద్యుత్ నియంత్రణ
++Name[tg]=Идораи қувваи барқ
++Name[th]=ควบคุมการใช้พลังงาน
++Name[tr]=Güç Denetimi
++Name[tt]=Qüät İdäräse
++Name[uk]=Керування живленням
++Name[uz]=Elektr taʼminotni boshqarish
++Name[uz@cyrillic]=Электр таъминотни бошқариш
++Name[ven]=Ndanguli ya maanda
++Name[vi]=Điều khiển Nguồn điện
++Name[wa]=Controle di l' alimintåcion
++Name[xh]=Ulawulo Lwamandla
++Name[zh_CN]=电源控制
++Name[zh_TW]=電源控制
++Name[zu]=Ukulawulwa kwamandla
++Icon=energy
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-security.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-security.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-security.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-security.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,86 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Security & Privacy
++Name[af]=Sekuriteit & Privaatheid
++Name[ar]=الأمن و السرية
++Name[az]=Təhlükəsizlik & Gizlilik
++Name[be]=Бяспека і прыватнасць
++Name[bg]=Поверителност
++Name[bn]=নিরাপত্তা এবং গোপনীয়তা
++Name[br]=Surentez ha buhez prevez
++Name[bs]=Sigurnost i privatnost
++Name[ca]=Seguretat i privacitat
++Name[cs]=Bezpečnost a soukromí
++Name[csb]=Bezpiek ë priwatnosc
++Name[cy]=Diogelwch & Preifatrwydd
++Name[da]=Sikkerhed & Private data
++Name[de]=Sicherheit & Privatsphäre
++Name[el]=Ασφάλεια & Προσωπικό απόρρητο
++Name[eo]=Sekureco & Privateco
++Name[es]=Seguridad y privacidad
++Name[et]=Turvalisus ja privaatsus
++Name[eu]=Segurtasuna eta pribatutasuna
++Name[fa]=امنیت و محرمانگی
++Name[fi]=Turvallisuus ja yksityisyys
++Name[fr]=Sécurité et confidentialité
++Name[fy]=Privacy en befeiliging
++Name[ga]=Slándáil agus Príobháideachas
++Name[gl]=Seguridade e Privacidade
++Name[he]=אבטחה ופרטיות
++Name[hi]=सुरक्षा तथा गोपनीयता
++Name[hr]=Sigurnost i privatnost
++Name[hsb]=Wěstosć & Anonymnosć
++Name[hu]=Adatvédelem
++Name[id]=Keamanan & Privasi
++Name[is]=Öryggi og einkamál
++Name[it]=Sicurezza e Privacy
++Name[ja]=セキュリティ & プライバシー
++Name[ka]=დაცვა და კონფიდენციალურობა
++Name[kk]=Қауіпсіздік
++Name[km]=សុវត្ថិភាព & ភាព​ឯកជន
++Name[ko]=보안과 사생활
++Name[lo]=ຄວາມປອດໄພ & ຄວາມເປັນສ່ວນຕົວ
++Name[lt]=Saugumas ir privatumas
++Name[lv]=Drošība un Privātums
++Name[mk]=Безбедност и приватност
++Name[mn]=Хамгаалалт & Амгалан
++Name[ms]=Sekuriti dan Privasi
++Name[mt]=Sigurtà u Privatezza
++Name[nb]=Sikkerhet og personvern
++Name[nds]=Sekerheit & Privaatrebeet
++Name[ne]=सुरक्षा र गोपनीयता
++Name[nl]=Privacy en beveiliging
++Name[nn]=Tryggleik og privatliv
++Name[nso]=Tshireletso & Bosephiri
++Name[pa]=ਸੁਰੱਖਿਆ ਅਤੇ ਰਹੱਸ
++Name[pl]=Bezpieczeństwo i prywatność
++Name[pt]=Segurança e Privacidade
++Name[pt_BR]=Segurança & Privacidade
++Name[ro]=Securitate și confidențialitate
++Name[ru]=Безопасность и конфиденциальность
++Name[rw]=Umutekano & Umwihariko
++Name[se]=Sihkkarvuohta ja iežassuodjaleapmi
++Name[sk]=Zabezpečenie a súkromie
++Name[sl]=Varnost in zasebnost
++Name[sr]=Безбедност и приватност
++Name[sr@Latn]=Bezbednost i privatnost
++Name[ss]=Kuphepha & ngasese
++Name[sv]=Säkerhet och integritet
++Name[ta]=பாதுகாப்பு & தனித்துவம்
++Name[te]=భద్రత & ప్రైవసి
++Name[tg]=Амният ва махфинокӣ
++Name[th]=ความปลอดภัยและความเป็นส่วนตัว
++Name[tr]=Güvenlik ve Gizlilik
++Name[tt]=İminlek & Xosusílıq
++Name[uk]=Безпека та приватність
++Name[uz]=Xavfsizlik va shaxsiy maʼlumot
++Name[uz@cyrillic]=Хавфсизлик ва шахсий маълумот
++Name[ven]=Vhutsireledzi & Tshiphiri
++Name[vi]=Bảo mật & Sự riêng tư
++Name[wa]=Såvrité & Privaceye
++Name[xh]=Ukhuseleko & Nobunikazi
++Name[zh_CN]=安全和隐私
++Name[zh_TW]=安全性與私密性
++Name[zu]=Ukuvikeleka & Ingasese
++Icon=password
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-sound.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-sound.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-sound.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-sound.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,85 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Sound & Multimedia
++Name[af]=Klank & Multimedia
++Name[ar]=الصوت و الوسائط المتعددة
++Name[az]=Səs & Multimediya
++Name[be]=Гук і мультымедыя
++Name[bg]=Мултимедия
++Name[bn]=শব্দ ও মাল্টিমিডিয়া
++Name[br]=Son & Liesvedia
++Name[bs]=Zvuk i multimedija
++Name[ca]=So i multimèdia
++Name[cs]=Zvuk a multimédia
++Name[csb]=Zwãk ë mùltimedia
++Name[cy]=Sain & Amlgyfryngau
++Name[da]=Lyd & Multimedie
++Name[el]=Ήχος & Πολυμέσα
++Name[eo]=Sono & Plurmedio
++Name[es]=Sonidos y multimedia
++Name[et]=Heli ja multimeedia
++Name[eu]=Soinua eta multimedia
++Name[fa]=صوت و چند رسانه‌ای
++Name[fi]=Ääni ja multimedia
++Name[fr]=Son et multimédia
++Name[fy]=Lûd en multimedia
++Name[ga]=Fuaim agus Ilmheáin
++Name[gl]=Son e Multimedia
++Name[he]=צליל ומולטימדיה
++Name[hi]=ध्वनि व मल्टीमीडिया
++Name[hr]=Zvuk i multimedija
++Name[hsb]=Zwuk & Multimedia
++Name[hu]=Hang, multimédia
++Name[id]=Efek Suara & Multimedia
++Name[is]=Hljóð og margmiðlun
++Name[it]=Suono e Multimedia
++Name[ja]=サウンド & マルチメディア
++Name[ka]=ხმა და მეულტიმედია
++Name[kk]=Дыбыс пен мультимедиа
++Name[km]=សំឡេង & ពហុព័ត៌មាន
++Name[ko]=소리와 멀티미디어
++Name[lo]=ເມົາຕິມີເດຍ
++Name[lt]=Garsas ir daugialypė terpė
++Name[lv]=Skaņa un Multimēdija
++Name[mk]=Звук и мултимедија
++Name[mn]=Дуу & Мултимедиа
++Name[ms]=Bunyi & Multimedia
++Name[mt]=Ħsejjes u Multimedia
++Name[nb]=Lyd og multimedia
++Name[nds]=Kläng & Multimedia
++Name[ne]=ध्वनि र मल्टिमिडिया
++Name[nl]=Geluid en multimedia
++Name[nn]=Lyd og multimedia
++Name[nso]=Modumo & Media wa Bontshi
++Name[pa]=ਅਵਾਜ਼ ਅਤੇ ਮਲਟੀਮੀਡਿਆ
++Name[pl]=Dźwięk i multimedia
++Name[pt]=Som e Multimédia
++Name[pt_BR]=Som & Multimídia
++Name[ro]=Sunet și multimedia
++Name[ru]=Звук и мультимедиа
++Name[rw]=Ijwi & Mutwaramakuru
++Name[se]=Jietna ja multimedia
++Name[sk]=Zvuk a multimédiá
++Name[sl]=Zvok in večpredstavnost
++Name[sr]=Звук и мултимедија
++Name[sr@Latn]=Zvuk i multimedija
++Name[ss]=Umsindvo & tinhlobonhlobo-tetindzaba
++Name[sv]=Ljud och multimedia
++Name[ta]=ஒலி & பல்லூடகம்
++Name[te]=శబ్దం & మల్టీ మీడియా
++Name[tg]=Садо ва мултимедия
++Name[th]=เสียงและมัลติมีเดีย
++Name[tr]=Ses ve Çokluortam
++Name[tt]=Tawış & Multimedia
++Name[uk]=Звук та мультимедіа
++Name[uz]=Tovush va multimedia
++Name[uz@cyrillic]=Товуш ва мултимедиа
++Name[ven]=Mubvumo & Zwimwumwusi
++Name[vi]=Âm nhạc & Đa phương tiện
++Name[wa]=Son & Multimedia
++Name[xh]=Isandi & Multimedia
++Name[zh_CN]=声音和多媒体
++Name[zh_TW]=聲音與多媒體
++Name[zu]=Umsindo & Onozindaba abaningi
++Icon=multimedia
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-system.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-system.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-system.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-system.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,84 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=System Administration
++Name[af]=Stelsel Administrasie
++Name[ar]=إدارة النّظام
++Name[az]=Sistem İdarəsi
++Name[be]=Сістэмнае адміністраванне
++Name[bg]=Администрация
++Name[bn]=সিস্টেম অ্যাডমিনস্ট্রেশন
++Name[br]=Melestradur ar Reizhiad
++Name[bs]=Administracija sistema
++Name[ca]=Administració del sistema
++Name[cs]=Správa systému
++Name[csb]=Sprôwianié systemã
++Name[cy]=Gweinyddiaith Cysawd
++Name[da]=Systemadministration
++Name[de]=Systemverwaltung
++Name[el]=Διαχείριση συστήματος
++Name[eo]=Sistemadministrado
++Name[es]=Administración del sistema
++Name[et]=Süsteemi administreerimine
++Name[eu]=Sistemaren kudeaketa
++Name[fa]=سرپرستی سیستم
++Name[fi]=Järjestelmänhallinta
++Name[fr]=Administration du système
++Name[fy]=Systeembehear
++Name[ga]=Riarachán Córais
++Name[gl]=Administración do Sistema
++Name[he]=מנהל המערכת
++Name[hi]=तंत्र प्रशासन
++Name[hr]=Administracija sustava
++Name[hsb]=Zarjadowanje systema
++Name[hu]=Rendszeradminisztráció
++Name[id]=Administrasi Sistem
++Name[is]=Kerfisstjórnun
++Name[it]=Amministrazione di sistema
++Name[ja]=システム管理
++Name[ka]=სისტემის ადმინისტრირება
++Name[kk]=Жүйе әкімшілігі
++Name[km]=ការ​គ្រប់គ្រង​ប្រព័ន្ធ
++Name[ko]=시스템 관리
++Name[lo]=SAM -ສຳລັບຜູ້ເບິ່ງແຍງລະບົບ
++Name[lt]=Sistemos administravimas
++Name[lv]=Sistēmas Administrācija
++Name[mk]=Системска администрација
++Name[mn]=Систем-Зохион байгуулалт
++Name[ms]= Pengurusan Sistem
++Name[mt]=Amministrazzjoni tas-Sistema
++Name[nb]=Systemadministrasjon
++Name[nds]=Systeempleeg
++Name[ne]=प्रणाली प्रशासक
++Name[nl]=Systeembeheer
++Name[nn]=Systemadministrasjon
++Name[pa]=ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਨ
++Name[pl]=Administracja systemu
++Name[pt]=Administração do Sistema
++Name[pt_BR]=Administração do Sistema
++Name[ro]=Administrare sistem
++Name[ru]=Системное администрирование
++Name[rw]=Ubuyobozi bwa Sisitemu
++Name[se]=Vuogádathálddašeapmi
++Name[sk]=Správa systému
++Name[sl]=Sistemsko upravljanje
++Name[sr]=Администрација система
++Name[sr@Latn]=Administracija sistema
++Name[sv]=Systemadministration
++Name[ta]=கணினி-நிர்வாகம்
++Name[te]=వ్యవస్థ నిర్వహణ
++Name[tg]=Идоракунии система
++Name[th]=การดูแลระบบ
++Name[tr]=Sistem Yönetimi
++Name[tt]=Sanaq İdäräse
++Name[uk]=Адміністрування системи
++Name[uz]=Tizimni boshqarish
++Name[uz@cyrillic]=Тизимни бошқариш
++Name[ven]=Kulangulele kwa Maitele
++Name[vi]=Quản lý Hệ thống
++Name[wa]=Manaedjmint do sistinme
++Name[xh]=Umphathi Wendlela yokusebenza
++Name[zh_CN]=系统管理
++Name[zh_TW]=系統管理
++Name[zu]=Ukugcinwa kwe-sistimu
++Icon=kcmsystem
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-webbrowsing.directory trinity-tdebase-3.5.13.2/applnk/tde-settings-webbrowsing.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-settings-webbrowsing.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-settings-webbrowsing.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,85 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Web Browser
++Name[af]=Web Blaaier
++Name[ar]=متصفح الشبكة
++Name[az]=Veb Səyyahı
++Name[be]=Вандроўнік па Сеціве
++Name[bg]=Уеб браузър
++Name[bn]=ওয়েব ব্রাউজার
++Name[br]=Furcher an Internet
++Name[bs]=Web preglednik
++Name[ca]=Navegació Web
++Name[cs]=Prohlížeč Webu
++Name[csb]=Przezérnik WWW
++Name[cy]=Porydd Gwê
++Name[da]=Browser
++Name[de]=Webbrowser
++Name[el]=Περιηγητής ιστού
++Name[eo]=TTT-legilo
++Name[es]=Navegador Web
++Name[et]=Veebilehitseja
++Name[eu]=Web arakatzailea
++Name[fa]=مرورگر وب‌‌
++Name[fi]=WWW-selain
++Name[fo]=Vevlesari
++Name[fr]=Navigateur web
++Name[fy]=Webblêder
++Name[ga]=Brabhsálaí Lín
++Name[gl]=Navegador Web
++Name[he]=דפדפן
++Name[hi]=वेब ब्राउज़र
++Name[hr]=Web preglednik
++Name[hsb]=Web-browser
++Name[hu]=Webböngésző
++Name[id]=Peselancar Web
++Name[is]=Vafri
++Name[it]=Navigazione Web
++Name[ja]=ウェブブラウザ
++Name[ka]=ვებ ბრაუზერი
++Name[kk]=Веб шолғыш
++Name[km]=កម្មវិធី​រុករក​បណ្ដាញ
++Name[ko]=웹 브라우저
++Name[lo]=ຮງກເບິ່ງຖານເບິ່ງຂໍ້ມູນ
++Name[lt]=Žiniatinklio naršyklė
++Name[lv]=Tīmekļa Pārlūks
++Name[mk]=Веб-прелистувач
++Name[mn]=Вэб-Хөтөч
++Name[ms]=Pelayar Web
++Name[nb]=Nettleser
++Name[nds]=Nettkieker
++Name[ne]=वेब ब्राउजर
++Name[nl]=Webbrowser
++Name[nn]=Nettlesar
++Name[nso]=Seinyakisi sa Web
++Name[pa]=ਵੈਬ ਝਲਕਾਰਾ
++Name[pl]=Przeglądarka WWW
++Name[pt]=Navegação Web
++Name[pt_BR]=Navegador Web
++Name[ro]=Navigator de web
++Name[ru]=Браузер
++Name[rw]=Mucukumbuzi Rubuga
++Name[se]=Fierpmádatlogan
++Name[sk]=Webový prehliadač
++Name[sl]=Spletni brskalnik
++Name[sr]=Веб прегледач
++Name[sr@Latn]=Veb pregledač
++Name[ss]=Ibrawuza ye-Web
++Name[sv]=Webbläsning
++Name[ta]=வலை உலாவி
++Name[te]=వెబ్ బ్రౌజర్
++Name[tg]=Намоишгари Веб
++Name[th]=เว็บเบราว์เซอร์
++Name[tr]=Web Tarayıcı
++Name[uk]=Навігатор Тенет
++Name[uz]=Veb-brauzer
++Name[uz@cyrillic]=Веб-браузер
++Name[ven]=Burausa ya Web
++Name[vi]=Trình duyệt Mạng
++Name[wa]=Betchteu waibe
++Name[xh]=Umkhangeli zincwadi we Web
++Name[zh_CN]=Web 浏览器
++Name[zh_TW]=網頁瀏覽器
++Name[zu]=Umcingi we-Web
++Icon=konqueror
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-system.directory trinity-tdebase-3.5.13.2/applnk/tde-system.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-system.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-system.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,81 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=System
++Name[af]=Stelsel
++Name[ar]=النظام
++Name[az]=Sistem
++Name[be]=Сістэма
++Name[bg]=Система
++Name[bn]=সিস্টেম
++Name[br]=Reizhiad
++Name[bs]=Sistem
++Name[ca]=Sistema
++Name[cs]=Systém
++Name[csb]=Systema
++Name[cy]=Cysawd
++Name[el]=Σύστημα
++Name[eo]=Sistemo
++Name[es]=Sistema
++Name[et]=Süsteem
++Name[eu]=Sistema
++Name[fa]=سیستم
++Name[fi]=Järjestelmä
++Name[fo]=Kervi
++Name[fr]=Système
++Name[fy]=Systeem
++Name[ga]=Córas
++Name[gl]=Sistema
++Name[he]=מערכת
++Name[hi]=तंत्र
++Name[hr]=Sustav
++Name[hu]=Rendszer
++Name[id]=Sistem
++Name[is]=Kerfi
++Name[it]=Sistema
++Name[ja]=システム
++Name[ka]=სისტემა
++Name[kk]=Жүйелік
++Name[km]=ប្រព័ន្ធ
++Name[ko]=시스템
++Name[lo]=ຈັດການລະບົບ
++Name[lt]=Sistema
++Name[lv]=Sistēma
++Name[mk]=Систем
++Name[mn]=Систем
++Name[ms]=Sistem
++Name[mt]=Sistema
++Name[nds]=Systeem
++Name[ne]=प्रणाली
++Name[nl]=Systeem
++Name[oc]=Sistemo
++Name[pa]=ਸਿਸਟਮ
++Name[pt]=Sistema
++Name[pt_BR]=Sistema
++Name[ro]=Sistem
++Name[ru]=Система
++Name[rw]=Sisitemu
++Name[se]=Vuogádat
++Name[sk]=Systém
++Name[sl]=Sistem
++Name[sr]=Систем
++Name[sr@Latn]=Sistem
++Name[ss]=Umshini
++Name[ta]=அமைப்பு
++Name[te]=వ్యవస్థ
++Name[tg]=Система
++Name[th]=ระบบ
++Name[tr]=Sistem
++Name[tt]=Sistem
++Name[uk]=Система
++Name[uz]=Tizim
++Name[uz@cyrillic]=Тизим
++Name[ven]=Maitele
++Name[vi]=Hệ thống
++Name[wa]=Sistinme
++Name[xh]=Indlela esestyenziswayo
++Name[zh_CN]=系统
++Name[zh_TW]=系統
++Name[zu]=Isistimu
++Icon=package_system
++
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-screensavers.directory trinity-tdebase-3.5.13.2/applnk/tde-system-screensavers.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-screensavers.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-system-screensavers.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,171 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Screen Savers
++Name[af]=Skerm Bewaarders
++Name[ar]=مدخري الشاشة
++Name[az]=Ekran Qoruyucuları
++Name[be]=Зберагальнікі экрана
++Name[bg]=Предпазители на екрана
++Name[bn]=স্ক্রীন সেভার
++Name[br]=Damanterien Skramm
++Name[bs]=Zaštita ekrana (screensaver)
++Name[ca]=Salvapantalles
++Name[cs]=Šetřiče obrazovky
++Name[csb]=Wëgaszôcz ekranu
++Name[cy]=Arbedyddion Sgrîn
++Name[da]=Pauseskærme
++Name[de]=Bildschirmschoner
++Name[el]=Προφύλαξη οθόνης
++Name[eo]=Ekrankurtenoj
++Name[es]=Salvapantallas
++Name[et]=Ekraanisäästjad
++Name[eu]=Pantaila babesleak
++Name[fa]=محافظهای صفحه نمایش
++Name[fi]=Näytönsäästäjät
++Name[fo]=Skíggjaspararir
++Name[fr]=Écrans de veille
++Name[fy]=Skermbefeiliging
++Name[ga]=Spárálaithe Scáileáin
++Name[gl]=Protectores de Pantalla
++Name[he]=שומרי מסך
++Name[hi]=स्क्रीन सेवर
++Name[hr]=Zaštita zaslona
++Name[hsb]=Škitaki za wobrazowku
++Name[hu]=Képernyővédő
++Name[is]=Skjásvæfur
++Name[it]=Salvaschermi
++Name[ja]=スクリーンセーバー
++Name[kk]=Экран сақтаушылары
++Name[km]=ធាតុ​សង្គ្រោះ​អេក្រង់
++Name[ko]=화면 보호기
++Name[lo]=ໂປຣແກຣມຮັກສາຫນ້າຈໍ
++Name[lt]=Ekrano Užsklandos
++Name[lv]=Ekrāna saudzetāji
++Name[mk]=Екрански чувари
++Name[mn]=Дэлгэц гамнагч
++Name[ms]=Penghias Skrin
++Name[nb]=Pauseskjerme
++Name[nds]=Pausschirm
++Name[ne]=स्क्रिनसेभर
++Name[nl]=Schermbeveiliging
++Name[nn]=Pauseskjermar
++Name[nso]=Diboloki tsa Pontsho
++Name[oc]=Salvador d'ecrans
++Name[pa]=ਸਕਰੀਨ-ਸੇਵਰ
++Name[pl]=Wygaszacze ekranu
++Name[pt]=Protectores de Ecrã
++Name[pt_BR]=Protetores de tela
++Name[ro]=Protecții de ecran
++Name[ru]=Хранители экрана
++Name[rw]=Mugaragaza Ukubamaso
++Name[se]=Šearbmasiestejeaddjit
++Name[sk]=Šetriče obrazovky
++Name[sl]=Ohranjevalniki zaslona
++Name[sr]=Чувари екрана
++Name[sr@Latn]=Čuvari ekrana
++Name[ss]=Sigcini-skrini
++Name[sv]=Skärmsläckare
++Name[ta]=திரை காப்பாளர்கள்
++Name[te]= స్క్రీన్ సేవర్లు
++Name[tg]=Пардаи экран
++Name[th]=โปรแกรมรักษาหน้าจอ
++Name[tr]=Ekran Koruyucular
++Name[tt]=Küräk Saqlağıçı
++Name[uk]=Зберігачі екрана
++Name[uz]=Ekran saqlovchilari
++Name[uz@cyrillic]=Экран сақловчилари
++Name[ven]=Tshivhulungi tsha Tshikirini
++Name[vi]=Trình bảo vệ màn hình
++Name[wa]=Sipårgneus di waitroûle
++Name[xh]=Abagcini Bekhusi
++Name[zh_CN]=屏幕保护程序
++Name[zh_TW]=螢幕保護程式
++Name[zu]=Abagcini Besikrini
++Icon=kscreensaver
++X-KDE-BaseGroup=screensavers
++
++Comment=Screen saver demos
++Comment[af]=Skerm bewaarder demonstrasies
++Comment[ar]=عروض توضيحية لمدخر الشاشة
++Comment[az]=Ekran Qoruyucu Demoları
++Comment[be]=Дэманстрацыі зберагальніка экрана
++Comment[bg]=Демо на предпазителите на екрана
++Comment[bn]=স্ক্রীন সেভার ডেমো
++Comment[br]=Diskouezadur damanterien skramm
++Comment[bs]=Demonstracije zaštite ekrana
++Comment[ca]=Demos de salvapantalles
++Comment[cs]=Ukázky šetřičů obrazovky
++Comment[csb]=Pòdzérk wëgaszôcza ekranu
++Comment[cy]=Arddangosfeydd arbedyddion sgrîn
++Comment[da]=Pauseskærm-demoer
++Comment[de]=Demos zu Bildschirmschonern
++Comment[el]=Επίδειξη προφύλαξης οθόνης
++Comment[eo]=Demonstro de la ekrankurtenoj
++Comment[es]=Demostraciones del salvapantallas
++Comment[et]=Ekraanisäästjate demod
++Comment[eu]=Pantaila babesle demoak
++Comment[fa]=نمایشهای صفحه کلید
++Comment[fi]=Näytönsäästäjien mallit
++Comment[fo]=Skíggjaspararadømi
++Comment[fr]=Démonstrations d'écrans de veille
++Comment[fy]=Skermbefeiligingdemo's
++Comment[ga]=Taispeántais na spárálaithe scáileáin
++Comment[gl]=Demostracións dos protectores de pantalla
++Comment[he]=הדגמות של שומרי מסך
++Comment[hi]=स्क्रीन सेवर डेमोस
++Comment[hr]=Demonstracije zaštite zaslona
++Comment[hsb]=demonstrowanje škitakow za wobrazowku
++Comment[hu]=Képernyővédő-demók
++Comment[id]=Demo screen saver
++Comment[is]=Skjásvæfukynningar
++Comment[it]=Anteprime dei salvaschermi
++Comment[ja]=スクリーンセーバーのデモ
++Comment[kk]=Экран сақтаушыны таңдау
++Comment[km]=បង្ហាញ​ធាតុ​សង្គ្រោះ​អេក្រង់​សាក​មើល
++Comment[ko]=화면 보호기 데모
++Comment[lo]=ຕົວຢ່າງໂປຣແກຣມຮັກສາຫນ້າຈໍ
++Comment[lt]=Ekrano užsklandos demonstracija
++Comment[lv]=Ekrāna saudzētāja demoversijas
++Comment[mk]=Демоа на екрански чувари
++Comment[mn]=Дэлгэц гамнагчийн үзүүлэн
++Comment[ms]=Contoh penghias skrin
++Comment[mt]=Wirjiet ta' screen savers
++Comment[nb]=Pauseskjerm-demoer
++Comment[nds]=Pausschirmen utproberen
++Comment[ne]=स्क्रिनसेभर डेमो
++Comment[nl]=Schermbeveiligingdemo's
++Comment[nn]=Pauseskjerm-demoar
++Comment[nso]=Di-demo tsa seboloki sa pontsho
++Comment[oc]=Demonstracions dèu salvador d'ecran
++Comment[pa]=ਸਕਰੀਨ-ਸੇਵਰ ਝਲਕ
++Comment[pl]=Podgląd wygaszacza ekranu
++Comment[pt]=Demonstrações de protectores de ecrã
++Comment[pt_BR]=Amostras de protetores de tela
++Comment[ro]=Demonstrații pentru protecții de ecran
++Comment[ru]=Просмотр хранителей экрана
++Comment[rw]=Amayerekana ya Mugaragaza Ukubamaso
++Comment[se]=Šearbmasiestejeaddji demonstrašuvnnat.
++Comment[sk]=Demo šetričov obrazovky
++Comment[sl]=Predstavitve ohranjevalnikov zaslona
++Comment[sr]=Демои чуварâ екрана
++Comment[sr@Latn]=Demoi čuvarâ ekrana
++Comment[ss]=Kukhonjiswa kwesigcini skrini
++Comment[sv]=Demonstration av skärmsläckare
++Comment[ta]=திரை காத்தலின் விளக்கக் காட்சிகள்
++Comment[te]=స్క్రీన్ సేవర్ డెమొలు
++Comment[tg]=Намоиши пардаи экран
++Comment[th]=ตัวอย่างโปรแกรมรักษาหน้าจอ
++Comment[tr]=Ekran koruyucu tanıtımları
++Comment[tt]=Küräksaqçı sınawları
++Comment[uk]=Демонстрації зберігачів екрана
++Comment[uz]=Ekran saqlovchilar namunalari
++Comment[uz@cyrillic]=Экран сақловчилар намуналари
++Comment[ven]=Demo ya tshivhulungi tsha tshikirini
++Comment[vi]=Thử trình bảo vệ màn hình
++Comment[wa]=Sipårgneus di waitroûle di saye
++Comment[xh]=Demos zomgcini wekhusi
++Comment[zh_CN]=屏幕保护程序演示
++Comment[zh_TW]=螢幕保護程式展示
++Comment[zu]=Imiboniso yezigcini zikrini
++NoDisplay=true
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-terminal.directory trinity-tdebase-3.5.13.2/applnk/tde-system-terminal.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-system-terminal.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-system-terminal.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,88 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Terminal Applications
++Name[af]=Terminaal Programme
++Name[ar]=تطبيقات مطرافية
++Name[az]=Terminal Proqramları
++Name[be]=Тэрмінальныя праграмы
++Name[bg]=Конзолни програми
++Name[bn]=টার্মিনাল অ্যাপলিকেশন
++Name[br]=Arloadoù an termenell
++Name[bs]=Tekstualni programi
++Name[ca]=Aplicacions de terminal
++Name[cs]=Terminálové aplikace
++Name[csb]=Programë terminala
++Name[cy]=Cymhwysiadau Terfynell
++Name[da]=Terminalprogrammer
++Name[de]=Terminalprogramme
++Name[el]=Εφαρμογές τερματικού
++Name[eo]=Terminal-Aplikaĵoj
++Name[es]=Aplicaciones de terminal
++Name[et]=Terminali rakendused
++Name[eu]=Terminaleko aplikazioak
++Name[fa]=کاربردهای پایانه
++Name[fi]=Päätesovellukset
++Name[fo]=Tekstforrit
++Name[fr]=Applications pour terminal
++Name[fy]=Terminal-tapassingen
++Name[ga]=Feidhmchláir Teirminéil
++Name[gl]=Aplicacións de Terminal
++Name[he]=יישומי מסוף
++Name[hi]=टर्मिनल अनुप्रयोग
++Name[hr]=Terminalske aplikacije
++Name[hsb]=Programy za terminal
++Name[hu]=Parancsértelmezők
++Name[id]=Aplikasi Terminal
++Name[is]=Skjáhermiforrit
++Name[it]=Applicazioni terminale
++Name[ja]=ターミナルアプリケーション
++Name[ka]=კონსოლის პროგრამები
++Name[kk]=Консоль қолданбалары
++Name[km]=កម្មវិធី​ស្ថានីយ
++Name[ko]=터미널 프로그램
++Name[lo]=ໂປຣແກຣມເທີມີນໍ
++Name[lt]=Terminalinės programos
++Name[lv]=Termināla Aplikācijas
++Name[mk]=Терминалски апликации
++Name[mn]=Терминал-Програм
++Name[ms]=Aplikasi Terminal
++Name[mt]=Programmi tat-Terminal
++Name[nb]=Terminalprogrammer
++Name[nds]=Terminalprogrammen
++Name[ne]=टर्मिनल अनुप्रयोग
++Name[nl]=Terminal-toepassingen
++Name[nn]=Terminalprogram
++Name[nso]=Ditshumiso tsa Terminal
++Name[pa]=ਟਰਮੀਨਲ ਕਾਰਜ
++Name[pl]=Programy terminala
++Name[pt]=Aplicações de Terminal
++Name[pt_BR]=Aplicativos de terminal
++Name[ro]=Aplicații de terminal
++Name[ru]=Консольные приложения
++Name[rw]=Amaporogaramu Nkiriya
++Name[se]=Terminálprográmmat
++Name[sk]=Terminálové aplikácie
++Name[sl]=Terminalski programi
++Name[sr]=Терминалски програми
++Name[sr@Latn]=Terminalski programi
++Name[ss]=Ticelo tesikhungo
++Name[sv]=Terminalprogram
++Name[ta]=முனைய பயன்பாடுகள்
++Name[te]=టర్మినల్ కార్యక్రమములు
++Name[tg]=Барномаҳои консол
++Name[th]=โปรแกรมเทอร์มินัล
++Name[tr]=Uçbirim Uygulamaları
++Name[tt]=Terminal Yazılımnarı
++Name[uk]=Термінальні програми
++Name[uz]=Terminal uchun dasturlar
++Name[uz@cyrillic]=Терминал учун дастурлар
++Name[ven]=Apulikhesheni ya Theminala
++Name[vi]=Trình đầu cuối
++Name[wa]=Programes terminås
++Name[xh]=Izicelo Zesiphelo sendlela
++Name[zh_CN]=终端应用程序
++Name[zh_TW]=終端機程式
++Name[zu]=Abayaleli bangaphandle
++Icon=konsole
++Version=1.0
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-toys.directory trinity-tdebase-3.5.13.2/applnk/tde-toys.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-toys.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-toys.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,88 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Toys
++Name[af]=Speelgoed
++Name[ar]=الألعاب
++Name[az]=Oyuncaqlar
++Name[be]=Цацкі
++Name[bg]=Играчки
++Name[bn]=খেলনা
++Name[br]=C'hoarielloù
++Name[bs]=Igračke
++Name[ca]=Joguines
++Name[cs]=Hračky
++Name[csb]=Zôbôwczi
++Name[cy]=Tegannau
++Name[da]=Legetøj
++Name[de]=Kleinigkeiten
++Name[el]=Παιχνιδάκια
++Name[eo]=Amuzaĵoj
++Name[es]=Ocio
++Name[et]=Mänguasjad
++Name[eu]=Jolasak
++Name[fa]=سرگرمیها
++Name[fi]=Lelut
++Name[fo]=Leiku
++Name[fr]=Petits outils
++Name[fy]=Boartersguod
++Name[ga]=Áilleagáin
++Name[gl]=Entretementos
++Name[he]=צעצועים
++Name[hi]=खिलौने
++Name[hr]=Igračke
++Name[hsb]=Hrajki
++Name[hu]=Mütyürkék
++Name[id]=Mainan
++Name[is]=Leikföng
++Name[it]=Giochini
++Name[ja]=アクセサリ
++Name[ka]=სათამაშოები
++Name[kk]=Ойын-сауықтар
++Name[km]=ប្រដាប់​ក្មេង​លេង
++Name[ko]=장난감
++Name[lo]=ຂອງເຫລັ້ນ
++Name[lt]=Žaislai
++Name[lv]=Rotaļlietas
++Name[mk]=Играчки
++Name[mn]=Наадгай
++Name[ms]=Permainan
++Name[mt]=Ġugarelli
++Name[nb]=Leketøy
++Name[nds]=Speelkraam
++Name[ne]=खेलौना
++Name[nl]=Speelgoed
++Name[nn]=Leiker
++Name[nso]=Dibapadisane
++Name[oc]=Joguines
++Name[pa]=ਖਿਡੌਣੇ
++Name[pl]=Zabawa
++Name[pt]=Diversão
++Name[pt_BR]=Brinquedos
++Name[ro]=Jucării
++Name[ru]=Развлечения
++Name[rw]=Ibikinisho
++Name[se]=Stohkosat
++Name[sk]=Hračky
++Name[sl]=Igrače
++Name[sr]=Играчке
++Name[sr@Latn]=Igračke
++Name[ss]=Kwekudlalisa
++Name[sv]=Leksaker
++Name[ta]=பொம்மைகள்
++Name[te]=ఆట వస్తువులు
++Name[tg]=Бозичаҳои шавқовар
++Name[th]=ของเล่นสนุกๆ
++Name[tr]=Eğlence
++Name[tt]=Uyınnar
++Name[uk]=Іграшки
++Name[uz]=Oʻyinchoqlar
++Name[uz@cyrillic]=Ўйинчоқлар
++Name[ven]=Zwautambisa vhana
++Name[vi]=Đồ chơi
++Name[wa]=Amuzmints
++Name[xh]=Izinto zokudlala
++Name[zh_CN]=玩具
++Name[zh_TW]=玩具
++Name[zu]=Amathoyizi
++Icon=package_toys
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-unknown.directory trinity-tdebase-3.5.13.2/applnk/tde-unknown.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-unknown.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-unknown.directory 2013-07-28 15:47:19.320022740 +0200
+@@ -0,0 +1,76 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Lost & Found
++Name[af]=Verlore & Gevind
++Name[ar]=فُقد ووُجد
++Name[az]=İtirdim və Tapdım
++Name[be]=Згубленыя і знойдзеныя
++Name[bg]=Разни
++Name[bn]=হারানো প্রাপ্তি
++Name[br]=Kollet & kavet
++Name[bs]=Izgubljeno/nađeno
++Name[ca]=Perdut i trobat
++Name[cs]=Ztráty a nálezy
++Name[csb]=Zgùbione ë nalazłé
++Name[cy]=Colledig a Chanfyddedig
++Name[da]=Glemte sager
++Name[de]=Nicht zuzuordnen
++Name[el]=Χάθηκαν & Βρέθηκαν
++Name[eo]=Perdita kaj trovita
++Name[es]=Objetos perdidos
++Name[et]=Tundmatud
++Name[eu]=Galdu eta aurkitutakoak
++Name[fa]=گم‌شده و یافته‌شده
++Name[fi]=Hävinneet ja löydetyt
++Name[fr]=Objets trouvés
++Name[fy]=Wat oer is
++Name[ga]=Caillte agus Aimsithe
++Name[gl]=Outros
++Name[he]=אבדות
++Name[hi]=खोया/पाया
++Name[hr]=Izgubljeno-nađeno
++Name[hsb]=Pytane & Namakane
++Name[hu]=Ismeretlen
++Name[is]=Tapað & fundið
++Name[it]=Oggetti smarriti
++Name[kk]=Жоғалып табылғандар
++Name[km]=បាត់ & រកឃើញ
++Name[ko]=기타 프로그램
++Name[lt]=Pamesta ir rasta
++Name[lv]=Pazudis & Atrasts
++Name[mk]=Изгубено-најдено
++Name[mn]=Алдагдал & Олдолт
++Name[ms]=Hilang & Jumpa
++Name[mt]=Mitlufin u Misjuba
++Name[nb]=Tapt og funnet
++Name[nds]=Passt narms sünst
++Name[ne]=हराएका र फेला परेका
++Name[nl]=Overig
++Name[nn]=Tapt og funne
++Name[pa]=ਗੁਆਚੇ ਤੇ ਲੱਭੇ
++Name[pl]=Zgubione i znalezione
++Name[pt]=Perdidos e Achados
++Name[pt_BR]=Achados & Perdidos
++Name[ro]=Pierdute și regăsite
++Name[ru]=Камера хранения
++Name[rw]=Byabuze & Byabonetse
++Name[se]=Láhppon ja gávdnon
++Name[sk]=Straty a nálezy
++Name[sl]=Izgubljeno in najdeno
++Name[sr]=Изгубљено-нађено
++Name[sr@Latn]=Izgubljeno-nađeno
++Name[sv]=Hittegods
++Name[ta]=இழந்த & கிடைத்த
++Name[te]=పోయినవి & దొరికినవి
++Name[tg]=Ҷустуҷӯй
++Name[th]=หาไม่เจอดูที่นี่
++Name[tr]=Kayıplar ve Bulunanlar
++Name[tt]=Yuğaltu & Tabu
++Name[uk]=Загублено та знайдено
++Name[uz]=Nomaʼlum
++Name[uz@cyrillic]=Номаълум
++Name[vi]=Mất & Tìm
++Name[wa]=Pierdous & rtrovés
++Name[zh_CN]=未知类别
++Icon=help
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-accessibility.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-accessibility.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-accessibility.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-accessibility.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,148 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Accessibility
++Name[af]=Toeganklikheid
++Name[ar]=تسهيل الوصول
++Name[az]=Yetişmə Qabiliyyəti
++Name[be]=Даступнасць
++Name[bg]=Равностоен достъп
++Name[bn]=সহায়ক প্রযুক্তি
++Name[br]=Haezadusted
++Name[bs]=Pristupačnost
++Name[ca]=Accessibilitat
++Name[cs]=Zpřístupnění
++Name[csb]=Pòmòce przistãpù
++Name[cy]=Hygyrchedd
++Name[da]=Tilgængelighed
++Name[de]=Zugangshilfen
++Name[el]=Προσιτότητα
++Name[eo]=Alirebleco
++Name[es]=Accesibilidad
++Name[et]=Hõlbustus
++Name[eu]=Erabilerraztasuna
++Name[fa]=دستیابی‌پذیری
++Name[fi]=Helppokäyttötoiminnot
++Name[fr]=Accessibilité
++Name[fy]=Tagonklikens
++Name[ga]=Inrochtaineacht
++Name[gl]=Accesibilidade
++Name[he]=נגישות
++Name[hi]=पहुँच
++Name[hr]=Pristupačnost
++Name[hu]=Kezelési segítség
++Name[id]=Aksesibiliti
++Name[is]=Aðgengi
++Name[it]=Accessibilità
++Name[ja]=アクセシビリティ
++Name[ka]=სპეციალური შესაძლბლობები
++Name[kk]=Арнайы мүмкіндіктер
++Name[km]=ភាព​អាច​ចូល​ដំណើរការ​បាន
++Name[ko]=내게 필요한 설정
++Name[lo]=ຄວາມສາມາດໃນການໃຊ້ງານ
++Name[lt]=Prieinamumas
++Name[lv]=Pieejamība
++Name[mk]=Пристапливост
++Name[mn]=Хэрэглэх тохь
++Name[ms]=Kebolehcapaian
++Name[mt]=Aċċessibiltà
++Name[nb]=Tilgjengelighet
++Name[nds]=Behinnertenhülp
++Name[ne]=पहुँचता
++Name[nl]=Toegankelijkheid
++Name[nn]=Tilgjenge
++Name[nso]=Botsenelo
++Name[oc]=Accessibilitat
++Name[pa]=ਸਹੂਲਤਾਂ
++Name[pl]=Dostępność
++Name[pt]=Acessibilidade
++Name[pt_BR]=Acessibilidade
++Name[ro]=Accesibilitate
++Name[ru]=Специальные возможности
++Name[rw]=Ukugerwaho
++Name[se]=Álkkibut geavaheapmi
++Name[sk]=Prístupnosť
++Name[sl]=Dostopnost
++Name[sr]=Приступачност
++Name[sr@Latn]=Pristupačnost
++Name[ss]=Kutfolakala kalula
++Name[sv]=Handikappstöd
++Name[ta]=அணுகல்
++Name[te]=అందుబాటు
++Name[tg]=Имконпазирӣ
++Name[th]=ตัวช่วยในการใช้งาน
++Name[tr]=Erişilebilirlik
++Name[tt]=Qulaylıq
++Name[uk]=Доступність
++Name[uz]=Qulayliklar
++Name[uz@cyrillic]=Қулайликлар
++Name[ven]=Dzheneaho
++Name[vi]=Hỗ trợ người tàn tật
++Name[wa]=Accessibilité
++Name[xh]=Unikezelo
++Name[zh_CN]=辅助
++Name[zh_TW]=無障礙輔助
++Name[zu]=Ukungena
++Icon=access
++Comment=Accessibility
++Comment[af]=Toeganklikheid
++Comment[be]=Даступнасць
++Comment[bg]=Равностоен достъп
++Comment[bn]=সহায়ক প্রযুক্তি
++Comment[br]=Haezadusted
++Comment[bs]=Pristupačnost
++Comment[ca]=Accessibilitat
++Comment[cs]=Zpřístupnění
++Comment[csb]=Pòmòce przistãpù
++Comment[cy]=Hygyrchedd
++Comment[da]=Tilgængelighed
++Comment[de]=Zugangshilfen
++Comment[el]=Προσβασιμότητα
++Comment[eo]=Alirebleco
++Comment[es]=Accesibilidad
++Comment[et]=Hõlbustus
++Comment[eu]=Erabilerraztasuna
++Comment[fa]=دستیابی‌پذیری
++Comment[fi]=Helppokäyttöisyys
++Comment[fr]=Accessibilité
++Comment[fy]=Tagonklikens
++Comment[ga]=Inrochtaineacht
++Comment[gl]=Accesibilidade
++Comment[he]=נגישות
++Comment[hr]=Pristupačnost
++Comment[hu]=Kezelési segítség
++Comment[is]=Aðgengi
++Comment[it]=Accessibilità
++Comment[ja]=アクセシビリティ
++Comment[kk]=Арнайы мүмкіндіктер
++Comment[km]=មធ្យោបាយ​ងាយស្រួល
++Comment[ko]=내게 필요한 설정
++Comment[mk]=Пристапливост
++Comment[ms]=Kebolehcapaian
++Comment[nb]=Tilgjengelighet
++Comment[nds]=Behinnertenhülp
++Comment[ne]=पहुँचता
++Comment[nl]=Toegankelijkheid
++Comment[nn]=Tilgjenge
++Comment[pa]=ਸਹੂਲਤਾਂ
++Comment[pl]=Dostępność
++Comment[pt]=Acessibilidade
++Comment[pt_BR]=Acessibilidade
++Comment[ro]=Accesibilitate
++Comment[ru]=Специальные возможности
++Comment[sk]=Prístupnosť
++Comment[sl]=Dostopnost
++Comment[sr]=Приступачност
++Comment[sr@Latn]=Pristupačnost
++Comment[sv]=Handikappstöd
++Comment[te]=అందుబాటు
++Comment[tg]=Имконпазирӣ
++Comment[th]=ตัวช่วยให้ใช้งานสะดวกขึ้น
++Comment[tr]=Erişilebilirlik
++Comment[uk]=Доступність
++Comment[uz]=Qulayliklar
++Comment[uz@cyrillic]=Қулайликлар
++Comment[vi]=Hỗ trợ người tàn tật
++Comment[wa]=Accessibilité
++Comment[zh_CN]=辅助
++Comment[zh_TW]=無障礙輔助
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-desktop.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-desktop.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-desktop.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-desktop.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,141 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Desktop
++Name[af]=Werkskerm
++Name[ar]=سطح المكتب
++Name[az]=Masa Üstü
++Name[be]=Працоўны стол
++Name[bg]=Работен плот
++Name[bn]=ডেস্কটপ
++Name[br]=Gorretaol
++Name[bs]=Radna površina
++Name[ca]=Escriptori
++Name[cs]=Pracovní plocha
++Name[csb]=Pùlt
++Name[cy]=Penbwrdd
++Name[de]=Arbeitsfläche
++Name[el]=Επιφάνεια εργασίας
++Name[eo]=Tabulo
++Name[es]=Escritorio
++Name[et]=Töölaud
++Name[eu]=Mahaigaina
++Name[fa]=رومیزی
++Name[fi]=Työpöytä
++Name[fo]=Skriviborð
++Name[fr]=Bureau
++Name[fy]=Buroblêd
++Name[ga]=Deasc
++Name[gl]=Escritorio
++Name[he]=שולחן עבודה
++Name[hi]=डेस्कटॉप
++Name[hr]=Radna površina
++Name[hsb]=Dźěłowy powjerch
++Name[hu]=Munkaasztal
++Name[is]=Skjáborð
++Name[ja]=デスクトップ
++Name[ka]=სამუშაო დაფა
++Name[kk]=Жұмыс үстелі
++Name[km]=ផ្ទៃតុ
++Name[ko]=데스크톱
++Name[lo]=ພື້ນທີ່ເຮັດວງກ
++Name[lt]=Darbastalis
++Name[lv]=Darbvirsma
++Name[mk]=Работна површина
++Name[mn]=Ажлын тавцан
++Name[ms]=Ruang Kerja
++Name[nb]=Skrivebord
++Name[nds]=Schriefdisch
++Name[ne]=डेस्कटप
++Name[nl]=Bureaublad
++Name[nn]=Skrivebord
++Name[oc]=BurèU
++Name[pa]=ਵੇਹੜਾ
++Name[pl]=Pulpit
++Name[pt]=Ambiente de Trabalho
++Name[pt_BR]=Área de Trabalho
++Name[ru]=Рабочий стол
++Name[rw]=Ibiro
++Name[se]=Čállinbeavdi
++Name[sk]=Plocha
++Name[sl]=Namizje
++Name[sr]=Радна површина
++Name[sr@Latn]=Radna površina
++Name[ss]=Desktop
++Name[sv]=Skrivbord
++Name[ta]=மேல்மேசை
++Name[te]=రంగస్ఠలం
++Name[tg]=Мизи корӣ
++Name[th]=พื้นที่ทำงาน
++Name[tr]=Masaüstü
++Name[tt]=Östäl
++Name[uk]=Стільниця
++Name[uz]=Ish stoli
++Name[uz@cyrillic]=Иш столи
++Name[ven]=Desikithopo
++Name[vi]=Màn hình nền
++Name[wa]=Sicribanne
++Name[zh_CN]=桌面
++Name[zh_TW]=桌面
++Icon=desktop
++Comment=Desktop
++Comment[af]=Werkskerm
++Comment[ar]=سطح المكتب
++Comment[be]=Працоўны стол
++Comment[bg]=Работен плот
++Comment[bn]=ডেস্কটপ
++Comment[br]=Burev
++Comment[ca]=Escriptori
++Comment[cs]=Pracovní plocha
++Comment[csb]=Pùlt
++Comment[cy]=Penbwrdd
++Comment[de]=KDE-Arbeitsfläche
++Comment[el]=Επιφάνεια εργασίας
++Comment[eo]=KDEa labortablo
++Comment[es]=Escritorio
++Comment[et]=Töölaud
++Comment[eu]=Mahaigaina
++Comment[fa]=رومیزی
++Comment[fi]=Työpöytä
++Comment[fr]=Bureau
++Comment[fy]=Buroblêd
++Comment[ga]=Deasc
++Comment[gl]=Escritorio
++Comment[he]=שולחן העבודה
++Comment[hr]=Radna površina
++Comment[hu]=Munkaasztal
++Comment[is]=Skjáborð
++Comment[ja]=デスクトップ
++Comment[ka]=სამუშაო დაფა
++Comment[kk]=Үстел
++Comment[km]=ផ្ទៃតុ
++Comment[ko]=데스크톱
++Comment[lt]=Darbastalis
++Comment[mk]=Работна површина
++Comment[nb]=Skrivebord
++Comment[nds]=Schriefdisch
++Comment[ne]=डेस्कटप
++Comment[nl]=Bureaublad
++Comment[nn]=Skrivebord
++Comment[pa]=ਵੇਹੜਾ
++Comment[pl]=Pulpit
++Comment[pt]=Ecrã
++Comment[pt_BR]=Área de Trabalho
++Comment[ru]=Рабочий стол
++Comment[se]=Čállinbeavdi
++Comment[sk]=Pracovná plocha
++Comment[sl]=Namizje
++Comment[sr]=Радна површина
++Comment[sr@Latn]=Radna površina
++Comment[sv]=Skrivbord
++Comment[te]=రంగస్థలం
++Comment[tg]=Мизи корӣ
++Comment[th]=พื้นที่หน้าจอ
++Comment[tr]=Masaüstü
++Comment[uk]=Стільниця
++Comment[uz]=Ish stoli
++Comment[uz@cyrillic]=Иш столи
++Comment[vi]=Màn hình nền
++Comment[wa]=Sicribanne
++Comment[zh_CN]=桌面
++Comment[zh_TW]=桌面
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,170 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Utilities
++Name[af]=Nutsprogramme
++Name[ar]=عدة التشغيل
++Name[az]=Tə'minatlar
++Name[be]=Службовыя праграмы
++Name[bg]=Инструменти
++Name[bn]=আনুষঙ্গিক
++Name[br]=Mavegoù
++Name[bs]=Korisni programi
++Name[ca]=Utilitats
++Name[cs]=Nástroje
++Name[csb]=Nôrzãdza
++Name[cy]=Defnyddioldebau
++Name[da]=Redskaber
++Name[de]=Dienstprogramme
++Name[el]=Εργαλεία
++Name[eo]=Utilaĵoj
++Name[es]=Utilidades
++Name[et]=Utiliidid
++Name[eu]=Tresnak
++Name[fa]=برنامه‌های سودمند
++Name[fi]=Apuohjelmat
++Name[fo]=Hentleikar
++Name[fr]=Utilitaires
++Name[fy]=Helpmiddelen
++Name[ga]=Uirlisí
++Name[gl]=Utilidades
++Name[he]=כלים
++Name[hi]=यूटिलिटीज़
++Name[hr]=Alati
++Name[hsb]=Pomocniki
++Name[hu]=Segédprogramok
++Name[is]=Nytjatól
++Name[it]=Accessori
++Name[ja]=ユーティリティ
++Name[ka]=ხელსაწყოები
++Name[kk]=Утилиталары
++Name[km]=ឧបករណ៍
++Name[ko]=유틸리티
++Name[lo]=ໃຊ້ປະໂຫຍດ
++Name[lt]=Pagalbininkai
++Name[lv]=Utilītas
++Name[mk]=Алатки
++Name[mn]=Хэрэгсэл програмууд
++Name[ms]=Utiliti
++Name[mt]=Utilitajiet
++Name[nb]=Verktøy
++Name[nds]=Warktüüch
++Name[ne]=युटिलिटी
++Name[nl]=Hulpmiddelen
++Name[nn]=Verktøy
++Name[nso]=Didiriswa
++Name[oc]=Utilitats
++Name[pa]=ਸਹੂਲਤ
++Name[pl]=Narzędzia
++Name[pt]=Utilitários
++Name[pt_BR]=Utilitários
++Name[ro]=Utilitare
++Name[ru]=Служебные
++Name[rw]=Nkemurabibazo
++Name[se]=Reaiddut
++Name[sk]=Nástroje
++Name[sl]=Potrebščine
++Name[sr]=Алати
++Name[sr@Latn]=Alati
++Name[ss]=Kwekusetjentiswa
++Name[sv]=Verktyg
++Name[ta]=கருவிகள்
++Name[te]=సౌలభ్యాలు
++Name[tg]=Лавозимот
++Name[th]=โปรแกรมอรรถประโยชน์
++Name[tr]=Yardımcı Programlar
++Name[tt]=Faydalıq
++Name[uk]=Утиліти
++Name[uz]=Vositalar
++Name[uz@cyrillic]=Воситалар
++Name[ven]=Zwishumiswa
++Name[vi]=Các tiện ích
++Name[wa]=Usteyes
++Name[xh]=Izinto eziluncedo
++Name[zh_CN]=实用工具
++Name[zh_TW]=實用工具
++Name[zu]=Izisebenzi
++Icon=package_utilities
++Comment=Utilities
++Comment[af]=Nutsprogramme
++Comment[ar]=عدّة التشغيل
++Comment[az]=Tə'minatlar
++Comment[be]=Службовыя праграмы
++Comment[bg]=Помощни програми
++Comment[bn]=প্রায়শই কাজে লাগে এমন কিছু প্রোগ্রাম
++Comment[br]=Mavegoù
++Comment[bs]=Korisni programi
++Comment[ca]=Utilitats
++Comment[cs]=Nástroje
++Comment[csb]=Nôrzãdza
++Comment[cy]= Defnyddioldebau
++Comment[da]=Redskaber
++Comment[de]=Dienstprogramme
++Comment[el]=Εργαλεία
++Comment[eo]=Utilaĵoj
++Comment[es]=Utilidades
++Comment[et]=Utiliidid
++Comment[eu]=Tresnak
++Comment[fa]=برنامه‌های سودمند
++Comment[fi]=Apuohjelmat
++Comment[fo]=Hentleikar
++Comment[fr]=Utilitaires
++Comment[fy]=Helpmiddelen
++Comment[ga]=Uirlisí
++Comment[gl]=Utilidades
++Comment[he]=כלים
++Comment[hi]=यूटिलिटीज़
++Comment[hr]=Alati
++Comment[hsb]=Pomocne programy
++Comment[hu]=Segédprogramok
++Comment[is]=Ýmis nytsamleg áhöld
++Comment[it]=Accessori
++Comment[ja]=ユーティリティ
++Comment[ka]=ხელსაწყოები
++Comment[kk]=Утилиталары
++Comment[km]=ឧបករណ៍
++Comment[ko]=유틸리티
++Comment[lo]=ໂປຣແກຣມໃຊ້ໃຫ້ເປັນປະໂຫຍດ
++Comment[lt]=Pagalbininkai
++Comment[lv]=Utilītas
++Comment[mk]=Алатки
++Comment[mn]=Хэрэгсэл програмууд
++Comment[ms]=Utiliti
++Comment[mt]=Utilitajiet
++Comment[nb]=Verktøy
++Comment[nds]=Hülpprogrammen
++Comment[ne]=युटिलिटी
++Comment[nl]=Hulpmiddelen
++Comment[nn]=Verktøy
++Comment[nso]=Didiriswa
++Comment[oc]=Utilitats
++Comment[pa]=ਸਹੂਲਤ
++Comment[pl]=Narzędzia
++Comment[pt]=Utilitários
++Comment[pt_BR]=Utilitários
++Comment[ro]=Utilitare
++Comment[ru]=Различные утилиты
++Comment[rw]=Nkemurabibazo
++Comment[se]=Reaiddut
++Comment[sk]=Nástroje
++Comment[sl]=Potrebščine
++Comment[sr]=Алати
++Comment[sr@Latn]=Alati
++Comment[ss]=Kwekusetjentiswa
++Comment[sv]=Verktyg
++Comment[ta]=கருவிகள்
++Comment[te]=సౌలభ్యాలు
++Comment[tg]=Лавозимоти гуногун
++Comment[th]=โปรแกรมอรรถประโยชน์
++Comment[tr]=Yardımcı Programlar
++Comment[tt]=Faydalıqlar
++Comment[uk]=Утиліти
++Comment[uz]=Vositalar
++Comment[uz@cyrillic]=Воситалар
++Comment[ven]=Zwishumiswa
++Comment[vi]=Các tiện ích
++Comment[wa]=Usteyes
++Comment[xh]=Izinto eziluncedo
++Comment[zh_CN]=实用工具
++Comment[zh_TW]=實用工具
++Comment[zu]=Izisebenzi
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-file.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-file.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-file.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-file.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,139 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=File
++Name[af]=Lêer
++Name[ar]=الملف
++Name[be]=Файл
++Name[bg]=Файл
++Name[bn]=ফাইল
++Name[br]=Restr
++Name[bs]=Datoteka
++Name[ca]=Fitxer
++Name[cs]=Soubor
++Name[csb]=Lopk
++Name[cy]=Ffeil
++Name[da]=Fil
++Name[de]=Datei
++Name[el]=Αρχείο
++Name[eo]=Dosiero
++Name[es]=Archivo
++Name[et]=Fail
++Name[eu]=Fitxategia
++Name[fa]=پرونده
++Name[fi]=Tiedosto
++Name[fr]=Fichier
++Name[fy]=Triem
++Name[ga]=Comhad
++Name[gl]=Ficheiro
++Name[he]=קובץ
++Name[hr]=Datoteka
++Name[hu]=Fájl
++Name[id]=Berkas
++Name[is]=Skrá
++Name[ja]=ファイル
++Name[ka]=ფაილი
++Name[kk]=Файл
++Name[km]=ឯកសារ
++Name[ko]=파일
++Name[ku]=Pel
++Name[lt]=Byla
++Name[mk]=Датотека
++Name[ms]=Fail
++Name[nb]=Fil
++Name[nds]=Datei
++Name[ne]=फाइल
++Name[nl]=Bestand
++Name[nn]=Fil
++Name[pa]=ਫਾਇਲ
++Name[pl]=Plik
++Name[pt]=Ficheiro
++Name[pt_BR]=Arquivo
++Name[ro]=Fișier
++Name[ru]=Работа с файлами
++Name[rw]=Idosiye
++Name[se]=Fiila
++Name[sk]=Súbor
++Name[sl]=Datoteke
++Name[sr]=Фајл
++Name[sr@Latn]=Fajl
++Name[sv]=Fil
++Name[te]=దస్త్రం
++Name[tg]=Файл
++Name[th]=แฟ้ม
++Name[tr]=Dosya
++Name[uk]=Файл
++Name[uz]=Fayl
++Name[uz@cyrillic]=Файл
++Name[vi]=Tập tin
++Name[wa]=Fitchî
++Name[zh_CN]=文件
++Name[zh_TW]=檔案
++Icon=kfm
++Comment=File
++Comment[af]=Lêer
++Comment[ar]=الملف
++Comment[be]=Файл
++Comment[bg]=Файл
++Comment[bn]=ফাইল
++Comment[br]=Restr
++Comment[bs]=Datoteka
++Comment[ca]=Fitxer
++Comment[cs]=Soubor
++Comment[csb]=Lopk
++Comment[cy]=Ffeil
++Comment[da]=Fil
++Comment[de]=Datei
++Comment[el]=Αρχείο
++Comment[eo]=Dosiero
++Comment[es]=Archivo
++Comment[et]=Fail
++Comment[eu]=Fitxategia
++Comment[fa]=پرونده
++Comment[fi]=Tiedosto
++Comment[fr]=Fichier
++Comment[fy]=Triem
++Comment[ga]=Comhad
++Comment[gl]=Ficheiro
++Comment[he]=קובץ
++Comment[hr]=Datoteka
++Comment[hu]=Fájl
++Comment[id]=Berkas
++Comment[is]=Skrá
++Comment[ja]=ファイル
++Comment[ka]=ფაილი
++Comment[kk]=Файл
++Comment[km]=ឯកសារ
++Comment[ko]=글꼴 파일
++Comment[ku]=Pel
++Comment[lt]=Byla
++Comment[mk]=Датотека
++Comment[ms]=Fail
++Comment[nb]=Fil
++Comment[nds]=Datei
++Comment[ne]=फाइल
++Comment[nl]=Bestand
++Comment[nn]=Fil
++Comment[pa]=ਫਾਇਲ
++Comment[pl]=Plik
++Comment[pt]=Ficheiro
++Comment[pt_BR]=Arquivo
++Comment[ro]=Fișier
++Comment[ru]=Работа с файлами
++Comment[se]=Fiila
++Comment[sk]=Súbor
++Comment[sl]=Datoteke
++Comment[sr]=Фајл
++Comment[sr@Latn]=Fajl
++Comment[sv]=Fil
++Comment[te]=దస్త్రం
++Comment[tg]=Файл
++Comment[th]=แฟ้ม
++Comment[tr]=Dosya
++Comment[uk]=Файл
++Comment[uz]=Fayl
++Comment[uz@cyrillic]=Файл
++Comment[vi]=Tập tin
++Comment[wa]=Fitchî
++Comment[zh_CN]=文件
++Comment[zh_TW]=檔案
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-peripherals.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-peripherals.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-peripherals.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-peripherals.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,149 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=Peripherals
++Name[af]=Randapperatuur
++Name[ar]=الأجهزة المحيطية
++Name[az]=Avadanlıq
++Name[be]=Перыферыя
++Name[bg]=Периферия
++Name[bn]=পেরিফেরাল
++Name[br]=Trobarzhelloù
++Name[bs]=Vanjski uređaji
++Name[ca]=Perifèrics
++Name[cs]=Periférie
++Name[csb]=Periferëjné ùrzãdzenia
++Name[cy]=Perifferolion
++Name[da]=Tilkoblinger
++Name[de]=Angeschlossene Geräte
++Name[el]=Περιφερειακά
++Name[eo]=Periferaĵoj
++Name[es]=Periféricos
++Name[et]=Välisseadmed
++Name[eu]=Periferikoak
++Name[fa]=وسایل جانبی
++Name[fi]=Laitteet
++Name[fo]=Úteindir
++Name[fr]=Périphériques
++Name[fy]=Râneapparaten
++Name[ga]=Forimeallaigh
++Name[gl]=Periféricos
++Name[he]=ציוד היקפי
++Name[hi]=सहायक पुरजे
++Name[hr]=Periferni uređaji
++Name[hsb]=Periferija
++Name[hu]=Perifériák
++Name[is]=Jaðartæki
++Name[it]=Periferiche
++Name[ja]=周辺機器
++Name[ka]=პერიფერიული
++Name[kk]=Периферия
++Name[km]=គ្រឿង​កុំព្យូទ័រ
++Name[ko]=주변 장치
++Name[lo]=ອຸປະກອນຕໍ່ພວງ
++Name[lt]=Periferija
++Name[lv]=Perifērija
++Name[mk]=Периферни уреди
++Name[mn]=Залгаатай төхөөрөмжүүд
++Name[ms]=Perkakasan
++Name[mt]=Apparat
++Name[nb]=Tilleggsenheter
++Name[nds]=Reedschappen
++Name[ne]=परिवृत्तीय
++Name[nl]=Randapparaten
++Name[nn]=Tilleggseiningar
++Name[nso]=Ditswelantle
++Name[oc]=Periferics
++Name[pa]=ਸਹਾਇਕ ਜੰਤਰ
++Name[pl]=Urządzenia peryferyjne
++Name[pt]=Periféricos
++Name[pt_BR]=Periféricos
++Name[ro]=Periferice
++Name[ru]=Периферия
++Name[rw]=Ibyinyuma
++Name[se]=Ovttadagat
++Name[sk]=Periférie
++Name[sl]=Strojni dodatki
++Name[sr]=Периферије
++Name[sr@Latn]=Periferije
++Name[ss]=Ema-peripherals
++Name[sv]=Kringutrustning
++Name[ta]=கருவிகள்
++Name[te]=పరికరాలు
++Name[tg]=Дастгоҳҳои лозимӣ
++Name[th]=อุปกรณ์ต่อพ่วง
++Name[tr]=Çevre Birimleri
++Name[tt]=Cıhazlar
++Name[uk]=Периферійні пристрої
++Name[uz]=Ulangan uskunalar
++Name[uz@cyrillic]=Уланган ускуналар
++Name[ven]=Dzipheriferala
++Name[vi]=Thiết bị ngoại vi
++Name[wa]=Periferikes
++Name[xh]=Iilayini zomda
++Name[zh_CN]=外设
++Name[zh_TW]=週邊設備
++Name[zu]=Imixhantela
++Icon=input_devices_settings
++Comment=Peripherals
++Comment[af]=Randapparatuur
++Comment[be]=Перыферыя
++Comment[bg]=Периферия
++Comment[bn]=পেরিফেরাল
++Comment[br]=Trobarzhelloù
++Comment[bs]=Vanjski uređaji
++Comment[ca]=Perifèrics
++Comment[cs]=Periférie
++Comment[csb]=Periferëjné ùrzãdzenia
++Comment[cy]=Perifferolion
++Comment[da]=Tilkoblinger
++Comment[de]=Angeschlossene Geräte
++Comment[el]=Περιφερειακά
++Comment[eo]=Periferaĵoj
++Comment[es]=Periféricos
++Comment[et]=Välisseadmed
++Comment[eu]=Periferikoak
++Comment[fa]=وسایل جانبی
++Comment[fi]=Oheislaitteet
++Comment[fr]=Périphériques
++Comment[fy]=Râneapparaten
++Comment[ga]=Forimeallaigh
++Comment[gl]=Periféricos
++Comment[he]=ציוד היקפי
++Comment[hr]=Periferni uređaji
++Comment[hu]=Perifériák
++Comment[is]=Jaðartæki
++Comment[it]=Periferiche
++Comment[ja]=周辺機器
++Comment[kk]=Периферия
++Comment[km]=គ្រឿង​កុំព្យូទ័រ
++Comment[ko]=주변 장치
++Comment[mk]=Периферни уреди
++Comment[ms]=Persisian
++Comment[nb]=Tikoblede enheter
++Comment[nds]=Reedschappen
++Comment[ne]=परिवृतिय
++Comment[nl]=Randapparaten
++Comment[nn]=Tilleggseiningar
++Comment[pa]=ਜੰਤਰ
++Comment[pl]=Urządzenia peryferyjne
++Comment[pt]=Periféricos
++Comment[pt_BR]=Periféricos
++Comment[ro]=Periferice
++Comment[ru]=Периферия
++Comment[sk]=Periférie
++Comment[sl]=Strojni dodatki
++Comment[sr]=Периферије
++Comment[sr@Latn]=Periferije
++Comment[sv]=Kringutrustning
++Comment[te]=పరికరాలు
++Comment[tg]=Дастгоҳҳои лозимӣ
++Comment[th]=อุปกรณ์ต่อพ่วง
++Comment[tr]=Çevre Birimleri
++Comment[uk]=Периферійні
++Comment[uz]=Ulangan uskunalar
++Comment[uz@cyrillic]=Уланган ускуналар
++Comment[vi]=Thiết bị ngoại vi
++Comment[wa]=Éndjins
++Comment[zh_CN]=外设
++Comment[zh_TW]=週邊設備
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-pim.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-pim.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-pim.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-pim.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,45 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=PIM
++Name[ar]=مدبِر المعلومات الشخصي
++Name[be]=Кіраўнік персанальнай інфармацыі
++Name[bn]=পি-আই-এম
++Name[csb]=Priwatnô wëdowiédzô
++Name[eo]=PCI
++Name[he]=ניהול מידע אישי
++Name[ne]=पी आई एम
++Name[pl]=Informacje osobiste
++Name[ro]=Manager de Informații Personale
++Name[ru]=Персональная информация
++Name[se]=Peršuvnnalaš diehtogieđahalli
++Name[sl]=Osebni podatki
++Name[sv]=Personlig information
++Name[te]=పిఐఎం
++Name[th]=ตัวจัดการข้อมูลส่วนตัว
++Name[uk]=Керування інформацією
++Name[zh_CN]=个人信息管理
++Icon=korganizer
++Comment=PIM
++Comment[af]=Persoonlike Informasie Bestuurder
++Comment[ar]=مدبر المعلومات الشخصي
++Comment[be]=Кіраўнік персанальнай інфармацыі
++Comment[bn]=পি-আই-এম
++Comment[csb]=Sprôwianie priwatną wëdowiédzą
++Comment[de]=Persönliches Informationsmanagement
++Comment[eo]=PCI
++Comment[fy]=Persoanlike Ynformaasje Behear
++Comment[he]=ניהול מידע אישי
++Comment[kk]=Дербес ақпарат менеджері
++Comment[ne]=पी आई एम
++Comment[nl]=Persoonlijke Informatie Management
++Comment[pl]=Zarządzanie informacjami osobistymi
++Comment[ro]=Manager de Informații Personale
++Comment[ru]=Управление личной информацией (PIM)
++Comment[se]=Peršuvnnalaš diehtogieđahalli
++Comment[sl]=Osebni podatki
++Comment[sv]=Personlig informationshantering
++Comment[te]=పిఐఎం
++Comment[th]=สำหรับจัดการข้อมูลส่วนตัว เช่น เบอร์โทรศัพท์, ที่อยู่
++Comment[uk]=Керування особистою інформацією (PIM)
++Comment[zh_CN]=个人信息管理
+diff -Nuar trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-xutils.directory trinity-tdebase-3.5.13.2/applnk/tde-utilities-xutils.directory
+--- trinity-tdebase-3.5.13.2/applnk.ORI/tde-utilities-xutils.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdebase-3.5.13.2/applnk/tde-utilities-xutils.directory 2013-07-28 15:47:19.321022719 +0200
+@@ -0,0 +1,166 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Directory
++Name=X-Utilities
++Name[ar]=عدة X
++Name[az]=X Tə'minatları
++Name[be]=Службовыя праграмы X
++Name[bg]=Инструменти за X
++Name[bn]=এক্স-উইটিলিটি
++Name[br]=Mavegoù X
++Name[ca]=Utilitats de X
++Name[cs]=Nástroje X
++Name[csb]=X - nôrzãdza
++Name[cy]=Defnyddioldebau-X
++Name[da]=X-Redskaber
++Name[de]=X-Dienstprogramme
++Name[el]=Εργαλεία-X
++Name[eo]=X-Utilaĵoj
++Name[es]=Utilidades-X
++Name[et]=X'i utiliidid
++Name[eu]=X-tresnak
++Name[fa]=برنامه‌های سودمند X
++Name[fi]=X-Apuohjelmat
++Name[fo]=Hentleikar til X
++Name[fr]=Utilitaires X
++Name[fy]=Grafyske helpprogramma's
++Name[ga]=Uirlisí X
++Name[gl]=Utilidades das X
++Name[he]=כלי X
++Name[hi]=एक्स-यूटिलिटीज़
++Name[hr]=X-alati
++Name[hsb]=Pomocniki za X
++Name[hu]=X segédprogramok
++Name[is]=X Tól
++Name[it]=Programmi di X
++Name[ja]=X-ユーティリティ
++Name[ka]= X-ხელსაწყოები
++Name[kk]=X-утилиталар
++Name[km]=ឧបករណ៍-X
++Name[ko]=X 유틸리티
++Name[lo]=ໃຊ້ປະໂຫຍດ์ X
++Name[lt]=X pagalbininkai
++Name[lv]=X Utilītas
++Name[mk]=X-алатки
++Name[mn]=X-Хэрэгслүүд
++Name[ms]=Utiliti X
++Name[mt]=Utilitajiet tal-X
++Name[nb]=X-verktøy
++Name[nds]=X-Warktüüch
++Name[ne]=X-युटिलिटी
++Name[nl]=Grafische hulpprogramma's
++Name[nn]=X-verktøy
++Name[nso]=X-Didiriswa
++Name[pa]=X-ਸਹੂਲਤ
++Name[pl]=Narzędzia dla X
++Name[pt]=Utilitários do X
++Name[pt_BR]=Utilitários X
++Name[ro]=Utilitare X
++Name[ru]=Утилиты X
++Name[rw]=X-Nkemurabibazo
++Name[se]=X-reaiddut
++Name[sk]=Nastroje pre X
++Name[sl]=Potrebščine za X
++Name[sr]=X-алати
++Name[sr@Latn]=X-alati
++Name[ss]=Kwekusetjentiswa-X
++Name[sv]=X-verktyg
++Name[ta]=X-கருவிகள்
++Name[te]=ఎక్స్-సౌలభ్యాలు
++Name[tg]=Лавозимотҳои X
++Name[th]=โปรแกรมอรรถประโยชน์ X
++Name[tr]=X Yardımcı Programları
++Name[tt]=X-Faydalıq
++Name[uk]=Утиліти X Window
++Name[uz]=X uchun vositalar
++Name[uz@cyrillic]=X учун воситалар
++Name[ven]=Zwishumiswa-X
++Name[vi]=Tiện ích X
++Name[wa]=Usteyes X
++Name[xh]=Izinto eziluncedo ze-X
++Name[zh_CN]=X 实用工具
++Name[zh_TW]=X-實用工具
++Name[zu]=Izisebenzi ze-X
++Icon=xapp
++Comment=X Window Utilities
++Comment[af]=X Window Nutsprogramme
++Comment[ar]=عدة نوافذ X
++Comment[az]=X Window Tə'minatları
++Comment[be]=Службовыя праграмы X Window
++Comment[bg]=Помощни програми за сървъра X
++Comment[bn]=এক্স উইণ্ডো সিস্টেম সম্বন্ধিত নানা প্রোগ্রাম
++Comment[br]=Mavegoù X Window
++Comment[bs]=Korisni X Window programi
++Comment[ca]=Utilitats de X Window System
++Comment[cs]=Nástroje X Window
++Comment[csb]=Nôrzãdza dlô systemë X Window
++Comment[cy]=Defnyddioldebau Ffenestr X
++Comment[da]=X-Window redskaber
++Comment[de]=X-Window-Dienstprogramme
++Comment[el]=Εργαλεία των X Windows
++Comment[eo]=Utilaĵoj por la X-Fenestrosistemo
++Comment[es]=Utilidades X Window
++Comment[et]=X Window utiliidid
++Comment[eu]=X Window tresnak
++Comment[fa]=برنامه‌های سودمند پنجرۀ X
++Comment[fi]=X Window -apuohjelmat
++Comment[fo]=Hentleikar til X
++Comment[fr]=Utilitaires X-Window
++Comment[fy]=X Window-helpprogramma's
++Comment[ga]=Uirlisí Fuinneoga X
++Comment[gl]=Utilidades das X Window
++Comment[he]=כלים של X Window
++Comment[hi]=एक्स विंडो यूटिलिटीज़
++Comment[hr]=Alati X prozora
++Comment[hsb]=Pomocne programy za X11
++Comment[hu]=X Window segédprogramok
++Comment[is]=X gluggatól
++Comment[it]=Programmi di X Window
++Comment[ja]=X ウィンドウユーティリティ
++Comment[ka]=X Window–ს ხელსაწყოები
++Comment[kk]=X Window утилиталары
++Comment[km]=ឧបករណ៍ X Window
++Comment[ko]=X 윈도 유틸리티
++Comment[lo]=ໂປຣແກຣມໃຊ້ໂຫຍດຂອງ X
++Comment[lt]=X Window pagalbininkai
++Comment[lv]=X logu utilītas
++Comment[mk]=Алатки за X Window
++Comment[mn]=X-Виндов-хэрэгсэл програмууд
++Comment[ms]=Utiliti Tetingkap X
++Comment[mt]=Utilitajiet tal-XWindows
++Comment[nb]=Verktøy for X-window
++Comment[nds]=Hülpprogrammen för X-Finstern
++Comment[ne]=X सञ्झ्याल युटिलिटी
++Comment[nl]=X Window-hulpprogramma's
++Comment[nn]=X Window-verktøy
++Comment[nso]=Didiriswa tsa X Window
++Comment[pa]=X Window ਸਹੂਲਤਾਂ
++Comment[pl]=Narzędzia dla systemu XWindow
++Comment[pt]=Utilitários do X Window
++Comment[pt_BR]=Utilitários do X Window
++Comment[ro]=Utilitare X Window
++Comment[ru]=Утилиты X Window
++Comment[rw]=Nkemurabibazo Idirishya X
++Comment[se]=X Window-reaiddut
++Comment[sk]=Nástroje pre X Window
++Comment[sl]=Potrebščine za X Window
++Comment[sr]=X Window алати
++Comment[sr@Latn]=X Window alati
++Comment[ss]=X kwekusetjentiswa kweliwindi
++Comment[sv]=X-window-verktyg
++Comment[ta]=X-சாளர கருவிகள்
++Comment[te]=ఎక్స్ విండో సౌలభ్యాలు
++Comment[tg]=Лавозимотҳои Х Window
++Comment[th]=โปรแกรมอรรถประโยชน์ของ X
++Comment[tr]=X Yardımcı Programları
++Comment[tt]=X Window Faydalığı
++Comment[uk]=Утиліти системи X Window
++Comment[uz]=X Windows vositalari
++Comment[uz@cyrillic]=X Windows воситалари
++Comment[ven]=Zwishumiswa zwa X window
++Comment[vi]=Các tiện ích của X window
++Comment[wa]=Usteyes pol sistinme grafike X11
++Comment[xh]=X Windows Izinto eziluncedo
++Comment[zh_CN]=X Window 实用工具
++Comment[zh_TW]=X 視窗實用工具
++Comment[zu]=Izisebenzi ze-X Window
diff --git a/redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch b/redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
new file mode 100644
index 000000000..1926ad62a
--- /dev/null
+++ b/redhat/tdebase/tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
@@ -0,0 +1,136 @@
+--- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI 2013-07-22 19:33:45.153674930 +0200
++++ tdebase/kcontrol/input/xcursor/themepage.cpp 2013-07-23 15:24:01.664497762 +0200
+@@ -33,6 +33,8 @@
+ #include <kio/netaccess.h>
+ #include <ktar.h>
+
++#include "../../krdb/krdb.h"
++
+ #include <tqlayout.h>
+ #include <tqdir.h>
+ #include <tqpixmap.h>
+@@ -42,6 +44,7 @@
+ #include <tqpainter.h>
+ #include <tqfileinfo.h>
+ #include <tqpushbutton.h>
++#include <dcopref.h>
+
+ #include <cstdlib> // for getenv()
+
+@@ -53,6 +56,10 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xcursor/Xcursor.h>
+
++#ifdef HAVE_XFIXES
++# include <X11/extensions/Xfixes.h>
++#endif
++
+ // Check for older version
+ #if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR)
+ # define XCURSOR_LIB_MAJOR XCURSOR_MAJOR
+@@ -133,6 +140,65 @@
+ {
+ }
+
++bool ThemePage::applyTheme(TQString theme, TQString size)
++{
++#ifdef HAVE_XCURSOR
++ if (theme.isEmpty()) {
++ return false;
++ }
++
++ // Apply the TDE cursor theme to ourselves
++ XcursorSetTheme(qt_xdisplay(), theme.latin1());
++
++ // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
++ // variables when launching applications.
++ DCOPRef klauncher("klauncher");
++ klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
++ if( !size.isEmpty()) {
++ klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
++ }
++
++ // Update the Xcursor X resources
++ runRdb(0);
++
++ // Apply the TDE cursor size to ourselves
++ if (!size.isEmpty()) {
++ XcursorSetDefaultSize(qt_xdisplay(), size.toUInt());
++ }
++
++ // Reload the standard cursors
++ TQStringList names;
++
++ // Qt cursors
++ names << "left_ptr" << "up_arrow" << "cross" << "wait"
++ << "left_ptr_watch" << "ibeam" << "size_ver" << "size_hor"
++ << "size_bdiag" << "size_fdiag" << "size_all" << "split_v"
++ << "split_h" << "pointing_hand" << "openhand"
++ << "closedhand" << "forbidden" << "whats_this" << "copy" << "move" << "link";
++
++ // X core cursors
++ names << "X_cursor" << "right_ptr" << "hand1"
++ << "hand2" << "watch" << "xterm"
++ << "crosshair" << "left_ptr_watch" << "center_ptr"
++ << "sb_h_double_arrow" << "sb_v_double_arrow" << "fleur"
++ << "top_left_corner" << "top_side" << "top_right_corner"
++ << "right_side" << "bottom_right_corner" << "bottom_side"
++ << "bottom_left_corner" << "left_side" << "question_arrow"
++ << "pirate";
++
++ for (int i = 0; i < names.size(); ++i)
++ {
++ const char* name = (*(names.at(i))).ascii();
++ Cursor handle = XcursorLibraryLoadCursor(qt_xdisplay(), name);
++ XFixesChangeCursorByName(qt_xdisplay(), handle, TQFile::encodeName(name));
++ XFreeCursor(qt_xdisplay(), handle); // Don't leak the cursor
++ }
++
++ return true;
++#else // HAVE_XCURSOR
++ return false;
++#endif
++}
+
+ void ThemePage::save()
+ {
+@@ -145,10 +209,17 @@
+ c.setGroup( "Mouse" );
+ c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
+
+- KMessageBox::information( this, i18n("You have to restart KDE for these "
++ // The Kcontrol panel does not allow to set cursor size for now.
++ // So we keep the same size as written in config file.
++ TQCString size = c.readEntry("cursorSize", TQString()).local8Bit();
++
++ if (!applyTheme(selectedTheme, size))
++ {
++ KMessageBox::information( this, i18n("You have to restart KDE for these "
+ "changes to take effect."), i18n("Cursor Settings Changed"),
+ "CursorSettingsChanged" );
+-
++ }
++
+ currentTheme = selectedTheme;
+ }
+
+--- tdebase/kcontrol/input/xcursor/themepage.h.ORI 2013-07-22 19:49:33.467191658 +0200
++++ tdebase/kcontrol/input/xcursor/themepage.h 2013-07-22 19:56:03.990484896 +0200
+@@ -45,6 +45,7 @@
+ void load();
+ void load( bool useDefaults );
+ void defaults();
++ bool applyTheme(TQString theme, TQString size);
+
+ signals:
+ void changed( bool );
+--- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI 2013-07-23 15:24:41.178064068 +0200
++++ tdebase/kcontrol/input/xcursor/CMakeLists.txt 2013-07-23 15:27:31.694851294 +0200
+@@ -21,5 +21,6 @@
+
+ tde_add_library( themepage STATIC_PIC AUTOMOC
+ SOURCES
+- themepage.cpp previewwidget.cpp
++ themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp
++ LINK Xfixes
+ )
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 3cd8e267a..d67aa015d 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,7 +25,7 @@
Name: trinity-tdebase
-Version: 3.5.13.2
+Version: %{tde_version}
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: Trinity Base Programs
@@ -77,27 +79,27 @@ Source8: tdm%{?dist}.pp
Source9: mgabutton.svg
%endif
-# TDE 3.5.13 patches
+# Patch party !
+
+# Permanent patches, all TDE versions
+## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
+Patch1: kdebase-3.5.12-desktop-openterminalhere.patch
+## [tdebase] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
+Patch2: kdebase-3.5.13.1-startkde_icon.patch
+## [tdebase/kcontrol] Adds FR translation for KCM ICC
+Patch3: tdebase-3.5.13.2-displayconfig_translation.patch
+## [tdebase/kicker] Adds default entries for Kickoff menu
+Patch4: tdebase-3.5.13.2-kickoff_default_favs.patch
+## [tdebase] Changes konsole default word separator
+Patch5: tdebase-14.0.0-konsole_wordseps.patch
+
+# Permanent patches, this TDE version only
+## [tdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE)
+Patch11: kdebase-3.5.13.1-fix_tdm_pid_file.patch
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box [RHEL/Fedora]
-Patch1: tdebase-3.5.13.2-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
-Patch2: kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
-Patch3: kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xdm/Xsession' [openSUSE]
-Patch4: kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
-Patch5: kdebase-3.5.13.1-startkde_icon.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
-Patch6: kdebase-3.5.12-kdm_hide_menu_button.patch
-## [kdebase/kdm] Fix PID file is 'tdm.pid' instead of 'kdm.pid' (needed for openSUSE)
-Patch7: kdebase-3.5.13.1-fix_tdm_pid_file.patch
-## [kdebase/kicker] Fixes for Kickoff menu
-Patch8: tdebase-3.5.13.2-kickoff_default_favs.patch
-## [kdebase/kcontrol] Adds FR translation for KCM ICC
-Patch9: tdebase-3.5.13.2-displayconfig_translation.patch
-
-Patch10: tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
+Patch12: tdebase-3.5.13.2-kdesu-noignorebutton.patch
+## [kdebase/applnk] Fix XDG menu to avoid KDE4 conflict
+Patch13: tdebase-3.5.13.2-fix_xdg_menu.patch
# Patches from Mandriva
Patch101: tdebase-3.5.13.2-vibrate_dialog.patch
@@ -107,21 +109,23 @@ Patch104: tdebase-3.5.13.2-kickoff_xdg_dirs.patch
Patch105: tdebase-3.5.13.2-suspend_unmount.patch
Patch106: tdebase-3.5.13.2-bookmark_global_copy.patch
+# Experimental patches
+Patch201: tdebase-3.5.13.2-kcm_xcursor_applytheme.patch
### Specific patches for RHEL4 (should not go upstream)
## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
-Patch201: kdebase-3.5.13-fix_lib_detection.patch
+Patch301: kdebase-3.5.13-fix_lib_detection.patch
## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
-Patch202: kdebase-3.5.13.2-build_without_dbustqt.patch
+Patch302: kdebase-3.5.13.2-build_without_dbustqt.patch
## [tdebase] Do not build against ConsoleKit
-Patch203: kdebase-3.5.13-build_without_consolekit.patch
+Patch303: kdebase-3.5.13-build_without_consolekit.patch
## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
-Patch204: kdebase-3.5.13.2-add_disable_composite_option.patch
+Patch304: kdebase-3.5.13.2-add_disable_composite_option.patch
## [tdebase] Downgrade halbackend to support Hal 0.4
-Patch205: kdebase-3.5.13-support_hal_04.patch
+Patch305: kdebase-3.5.13-support_hal_04.patch
## [tdebase] Other(s) FTBFS ...
-Patch206: kdebase-3.5.13-fix_rhel4_compilation.patch
+Patch306: kdebase-3.5.13-fix_rhel4_compilation.patch
### Distribution-specific settings ###
@@ -300,12 +304,12 @@ Requires: opensuse-manuals_en
%endif
BuildRequires: cmake >= 2.8
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
+BuildRequires: qt%{?_qt_suffix}-devel
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: make
-BuildRequires: qt%{?_qt_suffix}-devel
BuildRequires: openssl-devel
BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel
@@ -421,10 +425,10 @@ BuildRequires: nas-devel
%if 0%{?rhel} == 4
# Dbus bindings were rebuilt with Qt support
BuildRequires: dbus-devel >= 0.22-12.EL.9p1
-Requires: dbus-qt
+Requires: dbus-qt >= 0.22-12.EL.9p1
%else
-BuildRequires: trinity-dbus-tqt-devel
-Requires: trinity-dbus-tqt >= %{version}
+BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
+Requires: trinity-dbus-tqt >= %{tde_version}
%endif
%if 0%{?fedora} >= 17
@@ -439,7 +443,7 @@ BuildRequires: %{_lib}jack-devel
BuildRequires: jack-audio-connection-kit-devel
%endif
-# LIBART support
+# LIBART_LGPL support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
%define with_libart 1
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -542,9 +546,9 @@ Requires: trinity-libkonq = %{version}-%{release}
Requires: %{name}-libtqt3-integration = %{version}-%{release}
Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
-Requires: trinity-tqtinterface >= %{version}
-Requires: trinity-arts >= %{version}
-Requires: trinity-tdelibs >= %{version}
+Requires: trinity-tqtinterface >= %{tde_version}
+Requires: trinity-arts >= %{tde_version}
+Requires: trinity-tdelibs >= %{tde_version}
Requires: qt%{?_qt_suffix}
Requires: openssl
@@ -681,7 +685,7 @@ Such as the desktop right-click-"Create New" list
%{tde_datadir}/locale/l10n/*/entry.desktop
%{tde_datadir}/locale/l10n/*/flag.png
%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates
+%{tde_datadir}/templates/
%post runtime-data-common
for f in hicolor ; do
@@ -781,8 +785,8 @@ Some random features:
%{tde_tdelibdir}/kate.la
%{tde_tdelibdir}/kate.so
%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/lib[kt]deinit_kate.la
-%{tde_libdir}/lib[kt]deinit_kate.so
+%{tde_libdir}/libkdeinit_kate.la
+%{tde_libdir}/libkdeinit_kate.so
%{tde_tdeappdir}/kate.desktop
%{tde_datadir}/apps/kate/
%{tde_datadir}/apps/kconf_update/kate-2.4.upd
@@ -848,8 +852,8 @@ Kwrite is a text editor for TDE.
%{tde_bindir}/kwrite
%{tde_tdelibdir}/kwrite.la
%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/lib[kt]deinit_kwrite.la
-%{tde_libdir}/lib[kt]deinit_kwrite.so
+%{tde_libdir}/libkdeinit_kwrite.la
+%{tde_libdir}/libkdeinit_kwrite.so
%{tde_tdeappdir}/kwrite.desktop
%{tde_datadir}/apps/kwrite/kwriteui.rc
%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
@@ -939,8 +943,6 @@ plugdev group.
%{tde_tdelibdir}/kcm_fontinst.so
%{tde_tdelibdir}/kcm_fonts.la
%{tde_tdelibdir}/kcm_fonts.so
-#%{tde_tdelibdir}/kcm_hwmanager.la
-#%{tde_tdelibdir}/kcm_hwmanager.so
%{tde_tdelibdir}/kcm_icons.la
%{tde_tdelibdir}/kcm_icons.so
%{tde_tdelibdir}/kcm_info.la
@@ -953,8 +955,8 @@ plugdev group.
%{tde_tdelibdir}/kcm_joystick.so
%{tde_tdelibdir}/kcm_kded.la
%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_[kt]dm.la
-%{tde_tdelibdir}/kcm_[kt]dm.so
+%{tde_tdelibdir}/kcm_kdm.la
+%{tde_tdelibdir}/kcm_kdm.so
%{tde_tdelibdir}/kcm_kdnssd.so
%{tde_tdelibdir}/kcm_kdnssd.la
%{tde_tdelibdir}/kcm_keys.la
@@ -1017,10 +1019,10 @@ plugdev group.
%{tde_tdelibdir}/libkurisearchfilter.so
%{tde_tdelibdir}/liblocaldomainurifilter.la
%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/lib[kt]deinit_kaccess.la
-%{tde_libdir}/lib[kt]deinit_kaccess.so
-%{tde_libdir}/lib[kt]deinit_kcontrol.la
-%{tde_libdir}/lib[kt]deinit_kcontrol.so
+%{tde_libdir}/libkdeinit_kaccess.la
+%{tde_libdir}/libkdeinit_kaccess.so
+%{tde_libdir}/libkdeinit_kcontrol.la
+%{tde_libdir}/libkdeinit_kcontrol.so
%{tde_libdir}/libkfontinst.so.*
%{tde_tdeappdir}/arts.desktop
%{tde_tdeappdir}/background.desktop
@@ -1062,7 +1064,7 @@ plugdev group.
%{tde_tdeappdir}/kcmusb.desktop
%{tde_tdeappdir}/kcmview1394.desktop
%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/[kt]dm.desktop
+%{tde_tdeappdir}/kdm.desktop
%{tde_tdeappdir}/keys.desktop
%{tde_tdeappdir}/kfontview.desktop
%{tde_tdeappdir}/khtml_behavior.desktop
@@ -1193,7 +1195,7 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/krootbacking
#%{tde_bindir}/tdeinit_phase1
%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
+%attr(4511,root,root) %{tde_bindir}/kdmtsak
%{tde_bindir}/tsak
%endif
%{tde_bindir}/kdebugdialog
@@ -1209,8 +1211,8 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/kcminit
%{tde_bindir}/kcminit_startup
%{tde_bindir}/kdcop
-%{tde_bindir}/[kt]desu
-%attr(0755,root,root) %{tde_bindir}/[kt]desud
+%{tde_bindir}/kdesu
+%attr(0755,root,root) %{tde_bindir}/kdesud
%{tde_bindir}/kdialog
%{tde_bindir}/khotkeys
%{tde_bindir}/knetattach
@@ -1240,14 +1242,14 @@ TDE applications, particularly those in the TDE base module.
%{tde_tdelibdir}/khotkeys_arts.so
%{tde_tdelibdir}/kxkb.la
%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/lib[kt]deinit_kcminit.la
-%{tde_libdir}/lib[kt]deinit_kcminit.so
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
-%{tde_libdir}/lib[kt]deinit_khotkeys.la
-%{tde_libdir}/lib[kt]deinit_khotkeys.so
-%{tde_libdir}/lib[kt]deinit_kxkb.la
-%{tde_libdir}/lib[kt]deinit_kxkb.so
+%{tde_libdir}/libkdeinit_kcminit.la
+%{tde_libdir}/libkdeinit_kcminit.so
+%{tde_libdir}/libkdeinit_kcminit_startup.la
+%{tde_libdir}/libkdeinit_kcminit_startup.so
+%{tde_libdir}/libkdeinit_khotkeys.la
+%{tde_libdir}/libkdeinit_khotkeys.so
+%{tde_libdir}/libkdeinit_kxkb.la
+%{tde_libdir}/libkdeinit_kxkb.so
%{tde_libdir}/libkhotkeys_shared.so.*
%{tde_tdeappdir}/keyboard.desktop
%{tde_tdeappdir}/keyboard_layout.desktop
@@ -1268,7 +1270,7 @@ TDE applications, particularly those in the TDE base module.
%endif
%{tde_tdedocdir}/HTML/en/kdcop/
%{tde_tdedocdir}/HTML/en/kdebugdialog//
-%{tde_tdedocdir}/HTML/en/[kt]desu/
+%{tde_tdedocdir}/HTML/en/kdesu/
%{tde_tdedocdir}/HTML/en/knetattach/
%{tde_tdedocdir}/HTML/en/kxkb/
@@ -1376,7 +1378,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kdmconfig.png
%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
@@ -1576,17 +1578,11 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/sounds/
%{tde_datadir}/wallpapers/*
-%if "%{tde_prefix}" != "/usr"
-%{tde_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{tde_prefix}/etc/xdg/menus/kde-information.menu
-%{tde_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{tde_prefix}/etc/xdg/menus/kde-settings.menu
-%else
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%{_sysconfdir}/xdg/menus/kde-information.menu
-%{_sysconfdir}/xdg/menus/kde-screensavers.menu
-%{_sysconfdir}/xdg/menus/kde-settings.menu
-%endif
+# XDG directories information
+%{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
+%{_sysconfdir}/xdg/menus/tde-information.menu
+%{_sysconfdir}/xdg/menus/tde-screensavers.menu
+%{_sysconfdir}/xdg/menus/tde-settings.menu
%{tde_tdedocdir}/HTML/en/kcontrol/
%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
@@ -1796,7 +1792,6 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%postun tdeio-plugins
update-desktop-database %{tde_appdir} 2> /dev/null || :
-
##########
%package -n trinity-kdepasswd
@@ -1814,11 +1809,11 @@ system passwords.
%{tde_tdelibdir}/kcm_useraccount.so
%{tde_tdeappdir}/kcm_useraccount.desktop
%{tde_tdeappdir}/kdepasswd.desktop
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/*.png
+%exclude %{tde_datadir}/apps/kdm/pics/users/default1.png
+%exclude %{tde_datadir}/apps/kdm/pics/users/default2.png
+%exclude %{tde_datadir}/apps/kdm/pics/users/default3.png
+%exclude %{tde_datadir}/apps/kdm/pics/users/root1.png
+%{tde_datadir}/apps/kdm/pics/users/*.png
%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
@@ -1845,7 +1840,7 @@ Installation of smbclient will make you able to use smb shared printers.
%files -n trinity-tdeprint
%defattr(-,root,root,-)
-%{tde_bindir}/[kt]deprintfax
+%{tde_bindir}/kdeprintfax
%{tde_bindir}/kjobviewer
%{tde_bindir}/kprinter
%{tde_tdelibdir}/kcm_printmgr.la
@@ -1856,19 +1851,19 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_tdelibdir}/kjobviewer.so
%{tde_tdelibdir}/kprinter.la
%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/lib[kt]deprint_part.la
-%{tde_tdelibdir}/lib[kt]deprint_part.so
-%{tde_libdir}/lib[kt]deinit_kjobviewer.la
-%{tde_libdir}/lib[kt]deinit_kjobviewer.so
-%{tde_libdir}/lib[kt]deinit_kprinter.la
-%{tde_libdir}/lib[kt]deinit_kprinter.so
-%{tde_tdeappdir}/[kt]deprintfax.desktop
-%{tde_tdeappdir}/[kt]jobviewer.desktop
+%{tde_tdelibdir}/libkdeprint_part.la
+%{tde_tdelibdir}/libkdeprint_part.so
+%{tde_libdir}/libkdeinit_kjobviewer.la
+%{tde_libdir}/libkdeinit_kjobviewer.so
+%{tde_libdir}/libkdeinit_kprinter.la
+%{tde_libdir}/libkdeinit_kprinter.so
+%{tde_tdeappdir}/kdeprintfax.desktop
+%{tde_tdeappdir}/kjobviewer.desktop
%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/[kt]deprint/
-%{tde_datadir}/apps/[kt]deprintfax/
-%{tde_datadir}/apps/[kt]jobviewer/
-%{tde_datadir}/apps/[kt]deprint_part/kdeprint_part.rc
+%{tde_datadir}/apps/kdeprint/
+%{tde_datadir}/apps/kdeprintfax/
+%{tde_datadir}/apps/kjobviewer/
+%{tde_datadir}/apps/kdeprint_part/kdeprint_part.rc
%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
@@ -1885,7 +1880,7 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_datadir}/services/kdeprint_part.desktop
%{tde_datadir}/services/print.protocol
%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/[kt]deprint/
+%{tde_tdedocdir}/HTML/en/kdeprint/
%post -n trinity-tdeprint
/sbin/ldconfig || :
@@ -1932,8 +1927,8 @@ the TDE desktop.
%{tde_bindir}/kwebdesktop
%{tde_tdelibdir}/kdesktop.la
%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/lib[kt]deinit_kdesktop.la
-%{tde_libdir}/lib[kt]deinit_kdesktop.so
+%{tde_libdir}/libkdeinit_kdesktop.la
+%{tde_libdir}/libkdeinit_kdesktop.so
%{tde_datadir}/apps/kdesktop/
%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
%{tde_datadir}/autostart/kdesktop.desktop
@@ -2024,24 +2019,24 @@ already. Most users won't need this.
%defattr(-,root,root,-)
%{tde_tdelibdir}/kgreet_pam.la
%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen[kt]dmconf
-%{tde_bindir}/[kt]dm
-%{tde_bindir}/[kt]dm_config
-%{tde_bindir}/[kt]dmctl
-%{tde_bindir}/[kt]dm_greet
+%{tde_bindir}/genkdmconf
+%{tde_bindir}/kdm
+%{tde_bindir}/kdm_config
+%{tde_bindir}/kdmctl
+%{tde_bindir}/kdm_greet
%{tde_bindir}/krootimage
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo-crystal.png
-%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
-%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
-%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
-%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
-%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
-%{tde_datadir}/apps/[kt]dm/themes/
+%{tde_datadir}/apps/kdm/pics/kdelogo.png
+%{tde_datadir}/apps/kdm/pics/kdelogo-crystal.png
+%{tde_datadir}/apps/kdm/pics/shutdown.jpg
+%{tde_datadir}/apps/kdm/pics/users/default1.png
+%{tde_datadir}/apps/kdm/pics/users/default2.png
+%{tde_datadir}/apps/kdm/pics/users/default3.png
+%{tde_datadir}/apps/kdm/pics/users/root1.png
+%{tde_datadir}/apps/kdm/sessions/*.desktop
+%{tde_datadir}/apps/kdm/themes/
%{tde_datadir}/config/kdm
-%{_sysconfdir}/trinity/[kt]dm/
-%{tde_tdedocdir}/HTML/en/[kt]dm/
+%{_sysconfdir}/trinity/kdm/
+%{tde_tdedocdir}/HTML/en/kdm/
%if 0%{?suse_version} == 0
%{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np
@@ -2188,8 +2183,8 @@ documentation.
%{tde_bindir}/khelpcenter
%{tde_tdelibdir}/khelpcenter.la
%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/lib[kt]deinit_khelpcenter.la
-%{tde_libdir}/lib[kt]deinit_khelpcenter.so
+%{tde_libdir}/libkdeinit_khelpcenter.la
+%{tde_libdir}/libkdeinit_khelpcenter.so
%{tde_tdeappdir}/Help.desktop
%{tde_datadir}/apps/khelpcenter/
%{tde_datadir}/config.kcfg/khelpcenter.kcfg
@@ -2247,8 +2242,8 @@ functionality.
%{tde_tdelibdir}/kickermenu_find.so
%{tde_tdelibdir}/kickermenu_kate.so
%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.la
-%{tde_tdelibdir}/kickermenu_[kt]deprint.so
+%{tde_tdelibdir}/kickermenu_kdeprint.la
+%{tde_tdelibdir}/kickermenu_kdeprint.so
%{tde_tdelibdir}/kickermenu_konqueror.la
%{tde_tdelibdir}/kickermenu_konqueror.so
%{tde_tdelibdir}/kickermenu_konsole.la
@@ -2287,12 +2282,12 @@ functionality.
%{tde_tdelibdir}/trash_panelapplet.la
%{tde_tdelibdir}/trash_panelapplet.so
%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/lib[kt]deinit_appletproxy.la
-%{tde_libdir}/lib[kt]deinit_appletproxy.so
-%{tde_libdir}/lib[kt]deinit_extensionproxy.la
-%{tde_libdir}/lib[kt]deinit_extensionproxy.so
-%{tde_libdir}/lib[kt]deinit_kicker.la
-%{tde_libdir}/lib[kt]deinit_kicker.so
+%{tde_libdir}/libkdeinit_appletproxy.la
+%{tde_libdir}/libkdeinit_appletproxy.so
+%{tde_libdir}/libkdeinit_extensionproxy.la
+%{tde_libdir}/libkdeinit_extensionproxy.so
+%{tde_libdir}/libkdeinit_kicker.la
+%{tde_libdir}/libkdeinit_kicker.so
%{tde_libdir}/libkickermain.so.*
%{tde_libdir}/libtaskbar.so.*
%{tde_libdir}/libtaskmanager.so.*
@@ -2400,8 +2395,8 @@ web browser if the clipboard contains a URL.
%{tde_tdelibdir}/klipper.so
%{tde_tdelibdir}/klipper_panelapplet.la
%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/lib[kt]deinit_klipper.la
-%{tde_libdir}/lib[kt]deinit_klipper.so
+%{tde_libdir}/libkdeinit_klipper.la
+%{tde_libdir}/libkdeinit_klipper.so
%{tde_tdeappdir}/klipper.desktop
%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
@@ -2447,10 +2442,10 @@ structure.
%{tde_tdelibdir}/kcontroledit.so
%{tde_tdelibdir}/kmenuedit.la
%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/lib[kt]deinit_kcontroledit.la
-%{tde_libdir}/lib[kt]deinit_kcontroledit.so
-%{tde_libdir}/lib[kt]deinit_kmenuedit.la
-%{tde_libdir}/lib[kt]deinit_kmenuedit.so
+%{tde_libdir}/libkdeinit_kcontroledit.la
+%{tde_libdir}/libkdeinit_kcontroledit.so
+%{tde_libdir}/libkdeinit_kmenuedit.la
+%{tde_libdir}/libkdeinit_kmenuedit.so
%{tde_tdeappdir}/kmenuedit.desktop
%{tde_datadir}/applnk/System/kmenuedit.desktop
%{tde_datadir}/apps/kcontroledit/
@@ -2537,12 +2532,12 @@ ever launching another application.
%{tde_tdelibdir}/konqueror.so
%{tde_tdelibdir}/libkhtmlkttsdplugin.la
%{tde_tdelibdir}/libkhtmlkttsdplugin.so
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
-%{tde_libdir}/lib[kt]deinit_kfmclient.la
-%{tde_libdir}/lib[kt]deinit_kfmclient.so
-%{tde_libdir}/lib[kt]deinit_konqueror.la
-%{tde_libdir}/lib[kt]deinit_konqueror.so
+%{tde_libdir}/libkdeinit_keditbookmarks.la
+%{tde_libdir}/libkdeinit_keditbookmarks.so
+%{tde_libdir}/libkdeinit_kfmclient.la
+%{tde_libdir}/libkdeinit_kfmclient.so
+%{tde_libdir}/libkdeinit_konqueror.la
+%{tde_libdir}/libkdeinit_konqueror.so
%{tde_libdir}/libkonqsidebarplugin.so.*
%{tde_tdeappdir}/Home.desktop
%{tde_tdeappdir}/kcmhistory.desktop
@@ -2684,7 +2679,7 @@ Requires: %{name}-data = %{version}-%{release}
%description -n trinity-konsole
Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
+(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
better organize user's desktop by containing multiple sessions in a single
window (a less cluttered desktop).
@@ -2708,8 +2703,8 @@ Using Konsole, a user can open:
%{tde_tdelibdir}/konsole.so
%{tde_tdelibdir}/libkonsolepart.la
%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/lib[kt]deinit_konsole.la
-%{tde_libdir}/lib[kt]deinit_konsole.so
+%{tde_libdir}/libkdeinit_konsole.la
+%{tde_libdir}/libkdeinit_konsole.so
%{tde_tdeappdir}/konsole.desktop
%{tde_tdeappdir}/konsolesu.desktop
%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
@@ -2821,15 +2816,15 @@ Requires: %{name}-data = %{version}-%{release}
Requires: trinity-twin = %{version}-%{release}
%description -n trinity-ksmserver
-This package contains the KDE session manager. It is responsible for
+This package contains the TDE session manager. It is responsible for
restoring your TDE session on login. It is also needed to properly
-start a KDE session. It registers KDE with X display managers, and
-provides the 'starttde' command, for starting an X session with KDE
+start a TDE session. It registers KDE with X display managers, and
+provides the 'starttde' command, for starting an X session with TDE
from the console.
If you are running TDE for the first time for a certain user,
kpersonalizer is used to help with setup. If it is not present,
-KDE will start, but many good defaults will not be set.
+TDE will start, but many good defaults will not be set.
%files -n trinity-ksmserver
%defattr(-,root,root,-)
@@ -2838,8 +2833,8 @@ KDE will start, but many good defaults will not be set.
%{tde_bindir}/migratekde3
%{tde_tdelibdir}/ksmserver.la
%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/lib[kt]deinit_ksmserver.la
-%{tde_libdir}/lib[kt]deinit_ksmserver.so
+%{tde_libdir}/libkdeinit_ksmserver.la
+%{tde_libdir}/libkdeinit_ksmserver.so
%{tde_datadir}/apps/kconf_update/ksmserver.upd
%{tde_datadir}/apps/kconf_update/move_session_config.sh
%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
@@ -2851,9 +2846,15 @@ KDE will start, but many good defaults will not be set.
%post -n trinity-ksmserver
/sbin/ldconfig || :
+%if 0%{?mdkversion} || 0%{?mgaversion}
+fndSession
+%endif
%postun -n trinity-ksmserver
/sbin/ldconfig || :
+%if 0%{?mdkversion} || 0%{?mgaversion}
+fndSession
+%endif
##########
@@ -3049,45 +3050,45 @@ This package contains the default X window manager for TDE.
%files -n trinity-twin
%defattr(-,root,root,-)
%{tde_bindir}/kompmgr
-%{tde_bindir}/[kt]win
-%{tde_bindir}/[kt]win_killer_helper
-#%{tde_bindir}/[kt]win_resumer_helper
-%{tde_bindir}/[kt]win_rules_dialog
-%{tde_libdir}/kconf_update_bin/[kt]win_update_default_rules
-%{tde_libdir}/kconf_update_bin/[kt]win_update_window_settings
-%{tde_tdelibdir}/kcm_[kt]win*.la
-%{tde_tdelibdir}/kcm_[kt]win*.so
-%{tde_tdelibdir}/[kt]win*.la
-%{tde_tdelibdir}/[kt]win*.so
-%{tde_libdir}/lib[kt]decorations.so.*
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
-%{tde_libdir}/lib[kt]deinit_[kt]win.la
-%{tde_libdir}/lib[kt]deinit_[kt]win.so
+%{tde_bindir}/kwin
+%{tde_bindir}/kwin_killer_helper
+#%{tde_bindir}/kwin_resumer_helper
+%{tde_bindir}/kwin_rules_dialog
+%{tde_libdir}/kconf_update_bin/kwin_update_default_rules
+%{tde_libdir}/kconf_update_bin/kwin_update_window_settings
+%{tde_tdelibdir}/kcm_kwin*.la
+%{tde_tdelibdir}/kcm_kwin*.so
+%{tde_tdelibdir}/kwin*.la
+%{tde_tdelibdir}/kwin*.so
+%{tde_libdir}/libkdecorations.so.*
+%{tde_libdir}/libkdeinit_kwin_rules_dialog.la
+%{tde_libdir}/libkdeinit_kwin_rules_dialog.so
+%{tde_libdir}/libkdeinit_kwin.la
+%{tde_libdir}/libkdeinit_kwin.so
%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/[kt]windecoration.desktop
-%{tde_tdeappdir}/[kt]winoptions.desktop
-%{tde_tdeappdir}/[kt]winrules.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
-%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
-%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.pl
-%{tde_datadir}/apps/kconf_update/[kt]win3_plugin.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus1.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.sh
-%{tde_datadir}/apps/kconf_update/[kt]win_focus2.upd
-%{tde_datadir}/apps/kconf_update/[kt]win_fsp_workarounds_1.upd
-%{tde_datadir}/apps/kconf_update/[kt]winiconify.upd
-%{tde_datadir}/apps/kconf_update/[kt]winsticky.upd
-%{tde_datadir}/apps/kconf_update/[kt]win.upd
-%{tde_datadir}/apps/kconf_update/[kt]winupdatewindowsettings.upd
+%{tde_tdeappdir}/kwindecoration.desktop
+%{tde_tdeappdir}/kwinoptions.desktop
+%{tde_tdeappdir}/kwinrules.desktop
+%{tde_datadir}/applnk/.hidden/kwinactions.desktop
+%{tde_datadir}/applnk/.hidden/kwinadvanced.desktop
+%{tde_datadir}/applnk/.hidden/kwinfocus.desktop
+%{tde_datadir}/applnk/.hidden/kwinmoving.desktop
+%{tde_datadir}/applnk/.hidden/kwintranslucency.desktop
+%{tde_datadir}/apps/kconf_update/kwin3_plugin.pl
+%{tde_datadir}/apps/kconf_update/kwin3_plugin.upd
+%{tde_datadir}/apps/kconf_update/kwin_focus1.sh
+%{tde_datadir}/apps/kconf_update/kwin_focus1.upd
+%{tde_datadir}/apps/kconf_update/kwin_focus2.sh
+%{tde_datadir}/apps/kconf_update/kwin_focus2.upd
+%{tde_datadir}/apps/kconf_update/kwin_fsp_workarounds_1.upd
+%{tde_datadir}/apps/kconf_update/kwiniconify.upd
+%{tde_datadir}/apps/kconf_update/kwinsticky.upd
+%{tde_datadir}/apps/kconf_update/kwin.upd
+%{tde_datadir}/apps/kconf_update/kwinupdatewindowsettings.upd
%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/[kt]win/
-%{tde_datadir}/config.kcfg/[kt]win.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
+%{tde_datadir}/apps/kwin/
+%{tde_datadir}/config.kcfg/kwin.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kwin.png
%{tde_tdedocdir}/HTML/en/kompmgr/
%post -n trinity-twin
@@ -3118,7 +3119,7 @@ Requires: trinity-twin = %{version}-%{release}
%files -n trinity-twin-devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/[kt]win/
+%{tde_tdeincludedir}/kwin/
%{tde_tdeincludedir}/kcommondecoration.h
%{tde_tdeincludedir}/kdecoration.h
%{tde_tdeincludedir}/kdecoration_p.h
@@ -3248,21 +3249,15 @@ Windows and Samba shares.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .openterminalhere
+%patch2 -p1 -b .startmenuicon
+%patch3 -p1 -b .displayconfigtranslation
+%patch4 -p1 -b .kickoffdefaultsfav
+%patch5 -p1 -b .konsolewordseps
-%patch1 -p1 -b .kdesu_no_ignore
-%patch2 -p1 -b .openterminalhere
-%if 0%{?rhel} || 0%{?fedora}
-%patch3 -p1 -b .Xsession
-%endif
-%if 0%{?suse_version}
-%patch4 -p1 -b .Xsession
-%endif
-%patch5 -p1 -b .tdeicon
-%patch6 -p1 -b .xtestsupport
-%patch7 -p1 -b .pid
-%patch8 -p1 -b .kickoff_default_favs
-%patch9 -p1 -b .translation
-%patch10 -p1 -b .kcmxcursor
+%patch11 -p1 -b .tdmpid
+%patch12 -p1 -b .kdesunoignorebutton
+%patch13 -p1 -b .xdgmenu
%patch101 -p1 -b .vibrate_dialog
%patch102 -p1 -b .kcontrol_menu_entry
@@ -3271,14 +3266,16 @@ Windows and Samba shares.
%patch105 -p1 -b .suspend_unmount
%patch106 -p1 -b .bookmark_global_copy
+%patch201 -p1 -b .kcmxcursor
+
%if 0%{?rhel} == 4
-%patch201 -p1 -b .libdetect
-%patch202 -p1 -b .dbustqt
-%patch203 -p1 -b .consolekit
-%patch204 -p1 -b .composite
-#patch205 -p1 -b .hal04
-%patch206 -p1 -b .rhel4
+%patch301 -p1 -b .libdetect
+%patch302 -p1 -b .dbustqt
+%patch303 -p1 -b .consolekit
+%patch304 -p1 -b .composite
+#patch305 -p1 -b .hal04
+%patch306 -p1 -b .rhel4
%endif
# Applies an optional distro-specific graphical theme
@@ -3307,17 +3304,22 @@ Windows and Samba shares.
%__sed -i "kdm/config.def" \
-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-# TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "startkde" \
- -e "s|/opt/trinity|%{tde_prefix}|g"
-
-# TDE default start button icon
+# TDE default directory and icon in startup script
%__sed -i "startkde" \
+ -e "s|/opt/trinity|%{tde_prefix}|g" \
-e "s|%%{tde_starticon}|%{tde_starticon}|g"
+# Xsession script location may vary on some distro
+%if 0%{?rhel} || 0%{?fedora}
+%__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
+%endif
+%if 0%{?suse_version}
+%__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
+%endif
+
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@@ -3344,14 +3346,20 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
- -DCMAKE_SKIP_RPATH="OFF" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ \
-DWITH_SASL=ON \
-DWITH_LDAP=ON \
-DWITH_SAMBA=ON \
@@ -3458,12 +3466,6 @@ EOF
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
%endif
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
-%endif
-
# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%if 0%{?suse_version}
@@ -3490,7 +3492,7 @@ EOF
%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif
-# Symlink KDM configuration
+# Symlink TDM configuration
%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
%__ln_s "%{_sysconfdir}/trinity/kdm" "%{?buildroot}%{tde_datadir}/config/kdm"
@@ -3510,5 +3512,10 @@ EOF
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+- Fix XDG menu
+- Fix Mageia/Mandriva specific icons
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdegames/tdegames-3.5.13.2.spec b/redhat/tdegames/tdegames-3.5.13.2.spec
index 517b23de4..d65c2f7d5 100644
--- a/redhat/tdegames/tdegames-3.5.13.2.spec
+++ b/redhat/tdegames/tdegames-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -20,8 +22,8 @@
Name: trinity-tdegames
Summary: Trinity Desktop Environment - Games
-Version: 3.5.13.2
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
Group: Amusements/Games
@@ -38,11 +40,11 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: autoconf automake libtool m4
BuildRequires: libtool
-BuildRequires: tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
-BuildRequires: trinity-tdemultimedia-devel >= %{version}
-BuildRequires: qt3-devel
+BuildRequires: tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
+BuildRequires: qt3-devel >= 3.3.8.d
Obsoletes: trinity-kdegames < %{version}-%{release}
Provides: trinity-kdegames = %{version}-%{release}
@@ -1546,21 +1548,23 @@ if [ -d "/usr/X11R6" ]; then
fi
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --disable-rpath \
- --enable-final \
- --disable-debug \
- --disable-warnings \
- --enable-closure \
- --disable-setgid \
- --with-extra-includes=%{tde_includedir}/tqt
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --disable-rpath \
+ \
+ --with-extra-includes=%{tde_includedir}/tqt \
+ \
+ --disable-setgid
# WTF hack for RHEL4
%if 0%{?rhel} == 4
@@ -1576,28 +1580,14 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
- done
- popd
- fi
-done
-fi
-
%clean
%__rm -rf %{buildroot}
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
index 623550984..cd6a53ad2 100644
--- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -19,8 +21,9 @@
Name: trinity-tdegraphics
-Version: 3.5.13.2
-Release: 1%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+
License: GPL
Summary: Trinity Desktop Environment - Graphics Applications
@@ -33,9 +36,9 @@ URL: http://www.trinitydesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-# TDE 3.5.13
+# TDE
## RHEL / Fedora specific patches
# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
@@ -1228,7 +1231,7 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
##########
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%if 0%{?rhel} && 0%{?rhel} <= 5
%patch3 -p1 -b .mkstemps
@@ -1262,13 +1265,19 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
%{?with_t1lib:-DWITH_T1LIB=ON} \
%{?with_paper:-DWITH_LIBPAPER=ON} \
-DWITH_TIFF=ON \
@@ -1287,23 +1296,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
- done
- popd
- fi
-done
-fi
-
# rpmdocs
for dir in k* ; do
for file in AUTHORS ChangeLog README TODO ; do
@@ -1320,5 +1312,8 @@ done
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
new file mode 100644
index 000000000..822e74210
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
@@ -0,0 +1,976 @@
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu trinity-tdelibs-3.5.13.2/kded/applications.menu
+--- trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu 2013-07-28 15:03:29.861478619 +0200
++++ trinity-tdelibs-3.5.13.2/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100
+@@ -1,472 +0,0 @@
+-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+- <Name>Applications</Name>
+- <Directory>kde-main.directory</Directory>
+- <!-- Search the default locations -->
+- <KDELegacyDirs/>
+- <DefaultAppDirs/>
+- <DefaultDirectoryDirs/>
+- <DefaultLayout>
+- <Merge type="menus"/>
+- <Merge type="files"/>
+- <Separator/>
+- <Menuname>More</Menuname>
+- </DefaultLayout>
+- <Layout>
+- <Merge type="menus"/>
+- <Menuname>Applications</Menuname>
+- <Merge type="files"/>
+- </Layout>
+-
+- <Menu>
+- <Name>Applications</Name>
+- <Directory>kde-unknown.directory</Directory>
+- <OnlyUnallocated/>
+- <Include>
+- <Not>
+- <!-- Don't list non-KDE core applications -->
+- <And>
+- <Category>Core</Category>
+- <Not><Category>KDE</Category></Not>
+- </And>
+- <!-- Don't list SUSE's YaST in here -->
+- <Category>X-SuSE-YaST</Category>
+- </Not>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Development</Name>
+- <Directory>kde-development.directory</Directory>
+- <Menu>
+- <Name>X-KDE-KDevelopIDE</Name>
+- <Directory>kde-development-kdevelop.directory</Directory>
+- <Include>
+- <And>
+- <Category>Development</Category>
+- <Category>X-KDE-KDevelopIDE</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Translation</Name>
+- <Directory>kde-development-translation.directory</Directory>
+- <Include>
+- <And>
+- <Category>Development</Category>
+- <Category>Translation</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Web Development</Name>
+- <Directory>kde-development-webdevelopment.directory</Directory>
+- <Include>
+- <And>
+- <Category>Development</Category>
+- <Category>WebDevelopment</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Include>
+- <And>
+- <Category>Development</Category>
+- <Not><Category>X-KDE-KDevelopIDE</Category></Not>
+- <Not><Category>Translation</Category></Not>
+- <Not><Category>WebDevelopment</Category></Not>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Science</Name>
+- <Directory>kde-science.directory</Directory>
+- <Include>
+- <And><!-- Include /any/ Science app which is not an Education app -->
+- <Or>
+- <Category>Astronomy</Category>
+- <Category>Biology</Category>
+- <Category>Chemistry</Category>
+- <Category>Geology</Category>
+- <Category>MedicalSoftware</Category>
+- <Category>Physics</Category>
+- <Category>Math</Category>
+- <Category>Science</Category>
+- </Or>
+- <Not><Category>Education</Category></Not>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Edutainment</Name>
+- <Directory>kde-edutainment.directory</Directory>
+- <Menu>
+- <Name>Languages</Name>
+- <Directory>kde-edu-languages.directory</Directory>
+- <Include>
+- <And>
+- <Category>Education</Category>
+- <Or>
+- <Category>Languages</Category>
+- <Category>X-KDE-Edu-Language</Category>
+- </Or>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Mathematics</Name>
+- <Directory>kde-edu-mathematics.directory</Directory>
+- <Include>
+- <And>
+- <Category>Education</Category>
+- <Category>Math</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Miscellaneous</Name>
+- <Directory>kde-edu-miscellaneous.directory</Directory>
+- <Include>
+- <And>
+- <Category>Education</Category>
+- <Not>
+- <Category>Languages</Category>
+- <Category>X-KDE-Edu-Language</Category>
+- <Category>Math</Category>
+- <Category>Science</Category>
+- <Category>Teaching</Category>
+- <Category>X-KDE-Edu-Teaching</Category>
+- </Not>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Science</Name>
+- <Directory>kde-edu-science.directory</Directory>
+- <Include>
+- <And>
+- <Category>Education</Category>
+- <Category>Science</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Tools</Name>
+- <Directory>kde-edu-tools.directory</Directory>
+- <Include>
+- <And>
+- <Category>Education</Category>
+- <Or>
+- <Category>Teaching</Category>
+- <Category>X-KDE-Edu-Teaching</Category>
+- </Or>
+- </And>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Games</Name>
+- <Directory>kde-games.directory</Directory>
+- <Menu>
+- <Name>Arcade</Name>
+- <Directory>kde-games-arcade.directory</Directory>
+- <Include>
+- <And>
+- <Category>Game</Category>
+- <Category>ArcadeGame</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Board</Name>
+- <Directory>kde-games-board.directory</Directory>
+- <Include>
+- <And>
+- <Category>Game</Category>
+- <Category>BoardGame</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Card</Name>
+- <Directory>kde-games-card.directory</Directory>
+- <Include>
+- <And>
+- <Category>Game</Category>
+- <Category>CardGame</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Kidsgames</Name>
+- <Directory>kde-games-kids.directory</Directory>
+- <Include>
+- <And>
+- <Category>Game</Category>
+- <Or>
+- <Category>X-KDE-KidsGame</Category>
+- <Category>KidsGame</Category>
+- </Or>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>TacticStrategy</Name>
+- <Directory>kde-games-strategy.directory</Directory>
+- <Include>
+- <And>
+- <Category>Game</Category>
+- <Category>StrategyGame</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Include>
+- <And>
+- <Category>Game</Category>
+- <Not>
+- <Category>ArcadeGame</Category>
+- <Category>BoardGame</Category>
+- <Category>CardGame</Category>
+- <Category>X-KDE-KidsGame</Category>
+- <Category>KidsGame</Category>
+- <Category>StrategyGame</Category>
+- </Not>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Graphics</Name>
+- <Directory>kde-graphics.directory</Directory>
+- <Include>
+- <And>
+- <Category>Graphics</Category>
+- <Not><Category>X-KDE-More</Category></Not>
+- <Not><Filename>ooo-draw.desktop</Filename></Not>
+- </And>
+- </Include>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>Graphics</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Internet</Name>
+- <Directory>kde-internet.directory</Directory>
+- <Include>
+- <And>
+- <Category>Network</Category>
+- <Not><Category>X-KDE-More</Category></Not>
+- </And>
+- </Include>
+- <Menu>
+- <Name>Terminal</Name>
+- <Directory>kde-internet-terminal.directory</Directory>
+- </Menu>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>Network</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Multimedia</Name>
+- <Directory>kde-multimedia.directory</Directory>
+- <Include>
+- <And>
+- <Category>AudioVideo</Category>
+- <Not><Category>X-KDE-More</Category></Not>
+- </And>
+- </Include>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>AudioVideo</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Office</Name>
+- <Directory>kde-office.directory</Directory>
+- <Layout>
+- <Merge type="menus"/>
+- <Merge type="files"/>
+- <Separator/>
+- <Menuname>More</Menuname>
+- </Layout>
+- <Include>
+- <And>
+- <Category>Office</Category>
+- <Not><Category>X-KDE-More</Category></Not>
+- </And>
+- <Filename>ooo-draw.desktop</Filename>
+- </Include>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>Office</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Settingsmenu</Name>
+- <Directory>kde-settingsmenu.directory</Directory>
+- <Include>
+- <Category>Settings</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>System</Name>
+- <Directory>kde-system.directory</Directory>
+- <Include>
+- <And>
+- <Category>System</Category>
+- <Not><Category>X-KDE-More</Category></Not>
+- </And>
+- </Include>
+- <Menu>
+- <Name>SuperUser</Name>
+- <Directory>kde-system-su.directory</Directory>
+- <Include>
+- <And>
+- <Category>X-KDE-System-su</Category>
+- <Not><Category>X-KDE-More</Category></Not>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>System</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>ScreenSavers</Name>
+- <Directory>kde-system-screensavers.directory</Directory>
+- </Menu>
+- <Menu>
+- <Name>Terminal</Name>
+- <Directory>kde-system-terminal.directory</Directory>
+- </Menu>
+- </Menu>
+- <Menu>
+- <Name>Utilities</Name>
+- <Directory>kde-utilities.directory</Directory>
+- <Include>
+- <And>
+- <Category>Utility</Category>
+- <Not><Category>Accessibility</Category></Not>
+- <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
+- <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
+- <Not><Category>X-KDE-Utilities-PIM</Category></Not>
+- <Not><Category>X-KDE-More</Category></Not>
+- </And>
+- </Include>
+- <Menu>
+- <Name>Accessibility</Name>
+- <Directory>kde-utilities-accessibility.directory</Directory>
+- <Include>
+- <And>
+- <Category>Utility</Category>
+- <Category>Accessibility</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Desktop</Name>
+- <Directory>kde-utilities-desktop.directory</Directory>
+- <Include>
+- <And>
+- <Category>Utility</Category>
+- <Category>X-KDE-Utilities-Desktop</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Editors</Name>
+- <Directory>kde-editors.directory</Directory>
+- <Include>
+- <Category>TextEditor</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>PIM</Name>
+- <Directory>kde-utilities-pim.directory</Directory>
+- <Include>
+- <And>
+- <Category>Utility</Category>
+- <Category>X-KDE-Utilities-PIM</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>Toys</Name>
+- <Directory>kde-toys.directory</Directory>
+- <Include>
+- <Category>Amusement</Category>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>XUtilities</Name>
+- <Directory>kde-utilities-xutils.directory</Directory>
+- </Menu>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>Utility</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- <Menu>
+- <Name>More</Name>
+- <Directory>kde-more.directory</Directory>
+- <Include>
+- <And>
+- <Category>Utility</Category>
+- <Category>X-KDE-More</Category>
+- </And>
+- </Include>
+- </Menu>
+- </Menu>
+- <Include>
+- <And>
+- <Category>KDE</Category>
+- <Category>Core</Category>
+- </And>
+- </Include>
+- <DefaultMergeDirs/>
+-
+- <Menu>
+- <Name>Debian</Name>
+- <Directory>debian.directory</Directory>
+- <MergeFile>debian-menu.menu</MergeFile>
+- </Menu>
+-
+- <MergeDir>applications-merged</MergeDir>
+- <MergeFile>applications-kmenuedit.menu</MergeFile>
+-</Menu>
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt
+--- trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt 2013-07-28 15:03:29.861478619 +0200
++++ trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt 2013-07-28 15:03:45.806126508 +0200
+@@ -35,7 +35,7 @@
+ ##### other data ################################
+
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+-install( FILES applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
++install( FILES tde-applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp
+--- trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp 2013-07-28 15:03:29.861478619 +0200
++++ trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp 2013-07-28 15:04:11.314563211 +0200
+@@ -379,7 +379,7 @@
+ connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
+ this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true);
+
+ KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu trinity-tdelibs-3.5.13.2/kded/tde-applications.menu
+--- trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdelibs-3.5.13.2/kded/tde-applications.menu 2013-06-07 19:23:04.000000000 +0200
+@@ -0,0 +1,472 @@
++<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++ <Name>Applications</Name>
++ <Directory>tde-main.directory</Directory>
++ <!-- Search the default locations -->
++ <KDELegacyDirs/>
++ <DefaultAppDirs/>
++ <DefaultDirectoryDirs/>
++ <DefaultLayout>
++ <Merge type="menus"/>
++ <Merge type="files"/>
++ <Separator/>
++ <Menuname>More</Menuname>
++ </DefaultLayout>
++ <Layout>
++ <Merge type="menus"/>
++ <Menuname>Applications</Menuname>
++ <Merge type="files"/>
++ </Layout>
++
++ <Menu>
++ <Name>Applications</Name>
++ <Directory>tde-unknown.directory</Directory>
++ <OnlyUnallocated/>
++ <Include>
++ <Not>
++ <!-- Don't list non-KDE core applications -->
++ <And>
++ <Category>Core</Category>
++ <Not><Category>KDE</Category></Not>
++ </And>
++ <!-- Don't list SUSE's YaST in here -->
++ <Category>X-SuSE-YaST</Category>
++ </Not>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Development</Name>
++ <Directory>tde-development.directory</Directory>
++ <Menu>
++ <Name>X-KDE-KDevelopIDE</Name>
++ <Directory>tde-development-kdevelop.directory</Directory>
++ <Include>
++ <And>
++ <Category>Development</Category>
++ <Category>X-KDE-KDevelopIDE</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Translation</Name>
++ <Directory>tde-development-translation.directory</Directory>
++ <Include>
++ <And>
++ <Category>Development</Category>
++ <Category>Translation</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Web Development</Name>
++ <Directory>tde-development-webdevelopment.directory</Directory>
++ <Include>
++ <And>
++ <Category>Development</Category>
++ <Category>WebDevelopment</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Include>
++ <And>
++ <Category>Development</Category>
++ <Not><Category>X-KDE-KDevelopIDE</Category></Not>
++ <Not><Category>Translation</Category></Not>
++ <Not><Category>WebDevelopment</Category></Not>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Science</Name>
++ <Directory>tde-science.directory</Directory>
++ <Include>
++ <And><!-- Include /any/ Science app which is not an Education app -->
++ <Or>
++ <Category>Astronomy</Category>
++ <Category>Biology</Category>
++ <Category>Chemistry</Category>
++ <Category>Geology</Category>
++ <Category>MedicalSoftware</Category>
++ <Category>Physics</Category>
++ <Category>Math</Category>
++ <Category>Science</Category>
++ </Or>
++ <Not><Category>Education</Category></Not>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Edutainment</Name>
++ <Directory>tde-edutainment.directory</Directory>
++ <Menu>
++ <Name>Languages</Name>
++ <Directory>tde-edu-languages.directory</Directory>
++ <Include>
++ <And>
++ <Category>Education</Category>
++ <Or>
++ <Category>Languages</Category>
++ <Category>X-KDE-Edu-Language</Category>
++ </Or>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Mathematics</Name>
++ <Directory>tde-edu-mathematics.directory</Directory>
++ <Include>
++ <And>
++ <Category>Education</Category>
++ <Category>Math</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Miscellaneous</Name>
++ <Directory>tde-edu-miscellaneous.directory</Directory>
++ <Include>
++ <And>
++ <Category>Education</Category>
++ <Not>
++ <Category>Languages</Category>
++ <Category>X-KDE-Edu-Language</Category>
++ <Category>Math</Category>
++ <Category>Science</Category>
++ <Category>Teaching</Category>
++ <Category>X-KDE-Edu-Teaching</Category>
++ </Not>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Science</Name>
++ <Directory>tde-edu-science.directory</Directory>
++ <Include>
++ <And>
++ <Category>Education</Category>
++ <Category>Science</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Tools</Name>
++ <Directory>tde-edu-tools.directory</Directory>
++ <Include>
++ <And>
++ <Category>Education</Category>
++ <Or>
++ <Category>Teaching</Category>
++ <Category>X-KDE-Edu-Teaching</Category>
++ </Or>
++ </And>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Games</Name>
++ <Directory>tde-games.directory</Directory>
++ <Menu>
++ <Name>Arcade</Name>
++ <Directory>tde-games-arcade.directory</Directory>
++ <Include>
++ <And>
++ <Category>Game</Category>
++ <Category>ArcadeGame</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Board</Name>
++ <Directory>tde-games-board.directory</Directory>
++ <Include>
++ <And>
++ <Category>Game</Category>
++ <Category>BoardGame</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Card</Name>
++ <Directory>tde-games-card.directory</Directory>
++ <Include>
++ <And>
++ <Category>Game</Category>
++ <Category>CardGame</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Kidsgames</Name>
++ <Directory>tde-games-kids.directory</Directory>
++ <Include>
++ <And>
++ <Category>Game</Category>
++ <Or>
++ <Category>X-KDE-KidsGame</Category>
++ <Category>KidsGame</Category>
++ </Or>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>TacticStrategy</Name>
++ <Directory>tde-games-strategy.directory</Directory>
++ <Include>
++ <And>
++ <Category>Game</Category>
++ <Category>StrategyGame</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Include>
++ <And>
++ <Category>Game</Category>
++ <Not>
++ <Category>ArcadeGame</Category>
++ <Category>BoardGame</Category>
++ <Category>CardGame</Category>
++ <Category>X-KDE-KidsGame</Category>
++ <Category>KidsGame</Category>
++ <Category>StrategyGame</Category>
++ </Not>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Graphics</Name>
++ <Directory>tde-graphics.directory</Directory>
++ <Include>
++ <And>
++ <Category>Graphics</Category>
++ <Not><Category>X-KDE-More</Category></Not>
++ <Not><Filename>ooo-draw.desktop</Filename></Not>
++ </And>
++ </Include>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>Graphics</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Internet</Name>
++ <Directory>tde-internet.directory</Directory>
++ <Include>
++ <And>
++ <Category>Network</Category>
++ <Not><Category>X-KDE-More</Category></Not>
++ </And>
++ </Include>
++ <Menu>
++ <Name>Terminal</Name>
++ <Directory>tde-internet-terminal.directory</Directory>
++ </Menu>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>Network</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Multimedia</Name>
++ <Directory>tde-multimedia.directory</Directory>
++ <Include>
++ <And>
++ <Category>AudioVideo</Category>
++ <Not><Category>X-KDE-More</Category></Not>
++ </And>
++ </Include>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>AudioVideo</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Office</Name>
++ <Directory>tde-office.directory</Directory>
++ <Layout>
++ <Merge type="menus"/>
++ <Merge type="files"/>
++ <Separator/>
++ <Menuname>More</Menuname>
++ </Layout>
++ <Include>
++ <And>
++ <Category>Office</Category>
++ <Not><Category>X-KDE-More</Category></Not>
++ </And>
++ <Filename>ooo-draw.desktop</Filename>
++ </Include>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>Office</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Settingsmenu</Name>
++ <Directory>tde-settingsmenu.directory</Directory>
++ <Include>
++ <Category>Settings</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>System</Name>
++ <Directory>tde-system.directory</Directory>
++ <Include>
++ <And>
++ <Category>System</Category>
++ <Not><Category>X-KDE-More</Category></Not>
++ </And>
++ </Include>
++ <Menu>
++ <Name>SuperUser</Name>
++ <Directory>tde-system-su.directory</Directory>
++ <Include>
++ <And>
++ <Category>X-KDE-System-su</Category>
++ <Not><Category>X-KDE-More</Category></Not>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>System</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>ScreenSavers</Name>
++ <Directory>tde-system-screensavers.directory</Directory>
++ </Menu>
++ <Menu>
++ <Name>Terminal</Name>
++ <Directory>tde-system-terminal.directory</Directory>
++ </Menu>
++ </Menu>
++ <Menu>
++ <Name>Utilities</Name>
++ <Directory>tde-utilities.directory</Directory>
++ <Include>
++ <And>
++ <Category>Utility</Category>
++ <Not><Category>Accessibility</Category></Not>
++ <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
++ <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
++ <Not><Category>X-KDE-Utilities-PIM</Category></Not>
++ <Not><Category>X-KDE-More</Category></Not>
++ </And>
++ </Include>
++ <Menu>
++ <Name>Accessibility</Name>
++ <Directory>tde-utilities-accessibility.directory</Directory>
++ <Include>
++ <And>
++ <Category>Utility</Category>
++ <Category>Accessibility</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Desktop</Name>
++ <Directory>tde-utilities-desktop.directory</Directory>
++ <Include>
++ <And>
++ <Category>Utility</Category>
++ <Category>X-KDE-Utilities-Desktop</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Editors</Name>
++ <Directory>tde-editors.directory</Directory>
++ <Include>
++ <Category>TextEditor</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>PIM</Name>
++ <Directory>tde-utilities-pim.directory</Directory>
++ <Include>
++ <And>
++ <Category>Utility</Category>
++ <Category>X-KDE-Utilities-PIM</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Toys</Name>
++ <Directory>tde-toys.directory</Directory>
++ <Include>
++ <Category>Amusement</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>XUtilities</Name>
++ <Directory>tde-utilities-xutils.directory</Directory>
++ </Menu>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>Utility</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>More</Name>
++ <Directory>tde-more.directory</Directory>
++ <Include>
++ <And>
++ <Category>Utility</Category>
++ <Category>X-KDE-More</Category>
++ </And>
++ </Include>
++ </Menu>
++ </Menu>
++ <Include>
++ <And>
++ <Category>KDE</Category>
++ <Category>Core</Category>
++ </And>
++ </Include>
++ <DefaultMergeDirs/>
++
++ <Menu>
++ <Name>Debian</Name>
++ <Directory>debian.directory</Directory>
++ <MergeFile>debian-menu.menu</MergeFile>
++ </Menu>
++
++ <MergeDir>applications-merged</MergeDir>
++ <MergeFile>applications-kmenuedit.menu</MergeFile>
++</Menu>
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index ec061213a..4fe30cdb5 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific variables
+%define tde_version 3.5.13.2
+
+# TDE specific variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -17,8 +19,8 @@
%define _docdir %{tde_docdir}
Name: trinity-tdelibs
-Version: 3.5.13.2
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: TDE Libraries
Group: Environment/Libraries
@@ -31,9 +33,12 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+# Fix categories in T-menu
+Patch1: tdelibs-3.5.13.2-fix_xdg_menu.patch
-Patch1: tdelibs-3.5.13.2-xdg_dirs_set_path.patch
-Patch2: tdelibs-3.5.13.2-cups_by_default.patch
+# Patches from Mandriva
+Patch101: tdelibs-3.5.13.2-xdg_dirs_set_path.patch
+Patch102: tdelibs-3.5.13.2-cups_by_default.patch
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
@@ -45,13 +50,12 @@ Provides: trinity-kdelibs-apidocs = %{version}-%{release}
BuildRequires: cmake >= 2.8
BuildRequires: libtool
-BuildRequires: qt3-devel
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
+BuildRequires: qt3-devel >= 3.3.8.d
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: krb5-devel
BuildRequires: libxslt-devel
BuildRequires: cups-devel
-BuildRequires: libart_lgpl-devel
BuildRequires: openssl-devel
BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel
@@ -61,6 +65,9 @@ BuildRequires: glib2-devel
# LUA support are not ready yet
#BuildRequires: lua-devel
+# LIBART_LGPL support
+BuildRequires: libart_lgpl-devel
+
# ASPELL support
BuildRequires: aspell
BuildRequires: aspell-devel
@@ -124,7 +131,7 @@ BuildRequires: jasper-devel
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_avahi 1
-BuildRequires: trinity-avahi-tqt-devel >= %{version}
+BuildRequires: trinity-avahi-tqt-devel >= %{tde_version}
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
@@ -189,9 +196,21 @@ BuildRequires: xz-devel
%endif
%endif
-Requires: trinity-tqtinterface >= %{version}
-Requires: trinity-arts >= %{version}
+# Certificates support
+%if 0%{?rhel} || 0%{?fedora}
+%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
+Requires: ca-certificates
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires: openssl
+%endif
+
+# Trinity dependencies
Requires: qt3 >= 3.3.8.d
+Requires: trinity-tqtinterface >= %{tde_version}
+Requires: trinity-arts >= %{tde_version}
+
%description
Libraries for the Trinity Desktop Environment:
@@ -231,6 +250,7 @@ kimgio (image manipulation).
%{tde_bindir}/kdeinit_shutdown
%{tde_bindir}/kdeinit_wrapper
%{tde_bindir}/kdesu_stub
+%{tde_bindir}/kdetcompmgr
%{tde_bindir}/kdontchangethehostname
%{tde_bindir}/kdostartupconfig
%{tde_bindir}/kfile
@@ -259,10 +279,14 @@ kimgio (image manipulation).
%{tde_bindir}/start_kdeinit
%{tde_bindir}/start_kdeinit_wrapper
%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%{tde_bindir}/checkXML
+%{tde_bindir}/ksvgtopng
+%{tde_bindir}/kunittestmodrunner
+%{tde_bindir}/preparetips
%{tde_tdelibdir}/*
%{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib[kt]deinit_*.la
-%{tde_libdir}/lib[kt]deinit_*.so
+%{tde_libdir}/libkdeinit_*.la
+%{tde_libdir}/libkdeinit_*.so
%{tde_datadir}/applications/kde/*.desktop
%{tde_datadir}/autostart/kab2kabc.desktop
%{tde_datadir}/applnk/kio_iso.desktop
@@ -270,48 +294,19 @@ kimgio (image manipulation).
%exclude %{tde_datadir}/apps/ksgmltools2/
%config(noreplace) %{tde_datadir}/config/*
%{tde_datadir}/emoticons/*
+%{tde_datadir}/icons/crystalsvg/
%{tde_datadir}/icons/default.kde
-%{_sysconfdir}/alternatives/default.kde
+%{tde_datadir}/icons/hicolor/index.theme
+%{tde_datadir}/locale/all_languages
%{tde_datadir}/mimelnk/magic
%{tde_datadir}/mimelnk/*/*.desktop
%{tde_datadir}/services/*
%{tde_datadir}/servicetypes/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_tdedocdir}/HTML/en/kspell/
-# remove conflicts with kdelibs-4
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
%{tde_tdedocdir}/HTML/en/common/*
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%else
-%exclude %{tde_bindir}/checkXML
-%exclude %{tde_bindir}/ksvgtopng
-%exclude %{tde_bindir}/kunittestmodrunner
-%exclude %{tde_bindir}/preparetips
-%exclude %{tde_datadir}/config/colors
-%exclude %{tde_datadir}/config/kdebug.areas
-%exclude %{tde_datadir}/config/kdebugrc
-%exclude %{tde_datadir}/config/ksslcalist
-%exclude %{tde_datadir}/config/ui/ui_standards.rc
-%exclude %{tde_datadir}/icons/hicolor/index.theme
-%exclude %{tde_datadir}/locale/all_languages
-%exclude %{tde_tdedocdir}/HTML/en/common/*
-%endif
-
-# Avoid conflict with 'redhat-menus' package
-%if "%{tde_prefix}" == "/usr"
-%{_sysconfdir}/xdg/menus/kde-applications.menu
-%else
-%{tde_prefix}/etc/xdg/menus/kde-applications.menu
-%endif
+%{tde_tdedocdir}/HTML/en/kspell/
-# New in TDE 3.5.13
-%{tde_bindir}/kdetcompmgr
+%{_sysconfdir}/xdg/menus/tde-applications.menu
+%{_sysconfdir}/ld.so.conf.d/trinity.conf
%pre
# TDE Bug #1074
@@ -321,19 +316,6 @@ fi
%post
/sbin/ldconfig || :
-# Sets default theme as 'crystalsvg'
-update-alternatives --install \
- %{tde_datadir}/icons/default.kde \
- default.kde \
- %{tde_datadir}/icons/crystalsvg \
- 10 || :
-
-%preun
-if [ $1 -eq 0 ]; then
- update-alternatives --remove \
- default.kde \
- %{tde_datadir}/icons/crystalsvg || :
-fi
%postun
/sbin/ldconfig || :
@@ -364,11 +346,9 @@ applications for TDE.
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/*.a
-%exclude %{tde_libdir}/lib[kt]deinit_*.la
-%exclude %{tde_libdir}/lib[kt]deinit_*.so
-
-# New in TDE 3.5.13
-%{tde_datadir}/cmake/[kt]delibs.cmake
+%exclude %{tde_libdir}/libkdeinit_*.la
+%exclude %{tde_libdir}/libkdeinit_*.so
+%{tde_datadir}/cmake/kdelibs.cmake
%post devel
/sbin/ldconfig || :
@@ -386,12 +366,13 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .xdg_path
-%patch2 -p1 -b .cups_by_default
+%patch1 -p1 -b .xdg
+%patch101 -p1 -b .xdg_path
+%patch102 -p1 -b .cups_by_default
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@@ -412,6 +393,12 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
@@ -419,7 +406,8 @@ cd build
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
- -DCMAKE_SKIP_RPATH=OFF \
+ \
+ -DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \
-DWITH_ALSA=ON \
-DWITH_LIBART=ON \
@@ -434,9 +422,9 @@ cd build
%{?with_avahi:-DWITH_AVAHI=ON} \
%{?!with_pcre:-DWITH_PCRE=OFF} \
%{?!with_inotify:-DWITH_INOTIFY=OFF} \
- %{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \
+ %{?!with_gamin:-DWITH_GAMIN=OFF} \
-DWITH_SUDO_KDESU_BACKEND=OFF \
- %{?with_lzma:-DWITH_LZMA=ON} %{?!with_lzma:-DWITH_LZMA=OFF} \
+ %{?!with_lzma:-DWITH_LZMA=OFF} \
-DWITH_ASPELL=ON \
%{?with_hspell:-DWITH_HSPELL=ON} \
..
@@ -455,27 +443,21 @@ cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
EOF
%endif
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__install -p -D -m644 \
- "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
- "%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-%else
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+# Use system-wide CA certificate
+%if "%{?cacert}" != ""
+%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
+%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%endif
-# Makes 'default.kde' theme an alternative with 'crystalsvg-updated'
-%__rm -f "%{?buildroot}%{tde_datadir}/icons/default.kde"
-%__ln_s "%{_sysconfdir}/alternatives/default.kde" "%{?buildroot}%{tde_datadir}/icons/default.kde"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "%{tde_datadir}/icons/crystalsvg" "%{?buildroot}%{_sysconfdir}/alternatives/default.kde"
-
%clean
%__rm -rf "%{?buildroot}"
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+- Fix XDG menu
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch
new file mode 100644
index 000000000..c8a4e4d96
--- /dev/null
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch
@@ -0,0 +1,250 @@
+diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory
+--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory 2013-07-28 16:37:31.827222470 +0200
++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,89 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Name=Music
+-Name[br]=Sonerezh
+-Name[bs]=Muzika
+-Name[ca]=Música
+-Name[da]=Musik
+-Name[el]=Μουσική
+-Name[eo]=Muziko
+-Name[es]=Musica
+-Name[et]=Muusika
+-Name[eu]=Musika
+-Name[fa]=موسیقی
+-Name[fi]=Musiikki
+-Name[fr]=Musique
+-Name[ga]=Ceol
+-Name[gl]=Música
+-Name[he]=מוזיקה
+-Name[hu]=Zene
+-Name[is]=Tónlist
+-Name[it]=Musica
+-Name[ja]=音楽
+-Name[km]=តន្ត្រី
+-Name[lt]=Muzika
+-Name[nb]=Musikk
+-Name[ne]=सङ्गित
+-Name[nl]=Muziek
+-Name[nn]=Musikk
+-Name[pa]=ਸੰਗੀਤ
+-Name[pl]=Muzyka
+-Name[pt]=Música
+-Name[pt_BR]=Música
+-Name[sk]=Hudba
+-Name[sl]=Glasba
+-Name[sr]=Музика
+-Name[sr@Latn]=Muzika
+-Name[sv]=Musik
+-Name[tr]=Müzik
+-Name[uk]=Музика
+-Name[zh_CN]=音乐
+-Name[zh_HK]=音樂
+-GenericName=Professional Audio
+-GenericName[bg]=Професионално аудио
+-GenericName[bs]=Profesionalni audio
+-GenericName[ca]=Àudio professional
+-GenericName[cs]=Profesionální zvuk
+-GenericName[da]=Professionel lyd
+-GenericName[el]=Επαγγελματικός ήχος
+-GenericName[es]=Audio profesional
+-GenericName[et]=Professionaalne audio
+-GenericName[eu]=Audio profesionala
+-GenericName[fa]=صوتی حرفه‌ای
+-GenericName[fi]=Ammattilaisääni
+-GenericName[fr]=Audio professionnel
+-GenericName[ga]=Fuaim Phroifisiúnta
+-GenericName[gl]=Son Profesional
+-GenericName[he]=שמע מקצועי
+-GenericName[hu]=Professzinonális minőségű hanganyag
+-GenericName[is]=Atvinnumannahljóð
+-GenericName[it]=Audio professionale
+-GenericName[ja]=プロフェッショナルオーディオ
+-GenericName[kk]=Кәсіпқой Аудио
+-GenericName[km]=អូឌីយ៉ូ​ឯកទេស
+-GenericName[ko]=전문가 오디오
+-GenericName[lt]=Profesionalus audio
+-GenericName[mk]=Професионално аудио
+-GenericName[nb]=Profesjonell lyd
+-GenericName[nds]=Profeschonell Klang
+-GenericName[ne]=पेशागत अडियो
+-GenericName[nl]=Professionele audio
+-GenericName[nn]=Profesjonell lydhandsaming
+-GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
+-GenericName[pl]=Profesjonalne audio
+-GenericName[pt]=Áudio Profissional
+-GenericName[pt_BR]=Áudio Profissional
+-GenericName[ru]=Профессиональное аудио
+-GenericName[sk]=Profesionálne audio
+-GenericName[sl]=Profesionalni zvok
+-GenericName[sr]=Професионални звук
+-GenericName[sr@Latn]=Profesionalni zvuk
+-GenericName[sv]=Professionellt ljud
+-GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
+-GenericName[tr]=Profesyonel Ses
+-GenericName[uk]=Професійне аудіо
+-GenericName[zh_CN]=专业音频
+-GenericName[zh_HK]=專業音效
+-GenericName[zh_TW]=專業音效
+-Icon=package
+-
+diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu
+--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu 2013-07-28 16:37:31.827222470 +0200
++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+-<Name>Applications</Name>
+-<Menu>
+- <Name>Multimedia</Name>
+- <Exclude>
+- <Category>Music</Category>
+- </Exclude>
+- <Menu>
+- <Name>Jack and More</Name>
+- <Directory>kde-multimedia-music.directory</Directory>
+- <Include>
+- <And>
+- <Category>Music</Category>
+- </And>
+- </Include>
+- </Menu>
+-</Menu>
+-</Menu>
+diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am
+--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am 2013-07-28 16:37:31.827222470 +0200
++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am 2013-07-28 16:38:07.202464444 +0200
+@@ -22,8 +22,8 @@
+
+ EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
+
+-xdg_directory_DATA = kde-multimedia-music.directory
++xdg_directory_DATA = tde-multimedia-music.directory
+
+-xdg_mergedmenu_DATA = kde-multimedia-music.menu
++xdg_mergedmenu_DATA = tde-multimedia-music.menu
+ xdg_mergedmenudir = $(xdg_menudir)/applications-merged
+
+diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory
+--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory 2013-06-07 19:26:15.000000000 +0200
+@@ -0,0 +1,89 @@
++[Desktop Entry]
++Encoding=UTF-8
++Name=Music
++Name[br]=Sonerezh
++Name[bs]=Muzika
++Name[ca]=Música
++Name[da]=Musik
++Name[el]=Μουσική
++Name[eo]=Muziko
++Name[es]=Musica
++Name[et]=Muusika
++Name[eu]=Musika
++Name[fa]=موسیقی
++Name[fi]=Musiikki
++Name[fr]=Musique
++Name[ga]=Ceol
++Name[gl]=Música
++Name[he]=מוזיקה
++Name[hu]=Zene
++Name[is]=Tónlist
++Name[it]=Musica
++Name[ja]=音楽
++Name[km]=តន្ត្រី
++Name[lt]=Muzika
++Name[nb]=Musikk
++Name[ne]=सङ्गित
++Name[nl]=Muziek
++Name[nn]=Musikk
++Name[pa]=ਸੰਗੀਤ
++Name[pl]=Muzyka
++Name[pt]=Música
++Name[pt_BR]=Música
++Name[sk]=Hudba
++Name[sl]=Glasba
++Name[sr]=Музика
++Name[sr@Latn]=Muzika
++Name[sv]=Musik
++Name[tr]=Müzik
++Name[uk]=Музика
++Name[zh_CN]=音乐
++Name[zh_HK]=音樂
++GenericName=Professional Audio
++GenericName[bg]=Професионално аудио
++GenericName[bs]=Profesionalni audio
++GenericName[ca]=Àudio professional
++GenericName[cs]=Profesionální zvuk
++GenericName[da]=Professionel lyd
++GenericName[el]=Επαγγελματικός ήχος
++GenericName[es]=Audio profesional
++GenericName[et]=Professionaalne audio
++GenericName[eu]=Audio profesionala
++GenericName[fa]=صوتی حرفه‌ای
++GenericName[fi]=Ammattilaisääni
++GenericName[fr]=Audio professionnel
++GenericName[ga]=Fuaim Phroifisiúnta
++GenericName[gl]=Son Profesional
++GenericName[he]=שמע מקצועי
++GenericName[hu]=Professzinonális minőségű hanganyag
++GenericName[is]=Atvinnumannahljóð
++GenericName[it]=Audio professionale
++GenericName[ja]=プロフェッショナルオーディオ
++GenericName[kk]=Кәсіпқой Аудио
++GenericName[km]=អូឌីយ៉ូ​ឯកទេស
++GenericName[ko]=전문가 오디오
++GenericName[lt]=Profesionalus audio
++GenericName[mk]=Професионално аудио
++GenericName[nb]=Profesjonell lyd
++GenericName[nds]=Profeschonell Klang
++GenericName[ne]=पेशागत अडियो
++GenericName[nl]=Professionele audio
++GenericName[nn]=Profesjonell lydhandsaming
++GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
++GenericName[pl]=Profesjonalne audio
++GenericName[pt]=Áudio Profissional
++GenericName[pt_BR]=Áudio Profissional
++GenericName[ru]=Профессиональное аудио
++GenericName[sk]=Profesionálne audio
++GenericName[sl]=Profesionalni zvok
++GenericName[sr]=Професионални звук
++GenericName[sr@Latn]=Profesionalni zvuk
++GenericName[sv]=Professionellt ljud
++GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
++GenericName[tr]=Profesyonel Ses
++GenericName[uk]=Професійне аудіо
++GenericName[zh_CN]=专业音频
++GenericName[zh_HK]=專業音效
++GenericName[zh_TW]=專業音效
++Icon=package
++
+diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu
+--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu 2013-07-28 16:38:14.396310283 +0200
+@@ -0,0 +1,21 @@
++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++<Name>Applications</Name>
++<Menu>
++ <Name>Multimedia</Name>
++ <Exclude>
++ <Category>Music</Category>
++ </Exclude>
++ <Menu>
++ <Name>Jack and More</Name>
++ <Directory>tde-multimedia-music.directory</Directory>
++ <Include>
++ <And>
++ <Category>Music</Category>
++ </And>
++ </Include>
++ </Menu>
++</Menu>
++</Menu>
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 1e4b2a989..17bd92fc2 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -25,8 +27,8 @@
Name: trinity-tdemultimedia
Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
-Version: 3.5.13.2
-Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
Group: Applications/Multimedia
@@ -39,8 +41,8 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
Patch0: tdemultimedia-3.5.13.2-ftbfs.patch
+Patch1: tdemultimedia-3.5.13.2-fix_xdg_menu.patch
Obsoletes: trinity-kdemultimedia < %{version}-%{release}
Provides: trinity-kdemultimedia = %{version}-%{release}
@@ -53,17 +55,15 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
BuildRequires: autoconf automake libtool m4
-BuildRequires: qt3-devel
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
+BuildRequires: qt3-devel >= 3.3.8.d
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
%if "%{?_with_akode}" != ""
BuildRequires: trinity-akode-devel
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
BuildRequires: trinity-akode-libmad
%endif
-%endif
BuildRequires: desktop-file-utils
BuildRequires: zlib-devel
@@ -567,8 +567,8 @@ This package provides data on multimedia applications for kappfinder.
%files kappfinder-data
%defattr(-,root,root,-)
%{tde_datadir}/apps/kappfinder/*
-%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory
-%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
+%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
+%{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
##########
@@ -671,8 +671,8 @@ This package includes TDE's dockable sound mixer applet.
%{tde_tdelibdir}/kmix_panelapplet.so
%{tde_tdelibdir}/kmixctrl.la
%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/lib[kt]deinit_kmix.so
-%{tde_libdir}/lib[kt]deinit_kmixctrl.so
+%{tde_libdir}/libkdeinit_kmix.so
+%{tde_libdir}/libkdeinit_kmixctrl.so
%{tde_tdeappdir}/kmix.desktop
%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
%{tde_datadir}/apps/kmix/
@@ -725,7 +725,7 @@ This is a sound recording utility for Trinity.
%{tde_tdelibdir}/libkrecexport_ogg.so
%{tde_tdelibdir}/libkrecexport_wave.la
%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/lib[kt]deinit_krec.so
+%{tde_libdir}/libkdeinit_krec.so
%{tde_tdeappdir}/krec.desktop
%{tde_datadir}/apps/krec/
%{tde_datadir}/icons/hicolor/*/apps/krec.png
@@ -1020,7 +1020,7 @@ formats supported by your installation of aRts (including aRts plugins).
%{tde_tdelibdir}/noatunsimple.so
%{tde_libdir}/libartseffects.la
%{tde_libdir}/libartseffects.so
-%{tde_libdir}/lib[kt]deinit_noatun.so
+%{tde_libdir}/libkdeinit_noatun.so
%{tde_libdir}/libnoatun.so.*
%{tde_libdir}/libnoatunarts.la
%{tde_libdir}/libnoatunarts.so
@@ -1105,10 +1105,10 @@ noatun plugins.
%{tde_libdir}/libaudiocdplugins.so
%{tde_libdir}/libkcddb.la
%{tde_libdir}/libkcddb.so
-%{tde_libdir}/lib[kt]deinit_kmix.la
-%{tde_libdir}/lib[kt]deinit_kmixctrl.la
-%{tde_libdir}/lib[kt]deinit_krec.la
-%{tde_libdir}/lib[kt]deinit_noatun.la
+%{tde_libdir}/libkdeinit_kmix.la
+%{tde_libdir}/libkdeinit_kmixctrl.la
+%{tde_libdir}/libkdeinit_krec.la
+%{tde_libdir}/libkdeinit_noatun.la
%{tde_libdir}/libkmidlib.la
%{tde_libdir}/libkmidlib.so
%{tde_libdir}/libmpeg.la
@@ -1139,8 +1139,8 @@ noatun plugins.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
%patch0 -p1 -b .ftbfs
+%patch1 -p1 -b .xdgmenu
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -1168,31 +1168,33 @@ if [ -d "/usr/X11R6" ]; then
fi
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
- --datadir=%{tde_datadir} \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --with-cdparanoia \
- --with-flac \
- --with-theora \
- --with-vorbis \
- --with-alsa \
- --with-gstreamer \
- --with-lame \
- --disable-debug \
- --disable-warnings \
- --enable-final \
- --disable-rpath \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --includedir=%{tde_tdeincludedir} \
+ --datadir=%{tde_datadir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --disable-rpath \
+ \
+ --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
+ \
+ --with-cdparanoia \
+ --with-flac \
+ --with-theora \
+ --with-vorbis \
+ --with-alsa \
+ --with-gstreamer \
+ --with-lame \
%{?_with_akode} %{!?_with_akode:--without-akode} \
%{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
- %{?with_xine:--with-xine} %{!?with_xine:--without-xine} \
- --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
- --enable-closure
+ %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
%__make %{?_smp_mflags}
@@ -1205,35 +1207,16 @@ export PATH="%{tde_bindir}:${PATH}"
# don't make these world-writeable
chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
- done
- popd
- fi
-done
-fi
-
-# Moves the XDG configuration files to TDE directory
-%__install -p -D -m644 \
- "%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
- "%{?buildroot}%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-
%clean
%__rm -rf %{buildroot}
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
+- Rebuild with NDEBUG option
+- Fix XDG menu
+
* Mon Jun 17 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
- Enable "LAME" support
diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
index 701f108df..29685ae2a 100644
--- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -6,7 +6,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -32,8 +34,8 @@
%endif
Name: trinity-tdenetwork
-Version: 3.5.13.2
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Summary: Trinity Desktop Environment - Network Applications
Vendor: Trinity Project
@@ -49,8 +51,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
-Source4: lisarc
-Source5: lisa.redhat
# RedHat/Fedora legacy patches
Patch3: kdenetwork-3.5.8-kppp.patch
@@ -65,12 +65,17 @@ Patch1: kdenetwork-3.5.13-missing_ldflags.patch
Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
+BuildRequires: cmake >= 2.8
BuildRequires: gettext
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: coreutils
BuildRequires: openssl-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: sqlite3-devel
+%else
BuildRequires: sqlite-devel
+%endif
BuildRequires: gnutls-devel
# GADU support
@@ -86,6 +91,10 @@ BuildRequires: libXtst-devel
BuildRequires: libXxf86vm-devel
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+BuildRequires: libxtst-devel
+%endif
+
# Wifi support
%if "%{?_with_wifi:1}" == "1"
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
@@ -148,9 +157,9 @@ BuildRequires: meanwhile-devel
%endif
# ORTP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: ortp-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+#BuildRequires: ortp-devel
+#%endif
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
@@ -252,12 +261,12 @@ update-desktop-database 2> /dev/null || :
%package devel
Summary: Development files for the Trinity network module
Group: Development/Libraries
-Requires: trinity-tdenetwork = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: trinity-kdict = %{version}-%{release}
Requires: trinity-kopete = %{version}-%{release}
Requires: trinity-ksirc = %{version}-%{release}
Requires: trinity-librss = %{version}-%{release}
-Requires: trinity-tdelibs-devel
+Requires: trinity-tdelibs-devel >= %{tde_version}
Obsoletes: trinity-kdenetwork-devel < %{version}-%{release}
Provides: trinity-kdenetwork-devel = %{version}-%{release}
@@ -775,11 +784,11 @@ Servers using RDP.
%{tde_bindir}/krdc
%{tde_tdeappdir}/krdc.desktop
%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
-%{tde_datadir}/apps/krdc
+%{tde_datadir}/apps/krdc/
%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
%{tde_datadir}/services/rdp.protocol
%{tde_datadir}/services/vnc.protocol
-%{tde_tdedocdir}/HTML/en/krdc
+%{tde_tdedocdir}/HTML/en/krdc/
%post -n trinity-krdc
for f in crystalsvg ; do
@@ -825,7 +834,7 @@ task.
%{tde_datadir}/services/kinetd_krfb.desktop
%{tde_datadir}/services/kinetd_krfb_httpd.desktop
%{tde_datadir}/servicetypes/kinetdmodule.desktop
-%{tde_tdedocdir}/HTML/en/krfb
+%{tde_tdedocdir}/HTML/en/krfb/
%post -n trinity-krfb
for f in crystalsvg locolor ; do
@@ -983,13 +992,6 @@ automatically when needed.
%package -n trinity-lisa
Summary: LAN information server for Trinity
Group: Applications/Internet
-%if 0%{?suse_version}
-Requires(preun): aaa_base
-Requires(post): aaa_base
-%else
-Requires(preun): chkconfig
-Requires(post): chkconfig
-%endif
%description -n trinity-lisa
LISa is intended to provide TDE with a kind of "network neighborhood"
@@ -997,8 +999,6 @@ but relying only on the TCP/IP protocol.
%files -n trinity-lisa
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/lisarc*
-%config(noreplace) %{_initrddir}/lisa
%{tde_tdelibdir}/kcm_lanbrowser.la
%{tde_tdelibdir}/kcm_lanbrowser.so
%{tde_tdelibdir}/kio_lan.la
@@ -1018,20 +1018,15 @@ but relying only on the TCP/IP protocol.
%{tde_bindir}/reslisa
%post -n trinity-lisa
-/sbin/chkconfig --add lisa ||:
update-desktop-database 2> /dev/null || :
%postun -n trinity-lisa
-if [ $1 -eq 0 ]; then
- /sbin/service lisa stop > /dev/null 2>&1 ||:
- /sbin/chkconfig --del lisa ||:
-fi
update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kdnssd
-Summary: Zeroconf support for KDE
+Summary: Zeroconf support for TDE
Group: Applications/Internet
%description -n trinity-kdnssd
@@ -1101,10 +1096,17 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
-DWITH_JINGLE=ON \
%{?with_speex:-DWITH_SPEEX=ON} \
-DWITH_WEBCAM=ON \
@@ -1128,33 +1130,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
-
-# Show only in KDE, FIXME, need to re-evaluate these -- Rex
-for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
- kwifimanager kget knewsticker ksirc kdict ; do
- if [ -f %{buildroot}%{tde_tdeappdir}/$i.desktop ] ; then
- echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop
- fi
-done
-
%if 0%{?with_consolehelper}
# Run kppp through consolehelper, and rename it to 'kppp3'
%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
@@ -1177,15 +1152,6 @@ EOF
# ktalk
%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
-# Add lisa startup script
-%__install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
-%__install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
-
-# RHEL 5: Avoids conflict with 'kdenetwork'
-%if 0%{?rhel} == 5
-%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde
-%endif
-
# Avoids conflict with trinity-kvirc
%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
@@ -1195,5 +1161,9 @@ EOF
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+- Disable 'lisa' service
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec
index 76b3392b9..57ab87fd2 100644
--- a/redhat/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/tdepim/tdepim-3.5.13.2.spec
@@ -3,8 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -29,8 +30,8 @@ BuildRequires: gnokii-devel
Name: trinity-tdepim
-Version: 3.5.13.2
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Group: Applications/Productivity
@@ -47,12 +48,13 @@ Patch14: kdepim-3.5.13-missing_ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-libcaldav-devel
BuildRequires: trinity-libcarddav-devel
+BuildRequires: cmake >= 2.8
BuildRequires: gpgme-devel
BuildRequires: libgpg-error-devel
BuildRequires: flex
@@ -2187,6 +2189,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch14 -p1 -b .ldflags
+# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
+if [ -x /usr/bin/perl ]; then
+ %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|"
+fi
+
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
@@ -2206,12 +2213,18 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
-DWITH_ARTS=ON \
-DWITH_SASL=ON \
-DWITH_NEWDISTRLISTS=ON \
@@ -2247,5 +2260,8 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdesdk/tdesdk-3.5.13.2.spec b/redhat/tdesdk/tdesdk-3.5.13.2.spec
index 22d097f2b..f2c8a9a34 100644
--- a/redhat/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/tdesdk/tdesdk-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -18,9 +20,9 @@
Name: trinity-tdesdk
-Summary: The KDE Software Development Kit (SDK)
-Version: 3.5.13.2
-Release: 1%{?dist}%{?_variant}
+Summary: The Trinity Software Development Kit (SDK)
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
@@ -31,7 +33,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: cmake >= 2.8
BuildRequires: libtool
@@ -1060,7 +1062,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build
@@ -1081,13 +1083,19 @@ cd build
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DMAN_INSTALL_DIR=%{tde_mandir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
-DWITH_DBSEARCHENGINE=ON \
-DWITH_KCAL=ON \
-DBUILD_ALL=ON \
@@ -1145,12 +1153,15 @@ fi
# Removes useless stuff
%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
+
%clean
%__rm -rf %{buildroot}
-
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdeutils/tdeutils-3.5.13.2.spec b/redhat/tdeutils/tdeutils-3.5.13.2.spec
index 56841ee48..e878f2e69 100644
--- a/redhat/tdeutils/tdeutils-3.5.13.2.spec
+++ b/redhat/tdeutils/tdeutils-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -19,8 +21,8 @@
%define _docdir %{tde_docdir}
Name: trinity-tdeutils
-Version: 3.5.13.2
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: TDE Utilities
Group: Applications/System
@@ -989,6 +991,12 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
@@ -996,7 +1004,7 @@ cd build
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
- -DCMAKE_SKIP_RPATH=OFF \
+ \
-DWITH_DPMS=ON \
%{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-DWITH_ASUS=ON \
@@ -1021,31 +1029,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- pushd $lang_dir/kcontrol
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
- done
- popd
- fi
-done
-fi
-
-
%if 0%{?build_klaptopdaemon}
### Use consolehelper for 'klaptop_acpi_helper'
%if 0%{?with_consolehelper}
@@ -1068,7 +1051,7 @@ fi
%else
-# Klaptop's documentation is installed even if we did not build it ...
+# Klaptop's documentation is installed even if we did not build the program ...
%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
@@ -1082,5 +1065,8 @@ fi
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
diff --git a/redhat/tdevelop/tdevelop-3.5.13.2-fix_xdg_menu.patch b/redhat/tdevelop/tdevelop-3.5.13.2-fix_xdg_menu.patch
new file mode 100644
index 000000000..9c7138ccc
--- /dev/null
+++ b/redhat/tdevelop/tdevelop-3.5.13.2-fix_xdg_menu.patch
@@ -0,0 +1,30 @@
+diff -Nuar trinity-tdevelop-3.5.13.2.ORI/CMakeLists.txt trinity-tdevelop-3.5.13.2/CMakeLists.txt
+--- trinity-tdevelop-3.5.13.2.ORI/CMakeLists.txt 2013-07-28 16:47:38.143269451 +0200
++++ trinity-tdevelop-3.5.13.2/CMakeLists.txt 2013-07-28 16:48:05.207700906 +0200
+@@ -142,7 +142,7 @@
+ DESTINATION ${XDG_APPS_INSTALL_DIR} )
+
+ install( FILES
+- kde-development-kdevelop.directory
++ tde-development-kdevelop.directory
+ DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
+
+ install( FILES
+diff -Nuar trinity-tdevelop-3.5.13.2.ORI/kde-development-kdevelop.directory trinity-tdevelop-3.5.13.2/kde-development-kdevelop.directory
+--- trinity-tdevelop-3.5.13.2.ORI/kde-development-kdevelop.directory 2013-07-28 16:47:38.101270333 +0200
++++ trinity-tdevelop-3.5.13.2/kde-development-kdevelop.directory 1970-01-01 01:00:00.000000000 +0100
+@@ -1,5 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Name=KDevelop
+-Name[ne]=केडीई विकास
+-Icon=kdevelop
+diff -Nuar trinity-tdevelop-3.5.13.2.ORI/tde-development-kdevelop.directory trinity-tdevelop-3.5.13.2/tde-development-kdevelop.directory
+--- trinity-tdevelop-3.5.13.2.ORI/tde-development-kdevelop.directory 1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdevelop-3.5.13.2/tde-development-kdevelop.directory 2013-06-07 19:41:29.000000000 +0200
+@@ -0,0 +1,5 @@
++[Desktop Entry]
++Encoding=UTF-8
++Name=KDevelop
++Name[ne]=केडीई विकास
++Icon=kdevelop
diff --git a/redhat/tdevelop/tdevelop-3.5.13.2.spec b/redhat/tdevelop/tdevelop-3.5.13.2.spec
index 775174d00..c5ca687ff 100644
--- a/redhat/tdevelop/tdevelop-3.5.13.2.spec
+++ b/redhat/tdevelop/tdevelop-3.5.13.2.spec
@@ -3,7 +3,9 @@
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+%define tde_version 3.5.13.2
+
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -19,8 +21,8 @@
Name: trinity-tdevelop
Summary: Integrated Development Environment for C++/C
-Version: 3.5.13.2
-Release: 1%{?dist}%{?_variant}
+Version: %{tde_version}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
Group: Development/Tools
@@ -32,17 +34,17 @@ URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
# [c_cpp_ref] Fix library directories detection
-Patch1: c_cpp_reference-2.0.2-config.patch
-
+Patch1: c_cpp_reference-2.0.2-config.patch
# [kdevelop] fix FTBFS
Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
-
+# [kdevelop] Fix XDG menu
+Patch3: tdevelop-3.5.13.2-fix_xdg_menu.patch
# [c_cpp_ref] Fix installation of 'asm' files
-Patch4: c_cpp_reference-2.0.2-install.patch
+Patch4: c_cpp_reference-2.0.2-install.patch
Requires: %{name}-libs = %{version}-%{release}
@@ -51,13 +53,13 @@ Requires: make
Requires: perl
Requires: flex >= 2.5.4
%if 0%{?rhel} || 0%{?fedora}
-Requires: qt3-designer
+Requires: qt3-designer >= 3.3.8.d
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires: %{_lib}qt3-devel
+Requires: %{_lib}qt3-devel >= 3.3.8.d
%endif
%if 0%{?suse_version}
-Requires: qt3-devel
+Requires: qt3-devel >= 3.3.8.d
%endif
Requires: gettext
Requires: ctags
@@ -71,7 +73,7 @@ BuildRequires: trinity-tdesdk-devel >= %{version}
BuildRequires: db4-devel
%endif
BuildRequires: flex
-# FIXME: No CVS support in KDevelop? This is going to suck...
+# FIXME: No CVS support in tdevelop? This is going to suck...
# Requires kdesdk3.
BuildRequires: subversion-devel
BuildRequires: neon-devel
@@ -444,7 +446,7 @@ individual needs.
%{tde_datadir}/apps/kio_pydoc/kde_pydoc.py*
%{tde_datadir}/config/kdevassistantrc
%{tde_datadir}/config/kdeveloprc
-%{tde_datadir}/desktop-directories/kde-development-kdevelop.directory
+%{tde_datadir}/desktop-directories/tde-development-kdevelop.directory
%{tde_tdedocdir}/HTML/en/kdevelop/
%{tde_libdir}/libd.so.0
%{tde_libdir}/libd.so.0.0.0
@@ -503,7 +505,7 @@ Provides: trinity-kdevelop-devel = %{version}-%{release}
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: trinity-kdelibs
+Requires: trinity-tdelibs >= %{tde_version}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
@@ -566,6 +568,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
%setup -q -a1
%patch1 -p0 -b .config
%patch2 -p1
+%patch3 -p1 -b .xdgmenu
%patch4 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
@@ -583,7 +586,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@@ -614,11 +617,17 @@ cd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE="" \
+ -DCMAKE_C_FLAGS="-DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ \
-DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \
-DWITH_VCS_ALL=OFF \
@@ -642,5 +651,8 @@ cd ..
%changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2