Hello community,
here is the log from the commit of package kdemultimedia4
checked in at Thu Dec 20 16:31:30 CET 2007.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2007-12-05 19:07:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2007-12-20 13:35:46.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Dec 16 15:21:02 CET 2007 - dmueller@suse.de
+
+- update to 3.97.1
+
+-------------------------------------------------------------------
Old:
----
kdemultimedia-3.97.0.tar.bz2
New:
----
kdemultimedia-3.97.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.B28708/_old 2007-12-20 16:31:15.000000000 +0100
+++ /var/tmp/diff_new_pack.B28708/_new 2007-12-20 16:31:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 3.97.0)
+# spec file for package kdemultimedia4 (Version 3.97.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,13 +17,14 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 3.97.0
+Version: 3.97.1
Release: 1
-%define rversion 3.97.0
+%define rversion 3.97.1
Source0: kdemultimedia-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: kdebase4-runtime libkcddb4
+%kde4_runtime_requires
+Requires: libkcddb4
#Patch: desktop-files.diff
Suggests: kde4-juk
Suggests: kde4-kmix
@@ -82,7 +83,7 @@
%package -n kde4-juk
Group: Productivity/Multimedia/Sound/Players
Summary: Jukebox
-Requires: kdebase4-runtime
+%kde4_runtime_requires
%description -n kde4-juk
Jukebox and music manager for KDE
@@ -106,7 +107,7 @@
%package -n kde4-kmix
Group: Productivity/Multimedia/Sound/Mixers
Summary: Sound Mixer
-Requires: kdebase4-runtime
+%kde4_runtime_requires
%description -n kde4-kmix
KDE's full featured mini mixer
@@ -130,7 +131,8 @@
%package -n kde4-kscd
Group: Productivity/Multimedia/CD/Players
Summary: CD Player
-Requires: kdebase4-runtime libkcompactdisc4 kdemultimedia4
+%kde4_runtime_requires
+Requires: libkcompactdisc4 kdemultimedia4
%description -n kde4-kscd
KDE's CD Player
@@ -155,7 +157,8 @@
%package -n kde4-kio_audiocd
Group: System/GUI/KDE
Summary: KDE I/O Slave for Audio CDs
-Requires: kdebase4-runtime libkcompactdisc4 kdemultimedia4
+%kde4_runtime_requires
+Requires: libkcompactdisc4 kdemultimedia4
%description -n kde4-kio_audiocd
This package contains an KIO slave to access audio CDs.
@@ -266,7 +269,7 @@
%package -n phonon_xine
Group: System/GUI/KDE
Summary: A Phonon-Backend based on Xine
-Requires: kdebase4-runtime
+%kde4_runtime_requires
%description -n phonon_xine
A Phonon-Backend based on Xine
@@ -298,7 +301,7 @@
%package -n phonon_gst
Group: System/GUI/KDE
Summary: KDE 4 test build
-Requires: kdebase4-runtime
+%kde4_runtime_requires
%description -n phonon_gst
@@ -318,6 +321,8 @@
%doc COPYING COPYING-DOCS README
%changelog
+* Sun Dec 16 2007 - dmueller@suse.de
+- update to 3.97.1
* Wed Dec 05 2007 - dmueller@suse.de
- update to 3.97.0
* Tue Dec 04 2007 - dmueller@suse.de
++++++ kdemultimedia-3.97.0.tar.bz2 -> kdemultimedia-3.97.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/cmake/modules/FindTunePimp.cmake new/kdemultimedia-3.97.1/cmake/modules/FindTunePimp.cmake
--- old/kdemultimedia-3.97.0/cmake/modules/FindTunePimp.cmake 2007-08-29 11:56:42.000000000 +0200
+++ new/kdemultimedia-3.97.1/cmake/modules/FindTunePimp.cmake 2007-12-14 21:44:39.000000000 +0100
@@ -24,8 +24,11 @@
MESSAGE( STATUS "tunepimp found: includes in ${TUNEPIMP_INCLUDE_DIR}, library in ${TUNEPIMP_LIBRARIES}")
set(TUNEPIMP_FOUND TRUE)
INCLUDE(CheckLibraryExists)
+ SET(old_flags ${CMAKE_REQUIRED_LIBRARIES})
+ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
CHECK_LIBRARY_EXISTS(${TUNEPIMP_LIBRARIES} tp_SetFileNameEncoding "" TUNEPIMP_FOUND_VERSION_4)
CHECK_LIBRARY_EXISTS(${TUNEPIMP_LIBRARIES} tr_GetPUID "" TUNEPIMP_FOUND_VERSION_5)
+ SET(CMAKE_REQUIRED_LIBRARIES ${old_flags})
MESSAGE(STATUS "TUNEPIMP_FOUND_VERSION_4 :<${TUNEPIMP_FOUND_VERSION_4}>")
MESSAGE(STATUS "TUNEPIMP_FOUND_VERSION_5 :<${TUNEPIMP_FOUND_VERSION_5}>")
else(TUNEPIMP_INCLUDE_DIR AND TUNEPIMP_LIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/CMakeLists.txt new/kdemultimedia-3.97.1/CMakeLists.txt
--- old/kdemultimedia-3.97.0/CMakeLists.txt 2007-10-03 13:47:41.000000000 +0200
+++ new/kdemultimedia-3.97.1/CMakeLists.txt 2007-12-14 21:44:40.000000000 +0100
@@ -7,7 +7,8 @@
include (KDE4Defaults)
include (MacroLibrary)
include (MacroLogFeature)
-include(MacroOptionalAddSubdirectory)
+include (MacroOptionalAddSubdirectory)
+include (CheckStructMember)
macro_optional_find_package(Taglib)
macro_optional_find_package(Theora)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/config.h.cmake new/kdemultimedia-3.97.1/config.h.cmake
--- old/kdemultimedia-3.97.0/config.h.cmake 2007-05-03 10:48:35.000000000 +0200
+++ new/kdemultimedia-3.97.1/config.h.cmake 2007-12-14 21:44:40.000000000 +0100
@@ -44,6 +44,12 @@
/* Define to 1 if you have the header file. */
#cmakedefine HAVE_SYS_STAT_H 1
+/* Define to 1 if you have the header file. */
+#cmakedefine HAVE_SYS_ENDIAN_H 1
+
+/* Define to 1 if you have the header file. */
+#cmakedefine HAVE_ENDIAN_H 1
+
/* define if you have TagLib */
#cmakedefine HAVE_TAGLIB 1
@@ -53,6 +59,9 @@
/* Define if you have XShmGetEventBase in , FreeBSD has and Solaris has neither.
+check_include_files(endian.h HAVE_ENDIAN_H)
+check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H)
check_type_size("long" SIZEOF_LONG)
Files old/kdemultimedia-3.97.0/doc/juk/index.cache.bz2 and new/kdemultimedia-3.97.1/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-3.97.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-3.97.1/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-3.97.0/doc/kscd/index.cache.bz2 and new/kdemultimedia-3.97.1/doc/kscd/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/juk/collectionlist.cpp new/kdemultimedia-3.97.1/juk/collectionlist.cpp
--- old/kdemultimedia-3.97.0/juk/collectionlist.cpp 2007-10-03 13:47:40.000000000 +0200
+++ new/kdemultimedia-3.97.1/juk/collectionlist.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -85,7 +85,7 @@
m_list->sort();
- collection->setupPlaylist(m_list, "folder_sound");
+ collection->setupPlaylist(m_list, "folder-sound");
}
////////////////////////////////////////////////////////////////////////////////
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/juk/playlistbox.cpp new/kdemultimedia-3.97.1/juk/playlistbox.cpp
--- old/kdemultimedia-3.97.0/juk/playlistbox.cpp 2007-10-23 10:39:36.000000000 +0200
+++ new/kdemultimedia-3.97.1/juk/playlistbox.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -105,7 +105,7 @@
// add the view modes stuff
KSelectAction *viewModeAction =
- new KSelectAction( KIcon("view_choose"), i18n("View Modes"), ActionCollection::actions());
+ new KSelectAction( KIcon("view-choose"), i18n("View Modes"), ActionCollection::actions());
ActionCollection::actions()->addAction("viewModeMenu", viewModeAction);
m_viewModes.append(new ViewMode(this));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/juk/playlistcollection.cpp new/kdemultimedia-3.97.1/juk/playlistcollection.cpp
--- old/kdemultimedia-3.97.0/juk/playlistcollection.cpp 2007-10-23 10:39:36.000000000 +0200
+++ new/kdemultimedia-3.97.1/juk/playlistcollection.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -190,7 +190,7 @@
m_dynamicPlaylist->setPlaylists(playlists);
else
m_dynamicPlaylist =
- new DynamicPlaylist(playlists, this, i18n("Dynamic List"), "midi", false, true);
+ new DynamicPlaylist(playlists, this, i18n("Dynamic List"), "audio-midi", false, true);
PlaylistCollection::raise(m_dynamicPlaylist);
}
@@ -563,7 +563,7 @@
action<KToggleAction>("showHistory")->setChecked(true);
m_historyPlaylist = new HistoryPlaylist(this);
m_historyPlaylist->setName(i18n("History"));
- setupPlaylist(m_historyPlaylist, "history");
+ setupPlaylist(m_historyPlaylist, "view-history");
}
else {
delete m_historyPlaylist;
@@ -586,7 +586,7 @@
if(!m_upcomingPlaylist)
m_upcomingPlaylist = new UpcomingPlaylist(this);
- setupPlaylist(m_upcomingPlaylist, "today");
+ setupPlaylist(m_upcomingPlaylist, "go-jump-today");
}
else {
action<KToggleAction>("showUpcoming")->setChecked(false);
@@ -872,7 +872,7 @@
/* menu->setIconSet(SmallIconSet("wizard")); */
menu->addAction(createAction(i18n("From &File Name"), SLOT(slotGuessTagFromFile()),
- "guessTagFile", "file-import", KShortcut(Qt::CTRL + Qt::Key_G)));
+ "guessTagFile", "document-import", KShortcut(Qt::CTRL + Qt::Key_G)));
menu->addAction(createAction(i18n("From &Internet"), SLOT(slotGuessTagFromInternet()),
"guessTagInternet", "connection-established", KShortcut(Qt::CTRL + Qt::Key_I)));
#else
@@ -885,14 +885,14 @@
createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "edit-find-next");
createAction(i18n("Open..."), SLOT(slotOpen()), "file_open", "document-open", KShortcut(Qt::CTRL + Qt::Key_O));
- createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()), "openDirectory", "document-open");
- createAction(i18n("&Rename..."), SLOT(slotRename()), "renamePlaylist", "lineedit");
+ createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()), "openDirectory", "folder-new");
+ createAction(i18n("&Rename..."), SLOT(slotRename()), "renamePlaylist", "edit-rename");
createAction(i18n("D&uplicate..."), SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy");
createAction(i18n("Save"), SLOT(slotSave()), "file_save", "document-save", KShortcut(Qt::CTRL + Qt::Key_S));
createAction(i18n("Save As..."), SLOT(slotSaveAs()), "file_save_as", "document-save-as");
createAction(i18n("R&emove"), SLOT(slotRemove()), "deleteItemPlaylist", "user-trash");
createAction(i18n("Reload"), SLOT(slotReload()), "reloadPlaylist", "view-refresh");
- createAction(i18n("Edit Search..."), SLOT(slotEditSearch()), "editSearch", "edit-clear");
+ createAction(i18n("Edit Search..."), SLOT(slotEditSearch()), "editSearch");
createAction(i18n("&Delete"), SLOT(slotRemoveItems()), "removeItem", "edit-delete");
createAction(i18n("Refresh"), SLOT(slotRefreshItems()), "refresh", "view-refresh");
@@ -904,7 +904,7 @@
menu->addAction(createAction(i18n("&View Cover"),
SLOT(slotViewCovers()), "viewCover", "zoom-original"));
menu->addAction(createAction(i18n("Get Cover From &File..."),
- SLOT(slotAddLocalCover()), "addCover", "file-import", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F)));
+ SLOT(slotAddLocalCover()), "addCover", "document-import", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F)));
menu->addAction(createAction(i18n("Get Cover From &Internet..."),
SLOT(slotAddInternetCover()), "webImageCover", "connection-established", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G)));
menu->addAction(createAction(i18n("&Delete Cover"),
@@ -913,7 +913,7 @@
SLOT(slotShowCoverManager()), "showCoverManager"));
KToggleAction *historyAction =
- new KToggleAction(KIcon("history"), i18n("Show &History"), actions());
+ new KToggleAction(KIcon("view-history"), i18n("Show &History"), actions());
actions()->addAction("showHistory", historyAction);
historyAction->setCheckedState(KGuiItem(i18n("Hide &History")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/juk/playlistsplitter.cpp new/kdemultimedia-3.97.1/juk/playlistsplitter.cpp
--- old/kdemultimedia-3.97.0/juk/playlistsplitter.cpp 2007-10-03 13:47:40.000000000 +0200
+++ new/kdemultimedia-3.97.1/juk/playlistsplitter.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -134,7 +134,7 @@
{
KActionCollection* coll = ActionCollection::actions();
KToggleAction *showSearch =
- new KToggleAction(KIcon("file-find"), i18n("Show &Search Bar"), this);
+ new KToggleAction(KIcon("edit-find"), i18n("Show &Search Bar"), this);
coll->addAction("showSearch", showSearch);
showSearch->setCheckedState(KGuiItem(i18n("Hide &Search Bar")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/juk/tageditor.cpp new/kdemultimedia-3.97.1/juk/tageditor.cpp
--- old/kdemultimedia-3.97.0/juk/tageditor.cpp 2007-08-29 11:56:43.000000000 +0200
+++ new/kdemultimedia-3.97.1/juk/tageditor.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -527,7 +527,7 @@
m_artistNameBox = new KComboBox( true, this );
m_artistNameBox->setObjectName( "artistNameBox" );
m_artistNameBox->setCompletionMode(KGlobalSettings::CompletionAuto);
- addItem(i18n("&Artist name:"), m_artistNameBox, leftColumnLayout, "personal");
+ addItem(i18n("&Artist name:"), m_artistNameBox, leftColumnLayout, "view-media-artist");
m_trackNameBox = new KLineEdit(this);
m_trackNameBox->setObjectName( "trackNameBox" );
@@ -536,7 +536,7 @@
m_albumNameBox = new KComboBox( true, this );
m_albumNameBox->setObjectName( "albumNameBox" );
m_albumNameBox->setCompletionMode(KGlobalSettings::CompletionAuto);
- addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "cdrom_unmount");
+ addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "media-optical");
m_genreBox = new KComboBox( true, this );
m_genreBox->setObjectName( "genreBox" );
@@ -560,7 +560,7 @@
m_fileNameBox->setValidator(new FileNameValidator(m_fileNameBox));
QLabel *fileNameIcon = new QLabel(this);
- fileNameIcon->setPixmap(SmallIcon("sound"));
+ fileNameIcon->setPixmap(SmallIcon("audio-x-generic"));
QLabel * tmp = new QLabel(i18n("&File name:"), this);
tmp->setBuddy( m_fileNameBox );
QWidget *fileNameLabel = addHidden(tmp);
@@ -620,7 +620,7 @@
m_commentBox = new KTextEdit(this);
m_commentBox->setObjectName( "commentBox" );
- addItem(i18n("&Comment:"), m_commentBox, rightColumnLayout, "edit");
+ addItem(i18n("&Comment:"), m_commentBox, rightColumnLayout, "object-edit");
fileNameLabel->setMinimumHeight(m_trackSpin->height());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kioslave/audiocd/audiocd.cpp new/kdemultimedia-3.97.1/kioslave/audiocd/audiocd.cpp
--- old/kdemultimedia-3.97.0/kioslave/audiocd/audiocd.cpp 2007-10-08 09:42:19.000000000 +0200
+++ new/kdemultimedia-3.97.1/kioslave/audiocd/audiocd.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -211,8 +211,9 @@
return 0;
// Update our knowledge of the disc
+#if defined(HAVE_CDDA_IOCTL_DEVICE)
d->cd.setDevice(drive->ioctl_device_name, 50, false);
-#if 0
+#else
// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
// support for non-SCSI devices. Although it finds ATA cdroms just
// fine, there is no straightforward way to discover the device
@@ -913,7 +914,7 @@
{
d->clearURLargs();
- QString query(KUrl::decode_string(url.query()));
+ QString query(QUrl::fromPercentEncoding(url.query().toAscii()));
if (query.isEmpty() || query[0] != '?')
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kioslave/audiocd/plugins/lame/collectingprocess.cpp new/kdemultimedia-3.97.1/kioslave/audiocd/plugins/lame/collectingprocess.cpp
--- old/kdemultimedia-3.97.0/kioslave/audiocd/plugins/lame/collectingprocess.cpp 2007-05-03 10:48:27.000000000 +0200
+++ new/kdemultimedia-3.97.1/kioslave/audiocd/plugins/lame/collectingprocess.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -77,16 +77,14 @@
void CollectingProcess::slotReceivedStdout( K3Process *, char *buf, int len )
{
- QByteArray b;
- b.duplicate( buf, len );
+ QByteArray b( buf, len);
d->stdoutBuffer.append( b );
d->stdoutSize += len;
}
void CollectingProcess::slotReceivedStderr( K3Process *, char *buf, int len )
{
- QByteArray b;
- b.duplicate( buf, len );
+ QByteArray b( buf, len );
d->stderrBuffer.append( b );
d->stderrSize += len;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kioslave/audiocd/plugins/lame/encoderlame.cpp new/kdemultimedia-3.97.1/kioslave/audiocd/plugins/lame/encoderlame.cpp
--- old/kdemultimedia-3.97.0/kioslave/audiocd/plugins/lame/encoderlame.cpp 2007-08-29 11:56:50.000000000 +0200
+++ new/kdemultimedia-3.97.1/kioslave/audiocd/plugins/lame/encoderlame.cpp 2007-12-14 21:44:40.000000000 +0100
@@ -17,7 +17,16 @@
*/
#include
+
+// Linux has , FreeBSD has and Solaris has neither.
+#ifdef HAVE_ENDIAN_H
#include
+#else
+#ifdef HAVE_SYS_ENDIAN_H
+#include
+#endif
+#endif
+
#include "encoderlame.h"
#include "audiocd_lame_encoder.h"
@@ -90,7 +99,7 @@
return false;
QString str = QString::fromLocal8Bit( proc.collectedStdout() );
- d->genreList = QStringList::split( '\n', str );
+ d->genreList = str.split( '\n', QString::SkipEmptyParts );
// Remove the numbers in front of every genre
for( QStringList::Iterator it = d->genreList.begin(); it != d->genreList.end(); ++it ) {
QString& genre = *it;
@@ -226,7 +235,7 @@
*d->currentEncodeProcess << trackInfo;
// Read in stdin, output to the temp file
- *d->currentEncodeProcess << "-" << d->tempFile->fileName().latin1();
+ *d->currentEncodeProcess << "-" << d->tempFile->fileName().toLatin1();
//kDebug(7117) << d->currentEncodeProcess->args();
@@ -307,10 +316,10 @@
QByteArray output;
char data[1024];
while ( !file.atEnd() ) {
- uint read = file.readBlock(data, 1024);
- output.setRawData(data, read);
+ uint read = file.read(data, 1024);
+ output.fromRawData(data, read);
ioslave->data(output);
- output.resetRawData(data, read);
+ output.clear();
}
file.close();
}
@@ -344,7 +353,7 @@
trackInfo.append(QString("%1").arg(track));
const QString genre = info.get(Genre).toString();
- if ( d->genreList.find( genre ) != d->genreList.end() )
+ if ( d->genreList.indexOf( genre ) != -1 )
{
trackInfo.append("--tg");
trackInfo.append(genre);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kmix/kmixapplet.desktop new/kdemultimedia-3.97.1/kmix/kmixapplet.desktop
--- old/kdemultimedia-3.97.0/kmix/kmixapplet.desktop 2007-12-04 13:10:28.000000000 +0100
+++ new/kdemultimedia-3.97.1/kmix/kmixapplet.desktop 2007-12-14 21:44:40.000000000 +0100
@@ -70,6 +70,7 @@
Comment[fr]=Montre et vous permet de contrôler les volumes sonores
Comment[ga]=Taispeáin agus rialaigh airde na fuaime
Comment[gl]=Mostra e permítelle controlar os volumes do son
+Comment[hu]=Megjeleníti és beállíthatóvá teszi a hangerőket
Comment[ja]=音量の表示とコントロール
Comment[ko]=소리 음량을 보여 주고 조정합니다
Comment[lv]=Parāda un ļauj kontrolēt skaņu skaļumu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kmix/kmix.notifyrc new/kdemultimedia-3.97.1/kmix/kmix.notifyrc
--- old/kdemultimedia-3.97.0/kmix/kmix.notifyrc 2007-12-04 13:10:28.000000000 +0100
+++ new/kdemultimedia-3.97.1/kmix/kmix.notifyrc 2007-12-14 21:44:40.000000000 +0100
@@ -2,6 +2,7 @@
IconName=kmix
Comment=Sound Mixer
Comment[ca]=Mesclador de so
+Comment[cs]=Zvukový směšovač
Comment[de]=Lautstärkeregler
Comment[el]=Μείκτης ήχου
Comment[eo]=Sonmiksilo
@@ -9,6 +10,7 @@
Comment[et]=Helimikser
Comment[fr]=Console de mixage
Comment[ga]=Meascthóir Fuaime
+Comment[hu]=Hangkeverő
Comment[ja]=サウンドミキサー
Comment[ko]=소리 믹서
Comment[lv]=Skaņas mikseris
@@ -21,6 +23,7 @@
Comment[sr]=Звучна миксета
Comment[sr@latin]=Zvučna mikseta
Comment[sv]=Ljudmixer
+Comment[uk]=Аудіомікшер
Comment[x-test]=xxSound Mixerxx
Comment[zh_CN]=混音器
Comment[zh_TW]=音效混音器
@@ -28,13 +31,15 @@
[Event/MasterFallback]
Name=Audio Device Fallback
Name[ca]=Dispositiu d'àudio alternatiu
+Name[cs]=Náhradní zvukové zařízení
Name[de]=Sicherungs-Audiogerät
Name[el]=Αναπληρωματική συσκευή ήχου
Name[eo]=Sonaparata malantaŭiro
Name[es]=Dispositivo de audio alternativo
Name[et]=Varuheliseade
Name[fr]=Périphérique audio sur lequel se replier
-Name[ga]=Gléas Fuaime Tacachumais
+Name[ga]=Gléas Tacachumais Fuaime
+Name[hu]=Másodlagos hangeszköz
Name[ja]=オーディオデバイスのフォールバック
Name[ko]=오디오 장치 폴백
Name[lv]=Audio iekārtas atkāpes sistēma
@@ -46,6 +51,7 @@
Name[sr]=Резервни аудио уређај
Name[sr@latin]=Rezervni audio uređaj
Name[sv]=Reservljudenhet
+Name[uk]=Другорядний аудіопристрій
Name[x-test]=xxAudio Device Fallbackxx
Name[zh_CN]=基本声音设备
Name[zh_TW]=預設音效裝置
@@ -58,6 +64,7 @@
Comment[et]=Automaatne varuvariant, kui eelistatud seade pole saadaval
Comment[fr]=Notification sur le repli automatique si les périphériques préférés ne sont pas disponibles
Comment[ga]=Fógairt nuair nach bhfuil na gléasanna tosaíochta ar fáil agus úsáidtear gléas tacachumais
+Comment[hu]=Értesítés, ha váltás történik a másodlagos eszközre, mert az elsődleges nem elérhető
Comment[ja]=優先デバイスが利用できないために自動的にフォールバックしたときの通知
Comment[ko]=선호하는 장치를 사용할 수 없을 때 다음 장치 자동 선택 알리
Comment[lv]=Paziņo par automātisku atkāpšanās sistēmas izmantošanu, ja vēlamās iekārtas nav pieejamas
@@ -69,6 +76,7 @@
Comment[sr]=Обавештење о аутоматској резерви ако жељени уређај није доступан
Comment[sr@latin]=Obaveštenje o automatskoj rezervi ako željeni uređaj nije dostupan
Comment[sv]=Underrättelse vid automatisk återgång om önskade enheter inte är tillgängliga
+Comment[uk]=Сповіщення про автоматичне перемикання, якщо головний пристрій не наявний
Comment[x-test]=xxNotification on automatic fallback if the preferred devices in unavailablexx
Comment[zh_CN]=当首选设备无法使用时,通知会自动在基本设备上发出
Comment[zh_TW]=若是選用的裝置無法使用時,通知會自動使用預設的裝置
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kmix/restore_kmix_volumes.desktop new/kdemultimedia-3.97.1/kmix/restore_kmix_volumes.desktop
--- old/kdemultimedia-3.97.0/kmix/restore_kmix_volumes.desktop 2007-12-04 13:10:28.000000000 +0100
+++ new/kdemultimedia-3.97.1/kmix/restore_kmix_volumes.desktop 2007-12-14 21:44:40.000000000 +0100
@@ -21,7 +21,7 @@
Name[fa]=بازگردانی حجم صداهای مخلوطکن
Name[fi]=Palauta mikserin äänivoimakkuudet
Name[fr]=Restaurer les volumes du mixage
-Name[ga]=Athchóirigh Airdí an Mheascthóra
+Name[ga]=Athchóirigh Leibhéil Airde an Mheascthóra
Name[gl]=Restaurar os Volumes do Mesturador
Name[he]=שיחזור עוצמות הקול של המערבל
Name[hu]=A hangkeverő hangerőinek visszaállítása
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/kscd/kscd.cpp new/kdemultimedia-3.97.1/kscd/kscd.cpp
--- old/kdemultimedia-3.97.0/kscd/kscd.cpp 2007-10-31 21:42:30.000000000 +0100
+++ new/kdemultimedia-3.97.1/kscd/kscd.cpp 2007-12-14 21:44:39.000000000 +0100
@@ -85,14 +85,14 @@
setColors();
// the time slider
- timeIcon->setPixmap(SmallIcon("player_time"));
+ timeIcon->setPixmap(SmallIcon("player-time"));
connect(timeSlider, SIGNAL(sliderPressed()), SLOT(timeSliderPressed()));
connect(timeSlider, SIGNAL(sliderReleased()), SLOT(timeSliderReleased()));
connect(timeSlider, SIGNAL(sliderMoved(int)), SLOT(timeSliderMoved(int)));
connect(timeSlider, SIGNAL(valueChanged(int)), SLOT(jumpToTime(int)));
// the volume slider
- volumeIcon->setPixmap(SmallIcon("player_volume"));
+ volumeIcon->setPixmap(SmallIcon("player-volume"));
volumeSlider->setValue(Prefs::volume());
showVolumeInLabel();
connect(volumeSlider, SIGNAL(valueChanged(int)), SLOT(volChanged(int)));
@@ -463,7 +463,7 @@
m->load();
KCDDB::Config* cfg = new KCDDB::Config();
cfg->readConfig();
- configDialog -> addPage(m, cfg, QString("CDDB"), "cdtrack", i18n("Configure Fetching Items"));
+ configDialog -> addPage(m, cfg, QString("CDDB"), "text-xmcd", i18n("Configure Fetching Items"));
connect(configDialog, SIGNAL(okClicked()), m, SLOT(save()));
connect(configDialog, SIGNAL(applyClicked()), m, SLOT(save()));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.97.0/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-3.97.1/strigi-analyzer/mp3/kfile_mp3.desktop
--- old/kdemultimedia-3.97.0/strigi-analyzer/mp3/kfile_mp3.desktop 2007-12-04 13:10:26.000000000 +0100
+++ new/kdemultimedia-3.97.1/strigi-analyzer/mp3/kfile_mp3.desktop 2007-12-14 21:44:39.000000000 +0100
@@ -3,6 +3,7 @@
Type=Service
Name=MP3 Info
Name[af]=Mp3 Inligting
+Name[be]=MP3 звесткі
Name[bg]=Информация за MP3
Name[br]=Titouroù MP3
Name[ca]=Informació MP3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org