Hello community,
here is the log from the commit of package kdemultimedia4
checked in at Sun Dec 2 15:01:23 CET 2007.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2007-11-21 18:57:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2007-11-28 11:24:31.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 28 11:24:31 CET 2007 - dmueller@suse.de
+
+- update to 3.96.2
+
+-------------------------------------------------------------------
Old:
----
kdemultimedia-3.96.1.tar.bz2
New:
----
kdemultimedia-3.96.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.NI7701/_old 2007-12-02 15:00:54.000000000 +0100
+++ /var/tmp/diff_new_pack.NI7701/_new 2007-12-02 15:00:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 3.96.1)
+# spec file for package kdemultimedia4 (Version 3.96.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,9 +17,9 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 3.96.1
+Version: 3.96.2
Release: 1
-%define rversion 3.96.1
+%define rversion 3.96.2
Source0: kdemultimedia-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -318,6 +318,8 @@
%doc COPYING COPYING-DOCS README
%changelog
+* Wed Nov 28 2007 - dmueller@suse.de
+- update to 3.96.2
* Wed Nov 21 2007 - dmueller@suse.de
- update to 3.96.1
* Wed Nov 14 2007 - dmueller@suse.de
++++++ kdemultimedia-3.96.1.tar.bz2 -> kdemultimedia-3.96.2.tar.bz2 ++++++
Files old/kdemultimedia-3.96.1/doc/juk/index.cache.bz2 and new/kdemultimedia-3.96.2/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-3.96.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-3.96.2/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-3.96.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-3.96.2/doc/kscd/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/juk/juk.desktop new/kdemultimedia-3.96.2/juk/juk.desktop
--- old/kdemultimedia-3.96.1/juk/juk.desktop 2007-11-14 01:19:09.000000000 +0100
+++ new/kdemultimedia-3.96.2/juk/juk.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -21,7 +21,7 @@
GenericName[da]=Musikafspiller
GenericName[de]=Audio-Wiedergabe
GenericName[el]=Αναπαραγωγέας μουσικής
-GenericName[eo]=Muzikludilo
+GenericName[eo]=Muzika ludilo
GenericName[es]=Reproductor de audio
GenericName[et]=Muusika mängija
GenericName[eu]=Musika erreproduzigailua
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-3.96.2/kioslave/audiocd/kcmaudiocd/audiocd.desktop
--- old/kdemultimedia-3.96.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2007-11-14 11:30:52.000000000 +0100
+++ new/kdemultimedia-3.96.2/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2007-11-27 18:18:12.000000000 +0100
@@ -18,7 +18,7 @@
Name[da]=Lyd-cd'er
Name[de]=Audio-CDs
Name[el]=CD μουσικής
-Name[eo]=Son-KDoj
+Name[eo]=Sonaj KD
Name[es]=CDs audio
Name[et]=Heliplaadid
Name[eu]=Audio CD-ak
@@ -74,7 +74,7 @@
Comment[da]=Lyd-cd IO-slave-indstilling
Comment[de]=Einrichtung des Ein-/Ausgabemoduls für Audio-CDs
Comment[el]=Ρύθμιση Audiocd IO Slave
-Comment[eo]=Agordo por la muzikdiska sklavo
+Comment[eo]=Agordo de la son-KD-a IO-sklavo
Comment[es]=Configuración del esclavo de E/S de audiocd
Comment[et]=Audio CD IO mooduli seadistamine
Comment[eu]=Audiocd IO mendekoaren konfigurazioa
@@ -129,6 +129,7 @@
Keywords[da]=Lyd-cd,CD,Ogg,Vorbis,Indkodning,CDDA,Bitrate
Keywords[de]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,MP3
Keywords[el]=CD μουσικής,CD,Ogg,Vorbis,Κωδικοποίηση,CDDA,Ρυθμός bit
+Keywords[eo]=Sona KD,KD,Ogg,Vorbis,Kodado,CDDA,Bitkvanto
Keywords[es]=CD de audio,CD,Ogg,Vorbis,Codificación,CDDA,Ratio de bits
Keywords[et]=audio,heli,CD,Ogg,Vorbis,kodeering,CDDA,bitikiirus
Keywords[eu]=Audio CD,CD,Ogg,Vorbis,Kdeketa,CDDA,bit-maiztasuna
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/guiprofile.cpp new/kdemultimedia-3.96.2/kmix/guiprofile.cpp
--- old/kdemultimedia-3.96.1/kmix/guiprofile.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/guiprofile.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -426,6 +426,8 @@
QString name = attributes.value("name");
QString regexp = attributes.value("pattern");
QString show = attributes.value("show");
+ QString background = attributes.value("background");
+ QString switchtype = attributes.value("switchtype");
if ( !id.isNull() ) {
// We need at least an "id". We can set defaults for the rest, if undefined.
ProfControl *profControl = new ProfControl();
@@ -438,6 +440,12 @@
if ( name.isNull() ) {
// ignore. isNull() will be checked by all users.
}
+ if ( !background.isNull() ) {
+ // ignore. isNull() will be checked by all users.
+ }
+ if ( !switchtype.isNull() ) {
+ // ignore. isNull() will be checked by all users.
+ }
if ( regexp.isNull() ) {
// !! should do a dictonary lookup here, and i18n(). For now, just take over "id"
regexp = !name.isNull() ? name : id;
@@ -450,6 +458,8 @@
profControl->tab = tab;
if ( show.isNull() ) { show = "*"; }
profControl->show = show;
+ profControl->backgroundColor.setNamedColor (background);
+ profControl->switchtype = switchtype;
_guiProfile._controls.push_back(profControl);
} // id != null
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/guiprofile.h new/kdemultimedia-3.96.2/kmix/guiprofile.h
--- old/kdemultimedia-3.96.1/kmix/guiprofile.h 2007-06-27 12:59:22.000000000 +0200
+++ new/kdemultimedia-3.96.2/kmix/guiprofile.h 2007-11-27 18:18:12.000000000 +0100
@@ -24,6 +24,7 @@
class Mixer;
#include
+#include <QColor>
#include <QString>
#include <string>
#include <map>
@@ -63,6 +64,10 @@
QString regexp;
// show or hide (contains the GUI type: simple, extended, full)
QString show;
+ // For applying custom colors
+ QColor backgroundColor;
+ // For defining the switch type when it is not a standard palyback or capture switch
+ QString switchtype;
};
struct ProfTab
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixapplet.desktop new/kdemultimedia-3.96.2/kmix/kmixapplet.desktop
--- old/kdemultimedia-3.96.1/kmix/kmixapplet.desktop 2007-11-14 11:30:52.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmixapplet.desktop 2007-11-27 18:18:12.000000000 +0100
@@ -63,6 +63,7 @@
Comment[cs]=Zobrazuje a umožňuje měnit hlasitost
Comment[de]=Zeigt Ihnen die Lautstärkeregler und lässt Sie die Lautstärke kontrollieren
Comment[el]=Εμφανίζει και σας επιτρέπει να αλλάξετε την ένταση του ήχου
+Comment[eo]=Montras kaj permesas kontroli al vi la sonajn laŭtecojn
Comment[es]=Muestra y le deja controlar el volumen del sonido
Comment[et]=Näitab ja võimaldab kontrollida helitugevust
Comment[fr]=Montre et vous permet de contrôler les volumes sonores
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.cpp new/kdemultimedia-3.96.2/kmix/kmix.cpp
--- old/kdemultimedia-3.96.1/kmix/kmix.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmix.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -56,6 +56,7 @@
#include "kmixprefdlg.h"
#include "kmixdockwidget.h"
#include "kmixtoolbox.h"
+#include "viewdockareapopup.h"
//#include "osd.h" // Postponed to KDE4.1
@@ -70,6 +71,7 @@
// m_visibilityUpdateAllowed( true ),
m_multiDriverMode (false), // -<- I never-ever want the multi-drivermode to be activated by accident
m_dockWidget()
+ , _dockAreaPopup(0)
{
setObjectName("KMixWindow");
// disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in
@@ -164,7 +166,7 @@
*/
bool KMixWindow::updateDocking()
{
- if (m_showDockWidget == false) {
+ if (m_showDockWidget == false) {
return false; // docking is disabled
}
@@ -174,13 +176,24 @@
delete m_dockWidget;
m_dockWidget = 0L;
}
+ if ( _dockAreaPopup ) {
+ delete _dockAreaPopup;
+ _dockAreaPopup = 0L;
+ }
if ( Mixer::mixers().count() == 0 ) {
return false;
}
- // create dock widget
- m_dockWidget = new KMixDockWidget( this, "mainDockWidget", m_volumeWidget );
+ // create dock widget and the corresponding popup
+ /* A GUIProfile does not make sense for the DockAreaPopup => Using (GUIProfile*)0 */
+ QWidget* referenceWidgetForSystray = this;
+ if ( m_volumeWidget ) {
+ _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", Mixer::getGlobalMasterMixer(), 0, (GUIProfile*)0, this);
+ _dockAreaPopup->createDeviceWidgets();
+ referenceWidgetForSystray = _dockAreaPopup;
+ }
+ m_dockWidget = new KMixDockWidget( referenceWidgetForSystray, "mainDockWidget", _dockAreaPopup );
m_dockWidget->show();
return true;
}
@@ -575,6 +588,7 @@
bool labelsHasChanged = m_showLabels ^ prefDlg->m_showLabels->isChecked();
bool ticksHasChanged = m_showTicks ^ prefDlg->m_showTicks->isChecked();
bool dockwidgetHasChanged = m_showDockWidget ^ prefDlg->m_dockingChk->isChecked();
+ bool systrayPopupHasChanged = m_volumeWidget ^ prefDlg->m_volumeChk->isChecked();
bool toplevelOrientationHasChanged =
( prefDlg->_rbVertical->isChecked() && m_toplevelOrientation == Qt::Horizontal )
|| ( prefDlg->_rbHorizontal->isChecked() && m_toplevelOrientation == Qt::Vertical );
@@ -591,7 +605,7 @@
m_toplevelOrientation = Qt::Horizontal;
}
- if ( labelsHasChanged || ticksHasChanged || dockwidgetHasChanged || toplevelOrientationHasChanged ) {
+ if ( labelsHasChanged || ticksHasChanged || dockwidgetHasChanged || toplevelOrientationHasChanged || systrayPopupHasChanged) {
recreateGUI();
}
@@ -648,4 +662,6 @@
// It would lead to unnecesary flickering of the (complete) dock area.
}
+
+
#include "kmix.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixctrl_restore.desktop new/kdemultimedia-3.96.2/kmix/kmixctrl_restore.desktop
--- old/kdemultimedia-3.96.1/kmix/kmixctrl_restore.desktop 2007-10-23 10:39:36.000000000 +0200
+++ new/kdemultimedia-3.96.2/kmix/kmixctrl_restore.desktop 2007-11-27 18:18:12.000000000 +0100
@@ -11,7 +11,7 @@
Name[da]=Genopret mikseropsætning
Name[de]=Lautstärkeeinstellungen wiederherstellen
Name[el]=Αποκατάσταση ρυθμίσεων μείκτη
-Name[eo]=Restarigu Miksilagordon
+Name[eo]=Restarigi la miksilan agordon
Name[es]=Restaurar opciones del mezclador
Name[et]=Mikseri seadistuste taastamine
Name[eu]=Nahasgailuaren ezarpenak berreskuratu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.desktop new/kdemultimedia-3.96.2/kmix/kmix.desktop
--- old/kdemultimedia-3.96.1/kmix/kmix.desktop 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmix.desktop 2007-11-27 18:18:12.000000000 +0100
@@ -70,7 +70,6 @@
GenericName[zh_TW]=音效混音器
Name=KMix
Name[af]=Kmix
-Name[eo]=Miksilo
Name[lv]=KMiks
Name[ne]=केडीई मिक्स
Name[pa]=ਕੇ-ਮਿਕਸ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixdockwidget.cpp new/kdemultimedia-3.96.2/kmix/kmixdockwidget.cpp
--- old/kdemultimedia-3.96.1/kmix/kmixdockwidget.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmixdockwidget.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -50,7 +50,6 @@
KMixDockWidget::KMixDockWidget(QWidget *parent, const char *, bool volumePopup )
: KSystemTrayIcon( parent ),
- _dockAreaPopup(0L),
_audioPlayer(0L),
_playBeepOnVolumeChange(false), // disabled due to triggering a "Bug"
_oldToolTipValue(-1),
@@ -66,7 +65,6 @@
KMixDockWidget::~KMixDockWidget()
{
delete _audioPlayer;
- delete _dockAreaPopup;
}
void KMixDockWidget::createActions()
@@ -114,9 +112,6 @@
}
// create devices
- /* A GUIProfile does not make sense for the DockAreaPopup => Using (GUIProfile*)0 */
- _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", m_mixer, 0, (GUIProfile*)0, this);
- _dockAreaPopup->createDeviceWidgets();
m_mixer->readSetFromHWforceUpdate(); // after changing the master device, make sure to re-read (otherwise no "changed()" signals might get sent by the Mixer
/* With the recently introduced QSocketNotifier stuff, we can't rely on regular timer updates
any longer. Also the readSetFromHWforceUpdate() won't be enough. As a workaround, we trigger
@@ -244,79 +239,55 @@
_oldPixmapType = newPixmapType;
}
-void
-KMixDockWidget::mousePressEvent(QMouseEvent * /*me*/)
-{
-#ifdef __GNUC__
-#warning FIXME: ksystemtray is no longer a widget
-#endif
-#if 0
- if ( _dockAreaPopup == 0 ) {
- return KSystemTrayIcon::mousePressEvent(me);
- }
-
- // esken: Due to overwhelming request, LeftButton shows the ViewDockAreaPopup, if configured
- // to do so. Otherwise the main window will be shown.
- if ( me->button() == Qt::LeftButton )
- {
- if ( ! _volumePopup ) {
- // Case 1: User wants to show main window => This is the KSystemTrayIcon default action
- return KSystemTrayIcon::mousePressEvent(me);
- }
-
- // Case 2: User wants to show volume popup
- if ( _dockAreaPopup->justHidden() )
- return;
-
- if ( _dockAreaPopup->isVisible() )
- {
- _dockAreaPopup->hide();
- return;
- }
-
- int h = _dockAreaPopup->height();
- int x = this->mapToGlobal( QPoint( 0, 0 ) ).x() - this->width()/2 - _dockAreaPopup->width()/2;
- int y = this->mapToGlobal( QPoint( 0, 0 ) ).y() - h;
- if ( y < 0 )
- y = y + h + this->height();
-
- _dockAreaPopup->move(x, y); // so that the mouse is outside of the widget
-
- // Now handle Multihead displays. And also make sure that the dialog is not
- // moved out-of-the screen on the right (see Bug 101742).
- const QDesktopWidget* vdesktop = QApplication::desktop();
- const QRect& vScreenSize = vdesktop->screenGeometry(_dockAreaPopup);
-//const QRect screenGeometry(const QWidget *widget) const
- if ( (x+_dockAreaPopup->width()) > (vScreenSize.width() + vScreenSize.x()) ) {
- // move horizontally, so that it is completely visible
- _dockAreaPopup->move(vScreenSize.width() + vScreenSize.x() - _dockAreaPopup->width() -1 , y);
- } // horizontally out-of bound
- else if ( x < vScreenSize.x() ) {
- _dockAreaPopup->move(vScreenSize.x(), y);
- }
- // the above stuff could also be implemented vertically
-
- _dockAreaPopup->show();
- KWindowSystem::setState(_dockAreaPopup->winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager );
-
- QWidget::mousePressEvent(me); // KSystemTrayIcon's shouldn't do the default action for this
- return;
- } // LeftMouseButton pressed
- else if ( me->button() == Qt::MidButton ) {
- toggleActive();
- return;
- }
- else {
- KSystemTrayIcon::mousePressEvent(me);
- } // Other MouseButton pressed
-#endif
-}
-void
-KMixDockWidget::mouseReleaseEvent( QMouseEvent * /*me*/ )
+void KMixDockWidget::moveVolumePopoup()
{
+ ViewDockAreaPopup* dockAreaPopup = qobject_cast(parent());
+ if ( dockAreaPopup == 0 ) {
+ // If the associated parent os the MainWindow (and not the ViewDockAreaPopup), we return.
+ return;
+ }
- // KSystemTrayIcon::mouseReleaseEvent(me);
+/*
+ if ( dockAreaPopup->justHidden() )
+ return;
+
+ if ( dockAreaPopup->isVisible() )
+ {
+// dockAreaPopup->hide();
+ return;
+ }
+*/
+
+ int h = dockAreaPopup->height();
+ int x = geometry().x() - geometry().width()/2 - dockAreaPopup->width()/2;
+ int y = geometry().y() - h;
+
+ // kDebug() << "h="<dockDevice();
+ ViewDockAreaPopup* dockAreaPopup = qobject_cast(parent());
+ if ( dockAreaPopup != 0 ) {
+ MixDevice* md = dockAreaPopup->dockDevice();
KToggleAction *dockMuteAction = static_cast(actionCollection()->action("dock_mute"));
//kDebug(67100) << "---> md=" << md << "dockMuteAction=" << dockMuteAction << "isMuted=" << md->isMuted();
if ( md != 0 && dockMuteAction != 0 ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixdockwidget.h new/kdemultimedia-3.96.2/kmix/kmixdockwidget.h
--- old/kdemultimedia-3.96.1/kmix/kmixdockwidget.h 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmixdockwidget.h 2007-11-27 18:18:12.000000000 +0100
@@ -29,7 +29,7 @@
#include
class Mixer;
-class ViewDockAreaPopup;
+//class ViewDockAreaPopup;
class Volume;
namespace Phonon
@@ -48,10 +48,9 @@
void setErrorPixmap();
void ignoreNextEvent();
- ViewDockAreaPopup* getDockAreaPopup();
+ //ViewDockAreaPopup* getDockAreaPopup();
Mixer *m_mixer;
- ViewDockAreaPopup *_dockAreaPopup;
Phonon::MediaObject *_audioPlayer;
public slots:
@@ -61,8 +60,7 @@
protected:
void createMasterVolWidget();
void createActions();
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
+ void moveVolumePopoup();
void wheelEvent(QWheelEvent *);
void contextMenuAboutToShow( KMenu* menu );
void toggleMinimizeRestore();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.h new/kdemultimedia-3.96.2/kmix/kmix.h
--- old/kdemultimedia-3.96.1/kmix/kmix.h 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmix.h 2007-11-27 18:18:12.000000000 +0100
@@ -44,7 +44,7 @@
class KMixDockWidget;
class KMixWindow;
class Mixer;
-
+class ViewDockAreaPopup;
#include "mixer.h"
@@ -115,6 +115,7 @@
QString m_hwInfoString;
QVBoxLayout *m_widgetsLayout;
QLabel *m_errorLabel;
+ ViewDockAreaPopup *_dockAreaPopup;
private slots:
void slotHWInfo();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.notifyrc new/kdemultimedia-3.96.2/kmix/kmix.notifyrc
--- old/kdemultimedia-3.96.1/kmix/kmix.notifyrc 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/kmix.notifyrc 2007-11-27 18:18:12.000000000 +0100
@@ -4,6 +4,7 @@
Comment[ca]=Mesclador de so
Comment[de]=Lautstärkeregler
Comment[el]=Μείκτης ήχου
+Comment[eo]=Sonmiksilo
Comment[es]=Mezclador de sonido
Comment[et]=Helimikser
Comment[fr]=Console de mixage
@@ -23,6 +24,7 @@
Name[ca]=Dispositiu d'àudio alternatiu
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
@@ -40,6 +42,7 @@
Comment[ca]=Notificació del funcionament automàtic del de reserva si els dispositius preferits no estan disponibles
Comment[de]=Benachrichtigung bei automatischem Wechsel zu der Sicherung, wenn das bevorzugte Gerät nicht verfügbar ist
Comment[el]=Ειδοποίηση αυτόματης χρήσης της αναπληρωματικής συσκευής ήχου, αν η προκαθορισμένη δεν είναι διαθέσιμη
+Comment[eo]=Atentigo dum aŭtomata malantaŭiro se la preferataj aparatoj ne uzeblas
Comment[es]=Notificación sobre la selección automática de un dispositivo de audio alternativo si no está disponible el dispositivo preferido
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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mdwslider.cpp new/kdemultimedia-3.96.2/kmix/mdwslider.cpp
--- old/kdemultimedia-3.96.1/kmix/mdwslider.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/mdwslider.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -66,7 +66,7 @@
QWidget* parent, ViewBase* mw) :
MixDeviceWidget(md,small,orientation,parent,mw),
m_linked(true), m_defaultLabelSpacer(0), m_iconLabelSimple(0), m_qcb(0), m_muteText(0),
- m_iconLayout(0), m_playbackSpacer(0), _layout(0), m_extraCaptureLabel( 0 ), m_label( 0 ),
+ m_playbackSpacer(0), _layout(0), m_extraCaptureLabel( 0 ), m_label( 0 ),
m_captureLED( 0 ), m_captureText(0), m_captureSpacer(0)
{
// create actions (on _mdwActions, see MixDeviceWidget)
@@ -155,9 +155,11 @@
void MDWSlider::setPlaybackExtent(int extent) {
if ( playbackExtentHint() < extent ) {
if ( _orientation == Qt::Vertical )
- m_playbackSpacer->setFixedHeight(extent-playbackExtentHint());
+ if ( playbackExtentHint() < extent )
+ m_playbackSpacer->setFixedHeight(extent-playbackExtentHint());
else
- m_playbackSpacer->setFixedWidth(extent-playbackExtentHint());
+ if ( playbackExtentHint() < extent )
+ m_playbackSpacer->setFixedWidth(extent-playbackExtentHint());
}
}
@@ -248,11 +250,11 @@
QBoxLayout *controlLayout;
if ( _orientation == Qt::Vertical ) {
controlLayout = new QVBoxLayout();
- controlLayout->setAlignment(Qt::AlignHCenter);
+ controlLayout->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
}
else {
controlLayout = new QHBoxLayout();
- controlLayout->setAlignment(Qt::AlignVCenter);
+ controlLayout->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
}
_layout->addItem( controlLayout );
@@ -265,11 +267,12 @@
QBoxLayout *volLayout;
if ( _orientation == Qt::Vertical ) {
volLayout = new QHBoxLayout( );
- volLayout->setAlignment(Qt::AlignTop);
+ // we use AlignBottom, so that Switches will be aligned with the bottom of the sliders
+ volLayout->setAlignment(Qt::AlignHCenter|Qt::AlignBottom);
}
else {
volLayout = new QVBoxLayout( );
- volLayout->setAlignment(Qt::AlignLeft);
+ volLayout->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
}
controlLayout->addItem( volLayout );
@@ -297,13 +300,15 @@
/* Creates the top part: Icon, PlaybackSwitch (Switch + Text) */
void MDWSlider::createWidgetsTopPart(QBoxLayout *layout, bool showMuteLED)
{
- if ( _orientation == Qt::Vertical ) {
- m_iconLayout = new QVBoxLayout( );
+ QBoxLayout *m_iconLayout;
+ if ( _orientation == Qt::Vertical ) {
+ m_iconLayout = new QVBoxLayout( );
+ m_iconLayout->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
}
else {
- m_iconLayout = new QHBoxLayout( );
+ m_iconLayout = new QHBoxLayout( );
+ m_iconLayout->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
}
- m_iconLayout->setAlignment(Qt::AlignCenter);
layout->addItem(m_iconLayout);
m_iconLabelSimple = 0L;
@@ -315,15 +320,24 @@
m_iconLabelSimple->setToolTip( muteTip );
m_iconLayout->addSpacing( 3 );
if ( m_mixdevice->playbackVolume().hasSwitch() ) {
+ if ( m_mixdevice->playbackVolume().switchType() == Volume::OnSwitch ) {
+ m_muteText = new QLabel("On", this); // l10n() this AFTER KDE4.0 !!
+ }
+ else if ( m_mixdevice->playbackVolume().switchType() == Volume::OffSwitch ) {
+ m_muteText = new QLabel( "Off", this); // l10n() this AFTER KDE4.0 !!
+ }
+ else {
+ m_muteText = new QLabel(i18n( "Mute"), this);
+ }
+ m_iconLayout->addWidget( m_muteText );
+ m_muteText->installEventFilter(this);
+
m_qcb = new QCheckBox(this);
m_iconLayout->addWidget( m_qcb );
m_qcb->installEventFilter(this);
- m_muteText = new QLabel(i18n( "Mute"), this);
- m_iconLayout->addWidget( m_muteText );
- m_muteText->installEventFilter(this);
connect ( m_qcb, SIGNAL( toggled(bool) ), this, SLOT(toggleMuted() ) );
- QString muteTip2( i18n( "Mute/Unmute %1", m_mixdevice->readableName() ) );
- m_qcb->setToolTip( muteTip2 );
+ QString muteTip( i18n( "Mute/Unmute %1", m_mixdevice->readableName() ) );
+ m_qcb->setToolTip( muteTip );
} // can be muted
}
m_playbackSpacer = new QWidget(this);
@@ -334,53 +348,38 @@
void MDWSlider::createWidgetsBottomPart(QBoxLayout *layout, bool showCaptureLED)
{
// --- capture SOURCE LED --------------------------
+ if ( showCaptureLED ) {
+ layout->addSpacing( 3 );
+ }
-
- if ( showCaptureLED )
- {
- layout->addSpacing( 3 );
+ QBoxLayout *reclayout;
+ if ( _orientation == Qt::Vertical ) {
+ reclayout = new QVBoxLayout( );
+ reclayout->setAlignment(Qt::AlignHCenter|Qt::AlignBottom);
+ }
+ else {
+ reclayout = new QHBoxLayout( );
+ reclayout->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
+ }
+ layout->addItem( reclayout );
-
- // --- LED LAYOUT TO CENTER ---
- QBoxLayout *reclayout;
- if ( _orientation == Qt::Vertical ) {
- reclayout = new QVBoxLayout( );
- }
- else {
- reclayout = new QHBoxLayout( );
- }
- reclayout->setAlignment(Qt::AlignCenter);
- layout->addItem( reclayout );
- reclayout->setSizeConstraint(QLayout::SetFixedSize);
-
- m_captureSpacer = new QWidget(this);
- reclayout->addWidget( m_captureSpacer );
- m_captureSpacer->installEventFilter(this);
+ m_captureSpacer = new QWidget(this);
+ reclayout->addWidget( m_captureSpacer );
+ m_captureSpacer->installEventFilter(this);
-
- if( m_mixdevice->captureVolume().hasSwitch() )
- {
- /*
- m_captureLED = new KLedButton( Qt::red,
- m_mixdevice->isRecSource()?KLed::On:KLed::Off,
- KLed::Sunken, KLed::Circular, this, "RecordLED" );
- m_captureLED->setFixedSize( QSize(16, 16) );
- connect(m_captureLED, SIGNAL(stateChanged(bool)), this, SLOT(setRecsrc(bool)));
- */
- m_captureLED = new QCheckBox(this);
- reclayout->addWidget( m_captureLED );
- connect(m_captureLED, SIGNAL(toggled(bool)), this, SLOT(setRecsrc(bool)));
- m_captureLED->installEventFilter( this );
- QString muteTip( i18n( "Capture/Uncapture %1", m_mixdevice->readableName() ) );
- m_captureLED->setToolTip( muteTip ); // @todo: Whatsthis, explaining the device
-
- m_captureText = new QLabel(i18n("Capture"), this);
- reclayout->addWidget( m_captureText );
- m_captureText->installEventFilter(this);
- } // has capture LED
-
- } // showCaptureLED
-
+ if ( showCaptureLED && m_mixdevice->captureVolume().hasSwitch() )
+ {
+ m_captureLED = new QCheckBox(this);
+ reclayout->addWidget( m_captureLED );
+ m_captureLED->installEventFilter( this );
+ connect(m_captureLED, SIGNAL(toggled(bool)), this, SLOT(setRecsrc(bool)));
+ QString muteTip( i18n( "Capture/Uncapture %1", m_mixdevice->readableName() ) );
+ m_captureLED->setToolTip( muteTip ); // @todo: Whatsthis, explaining the device
+
+ m_captureText = new QLabel(i18n("Capture"), this);
+ reclayout->addWidget( m_captureText );
+ m_captureText->installEventFilter(this);
+ } // has capture LED
}
void MDWSlider::addSliders( QBoxLayout *volLayout, char type, bool addLabel)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mdwslider.h new/kdemultimedia-3.96.2/kmix/mdwslider.h
--- old/kdemultimedia-3.96.1/kmix/mdwslider.h 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/mdwslider.h 2007-11-27 18:18:12.000000000 +0100
@@ -128,7 +128,6 @@
QLabel *m_iconLabelSimple;
QCheckBox* m_qcb;
QLabel* m_muteText;
- QBoxLayout *m_iconLayout;
QWidget *m_playbackSpacer;
// GUI: Middle portion (Sliders , including labels)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixdevice.cpp new/kdemultimedia-3.96.2/kmix/mixdevice.cpp
--- old/kdemultimedia-3.96.1/kmix/mixdevice.cpp 2007-10-08 09:42:18.000000000 +0200
+++ new/kdemultimedia-3.96.2/kmix/mixdevice.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -23,7 +23,7 @@
#include
#include "mixdevice.h"
-
+#include "volume.h"
/**
* Constructs a MixDevice. A MixDevice represents one channel or control of
@@ -53,11 +53,13 @@
{
// Hint: "_playbackVolume" gets COPIED from "playbackVol", because the copy-constructor actually copies the volume levels.
_playbackVolume = playbackVol;
+ _playbackVolume.setSwitchType(Volume::PlaybackSwitch);
}
void MixDevice::addCaptureVolume (Volume &captureVol)
{
_captureVolume = captureVol;
+ _captureVolume.setSwitchType(Volume::CaptureSwitch);
}
void MixDevice::addEnums(QList& ref_enumList)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixdevice.h new/kdemultimedia-3.96.2/kmix/mixdevice.h
--- old/kdemultimedia-3.96.1/kmix/mixdevice.h 2007-11-06 08:59:57.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/mixdevice.h 2007-11-27 18:18:12.000000000 +0100
@@ -64,6 +64,7 @@
VIDEO, SURROUND, HEADPHONE, DIGITAL, AC97,
SURROUND_BACK, SURROUND_LFE, SURROUND_CENTERFRONT, SURROUND_CENTERBACK };
+ enum SwitchType { OnOff, Mute, Capture, Activator };
/**
* Constructor:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixdevicewidget.h new/kdemultimedia-3.96.2/kmix/mixdevicewidget.h
--- old/kdemultimedia-3.96.1/kmix/mixdevicewidget.h 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/mixdevicewidget.h 2007-11-27 18:18:12.000000000 +0100
@@ -63,6 +63,7 @@
virtual void setLabeled( bool );
virtual void setTicks( bool ) {}
+
public slots:
virtual void setDisabled( bool value );
virtual void defineKeys();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixer.cpp new/kdemultimedia-3.96.2/kmix/mixer.cpp
--- old/kdemultimedia-3.96.1/kmix/mixer.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/mixer.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -328,7 +328,7 @@
{
mixer = Mixer::mixers()[i];
if ( mixer != 0 && mixer->id() == _globalMasterCard ) {
- kDebug() << "Mixer::masterCard() found " << _globalMasterCard;
+ //kDebug() << "Mixer::masterCard() found " << _globalMasterCard;
break;
}
}
@@ -338,7 +338,7 @@
_globalMasterCard = mixer->id();
kDebug() << "Mixer::masterCard() fallback to " << _globalMasterCard;
}
- kDebug() << "Mixer::masterCard() returns " << mixer->id();
+ //kDebug() << "Mixer::masterCard() returns " << mixer->id();
return mixer;
}
@@ -351,15 +351,12 @@
{
md = mixer->_mixerBackend->m_mixDevices[i];
if ( md->id() == _globalMasterCardDevice ) {
- kDebug() << "Mixer::masterCardDevice() found " << _globalMasterCardDevice;
+ //kDebug() << "Mixer::masterCardDevice() found " << _globalMasterCardDevice;
break;
}
}
}
-
- if ( md )
- kDebug() << "Mixer::masterCardDevice() returns " << md->id();
- else
+ if ( ! md )
kDebug() << "Mixer::masterCardDevice() returns 0 (no globalMaster)";
return md;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/restore_kmix_volumes.desktop new/kdemultimedia-3.96.2/kmix/restore_kmix_volumes.desktop
--- old/kdemultimedia-3.96.1/kmix/restore_kmix_volumes.desktop 2007-11-14 11:30:52.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/restore_kmix_volumes.desktop 2007-11-27 18:18:12.000000000 +0100
@@ -14,7 +14,7 @@
Name[da]=Genopret mikser lydstyrke
Name[de]=Lautstärken wiederherstellen
Name[el]=Επαναφορά των εντάσεων του μείκτη
-Name[eo]=Restarigu Miksilagordon
+Name[eo]=Restarigi la miksilajn laŭtecojn
Name[es]=Restaurar opciones del mezclador
Name[et]=Mikseri helitugevuste taastamine
Name[eu]=Nahasgailuaren bolumenak berreskuratu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/viewdockareapopup.cpp new/kdemultimedia-3.96.2/kmix/viewdockareapopup.cpp
--- old/kdemultimedia-3.96.1/kmix/viewdockareapopup.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/viewdockareapopup.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -38,12 +38,12 @@
// KMix
#include "mdwslider.h"
#include "mixer.h"
-#include "kmixdockwidget.h"
+#include "kmix.h"
// !! Do NOT remove or mask out "WType_Popup"
// Users will not be able to close the Popup without opening the KMix main window then.
// See Bug #93443, #96332 and #96404 for further details. -- esken
-ViewDockAreaPopup::ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixDockWidget *dockW )
+ViewDockAreaPopup::ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixWindow *dockW )
: ViewBase(parent, name, mixer, Qt::Popup | Qt::MSWindowsFixedSizeDialogHint , vflags, guiprof), _mdw(0), _dock(dockW), _hideTimer(0)
{
QBoxLayout *layout = new QHBoxLayout( this );
@@ -54,6 +54,7 @@
_frame->setLineWidth( 1 );
_layoutMDW = new QGridLayout( _frame );
+// layout->addLayout(_layoutMDW);
_layoutMDW->setSpacing( 1 );
_layoutMDW->setMargin( 2 );
_layoutMDW->setObjectName( "KmixPopupLayout" );
@@ -175,8 +176,8 @@
}
void ViewDockAreaPopup::showPanelSlot() {
- _dock->toggleActive();
- _dock->_dockAreaPopup->hide();
+ _dock->setVisible(_dock->isHidden());
+ hide();
}
#include "viewdockareapopup.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/viewdockareapopup.h new/kdemultimedia-3.96.2/kmix/viewdockareapopup.h
--- old/kdemultimedia-3.96.1/kmix/viewdockareapopup.h 2007-11-14 01:19:14.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/viewdockareapopup.h 2007-11-27 18:18:12.000000000 +0100
@@ -24,22 +24,22 @@
#include "viewbase.h"
class QMouseEvent;
+class QFrame;
class QGridLayout;
-class QWidget;
class QPushButton;
+class QTime;
+class QWidget;
class Mixer;
-class KMixDockWidget;
class MixDeviceWidget;
class MixDevice;
-class QFrame;
-class QTime;
+class KMixWindow;
class ViewDockAreaPopup : public ViewBase
{
Q_OBJECT
public:
- ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixDockWidget *dockW);
+ ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixWindow *dockW);
~ViewDockAreaPopup();
MixDevice* dockDevice();
@@ -54,7 +54,7 @@
protected:
MixDeviceWidget *_mdw;
- KMixDockWidget *_dock;
+ KMixWindow *_dock;
MixDevice *_dockDevice;
QPushButton *_showPanelBox;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/viewsliders.cpp new/kdemultimedia-3.96.2/kmix/viewsliders.cpp
--- old/kdemultimedia-3.96.1/kmix/viewsliders.cpp 2007-11-21 11:48:15.000000000 +0100
+++ new/kdemultimedia-3.96.2/kmix/viewsliders.cpp 2007-11-27 18:18:12.000000000 +0100
@@ -108,6 +108,11 @@
this, // parent
this ); // View widget
_layoutSliders->addWidget(mdw);
+ QHBoxLayout* lay = ::qobject_cast(_layoutSliders);
+ if ( lay )
+ lay->addSpacing(2);
+ else
+ qobject_cast(_layoutSliders)->addSpacing(2);
}
@@ -149,6 +154,12 @@
// Apply the custom name from the profile
md->setReadableName(control->name); // @todo: This is the wrong place. It only applies to controls in THIS type of view
}
+ if ( !control->switchtype.isNull() ) {
+ if ( control->switchtype == "On" )
+ md->playbackVolume().setSwitchType(Volume::OnSwitch);
+ else if ( control->switchtype == "Off" )
+ md->playbackVolume().setSwitchType(Volume::OffSwitch);
+ }
_mixSet->append(md);
isUsed = true;
// We use no "break;" ,as multiple devices could match
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/volume.h new/kdemultimedia-3.96.2/kmix/volume.h
--- old/kdemultimedia-3.96.1/kmix/volume.h 2007-06-27 12:59:22.000000000 +0200
+++ new/kdemultimedia-3.96.2/kmix/volume.h 2007-11-27 18:18:12.000000000 +0100
@@ -96,6 +96,14 @@
bool hasVolume() { return (_maxVolume != _minVolume); }
bool isCapture() { return _isCapture; } // -<- Query thsi, to find out whether this is a capture or a playback volume
+ // Some playback switches control playback, and some are special.
+ // ALSA doesn't differentiate between playback, OnOff and special, so users can add this information in the profile.
+ // It is only used for GUI things, like showing a "Mute" text or tooltip
+ // Capture is not really used, and has only been added for completeness and future extensibility.
+ enum SwitchType { PlaybackSwitch, CaptureSwitch, OnSwitch, OffSwitch, SpecialSwitch };
+ void setSwitchType(SwitchType type) { _switchType = type; }
+ Volume::SwitchType switchType() { return _switchType; }
+
friend std::ostream& operator<<(std::ostream& os, const Volume& vol);
friend kdbgstream& operator<<(kdbgstream& os, const Volume& vol);
@@ -108,7 +116,6 @@
long _maxVolume;
long _minVolume;
-
protected:
// setSwitch() and isSwitchActivated() are tricky. No regular class (incuding the Backends) shall use
// these functions. Our friend class MixDevice will handle that gracefully for us.
@@ -124,6 +131,7 @@
bool _hasSwitch;
bool _switchActivated;
+ SwitchType _switchType;
bool _isCapture;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kscd/kscd.desktop new/kdemultimedia-3.96.2/kscd/kscd.desktop
--- old/kdemultimedia-3.96.1/kscd/kscd.desktop 2007-10-03 13:47:39.000000000 +0200
+++ new/kdemultimedia-3.96.2/kscd/kscd.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -10,7 +10,7 @@
GenericName[da]=Cd-afspiller
GenericName[de]=CD-Wiedergabe
GenericName[el]=Αναπαραγωγέας CD
-GenericName[eo]=Ludilo por muzikaj lumdiskoj
+GenericName[eo]=KD-ludilo
GenericName[es]=Reproductor de CDs
GenericName[et]=CD mängija
GenericName[eu]=CD erreproduzigailua
@@ -61,7 +61,6 @@
GenericName[zh_TW]=CD 播放器
Name=KsCD
Name[af]=Kscd
-Name[eo]=Lumdiskludilo
Name[sv]=Kscd
Name[ta]=Ksகுறுந்தகடு
Name[tg]=KsДиски Фишурда
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-3.96.2/libkcddb/kcmcddb/libkcddb.desktop
--- old/kdemultimedia-3.96.1/libkcddb/kcmcddb/libkcddb.desktop 2007-11-14 01:19:09.000000000 +0100
+++ new/kdemultimedia-3.96.2/libkcddb/kcmcddb/libkcddb.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -72,7 +72,7 @@
GenericName[da]=CDDB-Indstilling
GenericName[de]=CDDB-Einrichtung
GenericName[el]=Ρύθμιση CDDB
-GenericName[eo]=LDDB-agordo
+GenericName[eo]=CDDB-agordo
GenericName[es]=Configuración de CDDB
GenericName[et]=CDDB seadistamine
GenericName[eu]=CDDB konfigurazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/avi/kfile_avi.desktop new/kdemultimedia-3.96.2/strigi-analyzer/avi/kfile_avi.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/avi/kfile_avi.desktop 2007-11-06 08:59:56.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/avi/kfile_avi.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -11,7 +11,7 @@
Name[da]=AVI-info
Name[de]=AVI-Info
Name[el]=Πληροφορίες AVI
-Name[eo]=AVI-informo
+Name[eo]=AVI informo
Name[es]=Info AVI
Name[et]=AVI info
Name[eu]=AVI informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/flac/kfile_flac.desktop new/kdemultimedia-3.96.2/strigi-analyzer/flac/kfile_flac.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/flac/kfile_flac.desktop 2007-11-06 08:59:56.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/flac/kfile_flac.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -10,6 +10,7 @@
Name[da]=FLAC-Info
Name[de]=FLAC-Info
Name[el]=Πληροφορίες FLAC
+Name[eo]=FLAC informo
Name[es]=Info FLAC
Name[et]=FLAC info
Name[eu]=FLAC Informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-3.96.2/strigi-analyzer/mp3/kfile_mp3.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/mp3/kfile_mp3.desktop 2007-11-06 08:59:56.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/mp3/kfile_mp3.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -11,7 +11,7 @@
Name[da]=MP3-info
Name[de]=MP3-Info
Name[el]=Πληροφορίες MP3
-Name[eo]=MP3-informo
+Name[eo]=MP3 informo
Name[es]=Info MP3
Name[et]=MP3 info
Name[eu]=MP3 informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/mpc/kfile_mpc.desktop new/kdemultimedia-3.96.2/strigi-analyzer/mpc/kfile_mpc.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/mpc/kfile_mpc.desktop 2007-11-14 01:19:03.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/mpc/kfile_mpc.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -8,7 +8,7 @@
Name[cs]=Musepack info
Name[de]=Musepack-Info
Name[el]=Πληροφορίες Musepack
-Name[eo]=epack-informo
+Name[eo]=Musepack informo
Name[es]=Info Musepack
Name[et]=Musepacki info
Name[eu]=Musepack informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/ogg/kfile_ogg.desktop new/kdemultimedia-3.96.2/strigi-analyzer/ogg/kfile_ogg.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/ogg/kfile_ogg.desktop 2007-11-06 08:59:56.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/ogg/kfile_ogg.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -11,7 +11,7 @@
Name[da]=OGG-info
Name[de]=OGG-Info
Name[el]=Πληροφορίες OGG
-Name[eo]=OGG-informo
+Name[eo]=OGG informo
Name[es]=Info OGG
Name[et]=OGG info
Name[eu]=OGG informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/sid/kfile_sid.desktop new/kdemultimedia-3.96.2/strigi-analyzer/sid/kfile_sid.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/sid/kfile_sid.desktop 2007-11-14 01:19:04.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/sid/kfile_sid.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -10,7 +10,7 @@
Name[da]=SID-info
Name[de]=SID-Info
Name[el]=Πληροφορίες SID
-Name[eo]=SID-informo
+Name[eo]=SID informo
Name[es]=Info SID
Name[et]=SID info
Name[eu]=SID informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/theora/kfile_theora.desktop new/kdemultimedia-3.96.2/strigi-analyzer/theora/kfile_theora.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/theora/kfile_theora.desktop 2007-11-14 01:19:04.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/theora/kfile_theora.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -8,7 +8,7 @@
Name[cs]=theora info
Name[de]=Theora-Info
Name[el]=Πληροφορίες theora
-Name[eo]=theora-informo
+Name[eo]=theora informo
Name[es]=Info Theora
Name[et]=Theora info
Name[eu]=theora informazioa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/wav/kfile_wav.desktop new/kdemultimedia-3.96.2/strigi-analyzer/wav/kfile_wav.desktop
--- old/kdemultimedia-3.96.1/strigi-analyzer/wav/kfile_wav.desktop 2007-11-06 08:59:56.000000000 +0100
+++ new/kdemultimedia-3.96.2/strigi-analyzer/wav/kfile_wav.desktop 2007-11-27 18:18:11.000000000 +0100
@@ -11,7 +11,7 @@
Name[da]=WAV-info
Name[de]=WAV-Info
Name[el]=Πληροφορίες WAV
-Name[eo]=WAV-informo
+Name[eo]=WAV informo
Name[es]=Info WAV
Name[et]=WAV info
Name[eu]=WAV informazioa
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org