Hello community,
here is the log from the commit of package kdeutils3
checked in at Tue Feb 19 02:31:22 CET 2008.
--------
--- KDE/kdeutils3/kdeutils3.changes 2008-01-03 10:26:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeutils3/kdeutils3.changes 2008-02-18 17:33:55.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Feb 18 17:33:55 CET 2008 - dmueller@suse.de
+
+- update to 3.5.9
+
+-------------------------------------------------------------------
Old:
----
3_5_BRANCH.diff
kdeutils-3.5.8.tar.bz2
New:
----
kdeutils-3.5.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils3.spec ++++++
--- /var/tmp/diff_new_pack.m29457/_old 2008-02-19 02:31:11.000000000 +0100
+++ /var/tmp/diff_new_pack.m29457/_new 2008-02-19 02:31:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils3 (Version 3.5.8)
+# spec file for package kdeutils3 (Version 3.5.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: kdeutils3
BuildRequires: gmp-devel kdebase3-devel net-snmp-devel pcsc-lite python-devel
%ifarch ppc
@@ -27,10 +28,10 @@
Summary: KDE Utility Programs
Url: http://www.kde.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 3.5.8
-Release: 25
+Version: 3.5.9
+Release: 1
Source0: kdeutils-%{version}.tar.bz2
-Patch0: 3_5_BRANCH.diff
+#Patch0: 3_5_BRANCH.diff
Patch2: klaptop.diff
Patch5: disable-nonsense-security-check.diff
Patch11: ppc.dif
@@ -122,7 +123,7 @@
%prep
%setup -q -n kdeutils-%{version}
-%patch0
+#%patch0
%patch2
%patch5
%ifarch ppc ppc64
++++++ kdeutils-3.5.8.tar.bz2 -> kdeutils-3.5.9.tar.bz2 ++++++
++++ 8982 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/acinclude.m4 new/kdeutils-3.5.9/acinclude.m4
--- old/kdeutils-3.5.8/acinclude.m4 2007-10-08 16:31:08.000000000 +0200
+++ new/kdeutils-3.5.9/acinclude.m4 2008-02-13 16:12:55.000000000 +0100
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
AC_TRY_LINK(dnl
[
#include
+#include
],
[
char buf[42];
@@ -2638,7 +2663,7 @@
/* this would segfault.. but we only link, don't run */
(void) gzgets(f, buf, sizeof(buf));
- return (zlibVersion() == ZLIB_VERSION);
+ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
],
eval "ac_cv_lib_z='-lz'",
eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/admin/acinclude.m4.in new/kdeutils-3.5.9/admin/acinclude.m4.in
--- old/kdeutils-3.5.8/admin/acinclude.m4.in 2007-10-08 13:35:04.000000000 +0200
+++ new/kdeutils-3.5.9/admin/acinclude.m4.in 2008-02-13 14:19:06.000000000 +0100
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
AC_TRY_LINK(dnl
[
#include
+#include
],
[
char buf[42];
@@ -2638,7 +2663,7 @@
/* this would segfault.. but we only link, don't run */
(void) gzgets(f, buf, sizeof(buf));
- return (zlibVersion() == ZLIB_VERSION);
+ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
],
eval "ac_cv_lib_z='-lz'",
eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/admin/cvs.sh new/kdeutils-3.5.9/admin/cvs.sh
--- old/kdeutils-3.5.8/admin/cvs.sh 2007-10-08 13:35:04.000000000 +0200
+++ new/kdeutils-3.5.9/admin/cvs.sh 2008-02-13 14:19:06.000000000 +0100
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.8\""
+ VERSION="\"3.5.9\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/admin/detect-autoconf.pl new/kdeutils-3.5.9/admin/detect-autoconf.pl
--- old/kdeutils-3.5.8/admin/detect-autoconf.pl 2007-10-08 13:35:04.000000000 +0200
+++ new/kdeutils-3.5.9/admin/detect-autoconf.pl 2008-02-13 14:19:06.000000000 +0100
@@ -21,6 +21,73 @@
return "";
}
+# Subroutine to lexicographically compare two version strings, a and b.
+# If a > b, 1 is returned.
+# If a == b, 0 is returned.
+# If a < b, -1 is returned.
+#
+# If the strings are of uneven number length then the shorter string is
+# prepended by enough zeroes to make the two string lengths equal in order to
+# allow an accurate comparison. Note that the zero-padding only occurs in
+# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
+# Parts of the version ending in -foo (or any other text) are not considered
+# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
+# 2.053)
+sub compareVersions
+{
+ my ($a, $b) = @_;
+
+ # Split the strings up by '.' (version separator) and start comparing digit
+ # length.
+
+ my @aParts = split(/\./, $a);
+ my @bParts = split(/\./, $b);
+
+ # Make the arrays equal in length by adding missing zeroes to the end of the
+ # version.
+ push @aParts, '0' while scalar @aParts < scalar @bParts;
+ push @bParts, '0' while scalar @bParts < scalar @aParts;
+
+ # Now compare each individual portion.
+ for (my $i = 0; $i < scalar @aParts; ++$i)
+ {
+ # Make sure that any portion that has numbers is contiguous. I'm sure
+ # there's a technique for saving stuff like 2.52a2 but I don't feel
+ # like implementing it.
+ if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
+ $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
+ {
+ die "Not able to compare $a to $b!\n";
+ }
+
+ my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
+ my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
+
+ # Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
+ # the delta calculation below.
+ my $delta = (length $aDigits) - (length $bDigits);
+ if ($delta < 0) # b is longer
+ {
+ my $replacement = ('0' x (-$delta)) . $aDigits;
+ $aParts[$i] =~ s/$aDigits/$replacement/;
+ }
+ elsif ($delta > 0) # a is longer
+ {
+ my $replacement = ('0' x $delta) . $bDigits;
+ $bParts[$i] =~ s/$bDigits/$replacement/;
+ }
+ }
+
+ # Arrays now have standardized version components, let's re-merge them
+ # to strings to do the compare.
+ my $newA = join('.', @aParts);
+ my $newB = join('.', @bParts);
+
+ return 1 if ($newA gt $newB);
+ return -1 if ($newA lt $newB);
+ return 0;
+}
+
# Subroutine to determine the highest installed version of the given program,
# searching from the given paths.
sub findBest
@@ -29,9 +96,10 @@
my $best_version_found = '0'; # Deliberately a string.
my %versions;
my %minimumVersions = (
- 'autoconf' => '2.5',
+ 'autoconf' => '2.5',
'automake' => '1.6',
);
+ my $sgn; # Used for compareVersions results.
# Allow user to use environment variable to override search.
return $ENV{uc $program} if $ENV{uc $program};
@@ -45,9 +113,11 @@
next unless -x $file;
($version) = $file =~ /$prefix\/$program-?(.*)$/;
- $version =~ s/-|\.//g;
- # Don't check the -wrapper ones
- next if $version eq "wrapper";
+
+ # Don't check the -wrapper ones (or any other non program one).
+ # The real deal should start with a version number, or have no
+ # suffix at all.
+ next if $version =~ /^[^\d]/;
# Special case some programs to make sure it has a minimum version.
if (not $version and exists $minimumVersions{$program})
@@ -56,15 +126,20 @@
my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
# If we can't run the script to get the version it likely won't work later.
- next unless $versionOutput;
+ next unless $versionOutput;
# Use number.number for version (we don't need the excess in general).
- ($versionOutput) = ($versionOutput =~ /(\d\.\d)/);
+ ($versionOutput) = ($versionOutput =~ /(\d+\.\d+)/);
+
+ # compareVersions returns -1 if the left argument is less than
+ # the right argument. It can also die for invalid input so
+ # wrap with eval.
+ eval {
+ $sgn = compareVersions($versionOutput, $min_version);
+ };
- # Use lt to do lexicographical comparison of strings (which should be
- # equivalent and doesn't involve issues with floating point conversions).
- if (not $versionOutput or $versionOutput lt $min_version)
- {
+ # $@ would be set if an error was encountered.
+ if ($@ or not $versionOutput or $sgn == -1) {
next;
}
}
@@ -80,7 +155,12 @@
$versions{$version} = $file;
# Use string comparison so that e.g. 253a will be > 253 but < 254.
- if ($version gt $best_version_found)
+ # See above about the need for eval.
+ eval {
+ $sgn = compareVersions($version, $best_version_found);
+ };
+
+ if (not $@ and $sgn == 1)
{
$best_version_found = $version;
}
@@ -140,12 +220,12 @@
($automake_suffix) = $automake =~ /.*automake(.*)$/;
-# Use unsermake if we found it.
-$automake = "$unsermake -c" if $unsermake;
-
# Find matching automake companions.
$aclocal = findProgram('aclocal', $automake_suffix);
+# Use unsermake if we found it.
+$automake = "$unsermake -c" if ($unsermake and $aclocal);
+
$which = findWhich();
# Make sure we have all of the needed programs.
@@ -153,8 +233,7 @@
{
unless(${$i})
{
- print "# Unable to find $i!!\n";
- exit 1;
+ print STDERR "# Unable to find $i!!\n";
}
}
@@ -173,3 +252,5 @@
EOF
exit 0;
+
+# vim: set noet ts=8 sw=4:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/admin/Doxyfile.am new/kdeutils-3.5.9/admin/Doxyfile.am
--- old/kdeutils-3.5.8/admin/Doxyfile.am 2007-10-08 13:35:04.000000000 +0200
+++ new/kdeutils-3.5.9/admin/Doxyfile.am 2008-02-13 14:19:06.000000000 +0100
@@ -72,11 +72,11 @@
uninstall-apidox:
@if test "$(subdir)" != "."; then \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
fi \
else \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi \
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ark/arch.cpp new/kdeutils-3.5.9/ark/arch.cpp
--- old/kdeutils-3.5.8/ark/arch.cpp 2006-10-01 19:28:15.000000000 +0200
+++ new/kdeutils-3.5.9/ark/arch.cpp 2008-02-13 10:38:15.000000000 +0100
@@ -327,7 +327,7 @@
pos = strpos + len;
- columns[ curCol->colRef ] = line.mid( strpos, len );
+ columns[curCol->colRef] = QString::fromLocal8Bit( line.mid(strpos, len) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ark/arch.h new/kdeutils-3.5.9/ark/arch.h
--- old/kdeutils-3.5.8/ark/arch.h 2007-10-08 11:49:47.000000000 +0200
+++ new/kdeutils-3.5.9/ark/arch.h 2008-02-13 10:38:15.000000000 +0100
@@ -142,7 +142,7 @@
QString getUnarchUtility() { return m_unarchiver_program; }
- void appendShellOutputData( const char * data ) { m_lastShellOutput.append( data ); }
+ void appendShellOutputData( const char * data ) { m_lastShellOutput.append( QString::fromLocal8Bit( data ) ); }
void clearShellOutput() { m_lastShellOutput.truncate( 0 ); }
const QString& getLastShellOutput() const { return m_lastShellOutput; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ark/compressedfile.cpp new/kdeutils-3.5.9/ark/compressedfile.cpp
--- old/kdeutils-3.5.8/ark/compressedfile.cpp 2006-05-22 20:08:38.000000000 +0200
+++ new/kdeutils-3.5.9/ark/compressedfile.cpp 2008-02-13 10:38:15.000000000 +0100
@@ -361,11 +361,9 @@
kdDebug(1601) << "+CompressedFile::remove" << endl;
QFile::remove(m_tmpfile);
- // delete the compressed file but then create it empty in case someone
+ // do not delete but truncate the compressed file in case someone
// does a reload and finds it no longer exists!
- QFile::remove(m_filename);
-
- ::close(::open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL));
+ truncate(QFile::encodeName(m_filename), 0);
m_tmpfile = "";
emit sigDelete(true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ark/rar.cpp new/kdeutils-3.5.9/ark/rar.cpp
--- old/kdeutils-3.5.8/ark/rar.cpp 2006-05-22 20:08:38.000000000 +0200
+++ new/kdeutils-3.5.9/ark/rar.cpp 2008-02-13 10:38:15.000000000 +0100
@@ -82,7 +82,7 @@
{
if ( m_isFirstLine )
{
- m_entryFilename = line;
+ m_entryFilename = QString::fromLocal8Bit( line );
m_entryFilename.remove( 0, 1 );
m_isFirstLine = false;
return true;
@@ -226,6 +226,8 @@
if ( !m_password.isEmpty() )
*kp << "-p" + m_password;
+ else
+ *kp << "-p-";
if ( !ArkSettings::extractOverwrite() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ark/zoo.cpp new/kdeutils-3.5.9/ark/zoo.cpp
--- old/kdeutils-3.5.8/ark/zoo.cpp 2006-05-22 20:08:38.000000000 +0200
+++ new/kdeutils-3.5.9/ark/zoo.cpp 2008-02-13 10:38:15.000000000 +0100
@@ -54,8 +54,9 @@
ZooArch::ZooArch( ArkWidget *gui, const QString & fileName )
: Arch( gui, fileName )
{
- m_archiver_program = "zoo";
+ m_archiver_program = m_unarchiver_program = "zoo";
verifyCompressUtilityIsAvailable( m_archiver_program );
+ verifyUncompressUtilityIsAvailable( m_unarchiver_program );
m_headerString = "----";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/charselectapplet/kcharselectapplet.desktop new/kdeutils-3.5.9/charselectapplet/kcharselectapplet.desktop
--- old/kdeutils-3.5.8/charselectapplet/kcharselectapplet.desktop 2007-10-08 11:49:44.000000000 +0200
+++ new/kdeutils-3.5.9/charselectapplet/kcharselectapplet.desktop 2008-02-13 10:38:13.000000000 +0100
@@ -12,6 +12,7 @@
Name[da]=Tegnvælger
Name[de]=Tabelle zur Zeichenauswahl
Name[el]=Επιλογέας χαρακτήρων
+Name[eo]=Elektilo por signoj
Name[es]=Selector de caracteres
Name[et]=Sümbolite valija
Name[eu]=Karaktere autatzailea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/configure.in new/kdeutils-3.5.9/configure.in
--- old/kdeutils-3.5.8/configure.in 2007-10-08 16:31:10.000000000 +0200
+++ new/kdeutils-3.5.9/configure.in 2008-02-13 16:12:55.000000000 +0100
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdeutils, "3.5.8") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdeutils, "3.5.9") dnl searches for some needed programs
KDE_SET_PREFIX
Files old/kdeutils-3.5.8/doc/ark/index.cache.bz2 and new/kdeutils-3.5.9/doc/ark/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kcalc/index.cache.bz2 and new/kdeutils-3.5.9/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kcharselect/index.cache.bz2 and new/kdeutils-3.5.9/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kdelirc/irkick/index.cache.bz2 and new/kdeutils-3.5.9/doc/kdelirc/irkick/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kdelirc/kcmlirc/index.cache.bz2 and new/kdeutils-3.5.9/doc/kdelirc/kcmlirc/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kdf/index.cache.bz2 and new/kdeutils-3.5.9/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kedit/index.cache.bz2 and new/kdeutils-3.5.9/doc/kedit/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kfloppy/index.cache.bz2 and new/kdeutils-3.5.9/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kgpg/index.cache.bz2 and new/kdeutils-3.5.9/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/khexedit/index.cache.bz2 and new/kdeutils-3.5.9/doc/khexedit/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kinfocenter/blockdevices/index.cache.bz2 and new/kdeutils-3.5.9/doc/kinfocenter/blockdevices/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kjots/index.cache.bz2 and new/kdeutils-3.5.9/doc/kjots/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/KRegExpEditor/index.cache.bz2 and new/kdeutils-3.5.9/doc/KRegExpEditor/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/ksim/index.cache.bz2 and new/kdeutils-3.5.9/doc/ksim/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/ktimer/index.cache.bz2 and new/kdeutils-3.5.9/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/kwallet/index.cache.bz2 and new/kdeutils-3.5.9/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-3.5.8/doc/superkaramba/index.cache.bz2 and new/kdeutils-3.5.9/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kcalc/knumber/knumber.h new/kdeutils-3.5.9/kcalc/knumber/knumber.h
--- old/kdeutils-3.5.8/kcalc/knumber/knumber.h 2007-01-15 12:25:36.000000000 +0100
+++ new/kdeutils-3.5.9/kcalc/knumber/knumber.h 2008-02-13 10:38:15.000000000 +0100
@@ -20,8 +20,6 @@
#ifndef _KNUMBER_H
#define _KNUMBER_H
-#include
-
#include
#include "knumber_priv.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kcalc/knumber/knumber_priv.h new/kdeutils-3.5.9/kcalc/knumber/knumber_priv.h
--- old/kdeutils-3.5.8/kcalc/knumber/knumber_priv.h 2007-01-15 12:25:36.000000000 +0100
+++ new/kdeutils-3.5.9/kcalc/knumber/knumber_priv.h 2008-02-13 10:38:15.000000000 +0100
@@ -21,6 +21,7 @@
class QString;
+#include <cstdio>
#include
// work-around for pre-C99-libs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kdelirc/irkick/irkick.desktop new/kdeutils-3.5.9/kdelirc/irkick/irkick.desktop
--- old/kdeutils-3.5.8/kdelirc/irkick/irkick.desktop 2007-10-08 11:49:47.000000000 +0200
+++ new/kdeutils-3.5.9/kdelirc/irkick/irkick.desktop 2008-02-13 10:38:15.000000000 +0100
@@ -13,6 +13,7 @@
GenericName[da]=KDE LIRC-server
GenericName[de]=KDE LIRC-Server
GenericName[el]=Εξυπηρετητής LIRC του KDE
+GenericName[eo]=KDE LIRC-servilo
GenericName[es]=Servidor LIRC de KDE
GenericName[et]=KDE LIRC server
GenericName[eu]=KDE LIRC Zerbitzaria
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kdelirc/kcmlirc/kcmlirc.desktop new/kdeutils-3.5.9/kdelirc/kcmlirc/kcmlirc.desktop
--- old/kdeutils-3.5.8/kdelirc/kcmlirc/kcmlirc.desktop 2007-10-08 11:49:47.000000000 +0200
+++ new/kdeutils-3.5.9/kdelirc/kcmlirc/kcmlirc.desktop 2008-02-13 10:38:15.000000000 +0100
@@ -3,7 +3,7 @@
Icon=irkick
Comment=Configure your remote controls for use with applications
Comment[ar]=إعداد التحكّم عن بعد لاستخدامه في تطبيقاتك
-Comment[bg]=Настройване на дистанционно управление
+Comment[bg]=Настройване на дистанционното управление
Comment[bs]=Podesite vaš daljinski upravljač za upotrebu sa programima
Comment[ca]=Configura els teus controls remots per usar amb aplicacions
Comment[cs]=Nastavení dálkových ovladačů
@@ -68,6 +68,7 @@
Name[da]=Fjernbetjeninger
Name[de]=Fernsteuerungen
Name[el]=Τηλεχειριστήρια
+Name[eo]=Teleregiloj
Name[es]=Controles remotos
Name[et]=Kaugjuhtimine
Name[eu]=Urruneko Aginteak
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kdeutils.lsm new/kdeutils-3.5.9/kdeutils.lsm
--- old/kdeutils-3.5.8/kdeutils.lsm 2007-10-08 13:04:34.000000000 +0200
+++ new/kdeutils-3.5.9/kdeutils.lsm 2008-02-13 10:52:07.000000000 +0100
@@ -1,7 +1,7 @@
Begin4
Title: kdeutils
-Version: 3.5.8
-Entered-date: 2007-10-15
+Version: 3.5.9
+Entered-date: 2008-02-13
Description: Utilities for the K Desktop Environment (KDE)
Keywords: KDE X11 desktop Qt
Author: http://bugs.kde.org/ (KDE Bugtracking System)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kdf/kwikdisk.desktop new/kdeutils-3.5.9/kdf/kwikdisk.desktop
--- old/kdeutils-3.5.8/kdf/kwikdisk.desktop 2007-10-08 11:49:46.000000000 +0200
+++ new/kdeutils-3.5.9/kdf/kwikdisk.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -18,7 +18,7 @@
GenericName=Removable Media Utility
GenericName[af]=Verwyderbare Media Program
GenericName[ar]=أداة الوسائط القابلة للإزالة
-GenericName[bg]=Сменяеми носители
+GenericName[bg]=Преносими носители
GenericName[br]=Ostilh media lem-laka
GenericName[bs]=Alat za izmjenjive medije
GenericName[ca]=Utilitat per discos extraïbles
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kedit/KEdit.desktop new/kdeutils-3.5.9/kedit/KEdit.desktop
--- old/kdeutils-3.5.8/kedit/KEdit.desktop 2007-10-08 11:49:45.000000000 +0200
+++ new/kdeutils-3.5.9/kedit/KEdit.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -11,6 +11,7 @@
GenericName[da]=Simpel teksteditor
GenericName[de]=Einfacher Texteditor
GenericName[el]=Απλός επεξεργαστής κειμένου
+GenericName[eo]=Simpla Tekstredaktilo
GenericName[es]=Editor de texto sencillo
GenericName[et]=Lihtne tekstiredaktor
GenericName[eu]=Testu Editore Soila
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kfloppy/format.cpp new/kdeutils-3.5.9/kfloppy/format.cpp
--- old/kdeutils-3.5.8/kfloppy/format.cpp 2007-10-08 11:49:44.000000000 +0200
+++ new/kdeutils-3.5.9/kfloppy/format.cpp 2008-02-13 10:38:13.000000000 +0100
@@ -165,15 +165,15 @@
//
#ifdef ANY_LINUX
-const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", 0L } ;
-const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", 0L };
-const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", 0L };
-const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", 0L };
-
-const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", 0L } ;
-const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", 0L };
-const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", 0L };
-const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", 0L };
+const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", "/dev/fd0", 0L } ;
+const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", "/dev/fd0", 0L };
+const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", "/dev/fd0", 0L };
+const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", 0L };
+
+const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", "/dev/fd1", 0L } ;
+const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", "/dev/fd1", 0L };
+const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", "/dev/fd1", 0L };
+const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", 0L };
const char *fd0auto[] = { "/dev/fd0", 0L };
const char *fd1auto[] = { "/dev/fd1", 0L };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kgpg/encryptfile.desktop new/kdeutils-3.5.9/kgpg/encryptfile.desktop
--- old/kdeutils-3.5.8/kgpg/encryptfile.desktop 2007-10-08 11:49:44.000000000 +0200
+++ new/kdeutils-3.5.9/kgpg/encryptfile.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -15,6 +15,7 @@
Name[da]=Indkod fil
Name[de]=Datei verschlüsseln
Name[el]=Κρυπτογράφηση αρχείου
+Name[eo]=Ĉifri dosieron
Name[es]=Cifrar archivo
Name[et]=Krüpti fail
Name[eu]=Fitxategiak Zifratu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kgpg/encryptfolder.desktop new/kdeutils-3.5.9/kgpg/encryptfolder.desktop
--- old/kdeutils-3.5.8/kgpg/encryptfolder.desktop 2007-05-14 09:40:45.000000000 +0200
+++ new/kdeutils-3.5.9/kgpg/encryptfolder.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -12,6 +12,7 @@
Name[da]=Arkivér & kryptér mappe
Name[de]=Ordner packen und verschlüsseln
Name[el]=Αρχειοθέτηση & κρυπτογράφηση φακέλου
+Name[eo]=Arkivigi kaj ĉifri dosierujon
Name[es]=Archivar y cifrar carpeta
Name[et]=Arhiveeri ja krüpti kataloog
Name[eu]=Artxibatu eta enkriptatu karpeta
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kgpg/kgpg.cpp new/kdeutils-3.5.9/kgpg/kgpg.cpp
--- old/kdeutils-3.5.8/kgpg/kgpg.cpp 2006-07-22 10:12:20.000000000 +0200
+++ new/kdeutils-3.5.9/kgpg/kgpg.cpp 2008-02-13 10:38:14.000000000 +0100
@@ -221,12 +221,14 @@
else
arch=new KTar(kgpgfoldertmp->name(), "application/x-bzip2");
- if (!arch->open( IO_WriteOnly )) {
+ if (!arch->open( IO_WriteOnly )) {
KMessageBox::sorry(0,i18n("Unable to create temporary file"));
+ delete arch;
return;
- }
+ }
arch->addLocalDirectory (droppedUrls.first().path(),droppedUrls.first().fileName());
arch->close();
+ delete arch;
KgpgInterface *folderprocess=new KgpgInterface();
folderprocess->KgpgEncryptFile(selec,KURL(kgpgfoldertmp->name()),encryptedFile,encryptOptions,symetric);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kgpg/kgpg.desktop new/kdeutils-3.5.9/kgpg/kgpg.desktop
--- old/kdeutils-3.5.8/kgpg/kgpg.desktop 2007-10-08 11:49:44.000000000 +0200
+++ new/kdeutils-3.5.9/kgpg/kgpg.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -17,6 +17,7 @@
GenericName[da]=Krypteringsværktøj
GenericName[de]=Verschlüsselungsprogramm
GenericName[el]=Εργαλείο κρυπτογράφησης
+GenericName[eo]=Ilo por Ĉifrado
GenericName[es]=Herramienta de cifrado
GenericName[et]=Krüptimisvahend
GenericName[eu]=Zifraketa Tresna
@@ -66,6 +67,7 @@
Comment[da]=En GnuPG-forende
Comment[de]=Eine Benutzeroberfläche für GnuPG
Comment[el]=Λογισμικό κρυπτογράφησης (GnuPG)
+Comment[eo]=Fasado por GnuPG
Comment[es]=Interfaz para GnuPG
Comment[et]=GnuPG kasutajaliides
Comment[eu]=GnuPGren bitarteko bat
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/khexedit/parts/kbytesedit/kbyteseditwidget.desktop new/kdeutils-3.5.9/khexedit/parts/kbytesedit/kbyteseditwidget.desktop
--- old/kdeutils-3.5.8/khexedit/parts/kbytesedit/kbyteseditwidget.desktop 2007-05-14 09:40:45.000000000 +0200
+++ new/kdeutils-3.5.9/khexedit/parts/kbytesedit/kbyteseditwidget.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -9,6 +9,7 @@
Name[cy]=Celfigyn GolyguBeit
Name[de]=BytesEdit-Bedienelement
Name[el]=Γραφικό συστατικό BytesEdit
+Name[eo]=BytesEdit-fenestraĵo
Name[es]=Ventana de edición de bytes
Name[et]=Baitide redigeerimise komponent
Name[eu]=Byteak Editatzeko Widget-a
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/khexedit/parts/kpart/khexedit2part.desktop new/kdeutils-3.5.9/khexedit/parts/kpart/khexedit2part.desktop
--- old/kdeutils-3.5.8/khexedit/parts/kpart/khexedit2part.desktop 2007-05-14 09:40:45.000000000 +0200
+++ new/kdeutils-3.5.9/khexedit/parts/kpart/khexedit2part.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -12,6 +12,7 @@
Name[da]=Indlejret binær fremviser
Name[de]=Eingebettetes Anzeigeprogramm für Binärdateien
Name[el]=Ενσωματωμένος προβολέας δυαδικών αρχείων
+Name[eo]=Enkonstruita duum-rigardilo
Name[es]=Visor binario empotrado
Name[et]=Põimitud binaarfailide näitaja
Name[eu]=Ikusgailu binario txertagarria
@@ -34,7 +35,7 @@
Name[nn]=Innebygd binærframvisar
Name[pa]=ਸ਼ਾਮਲ ਬਾਈਨਰੀ ਦਰਸ਼ਕ
Name[pl]=Wbudowana przeglądarka binarna
-Name[pt]=Visualizador Binário Embebido
+Name[pt]=Visualizador Binário Incorporado
Name[pt_BR]=Visualizador Binário Embutido
Name[ru]=Компонент просмотра двоичных данных
Name[sk]=Vložený binárny prezerač
@@ -57,6 +58,7 @@
Comment[da]=Indlejret binær fremviser
Comment[de]=Eingebettetes Anzeigeprogramm für Binärdateien
Comment[el]=Ενσωματωμένος προβολέας δυαδικών αρχείων
+Comment[eo]=Enkonstruita duum-rigardilo
Comment[es]=Visor binario empotrado
Comment[et]=Põimitud binaarfailide näitaja
Comment[eu]=Ikusgailu binario txertagarria
@@ -79,7 +81,7 @@
Comment[nn]=Innebygd binærframvisar
Comment[pa]=ਸ਼ਾਮਲ ਬਾਈਨਰੀ ਦਰਸ਼ਕ
Comment[pl]=Wbudowana przeglądarka binarna
-Comment[pt]=Visualizador Binário Embebido
+Comment[pt]=Visualizador Binário Incorporado
Comment[pt_BR]=Visualizador Binário Embutido
Comment[ru]=Компонент просмотра двоичных данных
Comment[sk]=Vložený binárny prezerač
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/klaptopdaemon/applnk/.directory new/kdeutils-3.5.9/klaptopdaemon/applnk/.directory
--- old/kdeutils-3.5.8/klaptopdaemon/applnk/.directory 2007-10-08 11:49:45.000000000 +0200
+++ new/kdeutils-3.5.9/klaptopdaemon/applnk/.directory 2008-02-13 10:38:14.000000000 +0100
@@ -17,6 +17,7 @@
Name[ga]=Ríomhaire Glúine
Name[gl]=Portátil
Name[hi]=लैपटॉप
+Name[hu]=Noteszgép
Name[is]=Ferðavél
Name[it]=Computer portatile
Name[ja]=ラップトップ
@@ -27,6 +28,7 @@
Name[ms]=Komputer riba
Name[nds]=Klappreekner
Name[pt]=Portátil
+Name[ru]=Батарея ноутбука
Name[sl]=Prenosnik
Name[sr]=Лаптоп
Name[sv]=Bärbar dator
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/klaptopdaemon/applnk/klaptopdaemon.desktop new/kdeutils-3.5.9/klaptopdaemon/applnk/klaptopdaemon.desktop
--- old/kdeutils-3.5.8/klaptopdaemon/applnk/klaptopdaemon.desktop 2007-10-08 11:49:45.000000000 +0200
+++ new/kdeutils-3.5.9/klaptopdaemon/applnk/klaptopdaemon.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -20,6 +20,7 @@
Comment[da]=Batteriovervågning for bærbar
Comment[de]=Benachrichtigung über den Akku-Ladezustand
Comment[el]=Επόπτης μπαταρίας φορητού
+Comment[eo]=Portkomputila baterimonitoro
Comment[es]=Monitor de batería del portátil
Comment[et]=Sülearvuti aku monitooring
Comment[eu]=Magalekoaren bateria begiralea
@@ -67,6 +68,7 @@
Name[da]=Batteriovervågning for bærbar
Name[de]=Akku-Überwachung
Name[el]=Επόπτης μπαταρίας φορητού
+Name[eo]=Portkomputila baterimonitoro
Name[es]=Monitor de batería del portátil
Name[et]=Sülearvuti aku monitooring
Name[eu]=Magalekoaren Bateria Begiralea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/klaptopdaemon/portable.cpp new/kdeutils-3.5.9/klaptopdaemon/portable.cpp
--- old/kdeutils-3.5.8/klaptopdaemon/portable.cpp 2007-05-14 09:40:45.000000000 +0200
+++ new/kdeutils-3.5.9/klaptopdaemon/portable.cpp 2008-02-13 10:38:14.000000000 +0100
@@ -1,7 +1,7 @@
/*
* portable.cpp
*
- * $Id: portable.cpp 629304 2007-02-02 09:55:28Z dfaure $
+ * $Id: portable.cpp 770642 2008-02-04 09:40:51Z woebbe $
*
* Copyright (c) 1999 Paul Campbell
*
@@ -694,7 +694,8 @@
if (p.open(IO_ReadOnly)) {
QString l;
- p.readLine(l,500);
+ QTextStream t(&p);
+ l = t.readLine();
QStringList ll = QStringList::split(' ',l,false);
for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
QString s = *i;
@@ -710,7 +711,8 @@
}
else if (f.open(IO_ReadOnly)) {
QString l;
- f.readLine(l, 500);
+ QTextStream t(&f);
+ l = t.readLine();
QStringList ll = QStringList::split(' ',l,false);
for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
QString s = *i;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/demo/kmilo_demo.desktop new/kdeutils-3.5.9/kmilo/demo/kmilo_demo.desktop
--- old/kdeutils-3.5.8/kmilo/demo/kmilo_demo.desktop 2007-10-08 11:49:46.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/demo/kmilo_demo.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -11,6 +11,7 @@
Name[da]=Demo-plugin
Name[de]=Demo-Plugin
Name[el]=Πρόσθετο επίδειξης
+Name[eo]=Demo-kromaĵo
Name[es]=Extensión de demostración
Name[et]=Demoplugin
Name[eu]=Demo Plugina
@@ -60,6 +61,7 @@
Comment[da]=Dette plugin gør ingenting.
Comment[de]=Dieses Plugin macht nichts.
Comment[el]=Αυτό το πρόσθετο δεν κάνει τίποτα.
+Comment[eo]=Tiu kromaĵo faras nenion.
Comment[es]=Esta extensión no hace nada.
Comment[et]=See plugin ei tee mitte kui midagi.
Comment[eu]=Plugin honek ez du ezer egiten.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/generic/generic_monitor.cpp new/kdeutils-3.5.9/kmilo/generic/generic_monitor.cpp
--- old/kdeutils-3.5.8/kmilo/generic/generic_monitor.cpp 2007-05-14 09:40:46.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/generic/generic_monitor.cpp 2008-02-13 10:38:14.000000000 +0100
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include
@@ -34,8 +35,8 @@
#include
#include
+#define CONFIG_FILE "kmilodrc"
-// FIXME: use DCOPRef where possible instead of hand-rolled DCOP calls.
using namespace KMilo;
@@ -54,10 +55,24 @@
GenericMonitor::~GenericMonitor()
{
+ if(ga) {
+ ga->remove("FastVolumeUp");
+ ga->remove("FastVolumeDown");
+ ga->remove("SlowVolumeUp");
+ ga->remove("SlowVolumeDown");
+ ga->remove("Mute");
+ delete ga;
+ }
}
bool GenericMonitor::init()
{
+ KConfig config(CONFIG_FILE);
+ reconfigure(&config);
+
+ if(!m_enabled)
+ return false; // exit early if we are not supposed to run
+
static const ShortcutInfo shortcuts[] = {
{ "FastVolumeUp", Qt::Key_VolumeUp, SLOT(fastVolumeUp()) },
{ "FastVolumeDown", Qt::Key_VolumeDown, SLOT(fastVolumeDown()) },
@@ -88,11 +103,59 @@
return true;
}
+void GenericMonitor::reconfigure(KConfig *config)
+{
+ config->setGroup("generic monitor");
+
+ m_volumeDeviceIdx = config->readNumEntry("volumeDeviceIdx", -1);
+ m_muteDeviceIdx = config->readNumEntry("muteDeviceIdx", m_volumeDeviceIdx);
+ m_extraDeviceIdx = config->readNumEntry("extraDeviceIdx", -1);
+ m_volumeStepFast = config->readNumEntry("volumeStepFast", 10);
+ m_volumeStepSlow = config->readNumEntry("volumeStepSlow", 1);
+ m_enabled = config->readBoolEntry("enabled", true);
+}
+
+bool GenericMonitor::retrieveKmixDevices()
+{
+ if(m_volumeDeviceIdx != -1 && m_muteDeviceIdx != -1)
+ return true; // both indexes already set
+
+ DCOPReply reply = kmixClient->call("masterDeviceIndex");
+ if (!reply.isValid())
+ { // maybe the error occurred because kmix wasn't running
+ _interface->displayText(i18n("Starting KMix..."));
+ if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
+ {
+ reply = kmixClient->call("masterDeviceIndex");
+ if (reply.isValid())
+ kmixWindow->send("hide");
+ }
+ }
+
+ if (!reply.isValid())
+ {
+ kdDebug() << "KMilo: GenericMonitor could not access kmix/Mixer0 via dcop"
+ << endl;
+ _interface->displayText(i18n("It seems that KMix is not running."));
+
+ return false;
+ } else {
+ if (m_volumeDeviceIdx == -1)
+ m_volumeDeviceIdx = reply;
+ if (m_muteDeviceIdx == -1)
+ m_muteDeviceIdx = m_volumeDeviceIdx; // this is the behaviour documented in README
+ return true;
+ }
+}
+
bool GenericMonitor::retrieveVolume()
{
bool kmix_error = false;
- DCOPReply reply = kmixClient->call("absoluteVolume", 0);
+ if(!retrieveKmixDevices())
+ return false;
+
+ DCOPReply reply = kmixClient->call("absoluteVolume", m_volumeDeviceIdx);
if (reply.isValid())
m_volume = reply;
else
@@ -104,7 +167,7 @@
if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
{
// trying again
- reply = kmixClient->call("absoluteVolume", 0);
+ reply = kmixClient->call("absoluteVolume", m_volumeDeviceIdx);
if (reply.isValid())
{
m_volume = reply;
@@ -122,56 +185,59 @@
return false;
} else {
- reply = kmixClient->call("absoluteVolumeMax", 0);
+ reply = kmixClient->call("absoluteVolumeMax", m_volumeDeviceIdx);
m_maxVolume = reply;
- reply = kmixClient->call("absoluteVolumeMin", 0);
+ reply = kmixClient->call("absoluteVolumeMin", m_volumeDeviceIdx);
m_minVolume = reply;
return true;
}
}
-void GenericMonitor::volumeUp(int step)
-{
+void GenericMonitor::volumeChange(int direction, int step)
+{
if (!retrieveVolume())
return;
- m_volume += (int)((m_maxVolume - m_minVolume) * step /100) +1;
+ /* Following snippet of code may seem to be overcomplicated, but it works for both devices with
+ * volume grain < 100 (32 tested) and devices with volume grain > 100 (256 tested) while preserving
+ * accuracy for devices with fine grain and preserving usability for devices with rough grain. */
+ int userVisibleVolume = qRound(m_volume * 100.0 / (m_maxVolume - m_minVolume));
+ userVisibleVolume += direction * step; // add requested volume step
+ long previousVolume = m_volume;
+ m_volume = qRound(m_minVolume + userVisibleVolume * (m_maxVolume - m_minVolume) / 100.0);
+ if (m_volume == previousVolume) // if the change was rounded to zero
+ m_volume += direction;
+
if (m_volume > m_maxVolume)
m_volume = m_maxVolume;
-
- displayVolume();
-}
-
-void GenericMonitor::volumeDown(int step)
-{
- if (!retrieveVolume())
- return;
-
- m_volume -= (int)((m_maxVolume - m_minVolume) * step /100) +1;
if (m_volume < m_minVolume)
m_volume = m_minVolume;
-
+
displayVolume();
}
-void GenericMonitor::slowVolumeUp() { volumeUp(1); }
-void GenericMonitor::slowVolumeDown() { volumeDown(1); }
-void GenericMonitor::fastVolumeUp() { volumeUp(10); }
-void GenericMonitor::fastVolumeDown() { volumeDown(10); }
+void GenericMonitor::slowVolumeUp() { volumeChange( 1, m_volumeStepSlow); }
+void GenericMonitor::slowVolumeDown() { volumeChange(-1, m_volumeStepSlow); }
+void GenericMonitor::fastVolumeUp() { volumeChange( 1, m_volumeStepFast); }
+void GenericMonitor::fastVolumeDown() { volumeChange(-1, m_volumeStepFast); }
void GenericMonitor::displayVolume()
{
- _interface->displayProgress(i18n("Volume"), (int)(m_volume * 100 / (m_maxVolume - m_minVolume)));
+ _interface->displayProgress(i18n("Volume"), qRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)));
// If we got this far, the DCOP communication with kmix works,
// so we don't have to test the result.
- kmixClient->send("setAbsoluteVolume", 0, m_volume);
+ // Also, device indexes are set to their proper values.
+ kmixClient->send("setAbsoluteVolume", m_volumeDeviceIdx, m_volume);
+ if(m_extraDeviceIdx != -1)
+ // for simplicity, use relative volume rather that absolute (extra precision is not needed here)
+ kmixClient->send("setVolume", m_extraDeviceIdx, qRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)));
// if mute then unmute
if (m_mute)
{
m_mute = false;
- kmixClient->send("setMasterMute", m_mute);
+ kmixClient->send("setMute", m_muteDeviceIdx, m_mute);
}
}
@@ -179,7 +245,10 @@
{
bool kmix_error = false;
- DCOPReply reply = kmixClient->call("masterMute");
+ if(!retrieveKmixDevices())
+ return false;
+
+ DCOPReply reply = kmixClient->call("mute", m_muteDeviceIdx);
if (reply.isValid())
m_mute = reply;
else
@@ -192,7 +261,7 @@
if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
{
// trying again
- reply = kmixClient->call("masterMute");
+ reply = kmixClient->call("mute", m_muteDeviceIdx);
if (reply.isValid())
{
m_mute = reply;
@@ -224,19 +293,17 @@
return;
m_mute = !m_mute;
- int newVolume;
QString muteText;
if (m_mute)
{
- m_oldVolume = m_volume;
- newVolume = 0;
muteText = i18n("Mute on");
} else {
- newVolume = m_oldVolume;
muteText = i18n("Mute off");
}
- kmixClient->send("setMasterMute", m_mute);
+ kmixClient->send("setMute", m_muteDeviceIdx, m_mute);
+ if(m_extraDeviceIdx != -1)
+ kmixClient->send("setMute", m_extraDeviceIdx, m_mute);
_interface->displayText(muteText);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/generic/generic_monitor.h new/kdeutils-3.5.9/kmilo/generic/generic_monitor.h
--- old/kdeutils-3.5.8/kmilo/generic/generic_monitor.h 2007-05-14 09:40:46.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/generic/generic_monitor.h 2008-02-13 10:38:14.000000000 +0100
@@ -55,6 +55,7 @@
virtual bool init();
virtual int progress() const;
virtual DisplayType poll();
+ virtual void reconfigure(KConfig*);
public slots:
void slowVolumeUp();
@@ -64,8 +65,8 @@
void mute();
private:
- void volumeUp(int step);
- void volumeDown(int step);
+ bool retrieveKmixDevices();
+ void volumeChange(int direction, int step);
bool retrieveMute();
bool retrieveVolume();
void displayVolume();
@@ -75,11 +76,16 @@
DCOPRef *kmixClient, *kmixWindow;
int m_progress;
- long m_volume, m_oldVolume;
+ long m_volume;
bool m_mute;
long m_maxVolume, m_minVolume;
+ // following properties are read from config file:
+ int m_volumeStepFast, m_volumeStepSlow;
+ int m_volumeDeviceIdx, m_muteDeviceIdx, m_extraDeviceIdx;
+ bool m_enabled;
+
Monitor::DisplayType m_displayType;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/generic/kmilo_generic.desktop new/kdeutils-3.5.9/kmilo/generic/kmilo_generic.desktop
--- old/kdeutils-3.5.8/kmilo/generic/kmilo_generic.desktop 2007-10-08 11:49:46.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/generic/kmilo_generic.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -13,6 +13,7 @@
Name[da]=Generisk tastatur-plugin
Name[de]=Allgemeines Tastatur-Plugin
Name[el]=Γενικευμένο πρόσθετο πληκτρολογίου
+Name[eo]=Komuna klavar-kromprogramo
Name[es]=Extensión de teclado genérico
Name[et]=Tavaline klaviatuuriplugin
Name[eu]=Teklatu Arruntaren Plugina
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/generic/README new/kdeutils-3.5.9/kmilo/generic/README
--- old/kdeutils-3.5.8/kmilo/generic/README 2005-09-10 10:21:33.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/generic/README 2008-02-13 10:38:14.000000000 +0100
@@ -1,7 +1,38 @@
This module provides support for the VolumeUp, VolumeDown and Mute Internet
keys found in many laptops and special keyboards.
-If you use CTRL in conjunction with volUp/Down it changes the volume by 10,
-otherwise by 1.
+Please note that in order this module to work, mentioned special keys have to
+generate appropriate X key symbols (keysyms), namely XF86AudioLowerVolume,
+XF86AudioRaiseVolume, XF86AudioMute. You can use "xev" program to watch events
+generated by X server and "xmodmap" program to assign events (keycodes) to
+keysyms. Also watch kernel log (dmesg) for unknown scancodes.
-Have fun.
\ No newline at end of file
+If you use CTRL in conjunction with volUp/Down it changes the volume by 1%,
+otherwise by 10%.
+
+This module is now configurable (though with no configuration GUI), you can
+change which channels (kmix device indexes) to change volume on, you can also
+tweak volume changing steps. Channels are represented by numeric indexes
+starting from zero, in order to get the right channel, you have to experiment
+a little (keep the kmix mixer window open). ;) Examples:
+
+# Change "fast" step to 5% and "slow" step to 2%:
+kwriteconfig --file kmilodrc --group "generic monitor" --key volumeStepFast 5
+kwriteconfig --file kmilodrc --group "generic monitor" --key volumeStepSlow 2
+
+# Change channel to set volume on to 1 (use -1 to use kmix' master device):
+kwriteconfig --file kmilodrc --group "generic monitor" --key volumeDeviceIdx 1
+
+# You can also specify different mute channel (leave it unset or set it to -1
+# to use the same channel for muting and changing volume):
+kwriteconfig --file kmilodrc --group "generic monitor" --key muteDeviceIdx 2
+
+# KMilo now supports an extra channel, whose volume and mute will be set to
+# whatever your primary channel is set to. (leave it unset or set it to -1 to
+# disable this functionality):
+kwriteconfig --file kmilodrc --group "generic monitor" --key extraDeviceIdx 5
+
+# Use following call to apply these settings without restarting your session:
+dcop kded kmilod reconfigure
+
+Have fun.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/kmilod/kmilod.desktop new/kdeutils-3.5.9/kmilo/kmilod/kmilod.desktop
--- old/kdeutils-3.5.8/kmilo/kmilod/kmilod.desktop 2007-10-08 11:49:46.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/kmilod/kmilod.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -22,6 +22,7 @@
Comment[da]=KDE Speciel tast bekendtgørelse
Comment[de]=Unterstützung für Sonder- und Multimediatasten in KDE
Comment[el]=Ειδοποιητής ειδικών πλήκτρων του KDE
+Comment[eo]=KDE-specialklavatentigilo
Comment[es]=Notificador de teclas especiales de KDE
Comment[et]=KDE eriklahvide märkija
Comment[eu]=KDE tekla berezien jakinarazlea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kmilo/thinkpad/kmilo_thinkpad.desktop new/kdeutils-3.5.9/kmilo/thinkpad/kmilo_thinkpad.desktop
--- old/kdeutils-3.5.8/kmilo/thinkpad/kmilo_thinkpad.desktop 2007-10-08 11:49:46.000000000 +0200
+++ new/kdeutils-3.5.9/kmilo/thinkpad/kmilo_thinkpad.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -12,6 +12,7 @@
Name[cy]=Ategyn Thinkpad
Name[de]=Thinkpad-Plugin
Name[el]=Πρόσθετο Thinkpad
+Name[eo]=Thinkpad-kromaĵo
Name[es]=Extensión para Thinkpad
Name[et]=Thinkpadi plugin
Name[eu]=Thikpad Plugina
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kregexpeditor/kregexpeditor.desktop new/kdeutils-3.5.9/kregexpeditor/kregexpeditor.desktop
--- old/kdeutils-3.5.8/kregexpeditor/kregexpeditor.desktop 2007-05-14 09:40:46.000000000 +0200
+++ new/kdeutils-3.5.9/kregexpeditor/kregexpeditor.desktop 2008-02-13 10:38:15.000000000 +0100
@@ -25,6 +25,7 @@
GenericName[da]=Editor for regulære udtryk
GenericName[de]=Editor für reguläre Ausdrücke
GenericName[el]=Επεξεργαστής κανονικών εκφράσεων
+GenericName[eo]=Redaktilo por regulesprimoj
GenericName[es]=Editor de expresiones regulares
GenericName[et]=Regulaaravaldiste redaktor
GenericName[eu]=Adierazpen Erregularren Editorea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/kregexpeditor/kregexpeditorgui.desktop new/kdeutils-3.5.9/kregexpeditor/kregexpeditorgui.desktop
--- old/kdeutils-3.5.8/kregexpeditor/kregexpeditorgui.desktop 2007-05-14 09:40:46.000000000 +0200
+++ new/kdeutils-3.5.9/kregexpeditor/kregexpeditorgui.desktop 2008-02-13 10:38:15.000000000 +0100
@@ -38,7 +38,7 @@
Name[ne]=RegExp सम्पादक विजेट
Name[nn]=Skjermelement for redigering av regulære uttrykk
Name[pl]=Edytor wyrażeń regularnych
-Name[pt]=Editor de Expressões Regulares
+Name[pt]=Item de Edição de Expressões Regulares
Name[pt_BR]=Widget do Editor de Expressões Regulares
Name[ro]=Componentă editare expresii regulate
Name[ru]=Виджет редактора регулярных выражений
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ksim/ksim.desktop new/kdeutils-3.5.9/ksim/ksim.desktop
--- old/kdeutils-3.5.8/ksim/ksim.desktop 2007-10-08 11:49:45.000000000 +0200
+++ new/kdeutils-3.5.9/ksim/ksim.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -77,6 +77,7 @@
Comment[da]=Systeminformationsovervågning (GKrellM-lignende)
Comment[de]=System-Informationsüberwachung (GKrellM-Stil)
Comment[el]=Επόπτης πληροφοριών συστήματος (στο στυλ του GKrellM)
+Comment[eo]=Monitoro por Sisteminformoj (GKrellM-stilo)
Comment[es]=Monitor de información del sistema (estilo GKrellM)
Comment[et]=Süsteemi monitooring (GKrellM stiil)
Comment[eu]=Sistemaren Informazioaren Begiralea (GKrellM estiloa)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/ksim/monitors/snmp/Snmp.desktop new/kdeutils-3.5.9/ksim/monitors/snmp/Snmp.desktop
--- old/kdeutils-3.5.8/ksim/monitors/snmp/Snmp.desktop 2007-05-14 09:40:45.000000000 +0200
+++ new/kdeutils-3.5.9/ksim/monitors/snmp/Snmp.desktop 2008-02-13 10:38:14.000000000 +0100
@@ -9,6 +9,7 @@
Comment[da]=Snmp statusovervågning
Comment[de]=Statusanzeige für SNMP
Comment[el]=Επόπτης κατάστασης snmp
+Comment[eo]=Monitoro por la Snmp-stato
Comment[es]=Monitor de estado de Snmp
Comment[et]=Snmp oleku monitooring
Comment[eu]=Snmp Egoera Begiralea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdeutils-3.5.8/superkaramba/src/superkaramba.desktop new/kdeutils-3.5.9/superkaramba/src/superkaramba.desktop
--- old/kdeutils-3.5.8/superkaramba/src/superkaramba.desktop 2007-10-08 11:49:47.000000000 +0200
+++ new/kdeutils-3.5.9/superkaramba/src/superkaramba.desktop 2008-02-13 10:38:15.000000000 +0100
@@ -59,6 +59,7 @@
GenericName[da]=Desktopkontroller
GenericName[de]=Arbeitsflächen-Erweiterungen
GenericName[el]=Γραφικά συστατικά επιφάνειας εργασίας
+GenericName[eo]=Tabulaj fenestraĵoj
GenericName[es]=Elementos visuales para el escritorio
GenericName[et]=Töölauavidinad
GenericName[eu]=Mahaigaineko trepetak
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org