Hello community,
here is the log from the commit of package kdebase3-SuSE
checked in at Sat Sep 22 23:40:24 CEST 2007.
--------
--- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-09-20 16:07:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-09-21 19:05:53.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 21 19:03:28 CEST 2007 - dmueller@suse.de
+
+- fix swap not correctly displayed in sysinfo:/ (#327031)
+- fix media access of usb sticks with special chars in label (#326912)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.V23728/_old 2007-09-22 23:39:58.000000000 +0200
+++ /var/tmp/diff_new_pack.V23728/_new 2007-09-22 23:39:58.000000000 +0200
@@ -32,7 +32,7 @@
PreReq: %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 10.3
-Release: 144
+Release: 146
Source0: kdebase-SuSE-%{version}.tar.bz2
Source2: kdebase3-SuSE-displaymanager.fillup
Source3: kdebase3-SuSE-windowmanager.fillup
@@ -72,15 +72,13 @@
Authors:
--------
Artwork:
- Ken W. Wimer
- Torsten Rahn
- Everaldo
+ Jakub Steiner
Implementation:
- Adrian Schr�ter
- Marcus Meissner
- Oliver Ries
- Ludwig Nussel
+ Lukas Tinkl
+ Stephan Kulow
+ Dirk Mueller
+ Stephan Binner
%if %{suse_version} > 1020
%lang_package
@@ -207,6 +205,9 @@
/opt/kde3/%_lib/kde3/kio_sysinfo.*
/opt/kde3/share/services/sysinfo.protocol
%changelog
+* Fri Sep 21 2007 - dmueller@suse.de
+- fix swap not correctly displayed in sysinfo:/ (#327031)
+- fix media access of usb sticks with special chars in label (#326912)
* Thu Sep 20 2007 - stbinner@suse.de
- fix "don't start Beagle daemon for Live-CD user" change
* Wed Sep 19 2007 - dmueller@suse.de
++++++ kdebase-SuSE-10.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kio_sysinfo/hr.po new/kdebase-SuSE/po/kio_sysinfo/hr.po
--- old/kdebase-SuSE/po/kio_sysinfo/hr.po 2007-09-20 15:34:15.000000000 +0200
+++ new/kdebase-SuSE/po/kio_sysinfo/hr.po 2007-09-21 18:47:56.000000000 +0200
@@ -1,19 +1,19 @@
-# translation of kio_sysinfo.hr.po to Croatian
+# translation of kio_sysinfo.hr.po to Hrvatski
# Croatian message file for YaST2 (@memory@)
# Copyright (C) 2005 SUSE Linux Products GmbH.
# Copyright (C) 2002 SuSE Linux AG.
# Copyright (C) 2001 SuSE GmbH.
#
# Vlatko Kosturjak , 2001.
-# Krešimir Jozić , 2006.
+# Krešimir Jozić , 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: kio_sysinfo.hr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-01 12:10+0200\n"
-"PO-Revision-Date: 2006-12-09 12:14+0000\n"
+"PO-Revision-Date: 2007-09-20 21:34+0200\n"
"Last-Translator: Krešimir Jozić \n"
-"Language-Team: Croatian \n"
+"Language-Team: Hrvatski\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -142,11 +142,11 @@
#: sysinfo.cpp:209
msgid "Cores:"
-msgstr ""
+msgstr "Jezgre:"
#: sysinfo.cpp:213
msgid "Temperature:"
-msgstr ""
+msgstr "Temperatura:"
#: sysinfo.cpp:220
msgid "Looking for memory information..."
@@ -236,5 +236,3 @@
msgid "Unknown network status"
msgstr "Nepoznat status mreže"
-#~ msgid "unknown"
-#~ msgstr "nepoznato"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kryptomedia/hr.po new/kdebase-SuSE/po/kryptomedia/hr.po
--- old/kdebase-SuSE/po/kryptomedia/hr.po 2007-09-20 15:34:15.000000000 +0200
+++ new/kdebase-SuSE/po/kryptomedia/hr.po 2007-09-21 18:48:00.000000000 +0200
@@ -1,48 +1,49 @@
+# translation of kryptomedia.hr.po to Hrvatski
# @TITLE@
# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
-# FIRST AUTHOR , YEAR.
#
# This file is distributed under the same license as @PACKAGE@ package. FIRST
#
+# Krešimir Jozić , 2007.
msgid ""
msgstr ""
-"Project-Id-Version: @PACKAGE@\n"
+"Project-Id-Version: kryptomedia.hr\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
"POT-Creation-Date: 2007-01-15 11:13+0100\n"
-"PO-Revision-Date: 2001-07-17 16:22+0200\n"
-"Last-Translator: Vlatko Kosturjak \n"
-"Language-Team: Croatian \n"
+"PO-Revision-Date: 2007-09-20 21:47+0200\n"
+"Last-Translator: Krešimir Jozić \n"
+"Language-Team: Hrvatski\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.4\n"
#: dialog.cpp:31
msgid "Decrypt"
-msgstr ""
+msgstr "Dešifriraj"
#: dialog.cpp:92
-#, fuzzy
msgid "Wrong password!"
-msgstr "Proxy lozinka"
+msgstr "Pogrešna lozinka!"
#: dialog.cpp:94
msgid "Decryption failed! Application \"cryptsetup\" not found. Is package \"util-linux-crypto\" installed?"
-msgstr ""
+msgstr "Dešifriranje nije uspjelo! Program \"cryptsetup\" nije pronađen. Da li je paket \"util-linux-crypto\" instaliran?"
#: dialog.cpp:96
msgid "%1 is already decrypted!"
-msgstr ""
+msgstr "%1 je već dešifriran!"
#: main.cpp:38
msgid "HAL UDI to process."
-msgstr "HAL UDI procesu."
+msgstr "HAL UDI za obradu."
#. i18n: file decryptdialog.ui line 24
#: rc.cpp:3
#, no-c-format
msgid "Decrypting Storage Device"
-msgstr ""
+msgstr "Dešifriram uređaj za pohranu podataka"
#. i18n: file decryptdialog.ui line 110
#: rc.cpp:6
@@ -51,9 +52,12 @@
"<p><b>%1 %2</b> (<b>%3</b>) is an encrypted storage device.</p>\n"
"<p>Please enter the password to decrypt the storage device.</p>"
msgstr ""
+"<p><b>%1 %2</b> (<b>%3</b>) je šifrirani uređaj za pohranu podataka.</p>\n"
+"<p>Molim unesite lozinku za dešifriranje uređaja za pohranu podataka.</p>"
#. i18n: file decryptdialog.ui line 131
#: rc.cpp:10
-#, fuzzy, no-c-format
+#, no-c-format
msgid "&Password:"
-msgstr "Lozinka: "
+msgstr "&Lozinka:"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/sysinfo/src/sysinfo.cpp new/kdebase-SuSE/sysinfo/src/sysinfo.cpp
--- old/kdebase-SuSE/sysinfo/src/sysinfo.cpp 2007-09-12 11:53:45.000000000 +0200
+++ new/kdebase-SuSE/sysinfo/src/sysinfo.cpp 2007-09-21 18:41:53.000000000 +0200
@@ -255,7 +255,7 @@
return val;
}
-static unsigned long int calculateFreeRam()
+static Q_UINT64 calculateFreeRam()
{
FILE *fd = fopen( "/proc/meminfo", "rt" );
if ( !fd )
@@ -264,10 +264,10 @@
QTextIStream is( fd );
QString MemInfoBuf = is.read();
- unsigned long int MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
- unsigned long int Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
- unsigned long int Cached = scan_one( MemInfoBuf.latin1(), "Cached" );
- unsigned long int Slab = scan_one( MemInfoBuf.latin1(), "Slab" );
+ Q_UINT64 MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
+ Q_UINT64 Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
+ Q_UINT64 Cached = scan_one( MemInfoBuf.latin1(), "Cached" );
+ Q_UINT64 Slab = scan_one( MemInfoBuf.latin1(), "Slab" );
fclose( fd );
MemFree += Cached + Buffers + Slab;
@@ -283,19 +283,19 @@
if ( retval !=-1 )
{
- const int mem_unit = info.mem_unit;
+ Q_UINT64 mem_unit = info.mem_unit;
- m_info[MEM_TOTALRAM] = formattedUnit( info.totalram * mem_unit );
- unsigned long int totalFree = calculateFreeRam() * 1024;
+ m_info[MEM_TOTALRAM] = formattedUnit( Q_UINT64(info.totalram) * mem_unit );
+ Q_UINT64 totalFree = calculateFreeRam() * 1024;
kdDebug(1242) << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
if ( totalFree > info.freeram * info.mem_unit || true )
- m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( info.freeram * mem_unit ))
+ m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( Q_UINT64(info.freeram) * mem_unit ))
.arg( formattedUnit( totalFree - info.freeram * mem_unit ));
else
- m_info[MEM_FREERAM] = formattedUnit( info.freeram * mem_unit );
+ m_info[MEM_FREERAM] = formattedUnit( Q_UINT64(info.freeram) * mem_unit );
- m_info[MEM_TOTALSWAP] = formattedUnit( info.totalswap * mem_unit );
- m_info[MEM_FREESWAP] = formattedUnit( info.freeswap * mem_unit );
+ m_info[MEM_TOTALSWAP] = formattedUnit( Q_UINT64(info.totalswap) * mem_unit );
+ m_info[MEM_FREESWAP] = formattedUnit( Q_UINT64(info.freeswap) * mem_unit );
m_info[SYSTEM_UPTIME] = convertSeconds( info.uptime );
}
@@ -347,10 +347,14 @@
if (di.total)
percent = usage / ( di.total / 100);
- result += QString( "<tr><td>%1 %3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>\n" ).
- arg( icon( di.iconName ) ).arg( di.name ).arg( di.label ).arg( di.fsType ).
+ KURL media;
+ media.setProtocol("media");
+ media.setPath("/" + di.name);
+
+ result += QString( "<tr><td>%1 %3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>\n" ).
+ arg( icon( di.iconName ) ).arg( media.htmlURL() ).arg( htmlQuote(di.label) ).arg( di.fsType ).
arg( di.total ? formattedUnit( di.total) : QString::null).arg(di.mounted ?
- formattedUnit (di.avail ) : QString::null).arg( tooltip );
+ formattedUnit (di.avail ) : QString::null).arg( htmlQuote(tooltip) );
if (di.mounted) {
QColor c;
c.setHsv(100-percent, 180, 230);
@@ -403,6 +407,7 @@
}
result += "</table>";
+
return result;
}
@@ -609,7 +614,8 @@
QString kio_sysinfoProtocol::icon( const QString & name, int size ) const
{
QString path = KGlobal::iconLoader()->iconPath( name, -size );
- return QString( "" ).arg( path ).arg( size ).arg( size );
+ return QString( "" ).arg(
+ htmlQuote(path) ).arg( size ).arg( size );
}
QString kio_sysinfoProtocol::iconForDevice( const QString & name ) const
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org