Hello community, here is the log from the commit of package kdemultimedia4 checked in at Mon Sep 1 15:02:05 CEST 2008. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2008-07-23 13:23:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-08-28 12:34:53.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:34:48 CEST 2008 - dmueller@suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.1.0.tar.bz2 New: ---- kdemultimedia-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.xL3872/_old 2008-09-01 15:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.xL3872/_new 2008-09-01 15:01:56.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package kdemultimedia4 (Version 4.1.0) +# spec file for package kdemultimedia4 (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,7 +25,7 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.1.0 +Version: 4.1.1 Release: 1 Source0: kdemultimedia-%version.tar.bz2 Source1: _upstream @@ -298,6 +305,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Aug 28 2008 dmueller@suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php * Wed Jul 23 2008 dmueller@suse.de - update to 4.1.0 * Fri Jul 18 2008 dmueller@suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.xL3872/_old 2008-09-01 15:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.xL3872/_new 2008-09-01 15:01:56.000000000 +0200 @@ -1,8 +1,7 @@ -package: kdelibs-4.0.80.tar.bz2 -kdemod: kdelibs +package: kdemultimedia-4.1.1.tar.bz2 +kdemod: kdemultimedia --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: -+svn di between //tags/KDE/4.0.80/kdelibs and //trunk/KDE/kdelibs - ++current HEAD: 853806 ++svn di between //tags/KDE/4.1.1/kdemultimedia and //tags/KDE/4.1.1/kdemultimedia ++++++ kdemultimedia-4.1.0.tar.bz2 -> kdemultimedia-4.1.1.tar.bz2 ++++++ Files old/kdemultimedia-4.1.0/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.1.0/doc/juk/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.1.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-4.1.0/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.1.1/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer.desktop new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer.desktop --- old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -2,6 +2,7 @@ Type=Application Version=1.0 Name=Dragon Player +Name[bg]=Dragon Name[cs]=Přehrávač Dragon Name[el]=Αναπαραγωγέας Dragon Name[es]=Reproductor Dragón @@ -13,9 +14,11 @@ Name[sv]=Dragon videospelare Name[th]=โปรแกรมเล่นสื่อ Dragon Player Name[uk]=Програвач Dragon +Name[wa]=Djouweu Dragon Name[x-test]=xxDragon Playerxx Name[zh_TW]=神龍播放器 GenericName=Video Player +GenericName[bg]=Видео плеър GenericName[ca]=Reproductor de vídeo GenericName[cs]=Přehrávač videa GenericName[da]=Videoafspiller @@ -40,10 +43,12 @@ GenericName[pt]=Leitor de Vídeo GenericName[pt_BR]=Reprodutor de Vídeo GenericName[ru]=Видеопроигрыватель +GenericName[sl]=Predvajalnik videov GenericName[sv]=Videospelare GenericName[th]=โปรแกรมเล่นวิดีโอ GenericName[tr]=Video Oynatıcı GenericName[uk]=Відеопрогравач +GenericName[wa]=Djouweu d' videyos GenericName[x-test]=xxVideo Playerxx GenericName[zh_CN]=视频播放器 GenericName[zh_TW]=影像播放器 @@ -51,5 +56,5 @@ X-DocPath=dragonplayer/index.html TryExec=dragon Exec=dragon %u -MimeType=video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; +MimeType=video/ogg;video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; Categories=Qt;KDE;AudioVideo;Player; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_part.desktop new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_part.desktop --- old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_part.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_part.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -2,6 +2,7 @@ Type=Service Icon=dragonplayer Name=Dragon Player Part +Name[bg]=Dragon (част) Name[ca]=Part del Dragon Player Name[cs]=Komponenta přehrávače Dragon Name[da]=Dragon Player-part @@ -25,13 +26,16 @@ Name[pl]=Moduł odtwarzacza Dragon Player Name[pt]=Componente do Dragon Player Name[pt_BR]=Parte do Dragon Player +Name[sl]=Komponeneta Dragon Player Name[sv]=Dragon videodelprogram Name[th]=ส่วนเล่นสื่อ Dragon Player Name[uk]=Складова програвача Dragon +Name[wa]=Pårt do Djouweu Dragon Name[x-test]=xxDragon Player Partxx Name[zh_CN]=Dragon Player 部件 Name[zh_TW]=神龍播放器部件 Comment=Embeddable Video Player +Comment[bg]=Вграден видео плеър Comment[ca]=Reproductor de vídeo encastat Comment[cs]=Vložený Video Přehrávač Comment[da]=Videoafspiller som kan indlejres @@ -56,14 +60,16 @@ Comment[pt]=Leitor de Vídeo Incorporado Comment[pt_BR]=Reprodutor de Vídeo Embutível Comment[ru]=Встраиваемый видеопроигрыватель +Comment[sl]=Vgradni predvajalnik videov Comment[sv]=Inbäddningsbar videospelare Comment[th]=โปรแกรมเล่นวิดีโอแบบฝังตัวได้ Comment[tr]=Gömülebilir Video Oynatıcı Comment[uk]=Програвач відео +Comment[wa]=Ravalåve djouweu videyo Comment[x-test]=xxEmbeddable Video Playerxx Comment[zh_CN]=嵌入的视频播放器 Comment[zh_TW]=嵌入式影像播放器 X-KDE-ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=dragonpart InitialPreference=9 -MimeType=video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; +MimeType=video/ogg;video/x-theora;video/x-theora+ogg;video/x-ogm;video/x-ogm+ogg;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;video/mp4; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_play_dvd.desktop new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_play_dvd.desktop --- old/kdemultimedia-4.1.0/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -6,6 +6,7 @@ [Desktop Action Play] Name=Play DVD with Dragon Player +Name[bg]=Изпълнение на DVD с Dragon Name[ca]=Reprodueix DVD amb el Dragon Player Name[cs]=Přehrát DVD pomocí přehrávače Dragon Name[da]=Afspil dvd med Dragon Player @@ -17,7 +18,7 @@ Name[ga]=Seinn DVD le Dragon Player Name[gl]=Reproducir o DVD co Dragon Player Name[hu]=DVD-lejátszás a Dragon Playerrel -Name[it]=Visulizza DVD con Dragon Player +Name[it]=Riproduci DVD con Dragon Player Name[ja]=Dragon Player で DVD を再生 Name[km]=ចាក់ DVD ជាមួយកម្មវិធីចាក់ Dragon Name[ko]=Dragon 플레이어로 DVD 보기 @@ -30,10 +31,12 @@ Name[pt]=Reproduzir o DVD com o Dragon Player Name[pt_BR]=Reproduza um DVD com o Dragon Player Name[ru]=Воспроизведение DVD в Dragon Player +Name[sl]=Predvajaj DVD z Dragon Player Name[sv]=Spela dvd med Dragon videospelare Name[th]=เล่นแผ่นดีวีดีด้วยโปรแกรมเล่นสื่อ Dragon Player Name[tr]=DVDyi Dragon Player ile Oynat Name[uk]=Грати DVD програвачем Dragon +Name[wa]=Djouwer plake DVD avou l' Djouweu Dragon Name[x-test]=xxPlay DVD with Dragon Playerxx Name[zh_CN]=以 Dragon Player 播放 DVD Name[zh_TW]=用神龍播放器播放 DVD diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/collectionlist.cpp new/kdemultimedia-4.1.1/juk/collectionlist.cpp --- old/kdemultimedia-4.1.0/juk/collectionlist.cpp 2008-05-15 20:37:34.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/collectionlist.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -257,6 +257,12 @@ config.writeEntry("CollectionListSortColumn", sortColumn()); config.writeEntry("CollectionListSortAscending", sortOrder() == Qt::AscendingOrder); + // In some situations the dataChanged signal from clearItems will cause observers to + // subsequently try to access a deleted item. Since we're going away just remove all + // observers. + + clearObservers(); + // The CollectionListItems will try to remove themselves from the // m_columnTags member, so we must make sure they're gone before we // are. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/coverinfo.cpp new/kdemultimedia-4.1.1/juk/coverinfo.cpp --- old/kdemultimedia-4.1.0/juk/coverinfo.cpp 2008-07-15 21:51:03.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/coverinfo.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -72,7 +72,7 @@ m_hasCover(false), m_hasAttachedCover(false), m_haveCheckedForCover(false), - m_coverKey(CoverManager::NoMatch), + m_coverKey(CoverManager::idForTrack(file.absFilePath())), m_needsConverting(false) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/juk.desktop new/kdemultimedia-4.1.1/juk/juk.desktop --- old/kdemultimedia-4.1.0/juk/juk.desktop 2008-07-17 23:32:56.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/juk.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -4,6 +4,7 @@ Exec=juk -caption "%c" %i Icon=juk X-DocPath=juk/index.html +X-DBUS-StartupType=Unique Comment= Terminal=false Name=JuK @@ -14,7 +15,7 @@ Name[sv]=Juk Name[x-test]=xxJuKxx GenericName=Music Player -GenericName[bg]=Плеър за музикални файлове +GenericName[bg]=Музикален плеър GenericName[br]=C'hoarier ar sonerezh GenericName[ca]=Reproductor musical GenericName[cs]=Přehrávač hudby @@ -66,6 +67,7 @@ GenericName[uk]=Програвач музики GenericName[uz]=Musiqa pleyer GenericName[uz@cyrillic]=Мусиқа плейер +GenericName[wa]=Djoweu d' muzike GenericName[x-test]=xxMusic Playerxx GenericName[zh_CN]=音乐播放器 GenericName[zh_HK]=音樂播放器 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/jukservicemenu.desktop new/kdemultimedia-4.1.1/juk/jukservicemenu.desktop --- old/kdemultimedia-4.1.0/juk/jukservicemenu.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/jukservicemenu.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -5,6 +5,7 @@ [Desktop Action addToCollection] Name=Add to JuK Collection +Name[bg]=Добавяне към колекцията на JuK Name[bn]=জুক সংকলনে যোগ করো Name[br]=Ouzhpennañ d'an dastumad JuK Name[ca]=Afegeix a la col·lecció JuK @@ -56,6 +57,7 @@ Name[uk]=Додати до збірки JuK Name[uz]=JuK toʻplamiga qoʻshish Name[uz@cyrillic]=JuK тўпламига қўшиш +Name[wa]=Radjouter å ramexhnaedje di JuK Name[x-test]=xxAdd to JuK Collectionxx Name[zh_CN]=添加到 JuK 收藏 Name[zh_TW]=新增到 JuK 收藏清單 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/main.cpp new/kdemultimedia-4.1.1/juk/main.cpp --- old/kdemultimedia-4.1.0/juk/main.cpp 2008-05-29 13:20:13.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/main.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.1", ki18n(description), KAboutData::License_GPL, + "3.1.1", ki18n(description), KAboutData::License_GPL, ki18n("© 2002 - 2008, Scott Wheeler"), KLocalizedString(), "http://developer.kde.org/~wheeler/juk.html"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlist.cpp new/kdemultimedia-4.1.1/juk/playlist.cpp --- old/kdemultimedia-4.1.0/juk/playlist.cpp 2008-07-15 21:51:03.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/playlist.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -415,6 +415,12 @@ Playlist::~Playlist() { + // In some situations the dataChanged signal from clearItems will cause observers to + // subsequently try to access a deleted item. Since we're going away just remove all + // observers. + + clearObservers(); + // clearItem() will take care of removing the items from the history, // so call clearItems() to make sure it happens. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlistinterface.cpp new/kdemultimedia-4.1.1/juk/playlistinterface.cpp --- old/kdemultimedia-4.1.0/juk/playlistinterface.cpp 2008-01-05 01:02:04.000000000 +0100 +++ new/kdemultimedia-4.1.1/juk/playlistinterface.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -40,6 +40,11 @@ m_observers.remove(observer); } +void Watched::clearObservers() +{ + m_observers.clear(); +} + Watched::~Watched() { foreach(PlaylistObserver *observer, m_observers) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlistinterface.h new/kdemultimedia-4.1.1/juk/playlistinterface.h --- old/kdemultimedia-4.1.0/juk/playlistinterface.h 2008-01-05 01:02:04.000000000 +0100 +++ new/kdemultimedia-4.1.1/juk/playlistinterface.h 2008-08-28 10:08:27.000000000 +0200 @@ -33,6 +33,12 @@ void removeObserver(PlaylistObserver *observer); /** + * Call this to remove all objects observing this class unconditionally (for example, when + * you're being destructed). + */ + void clearObservers(); + + /** * This is triggered when the currently playing item has been changed. */ virtual void currentChanged(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/juk/playlistitem.cpp new/kdemultimedia-4.1.1/juk/playlistitem.cpp --- old/kdemultimedia-4.1.0/juk/playlistitem.cpp 2008-05-21 10:34:17.000000000 +0200 +++ new/kdemultimedia-4.1.1/juk/playlistitem.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -371,9 +371,9 @@ return 0; break; case CoverColumn: - if(firstItem->d->fileHandle.coverInfo()->hasCover() == secondItem->d->fileHandle.coverInfo()->hasCover()) + if(firstItem->d->fileHandle.coverInfo()->coverId() == secondItem->d->fileHandle.coverInfo()->coverId()) return 0; - else if (firstItem->d->fileHandle.coverInfo()->hasCover()) + else if (firstItem->d->fileHandle.coverInfo()->coverId() != CoverManager::NoMatch) return -1; else return 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/audiocd.cpp new/kdemultimedia-4.1.1/kioslave/audiocd/audiocd.cpp --- old/kdemultimedia-4.1.0/kioslave/audiocd/audiocd.cpp 2008-01-05 01:02:15.000000000 +0100 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/audiocd.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -212,7 +212,8 @@ // Update our knowledge of the disc #if defined(HAVE_CDDA_IOCTL_DEVICE) - d->cd.setDevice(drive->ioctl_device_name, 50, false); + if (d->cd.deviceName() != drive->ioctl_device_name) + d->cd.setDevice(drive->ioctl_device_name, 50, false); #else // FreeBSD's cdparanoia as of january 5th 2006 has rather broken // support for non-SCSI devices. Although it finds ATA cdroms just diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/data/audiocd.desktop new/kdemultimedia-4.1.1/kioslave/audiocd/data/audiocd.desktop --- old/kdemultimedia-4.1.0/kioslave/audiocd/data/audiocd.desktop 2008-07-23 10:26:40.000000000 +0200 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/data/audiocd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -3,6 +3,7 @@ URL=audiocd:/ Icon=media-optical-audio Name=Audio CD Browser +Name[bg]=Разглеждане на аудио дискове Name[ca]=Navegador de CD d'àudio Name[cs]=Prohlížeč zvukových CD Name[da]=Lyd-cd-browser @@ -27,10 +28,12 @@ Name[pt]=Navegador de CDs de Áudio Name[pt_BR]=Navegador de CDs de Áudio Name[ru]=Просмотр звуковых CD +Name[sl]=Brskalnik po glasbenih CD-jih Name[sv]=Bläddra ljud-cd Name[th]=เรียกดูซีดีเสียง Name[tr]=Ses CDsi Tarayıcı Name[uk]=Навігатор аудіо КД +Name[wa]=Foyteuse des plakes lazer odio Name[x-test]=xxAudio CD Browserxx Name[zh_CN]=音频 CD 浏览器 Name[zh_TW]=音樂光碟瀏覽器 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-4.1.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop --- old/kdemultimedia-4.1.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2008-07-17 23:32:56.000000000 +0200 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -10,7 +10,7 @@ Name=Audio CDs Name[af]=Audio Cds -Name[bg]=Аудио диск +Name[bg]=Аудио дискове Name[bn]=অডিও সিডি Name[br]=CD klevet Name[ca]=CD d'àudio @@ -62,6 +62,7 @@ Name[uk]=Аудіо-КД Name[uz]=Audio kompakt-disklar Name[uz@cyrillic]=Аудио компакт-дисклар +Name[wa]=Plakes lazer odio Name[x-test]=xxAudio CDsxx Name[xh]=CDs Zokuvakalayo Name[zh_CN]=音频 CD @@ -120,13 +121,14 @@ Comment[th]=ปรับแต่ง Audiocd IO Slave Comment[tr]=Müzik CD Yapılandırması Comment[uk]=Налаштування підлеглого В/В "Audiocd" +Comment[wa]=Apontiaedje do vårlet d' I/R audiocd Comment[x-test]=xxAudiocd IO Slave Configurationxx Comment[xh]=Video-DVD IO Slave Uqwalaselo Comment[zh_CN]=音频 CD 输入输出模块配置 Comment[zh_HK]=音樂 CD IO Slave 設定 Comment[zh_TW]=音樂光碟 IO Slave 組態 Keywords=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate -Keywords[bg]=Keywords=аудио, диск, компактдиск, КД, кодек, музика, Audio CD, CD, Ogg, Vorbis, Encoding, CDDA, Bitrate +Keywords[bg]=Keywords=аудио,диск,компактдиск,КД,кодек,музика,Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[br]=CD klevet,CD,Ogg,Vorbis,Kodadur,CDDA,Feur Keywords[ca]=Àudio CD,CD,Ogg,Vorbis,Codificació,CDDA,Taxa de bits Keywords[cs]=Zvukové CD,CD,Ogg,Vorbis,Kódování,CDDA,Bitrate,CDDB @@ -171,6 +173,7 @@ Keywords[th]=ซีดีบันทึกเสียง, ซีดี,Ogg,Vorbis,เข้ารหัส,CDDA,บิตเรต Keywords[tr]=Ses CDsi,CD,Ogg,Vorbis,Kodlama,CDDA,Bitrate Keywords[uk]=Аудіо-КД,КД,Ogg,Vorbis,кодування,CDDA,частота вибірки +Keywords[wa]=plake lazer odio,CD,Ogg,Vorbis,Ecôdaedje,Encoding,CDDA,Bitrate,roedeur des bits Keywords[x-test]=xxAudio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitratexx Keywords[zh_CN]=Audio CD,音频 CD,CD,Ogg,Vorbis,Encding,编码,CDDA,Bitrate,码率 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/flac/CMakeLists.txt new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/flac/CMakeLists.txt --- old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/flac/CMakeLists.txt 2008-01-05 01:02:15.000000000 +0100 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/flac/CMakeLists.txt 2008-08-28 10:08:27.000000000 +0200 @@ -14,7 +14,7 @@ -target_link_libraries(audiocd_encoder_flac ${FLAC_LIBRARIES} ${KDE4_KIO_LIBS} audiocdplugins ) +target_link_libraries(audiocd_encoder_flac ${FLAC_LIBRARIES} ${KDE4_KIO_LIBS} audiocdplugins kcddb ) install(TARGETS audiocd_encoder_flac DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/lame/encoderlame.cpp new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/lame/encoderlame.cpp --- old/kdemultimedia-4.1.0/kioslave/audiocd/plugins/lame/encoderlame.cpp 2008-01-15 02:57:24.000000000 +0100 +++ new/kdemultimedia-4.1.1/kioslave/audiocd/plugins/lame/encoderlame.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -321,13 +321,11 @@ // Now copy the file out of the temp into kio QFile file( d->tempFile->fileName() ); if ( file.open( QIODevice::ReadOnly ) ) { - QByteArray output; char data[1024]; while ( !file.atEnd() ) { uint read = file.read(data, 1024); - output.fromRawData(data, read); + QByteArray output(data, read); ioslave->data(output); - output.clear(); } file.close(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmixapplet.desktop new/kdemultimedia-4.1.1/kmix/kmixapplet.desktop --- old/kdemultimedia-4.1.0/kmix/kmixapplet.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/kmixapplet.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -95,6 +95,7 @@ Comment[th]=แสดงและอนุญาตให้คุณควบคุมระดับเสียง Comment[tr]=Ses seviyelerini gösterir ve onları kontrol etmenizi sağlar Comment[uk]=Показує і дає можливість керувати гучністю звуку +Comment[wa]=Vos mostere eyet vos leye controler les volumes do son Comment[x-test]=xxShows and let you control sound volumesxx Comment[zh_CN]=显示和控制音量 Comment[zh_TW]=顯示並讓您控制音量 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmixdockwidget.cpp new/kdemultimedia-4.1.1/kmix/kmixdockwidget.cpp --- old/kdemultimedia-4.1.0/kmix/kmixdockwidget.cpp 2008-04-30 16:00:46.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/kmixdockwidget.cpp 2008-08-28 10:08:27.000000000 +0200 @@ -65,6 +65,7 @@ createMasterVolWidget(); createActions(); //connect(this, SIGNAL(quitSelected()), kapp, SLOT(quitExtended())); + connect(contextMenu(), SIGNAL(aboutToShow()), this, SLOT(contextMenuAboutToShow())); } KMixDockWidget::~KMixDockWidget() @@ -374,7 +375,7 @@ } void -KMixDockWidget::contextMenuAboutToShow( KMenu* /* menu */ ) +KMixDockWidget::contextMenuAboutToShow() { QAction* showAction = actionCollection()->action("minimizeRestore"); if ( parentWidget() && showAction ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmixdockwidget.h new/kdemultimedia-4.1.1/kmix/kmixdockwidget.h --- old/kdemultimedia-4.1.0/kmix/kmixdockwidget.h 2008-01-05 01:02:14.000000000 +0100 +++ new/kdemultimedia-4.1.1/kmix/kmixdockwidget.h 2008-08-28 10:08:27.000000000 +0200 @@ -64,7 +64,6 @@ void moveVolumePopoup(); void trayWheelEvent(QWheelEvent *); // void trayToolTipEvent(QHelpEvent *e ); - void contextMenuAboutToShow( KMenu* menu ); void toggleMinimizeRestore(); bool event( QEvent *); @@ -80,6 +79,7 @@ void kmixSystrayAction(QSystemTrayIcon::ActivationReason); void selectMaster(); void handleNewMaster(QString& soundcard_id, QString& channel_id); + void contextMenuAboutToShow(); }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kmix/kmix.notifyrc new/kdemultimedia-4.1.1/kmix/kmix.notifyrc --- old/kdemultimedia-4.1.0/kmix/kmix.notifyrc 2008-07-17 23:32:56.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/kmix.notifyrc 2008-08-28 10:08:27.000000000 +0200 @@ -36,6 +36,7 @@ Comment[th]=ปรับแต่งผสมเสียง Comment[tr]=Ses Karıştırıcı Comment[uk]=Аудіомікшер +Comment[wa]=Maxheu d' sons Comment[x-test]=xxSound Mixerxx Comment[zh_CN]=混音器 Comment[zh_TW]=音效混音器 @@ -75,6 +76,7 @@ Name[th]=แจ้งความล้มเหลวอุปกรณ์เสียง Name[tr]=Ses Aygıtı Değişimi Name[uk]=Другорядний аудіопристрій +Name[wa]=Tcheyåjhe d' éndjin son Name[x-test]=xxAudio Device Fallbackxx Name[zh_CN]=基本声音设备 Name[zh_TW]=預設音效裝置 @@ -112,6 +114,7 @@ Comment[th]=แจ้งเตือนความล้มเหลวอัตโนมัติ หากอุปกรณ์ที่ควรใช้ไม่มีอยู่ Comment[tr]=Tercih edilen aygıtlar erişilemez ise otomatik olarak yeni aygıta geçme bildirimi Comment[uk]=Сповіщення про автоматичне перемикання, якщо головний пристрій не наявний +Comment[wa]=Notifiaedje des tcheyåjhes otomatikes sel éndjin mî inmé n' est nén disponibe 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-4.1.0/kmix/restore_kmix_volumes.desktop new/kdemultimedia-4.1.1/kmix/restore_kmix_volumes.desktop --- old/kdemultimedia-4.1.0/kmix/restore_kmix_volumes.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/kmix/restore_kmix_volumes.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -53,6 +53,7 @@ Name[th]=เรียกคืนระดับเสียงของมิกเซอร์ Name[tr]=Karıştırıcı Seslerini Yenile Name[uk]=Відновити параметри мікшера +Name[wa]=Rimete come divant les apontiaedjes do maxheu d' sons Name[x-test]=xxRestore Mixer Volumesxx Name[zh_CN]=恢复混音器设置 Name[zh_HK]=回復混音器音量 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kscd/audiocd_play.desktop new/kdemultimedia-4.1.1/kscd/audiocd_play.desktop --- old/kdemultimedia-4.1.0/kscd/audiocd_play.desktop 2008-07-03 07:06:30.000000000 +0200 +++ new/kdemultimedia-4.1.1/kscd/audiocd_play.desktop 2008-08-28 10:08:26.000000000 +0200 @@ -53,6 +53,7 @@ Name[th]=เล่น Name[tr]=Çal Name[uk]=Пуск +Name[wa]=Djouwer Name[x-test]=xxPlayxx Name[zh_CN]=播放 Name[zh_HK]=播放 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/kscd/kscd.desktop new/kdemultimedia-4.1.1/kscd/kscd.desktop --- old/kdemultimedia-4.1.0/kscd/kscd.desktop 2008-07-03 07:06:30.000000000 +0200 +++ new/kdemultimedia-4.1.1/kscd/kscd.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] GenericName=CD Player GenericName[af]=Cd Speler -GenericName[bg]=Плеър за аудио дискове +GenericName[bg]=Плеър за компактдискове GenericName[bn]=সিডি প্লেয়ার GenericName[br]=Ur c'hoarier CD GenericName[ca]=Reproductor de CD diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-4.1.1/libkcddb/kcmcddb/libkcddb.desktop --- old/kdemultimedia-4.1.0/libkcddb/kcmcddb/libkcddb.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/libkcddb/kcmcddb/libkcddb.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -59,6 +59,7 @@ Name[th]=ดึงข้อมูล CDDB Name[tr]=CDDB Erişimi Name[uk]=Звантаження CDDB +Name[wa]=Abaguaedje CDDB Name[x-test]=xxCDDB Retrievalxx Name[xh]=CDDB Ukukangela Name[zh_CN]=CDDB 检索 @@ -171,6 +172,7 @@ Comment[th]=ปรับแต่งการดึงข้อมูลจาก CDDB Comment[tr]=CDDB Erişimini Yapılandır Comment[uk]=Налаштування звантаження CDDB +Comment[wa]=Apontyî l' abaguadje CDDB Comment[x-test]=xxConfigure the CDDB Retrievalxx Comment[zh_CN]=CDDB 检索配置 Comment[zh_HK]=設定 CDDB 資訊擷取 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/avi/kfile_avi.desktop new/kdemultimedia-4.1.1/strigi-analyzer/avi/kfile_avi.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/avi/kfile_avi.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/avi/kfile_avi.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -55,6 +55,7 @@ Name[uk]=Інформація по AVI Name[uz]=AVI haqida maʼlumot Name[uz@cyrillic]=AVI ҳақида маълумот +Name[wa]=Informåcions AVI Name[x-test]=xxAVI Infoxx Name[xh]=Ulwazi lwe AVI Name[zh_CN]=AVI 信息 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/flac/kfile_flac.desktop new/kdemultimedia-4.1.1/strigi-analyzer/flac/kfile_flac.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/flac/kfile_flac.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/flac/kfile_flac.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -52,6 +52,7 @@ Name[uk]=Інформація по FLAC Name[uz]=FLAC haqida maʼlumot Name[uz@cyrillic]=FLAC ҳақида маълумот +Name[wa]=Informåcions FLAC Name[x-test]=xxFLAC Infoxx Name[zh_CN]=FLAC 信息 Name[zh_HK]=FLAC 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-4.1.1/strigi-analyzer/mp3/kfile_mp3.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/mp3/kfile_mp3.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/mp3/kfile_mp3.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -56,6 +56,7 @@ Name[uk]=Інформація по MP3 Name[uz]=MP3 haqida maʼlumot Name[uz@cyrillic]=MP3 ҳақида маълумот +Name[wa]=Infôrmåcions MP3 Name[x-test]=xxMP3 Infoxx Name[xh]=MP3 ulwazi Name[zh_CN]=MP3 信息 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/mpc/kfile_mpc.desktop new/kdemultimedia-4.1.1/strigi-analyzer/mpc/kfile_mpc.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/mpc/kfile_mpc.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/mpc/kfile_mpc.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -46,6 +46,7 @@ Name[th]=ข้อมูล Musepack Name[tr]=MusePack Bilgisi Name[uk]=Інформація по Musepack +Name[wa]=Informåcions Musepack Name[x-test]=xxMusepack Infoxx Name[zh_CN]=Musepack 信息 Name[zh_HK]=Musepack 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/ogg/kfile_ogg.desktop new/kdemultimedia-4.1.1/strigi-analyzer/ogg/kfile_ogg.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/ogg/kfile_ogg.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/ogg/kfile_ogg.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -54,6 +54,7 @@ Name[uk]=Інформація по OGG Name[uz]=OGG haqida maʼlumot Name[uz@cyrillic]=OGG ҳақида маълумот +Name[wa]=Informåcions OGG Name[x-test]=xxOGG Infoxx Name[xh]=OGG Ulwazi Name[zh_CN]=OGG 信息 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/sid/kfile_sid.desktop new/kdemultimedia-4.1.1/strigi-analyzer/sid/kfile_sid.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/sid/kfile_sid.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/sid/kfile_sid.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -50,6 +50,7 @@ Name[th]=ข้อมูล SID Name[tr]=SID Bilgisi Name[uk]=Інформація по SID +Name[wa]=Informåcions SID Name[x-test]=xxSID Infoxx Name[zh_CN]=SID 信息 Name[zh_HK]=SID 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/theora/kfile_theora.desktop new/kdemultimedia-4.1.1/strigi-analyzer/theora/kfile_theora.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/theora/kfile_theora.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/theora/kfile_theora.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -14,7 +14,7 @@ Name[eu]=theora informazioa Name[fa]=اطلاعات theora Name[fi]=Theoran tiedot -Name[fr]=Informations theora +Name[fr]=Informations Theora Name[ga]=Eolas faoi theora Name[gl]=Información theora Name[he]=מידע theora @@ -47,6 +47,7 @@ Name[th]=ข้อมูล theora Name[tr]=theora Bilgisi Name[uk]=Інформація по theora +Name[wa]=Informåcions theora Name[x-test]=xxtheora Infoxx Name[zh_CN]=theora 信息 Name[zh_HK]=theora 資訊 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.0/strigi-analyzer/wav/kfile_wav.desktop new/kdemultimedia-4.1.1/strigi-analyzer/wav/kfile_wav.desktop --- old/kdemultimedia-4.1.0/strigi-analyzer/wav/kfile_wav.desktop 2008-07-03 07:06:31.000000000 +0200 +++ new/kdemultimedia-4.1.1/strigi-analyzer/wav/kfile_wav.desktop 2008-08-28 10:08:27.000000000 +0200 @@ -53,6 +53,7 @@ Name[uk]=Інформація по WAV Name[uz]=WAV haqida maʼlumot Name[uz@cyrillic]=WAV ҳақида маълумот +Name[wa]=Informåcions WAV Name[x-test]=xxWAV Infoxx Name[xh]=MAV Ulwazi Name[zh_CN]=WAV 信息 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de