SOURCES: kdemultimedia-branch.diff - updated

Tue Aug 2 08:12:09 CEST 2005

Author: arekm                        Date: Tue Aug  2 06:12:09 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdemultimedia-branch.diff (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/kdemultimedia-branch.diff
diff -u SOURCES/kdemultimedia-branch.diff:1.7 SOURCES/kdemultimedia-branch.diff:1.8

--- SOURCES/kdemultimedia-branch.diff:1.7	Sat Apr  9 17:21:23 2005
+++ SOURCES/kdemultimedia-branch.diff	Tue Aug  2 08:12:04 2005
@@ -1,2567 +1,185 @@
-diff -urN -x CVS kdemultimedia.orig/admin/acinclude.m4.in kdemultimedia/admin/acinclude.m4.in
---- kdemultimedia.orig/admin/acinclude.m4.in	2005-02-09 23:21:09.000000000 +0100
-+++ kdemultimedia/admin/acinclude.m4.in	2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
- 
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
--	AC_MSG_ERROR([you need to install kdelibs first.])
-+	AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs. 
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the 
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
-         fi
-         rm -f conftest.h conftest.h.gch
-     fi
--    AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
-   fi
-+  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
-   if test "$CXX" = "KCC"; then
-     dnl unfortunately we currently cannot disable exception support in KCC
-     dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-@@ -3194,6 +3202,51 @@
-   ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
- 
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+  [
-+    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+      [
-+        AC_LANG_SAVE
-+        AC_LANG_CPLUSPLUS
-+
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+        AC_TRY_LINK(
-+        [
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+          template<typename CharT>
-+          struct VisTest
-+          {
-+            inline VisTest ();
-+          };
-+          template<typename CharT>
-+          inline VisTest<CharT>::VisTest()
-+          {}
-+          extern template class VisTest<char>;  // It works if we drop that line
-+          int some_function( int do_something ) __attribute__ ((visibility("default")));
-+          int some_function( int )
-+          {
-+            VisTest<char> a;
-+            return 0;
-+          }
-+        ], [/* elvis is alive */],
-+        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        AC_LANG_RESTORE
-+      ]
-+    )
-+
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+  ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
-   if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
-     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-     KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-     [
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        KDE_CHECK_VISIBILITY_GCC_BUG
-+
-         HAVE_GCC_VISIBILITY=1
-         AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-     ])
-diff -urN -x CVS kdemultimedia.orig/admin/am_edit kdemultimedia/admin/am_edit
---- kdemultimedia.orig/admin/am_edit	2004-12-17 21:18:28.000000000 +0100
-+++ kdemultimedia/admin/am_edit	2005-03-29 11:15:16.000000000 +0200
-@@ -483,6 +483,7 @@
-             $MakefileData =~ s/$lookup/$replacement/;
-             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
-             $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
-+            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
-             substituteLine($lookup, $replacement);
-         } else {
-             $found = 0;
-@@ -634,7 +635,7 @@
- 		if ($pre eq '' && exists($varcontent{$variable})) {
- 		    my @addlist = split(/[\034\s]+/, $varcontent{$variable});
- 		    push(@objlist, @addlist);
--                } elsif ($variable !~ 'OBJEXT') {
-+                } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
-                     $ocv = 1;
- 		}
-             }
-@@ -2276,7 +2277,7 @@
-            "\t        echo \"\$\$i\"; \\\n" . 
-            "\t        if ! ";
-     $t .=  $cxxsuffix eq "KKK" ?
--           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
-            "\$(CXXCOMPILE) ";
-     $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
-            "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-@@ -2352,7 +2353,7 @@
-     $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
-     # Append our $progId line, _below_ the "generated by automake" line
-     # because automake-1.6 relies on the first line to be his own.
--    my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-+    my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-     if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
-         warn "automake line not found in $makefile\n";
- 	# Fallback: first line
-diff -urN -x CVS kdemultimedia.orig/akode/arts_plugin/akodePlayObject_impl.cpp kdemultimedia/akode/arts_plugin/akodePlayObject_impl.cpp
---- kdemultimedia.orig/akode/arts_plugin/akodePlayObject_impl.cpp	2005-02-14 18:43:08.000000000 +0100
-+++ kdemultimedia/akode/arts_plugin/akodePlayObject_impl.cpp	2005-03-14 00:03:55.000000000 +0100
-@@ -327,7 +327,7 @@
-     // Invalid frame from broken plugin
-     if (inBuffer->sample_rate == 0) return false;
- 
--    if (samplingRate != inBuffer->sample_rate) {
-+    if (samplingRate != inBuffer->sample_rate || mSpeed != 1.0) {
-         //arts_debug("akode: resampling to %d/%d", inBuffer->sample_rate, samplingRate);
-         if ( !buffer || buffer==inBuffer ) buffer = new AudioFrame;
-         if ( !resampler)
-diff -urN -x CVS kdemultimedia.orig/arts/builder/artsbuilder.desktop kdemultimedia/arts/builder/artsbuilder.desktop
---- kdemultimedia.orig/arts/builder/artsbuilder.desktop	2005-02-23 06:06:30.000000000 +0100
-+++ kdemultimedia/arts/builder/artsbuilder.desktop	2005-03-07 15:19:20.000000000 +0100
-@@ -37,7 +37,6 @@
- Name[tr]=aRts YapÄącÄą
- Name[ven]=Mufhati wa aRts
- Name[xh]=Umakhi we aRts
--Name[xx]=xxaRts Builderxx
- Name[zh_CN]=aRts ćž„ĺťşç¨‹ĺş
- Name[zu]=Umakhi We aRts
- GenericName=Audio Filter Designer
-@@ -85,7 +84,6 @@
- GenericName[uk]=Đ”Đ¸ĐˇĐ°ĐšĐ˝ Đ°ŃƒĐ´Ń–ĐžŃ„Ń–ĐťŃŒŃ‚Ń€Ń–Đ˛
- GenericName[ven]=Muvhati wa filithara ino pfala
- GenericName[xh]=Umyili Wecebo lokucoca ulwelo Wesandi
--GenericName[xx]=xxAudio Filter Designerxx
- GenericName[zh_CN]=éŸłé˘‘ćť¤ćł˘ĺ™¨čŽžčŽĄç¨‹ĺş
- GenericName[zh_TW]=éŸłć•ˆéŽćżžĺ™¨č¨č¨ˆĺ¸Ť
- GenericName[zu]=Umdwebi Wehluzo Lokuzwakalayo
-diff -urN -x CVS kdemultimedia.orig/arts/builder/x-artsbuilder.desktop kdemultimedia/arts/builder/x-artsbuilder.desktop
---- kdemultimedia.orig/arts/builder/x-artsbuilder.desktop	2005-02-23 06:06:30.000000000 +0100
-+++ kdemultimedia/arts/builder/x-artsbuilder.desktop	2005-03-07 15:19:20.000000000 +0100
-@@ -43,7 +43,6 @@
- Comment[tr]=Arts YapÄącÄą
- Comment[ven]=Muiti wa zwavhutsila
- Comment[xh]=Umakhi wemizobo
--Comment[xx]=xxArts Builderxx
- Comment[zh_CN]=Arts ćž„ĺťşç¨‹ĺş
- Comment[zu]=Umakhi Wezamasiko
- Icon=arts
-diff -urN -x CVS kdemultimedia.orig/arts/modules/effects/mcopclass/Synth_FREEVERB.mcopclass kdemultimedia/arts/modules/effects/mcopclass/Synth_FREEVERB.mcopclass
---- kdemultimedia.orig/arts/modules/effects/mcopclass/Synth_FREEVERB.mcopclass	2003-07-31 11:42:02.000000000 +0200
-+++ kdemultimedia/arts/modules/effects/mcopclass/Synth_FREEVERB.mcopclass	2005-04-03 14:02:37.000000000 +0200
-@@ -4,3 +4,4 @@
- Library=libartsmoduleseffects.la
- Features=RackGUI
- Name="Freeverb"
-+Use=directly
-\ Brak znaku nowej linii na końcu pliku
-diff -urN -x CVS kdemultimedia.orig/arts/modules/effects/mcopclass/Synth_VOICE_REMOVAL.mcopclass kdemultimedia/arts/modules/effects/mcopclass/Synth_VOICE_REMOVAL.mcopclass
---- kdemultimedia.orig/arts/modules/effects/mcopclass/Synth_VOICE_REMOVAL.mcopclass	2003-07-31 11:42:02.000000000 +0200
-+++ kdemultimedia/arts/modules/effects/mcopclass/Synth_VOICE_REMOVAL.mcopclass	2005-04-03 14:02:37.000000000 +0200
-@@ -4,3 +4,4 @@
- Library=libartsmoduleseffects.la
- Features=RackGUI
- Name="Voice Removal"
-+Use=directly
-\ Brak znaku nowej linii na końcu pliku
-diff -urN -x CVS kdemultimedia.orig/arts/tools/artscontrolapplet.desktop kdemultimedia/arts/tools/artscontrolapplet.desktop
---- kdemultimedia.orig/arts/tools/artscontrolapplet.desktop	2005-02-23 06:06:30.000000000 +0100
-+++ kdemultimedia/arts/tools/artscontrolapplet.desktop	2005-03-07 15:19:21.000000000 +0100
-@@ -43,7 +43,6 @@
- Comment[uk]=ĐĐżĐťĐľŃ‚ Đ´ĐťŃ ĐşĐľŃ€ŃƒĐ˛Đ°Đ˝Đ˝Ń aRts
- Comment[uz]=Đ‘ŃƒŃ‚ŃƒĐ˝ aRts'Đ˝Đ¸ ĐąĐžŃˆŇ›Đ°Ń€Đ¸Ńˆ ŃƒŃ‡ŃƒĐ˝ ĐąĐ¸Ń‚Ń‚Đ° Đ°ĐżĐżĐťĐľŃ‚
- Comment[wa]=Ene aplikete po controler totafwaitmint aRts
--Comment[xx]=xxOne Applet to control whole aRtsxx
- Comment[zh_CN]=ćŽ§ĺˆść•´ä¸Ş aRts çš„ĺ°ç¨‹ĺş
- Name=aRts Control
- Name[bn]=ŕŚ†ŕŚ°ŕ§ŕŚŸŕ§â€ŒŕŚ¸ ŕŚ¨ŕŚżŕ§ŸŕŚ¨ŕ§ŕŚ¤ŕ§ŕŚ°ŕŚŁ
-@@ -85,7 +84,6 @@
- Name[tr]=aRts Kontol
- Name[uk]=ĐšĐľŃ€ŃƒĐ˛Đ°Đ˝Đ˝Ń aRts
- Name[uz]=aRts ĐąĐžŃˆŇ›Đ°Ń€ŃƒĐ˛Đ¸
--Name[xx]=xxaRts Controlxx
- Name[zh_CN]=aRts ćŽ§ĺˆś
- X-KDE-Library=libartscontrolapplet
- Icon=artscontrol
-diff -urN -x CVS kdemultimedia.orig/arts/tools/artscontrol.desktop kdemultimedia/arts/tools/artscontrol.desktop
---- kdemultimedia.orig/arts/tools/artscontrol.desktop	2005-02-23 06:06:30.000000000 +0100
-+++ kdemultimedia/arts/tools/artscontrol.desktop	2005-03-07 15:19:21.000000000 +0100
-@@ -49,7 +49,6 @@
- Name[uz]=aRts ĐąĐžŃˆŇ›Đ°Ń€ŃƒĐ˛ Đ˛ĐžŃĐ¸Ń‚Đ°ŃĐ¸
- Name[ven]=Tshishumiswa tshau langula aRTs
- Name[xh]=Ulawulo Lwemizobo
--Name[xx]=xxaRts Control Toolxx
- Name[zh_CN]=aRts ćŽ§ĺˆśĺˇĽĺ
ˇ
- Name[zh_TW]=aRts ćŽ§ĺˆśĺˇĽĺ
ˇ
- Name[zu]=Ithuluazi Lokuphatha le aRts
-@@ -102,7 +101,6 @@
- GenericName[ven]=Ndangulo ya siva ya mubvumo
- GenericName[wa]=ContrĂ´le do sierveu di sons
- GenericName[xh]=Ulawulo Lomncedisi Wesandi
--GenericName[xx]=xxSound Server Controlxx
- GenericName[zh_CN]=ĺŁ°éŸłćœĺŠĄĺ™¨ćŽ§ĺˆś
- GenericName[zh_TW]=č˛éŸłäźşćœĺ™¨ćŽ§ĺˆśĺ™¨
- GenericName[zu]=Ukulawila Lomlekeleli Womsindo
-diff -urN -x CVS kdemultimedia.orig/juk/googlefetcher.cpp kdemultimedia/juk/googlefetcher.cpp
---- kdemultimedia.orig/juk/googlefetcher.cpp	2005-01-15 23:56:10.000000000 +0100
-+++ kdemultimedia/juk/googlefetcher.cpp	2005-03-17 23:57:54.000000000 +0100
-@@ -139,7 +139,6 @@
- QPixmap GoogleFetcher::pixmap()
- {
-     bool chosen = false;
--    const int selectedIndex = 0;
-     m_loadedSize = All;
- 
-     displayWaitMessage();
-@@ -147,24 +146,21 @@
-     QPixmap pixmap;
- 
-     while(!chosen) {
--        GoogleFetcherDialog dialog("google", m_imageList, selectedIndex, m_file, 0);
- 
--        connect(&dialog, SIGNAL(sizeChanged(GoogleFetcher::ImageSize)),
--                this, SLOT(slotLoadImageURLs(GoogleFetcher::ImageSize)));
--        connect(this, SIGNAL(signalNewSearch(GoogleImageList &)),
--                &dialog, SLOT(refreshScreen(GoogleImageList &)));
--        dialog.exec();
--        pixmap = dialog.result();
--        chosen = dialog.takeIt();
--        if(dialog.newSearch()) {
--            bool ok;
--            m_searchString = KInputDialog::getText(i18n("Cover Downloader"),
--                                                   i18n("Enter new search terms:"),
--                                                   m_searchString, &ok);
--            if(ok && !m_searchString.isEmpty())
--                displayWaitMessage();
--            else
--                m_searchString = m_loadedQuery;
-+        if(m_imageList.isEmpty())
-+            chosen = !requestNewSearchTerms(true);
-+        else {
-+            GoogleFetcherDialog dialog("google", m_imageList, m_file, 0);
-+            connect(&dialog, SIGNAL(sizeChanged(GoogleFetcher::ImageSize)),
-+                    this, SLOT(slotLoadImageURLs(GoogleFetcher::ImageSize)));
-+            connect(this, SIGNAL(signalNewSearch(GoogleImageList &)),
-+                    &dialog, SLOT(refreshScreen(GoogleImageList &)));
-+            dialog.exec();
-+            pixmap = dialog.result();
-+            chosen = dialog.takeIt();
-+
-+            if(dialog.newSearch())
-+                requestNewSearchTerms();
-         }
-     }
-     return pixmap;
-@@ -178,5 +174,20 @@
-     statusBar->clear();
- }
- 
--#include "googlefetcher.moc"
-+bool GoogleFetcher::requestNewSearchTerms(bool noResults)
-+{
-+    bool ok;
-+    m_searchString = KInputDialog::getText(i18n("Cover Downloader"),
-+                                           noResults ?
-+                                             i18n("No matching images found, please enter new search terms:") :
-+                                             i18n("Enter new search terms:"),
-+                                           m_searchString, &ok);
-+    if(ok && !m_searchString.isEmpty())
-+        displayWaitMessage();
-+    else
-+        m_searchString = m_loadedQuery;
- 
-+    return ok;
-+}
-+
-+#include "googlefetcher.moc"
-diff -urN -x CVS kdemultimedia.orig/juk/googlefetcherdialog.cpp kdemultimedia/juk/googlefetcherdialog.cpp
---- kdemultimedia.orig/juk/googlefetcherdialog.cpp	2005-02-22 22:40:10.000000000 +0100
-+++ kdemultimedia/juk/googlefetcherdialog.cpp	2005-03-17 23:57:54.000000000 +0100
-@@ -30,7 +30,6 @@
- 
- GoogleFetcherDialog::GoogleFetcherDialog(const QString &name,
-                                          const GoogleImageList &imageList,
--                                         uint /* selectedIndex */,
-                                          const FileHandle &file,
-                                          QWidget *parent) :
-     KDialogBase(parent, name.latin1(), true, QString::null,
-diff -urN -x CVS kdemultimedia.orig/juk/googlefetcherdialog.h kdemultimedia/juk/googlefetcherdialog.h
---- kdemultimedia.orig/juk/googlefetcherdialog.h	2005-01-22 20:42:31.000000000 +0100
-+++ kdemultimedia/juk/googlefetcherdialog.h	2005-03-17 23:57:54.000000000 +0100
-@@ -30,7 +30,6 @@
- public:
-     GoogleFetcherDialog(const QString &name,
-                         const GoogleImageList &urlList,
--                        uint selectedIndex,
-                         const FileHandle &file,
-                         QWidget *parent = 0);
- 
-diff -urN -x CVS kdemultimedia.orig/juk/googlefetcher.h kdemultimedia/juk/googlefetcher.h
---- kdemultimedia.orig/juk/googlefetcher.h	2004-12-01 03:12:17.000000000 +0100
-+++ kdemultimedia/juk/googlefetcher.h	2005-03-17 23:57:54.000000000 +0100
-@@ -52,21 +52,16 @@
-     GoogleFetcher(const FileHandle &file);
-     QPixmap pixmap();
- 
-+signals:
-+    void signalNewSearch(GoogleImageList &images);
-+
- private:
--    void cancel();
--    void editSearch();
--    void saveCover();
--    void previous();
--    void next();
-     void displayWaitMessage();
--    void buildBox();
-+    bool requestNewSearchTerms(bool noResults = false);
- 
- private slots:
-     void slotLoadImageURLs(GoogleFetcher::ImageSize size = All);
- 
--signals:
--    void signalNewSearch(GoogleImageList &images);
--
- private:
-     FileHandle m_file;
-     QString m_searchString;
-diff -urN -x CVS kdemultimedia.orig/juk/juk.desktop kdemultimedia/juk/juk.desktop
---- kdemultimedia.orig/juk/juk.desktop	2005-02-05 05:16:55.000000000 +0100
-+++ kdemultimedia/juk/juk.desktop	2005-03-07 15:19:21.000000000 +0100
-@@ -6,13 +6,11 @@
- Icon=juk
- DocPath=juk/index.html
- Comment=
--Comment[xx]=xxxx
- Terminal=false
- Name=JuK
- Name[bn]=ŕŚœŕ§ŕŚ•
- Name[hi]=ŕ¤œŕĽŕ¤ŻŕĽ‚ŕ¤•
- Name[sv]=Juk
--Name[xx]=xxJuKxx
- GenericName=Music Player
- GenericName[bg]=ĐŸĐťĐľŃŠŃ€ ĐˇĐ° ĐźŃƒĐˇĐ¸ĐşĐ°ĐťĐ˝Đ¸ Ń„Đ°ĐšĐťĐžĐ˛Đľ
- GenericName[br]=C'hoarier ar sonerezh
-@@ -55,6 +53,5 @@
- GenericName[tr]=MĂźzik YĂźrĂźtĂźcĂźsĂź
- GenericName[uk]=ĐŸŃ€ĐžĐłŃ€Đ°Đ˛Đ°Ń‡ ĐźŃƒĐˇĐ¸ĐşĐ¸
- GenericName[uz]=ĐœŃƒŃĐ¸Ň›Đ° ĐżĐťĐľĐšĐľŃ€
--GenericName[xx]=xxMusic Playerxx
- GenericName[zh_CN]=éŸłäšć’ć”žĺ™¨
- Categories=Qt;KDE;AudioVideo;
-diff -urN -x CVS kdemultimedia.orig/juk/jukservicemenu.desktop kdemultimedia/juk/jukservicemenu.desktop
---- kdemultimedia.orig/juk/jukservicemenu.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/juk/jukservicemenu.desktop	2005-03-07 15:19:21.000000000 +0100
-@@ -43,7 +43,6 @@
- Name[tr]=JuK Koleksiyonu Ekle
- Name[uk]=Đ”ĐžĐ´Đ°Ń‚Đ¸ Đ´Đž ĐˇĐąŃ–Ń€ĐşĐ¸ JuK
- Name[uz]=JuK Ń‚ŃžĐżĐťĐ°ĐźĐ¸ĐłĐ° Ň›ŃžŃˆĐ¸Ńˆ
--Name[xx]=xxAdd to JuK Collectionxx
- Name[zh_CN]=ćˇťĺŠ ĺˆ° JuK ć”śč—
- Icon=juk
- Exec=dcop juk Player openFile %u
-diff -urN -x CVS kdemultimedia.orig/juk/trackpickerdialog.cpp kdemultimedia/juk/trackpickerdialog.cpp
---- kdemultimedia.orig/juk/trackpickerdialog.cpp	2004-12-07 16:43:15.000000000 +0100
-+++ kdemultimedia/juk/trackpickerdialog.cpp	2005-03-17 23:58:35.000000000 +0100
-@@ -60,6 +60,10 @@
-         new TrackPickerItem(m_base->trackList, *it);
- 
-     m_base->trackList->setSelected(m_base->trackList->firstChild(), true);
-+
-+    connect(m_base->trackList, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)),
-+            this, SLOT(accept()));
-+
-     setMinimumWidth(kMax(400, width()));
- }
- 
-diff -urN -x CVS kdemultimedia.orig/kaboodle/kaboodle_component.desktop kdemultimedia/kaboodle/kaboodle_component.desktop
---- kdemultimedia.orig/kaboodle/kaboodle_component.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/kaboodle/kaboodle_component.desktop	2005-03-07 15:19:21.000000000 +0100
-@@ -52,7 +52,6 @@
- Name[uk]=Đ’ĐźĐžĐ˝Ń‚ĐžĐ˛Đ°Đ˝Đ¸Đš ĐżŃ€ĐžĐłŃ€Đ°Đ˛Đ°Ń‡ ĐźĐľĐ´Ń–Đ°
- Name[ven]=Tshitambi tsha media tsha Embedded
- Name[xh]=Umdlali ophakathi olungisiweyo
--Name[xx]=xxEmbedded Media Playerxx
- Name[zh_CN]=ĺľŒĺ
ĽĺźĺŞ’ä˝“ć’ć”žĺ™¨
- Name[zh_TW]=ĺľŒĺ
ĽĺźĺŞ’éŤ”ć’ć”žĺ™¨
- Name[zu]=Oxubiwe Umdlai Wezezindaba
-diff -urN -x CVS kdemultimedia.orig/kaboodle/kaboodle.desktop kdemultimedia/kaboodle/kaboodle.desktop
---- kdemultimedia.orig/kaboodle/kaboodle.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/kaboodle/kaboodle.desktop	2005-03-20 21:43:56.000000000 +0100
-@@ -7,7 +7,6 @@
- Name[ko]=KëŹ´ëŚŹ
- Name[pa]=ŕ¨•ŕŠ‡ŕ¨ŹŕŠ‹ŕ¨Ąŕ¨˛ŕŠ€
- Name[ta]=ŕŽ•ŕŽŞŕŻ‚ŕŽŸŕŽ˛ŕŻ
--Name[xx]=xxKaboodlexx
- Exec=kaboodle %i %m -caption "%c" %U
- Icon=kaboodle
- X-KDE-StartupNotify=true
-@@ -65,11 +64,10 @@
- GenericName[uz]=ĐœĐľĐ´Đ¸Đ° ĐżĐťĐľĐšĐľŃ€
- GenericName[ven]=Tshitambi tsha Media
- GenericName[xh]=Umdlali we Midia
--GenericName[xx]=xxMedia Playerxx
- GenericName[zh_CN]=ĺŞ’ä˝“ć’ć”žĺ™¨
- GenericName[zh_TW]=ĺŞ’éŤ”ć’ć”žĺ™¨
- GenericName[zu]=Umdlali Womculo
- Terminal=false
- InitialPreference=6
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;AudioVideo;
-+Categories=Qt;KDE;AudioVideo;X-KDE-More;
-diff -urN -x CVS kdemultimedia.orig/kaboodle/kaboodleengine.desktop kdemultimedia/kaboodle/kaboodleengine.desktop
---- kdemultimedia.orig/kaboodle/kaboodleengine.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/kaboodle/kaboodleengine.desktop	2005-03-07 15:19:21.000000000 +0100
-@@ -44,7 +44,6 @@
- Name[uk]=ĐœĐľŃ
Đ°Đ˝Ń–ĐˇĐź Đ˛ĐźĐžĐ˝Ń‚ĐžĐ˛Đ°Đ˝ĐžĐłĐž ĐżŃ€ĐžĐłŃ€Đ°Đ˛Đ°Ń‡Đ° ĐźĐľĐ´Ń–Đ°
- Name[ven]=Tshitambi tsha media tsho dzheniswaho
- Name[xh]=Injini Yomdlali we Media Ebekiweyo
--Name[xx]=xxEmbedded Media Player Enginexx
- Name[zh_CN]=ĺľŒĺ
ĽĺźĺŞ’ä˝“ć’ć”žĺ™¨ĺź•ć“Ž
- Name[zh_TW]=ĺľŒĺ
ĽĺźĺŞ’éŤ”ć’ć”žĺ™¨ĺź•ć“Ž
- Name[zu]=Injini Yomdlali Womculom Ohlanganisiwe
-diff -urN -x CVS kdemultimedia.orig/kappfinder-data/ams.desktop kdemultimedia/kappfinder-data/ams.desktop
---- kdemultimedia.orig/kappfinder-data/ams.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/kappfinder-data/ams.desktop	2005-03-07 15:19:22.000000000 +0100
-@@ -4,7 +4,6 @@
- Icon=
- Name=ams
- Name[sv]=AMS
--Name[xx]=xxamsxx
- GenericName=Alsa Modular Synthesizer
- GenericName[bg]=ĐœĐžĐ´ŃƒĐťĐľĐ˝ ŃĐ¸Đ˝Ń‚ĐľĐˇĐ°Ń‚ĐžŃ€ Đ˝Đ° ALSA
- GenericName[ca]=Sintetitzador modular ALSA
-@@ -31,13 +30,12 @@
- GenericName[sk]=ModulĂĄrny syntezĂĄtor pre Alsa
- GenericName[sl]=Modularni sintetizator Alsa
- GenericName[sr]=ĐœĐžĐ´ŃƒĐťĐ°Ń€Đ˝Đ¸ Alsa-Đ¸Đ˝ ŃĐ¸Đ˝Ń‚ĐľŃ‚Đ¸ĐˇĐ°Ń‚ĐžŃ€
--GenericName[sr at Latn]=ĐœĐžĐ´ŃƒĐťĐ°Ń€Đ˝Đ¸ Alsa-Đ¸Đ˝ ŃĐ¸Đ˝Ń‚ĐľŃ‚Đ¸ĐˇĐ°Ń‚ĐžŃ€
-+GenericName[sr at Latn]=Modularni Alsa-in sintetizator
- GenericName[sv]=Alsa modulĂ¤r synthesizer
- GenericName[ta]=ŕŽ
ŕŽ˛ŕŻŕŽšŕŽž ŕŽŕŽąŕŻŕŽą ŕŽ‡ŕŽąŕŽ•ŕŻŕŽ• ŕŽ¤ŕŻŠŕŽ•ŕŻŕŽŞŕŻŕŽŞŕŽžŕŽŠŕŻ
- GenericName[tg]=Ň˛Đ°ĐźĐˇĐ°ĐźĐžĐ˝ŃĐžĐˇĐ¸ Alsa Modular
- GenericName[tr]=Alsa Sentezleyici
- GenericName[uk]=ĐœĐžĐ´ŃƒĐťŃŒĐ˝Đ¸Đš ŃĐ¸Đ˝Ń‚ĐľĐˇĐ°Ń‚ĐžŃ€ ALSA
--GenericName[xx]=xxAlsa Modular Synthesizerxx
- GenericName[zh_CN]=Alsa ć¨Ąĺ—ĺŒ–ćł˘čĄ¨ĺ™¨
- StartupNotify=true
- Type=Application
-diff -urN -x CVS kdemultimedia.orig/kappfinder-data/amsynth.desktop kdemultimedia/kappfinder-data/amsynth.desktop
---- kdemultimedia.orig/kappfinder-data/amsynth.desktop	2005-01-15 05:59:35.000000000 +0100
-+++ kdemultimedia/kappfinder-data/amsynth.desktop	2005-03-07 15:19:22.000000000 +0100
-@@ -6,7 +6,6 @@
- Name[pt_BR]=Sint. do Alsa Mixer
- Name[sv]=Amsynt
- Name[ta]=ŕŽ†ŕŽŽŕŻŕŽšŕŽżŕŽŠŕŻŕŽ¤ŕŻ
--Name[xx]=xxamSynthxx
- GenericName=Retro Analog - Modeling Softsynth
- GenericName[bg]=ĐĐ˝Đ°ĐťĐžĐłĐžĐ˛ ŃĐ¸Đ˝Ń‚ĐľĐˇĐ°Ń‚ĐžŃ€
- GenericName[cy]=Synth Meddal Modelu Analog Retro
-@@ -26,12 +25,12 @@
- GenericName[pt_BR]=Retro Analog - sintetizaĂ§ĂŁo de software de modelagem
- GenericName[ru]=Đ ĐľŃ‚Ń€Đž - ĐżŃ€ĐžĐłŃ€Đ°ĐźĐźĐ˝Ń‹Đš ŃĐ¸Đ˝Ń‚ĐľĐˇĐ°Ń‚ĐžŃ€
- GenericName[sk]=Retro-analĂłgovanĂŠ modelovanie Softsynth
-+GenericName[sl]=Retro Analog - Modelirni Softsynth
- GenericName[sr]=Đ ĐľŃ‚Ń€Đž Đ°Đ˝Đ°ĐťĐžĐłĐ˝Đž ĐźĐžĐ´ĐľĐťĐ¸Ń€Đ°ŃšĐľ ŃĐžŃ„Ń‚Đ˛ĐľŃ€ŃĐşĐžĐł ŃĐ¸Đ˝Ń‚ĐľŃ‚Đ¸ĐˇĐ°Ń‚ĐžŃ€Đ°
--GenericName[sr at Latn]=Đ ĐľŃ‚Ń€Đž Đ°Đ˝Đ°ĐťĐžĐłĐ˝Đž ĐźĐžĐ´ĐľĐťĐ¸Ń€Đ°ŃšĐľ ŃĐžŃ„Ń‚Đ˛ĐľŃ€ŃĐşĐžĐł ŃĐ¸Đ˝Ń‚ĐľŃ‚Đ¸ĐˇĐ°Ń‚ĐžŃ€Đ°
-+GenericName[sr at Latn]=Retro analogno modeliranje softverskog sintetizatora
- GenericName[sv]=Programvarusynt med gammaldags analogmodellering
- GenericName[ta]=ŕŽ°ŕŻ†ŕŽŸŕŻŕŽ°ŕŻ‹ ŕŽ
ŕŽŠŕŽ˛ŕŽžŕŽ•ŕŻ -  ŕŽŽŕŽžŕŽŸŕŽ˛ŕŽżŕŽ™ŕŻ ŕŽšŕŽžŕŽƒŕŽŞŕŻŕŽŸŕŻŕŽšŕŽżŕŽŠŕŻŕŽ¤ŕŻ
- GenericName[uk]=ĐŸŃ€ĐžĐłŃ€Đ°ĐźĐ˝Đ¸Đš ŃĐ¸Đ˝Ń‚ĐľĐˇĐ°Ń‚ĐžŃ€ - ŃŃ‚Đ°Ń€Ń– Đ°Đ˝Đ°ĐťĐžĐłĐžĐ˛Ń– ŃŃ
ĐľĐźĐ¸
--GenericName[xx]=xxRetro Analog - Modeling Softsynthxx
- GenericName[zh_CN]=çŤçŽć¨Ąć‹Ÿ - ć¨Ąĺźč˝Żćł˘čĄ¨
- StartupNotify=true
- Type=Application
-diff -urN -x CVS kdemultimedia.orig/kappfinder-data/ardour.desktop kdemultimedia/kappfinder-data/ardour.desktop
---- kdemultimedia.orig/kappfinder-data/ardour.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/kappfinder-data/ardour.desktop	2005-03-07 15:19:22.000000000 +0100
-@@ -4,7 +4,6 @@
- Icon=
- Name=Ardour
- Name[ta]=ŕŽ†ŕŽ°ŕŻŕŽŸŕŻ‹ŕŽ°ŕŻ
--Name[xx]=xxArdourxx
- GenericName=Multitrack Audio Studio
- GenericName[bg]=ĐŃƒĐ´Đ¸Đž ŃŃ‚ŃƒĐ´Đ¸Đž
- GenericName[ca]=Estudi d'Ă udio multipista
-@@ -29,14 +28,14 @@
- GenericName[pt_BR]=EstĂşdio de Ăudio Multitrack 
- GenericName[ru]=ĐŃƒĐ´Đ¸ĐžŃŃ‚ŃƒĐ´Đ¸Ń
- GenericName[sk]=Audio studio pre niekoÄžko stĂ´p
-+GenericName[sl]=VeÄstezni zvoÄni studio
- GenericName[sr]=Đ’Đ¸ŃˆĐľŃ‚Ń€Đ°Ń‡Đ˝Đ¸ Đ°ŃƒĐ´Đ¸Đž ŃŃ‚ŃƒĐ´Đ¸Đž
--GenericName[sr at Latn]=Đ’Đ¸ŃˆĐľŃ‚Ń€Đ°Ń‡Đ˝Đ¸ Đ°ŃƒĐ´Đ¸Đž ŃŃ‚ŃƒĐ´Đ¸Đž
-+GenericName[sr at Latn]=ViĹĄetraÄni audio studio
- GenericName[sv]=FlerspĂĽrs ljudstudio
- GenericName[ta]=ŕŽŞŕŽ˛ŕŽľŕŽżŕŽ¤ŕŽŞŕŽžŕŽ¤ŕŻˆŕŽŻŕŽŸŕŻˆŕŽŻ ŕŽ•ŕŻ‡ŕŽŸŕŻŕŽŞŕŻŠŕŽ˛ŕŽż ŕŽ¸ŕŻŕŽŸŕŻŕŽŸŕŽżŕŽŻŕŻ‹
- GenericName[tg]=ĐĄŃ‚ŃƒĐ´Đ¸ŃĐ¸ ĐĄĐ°Đ´ĐžĐ¸Đ¸ Đ‘Đ¸ŃŃ‘Ń€ŃˆĐ¸ĐžŃ€Đ°
- GenericName[tr]=Multitrack Sers StĂźdyosu
- GenericName[uk]=ĐŃƒĐ´Ń–ĐžŃŃ‚ŃƒĐ´Ń–Ń Đˇ ĐąĐ°ĐłĐ°Ń‚ŃŒĐźĐ° Đ´ĐžŃ€Ń–ĐśĐşĐ°ĐźĐ¸
--GenericName[xx]=xxMultitrack Audio Studioxx
- GenericName[zh_CN]=ĺ¤šéŸłč˝¨éŸłé˘‘ĺˇĽä˝œĺŽ¤
- StartupNotify=true
- Type=Application
-diff -urN -x CVS kdemultimedia.orig/kappfinder-data/djplay.desktop kdemultimedia/kappfinder-data/djplay.desktop
---- kdemultimedia.orig/kappfinder-data/djplay.desktop	2005-02-05 05:16:55.000000000 +0100
-+++ kdemultimedia/kappfinder-data/djplay.desktop	2005-03-07 15:19:22.000000000 +0100
-@@ -6,7 +6,6 @@
- Name[pt_BR]=DjPlay
- Name[sv]=DJplay
- Name[ta]=ŕŽŸŕŽżŕŽœŕŻ‡ŕŽ¤ŕŻŠŕŽŸŕŽ™ŕŻŕŽ•ŕŻ
--Name[xx]=xxDJPlayxx
- GenericName=DJ-Mixer and Player
- GenericName[bg]=Đ”Đ¸ŃĐşĐž ĐźĐ¸ĐşŃĐľŃ€ Đ¸ ĐżĐťĐľŃŠŃ€
- GenericName[bs]=DJ-Mixer i Player
-@@ -36,13 +35,12 @@
- GenericName[sk]=DJ-Mixer a prehrĂĄvaÄ
- GenericName[sl]=DJ-meĹĄalnik in predvajalnik
- GenericName[sr]=DJ-Mixer Đ¸ ĐżĐťĐľŃ˜ĐľŃ€
--GenericName[sr at Latn]=DJ-Mixer Đ¸ ĐżĐťĐľŃ˜ĐľŃ€
-+GenericName[sr at Latn]=DJ-Mixer i plejer
- GenericName[sv]=DJ-mixer och ljudspelare
- GenericName[ta]=ŕŽŸŕŽżŕŽœŕŻ‡-ŕŽ’ŕŽŠŕŻŕŽąŕŻŕŽšŕŻ‡ŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŻ ŕŽ‡ŕŽŻŕŽ•ŕŻŕŽ•ŕŻŕŽŽŕŻ
- GenericName[tg]=DJ-ĐžĐźĐľŃ
Ń‚Đ°ĐşŃƒĐ˝Đ°Đş Đ˛Đ° Đ‘ĐžĐˇĐ¸Đ˝ĐłĐ°Ń€
- GenericName[tr]=DJ-KarÄąĹŸtÄąrÄącÄą ve Ă‡alÄącÄą
- GenericName[uk]=ĐœŃ–ĐşŃˆĐľŃ€ Ń‚Đ° ĐżŃ€ĐžĐłŃ€Đ°Đ˛Đ°Ń‡ DJ
--GenericName[xx]=xxDJ-Mixer and Playerxx
- GenericName[zh_CN]=DJ-Mixer ĺ’Œć’ć”žĺ™¨
- StartupNotify=true
- Type=Application
-diff -urN -x CVS kdemultimedia.orig/kappfinder-data/ecamegapedal.desktop kdemultimedia/kappfinder-data/ecamegapedal.desktop
---- kdemultimedia.orig/kappfinder-data/ecamegapedal.desktop	2005-01-09 05:04:29.000000000 +0100
-+++ kdemultimedia/kappfinder-data/ecamegapedal.desktop	2005-03-07 15:19:22.000000000 +0100
-@@ -5,7 +5,6 @@
- Name=EcaMegaPedal
- Name[sv]=Ecamegapedal
- Name[ta]=ŕŽŽŕŽ•ŕŽžŕŽŽŕŻ†ŕŽ•ŕŽžŕŽŞŕŻ†ŕŽŸŕŽ˛ŕŻ
--Name[xx]=xxEcaMegaPedalxx
- GenericName=Ecasound Effektrack
- GenericName[et]=Ecasound efektirĂ¤kk
- GenericName[hu]=Ecasound effektezĹ‘
-@@ -14,10 +13,9 @@
- GenericName[nn]=Ecasound-effektspor
- GenericName[pt_BR]=Faixas de Efeito do Ecasound
- GenericName[sr]=Ecasound Ń‚Ń€Đ°ĐşĐ° ŃĐ° ĐľŃ„ĐľĐşŃ‚Đ¸ĐźĐ°
--GenericName[sr at Latn]=Ecasound Ń‚Ń€Đ°ĐşĐ° ŃĐ° ĐľŃ„ĐľĐşŃ‚Đ¸ĐźĐ°
-+GenericName[sr at Latn]=Ecasound traka sa efektima
- GenericName[sv]=Ecasound-effektspĂĽr
- GenericName[ta]=ŕŽŽŕŽ•ŕŽžŕŽ’ŕŽ˛ŕŽż ŕŽŽŕŽŞŕŻ†ŕŽ¸ŕŻŕŽŞŕŽžŕŽ¤ŕŻˆ
--GenericName[xx]=xxEcasound Effektrackxx
- StartupNotify=true
- Type=Application
- Categories=Music;AudioVideo;
-diff -urN -x CVS kdemultimedia.orig/kappfinder-data/freebirth.desktop kdemultimedia/kappfinder-data/freebirth.desktop
---- kdemultimedia.orig/kappfinder-data/freebirth.desktop	2005-02-23 06:06:31.000000000 +0100
-+++ kdemultimedia/kappfinder-data/freebirth.desktop	2005-03-07 15:19:22.000000000 +0100
-@@ -5,7 +5,6 @@
- Name=FreeBirth
- Name[sv]=Freebirth
- Name[ta]=ŕŽƒŕŽŞŕŻŕŽ°ŕŻ€ŕŽŞŕŽ°ŕŻŕŽ¤ŕŻ
--Name[xx]=xxFreeBirthxx
- GenericName=Drum Machine
- GenericName[bg]=Đ‘Đ°Ń€Đ°ĐąĐ°Đ˝
- GenericName[bs]=Ritam maĹĄina
-@@ -30,14 +29,14 @@
- GenericName[pt_BR]=Bateria
- GenericName[ro]=MaĹŸinÄƒ de tobe
- GenericName[sk]=NĂĄstroj pre bicie
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdemultimedia-branch.diff?r1=1.7&r2=1.8&f=u


