Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
ea67b42ac8
  1. 2
      ChangeLog
  2. 26
      acinclude.m4
  3. 2
      amarok/src/CMakeLists.txt
  4. 2
      amarok/src/contextbrowser.cpp
  5. 2
      amarok/src/covermanager.cpp
  6. 2
      amarok/src/engine/nmm/HostList.cpp
  7. 2
      amarok/src/engine/nmm/HostList.h
  8. 4
      amarok/src/engine/nmm/HostListItem.cpp
  9. 2
      amarok/src/engine/nmm/HostListItem.h
  10. 2
      amarok/src/engine/nmm/NmmLocation.cpp
  11. 2
      amarok/src/engine/nmm/NmmLocation.h
  12. 2
      amarok/src/engine/nmm/ServerregistryPing.cpp
  13. 2
      amarok/src/engine/nmm/ServerregistryPing.h
  14. 2
      amarok/src/engine/nmm/amarok_nmmengine_plugin.desktop
  15. 2
      amarok/src/engine/nmm/nmm_configdialog.cpp
  16. 2
      amarok/src/engine/nmm/nmm_configdialog.h
  17. 4
      amarok/src/engine/nmm/nmm_engine.cpp
  18. 2
      amarok/src/engine/nmm/nmm_engine.h
  19. 6
      amarok/src/htmlview.h
  20. 2
      amarok/src/iconloader.cpp
  21. 2
      amarok/src/konquisidebar/CMakeLists.txt
  22. 2
      amarok/src/konquisidebar/universalamarok.cpp
  23. 4
      amarok/src/konquisidebar/universalamarok.h
  24. 2
      amarok/src/loader/Makefile.am
  25. 2
      amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
  26. 2
      amarok/src/magnatunebrowser/magnatuneartistinfobox.h
  27. 2
      amarok/src/mediabrowser.cpp
  28. 2
      amarok/src/mediadevice/daap/CMakeLists.txt
  29. 2
      amarok/src/mediadevice/daap/daapreader/Makefile.am
  30. 2
      amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
  31. 2
      amarok/src/multitabbar.cpp
  32. 2
      amarok/src/multitabbar.h
  33. 2
      amarok/src/multitabbar_p.h
  34. 2
      amarok/src/playlistbrowser.cpp
  35. 2
      amarok/src/playlistwindow.cpp
  36. 6
      amarok/src/scriptmanager.cpp
  37. 2
      amarok/src/scripts/graphequalizer/Makefile.am
  38. 2
      amarok/src/statistics.cpp
  39. 2
      amarok/src/tagdialog.cpp
  40. 2
      amarok/src/tagdialog.h
  41. 6
      doc/amarok/advanced.docbook
  42. 2
      doc/amarok/requirements.docbook
  43. 6
      doc/da/advanced.docbook
  44. 2
      doc/da/requirements.docbook
  45. 6
      doc/de/advanced.docbook
  46. 2
      doc/de/requirements.docbook
  47. 6
      doc/es/advanced.docbook
  48. 2
      doc/es/requirements.docbook
  49. 6
      doc/et/advanced.docbook
  50. 2
      doc/et/requirements.docbook
  51. 2
      doc/fr/requirements.docbook
  52. 6
      doc/it/advanced.docbook
  53. 2
      doc/it/requirements.docbook
  54. 6
      doc/nl/advanced.docbook
  55. 2
      doc/nl/requirements.docbook
  56. 6
      doc/pl/advanced.docbook
  57. 2
      doc/pl/requirements.docbook
  58. 6
      doc/pt/advanced.docbook
  59. 2
      doc/pt/requirements.docbook
  60. 2
      doc/pt_BR/requirements.docbook
  61. 2
      doc/ru/requirements.docbook
  62. 6
      doc/sv/advanced.docbook
  63. 2
      doc/sv/requirements.docbook
  64. 12
      po/af/amarok.po
  65. 10
      po/ar/amarok.po
  66. 6
      po/az/amarok.po
  67. 10
      po/be/amarok.po
  68. 12
      po/bg/amarok.po
  69. 10
      po/bn/amarok.po
  70. 10
      po/br/amarok.po
  71. 12
      po/ca/amarok.po
  72. 10
      po/cs/amarok.po
  73. 6
      po/cy/amarok.po
  74. 12
      po/da/amarok.po
  75. 12
      po/de/amarok.po
  76. 12
      po/el/amarok.po
  77. 10
      po/en_GB/amarok.po
  78. 6
      po/eo/amarok.po
  79. 12
      po/es/amarok.po
  80. 12
      po/et/amarok.po
  81. 12
      po/eu/amarok.po
  82. 12
      po/fa/amarok.po
  83. 12
      po/fi/amarok.po
  84. 12
      po/fr/amarok.po
  85. 10
      po/ga/amarok.po
  86. 10
      po/gl/amarok.po
  87. 12
      po/he/amarok.po
  88. 6
      po/hi/amarok.po
  89. 12
      po/hu/amarok.po
  90. 6
      po/id/amarok.po
  91. 12
      po/is/amarok.po
  92. 12
      po/it/amarok.po
  93. 10
      po/ja/amarok.po
  94. 12
      po/ka/amarok.po
  95. 12
      po/km/amarok.po
  96. 10
      po/ko/amarok.po
  97. 6
      po/ku/amarok.po
  98. 6
      po/lo/amarok.po
  99. 12
      po/lt/amarok.po
  100. 10
      po/mk/amarok.po
  101. 6
      po/ms/amarok.po
  102. 12
      po/nb/amarok.po
  103. 12
      po/nds/amarok.po
  104. 12
      po/ne/amarok.po
  105. 14
      po/nl/amarok.po
  106. 12
      po/nn/amarok.po
  107. 12
      po/pa/amarok.po
  108. 12
      po/pl/amarok.po
  109. 12
      po/pt/amarok.po
  110. 12
      po/pt_BR/amarok.po
  111. 6
      po/ro/amarok.po
  112. 12
      po/ru/amarok.po
  113. 6
      po/rw/amarok.po
  114. 10
      po/se/amarok.po
  115. 12
      po/sk/amarok.po
  116. 10
      po/sl/amarok.po
  117. 6
      po/sq/amarok.po
  118. 12
      po/sr/amarok.po
  119. 12
      po/sr@Latn/amarok.po
  120. 10
      po/ss/amarok.po
  121. 10
      po/sv/amarok.po
  122. 6
      po/ta/amarok.po
  123. 6
      po/tg/amarok.po
  124. 12
      po/th/amarok.po
  125. 12
      po/tr/amarok.po
  126. 12
      po/uk/amarok.po
  127. 6
      po/uz/amarok.po
  128. 6
      po/uz@cyrillic/amarok.po
  129. 8
      po/zh_CN/amarok.po
  130. 10
      po/zh_TW/amarok.po

2
ChangeLog

@ -1881,7 +1881,7 @@ VERSION 1.3-beta1:
* Support for PostgreSQL as database backend. (BR 99863)
CHANGES:
* "amarokscript" filename extension is now mandatory for script packages.
* "amarotdescript" filename extension is now mandatory for script packages.
* Append Suggestions has been superceded by Dynamic Mode.
* Add a label (with shortcut) to the Playlist filter.

26
acinclude.m4

@ -2099,16 +2099,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2116,13 +2116,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2571,7 +2571,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3514,7 +3514,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

2
amarok/src/CMakeLists.txt

@ -104,7 +104,7 @@ tde_add_library( amarok SHARED AUTOMOC
amarokcore-static magnatunebrowser-static analyzers-static plugin-static
metadata-static statusbar-static
LINK
khtml-shared knewstuff-shared
tdehtml-shared knewstuff-shared
GL ${TAGLIB_LIBRARIES} ${SQLITE_LIBRARIES} pthread
DESTINATION ${LIB_INSTALL_DIR}
)

2
amarok/src/contextbrowser.cpp

@ -3209,7 +3209,7 @@ void ContextBrowser::showScanning()
TQString
ContextBrowser::getEncodedImage( const TQString &imageUrl )
{
// Embed cover image in html (encoded string), to get around khtml's caching
// Embed cover image in html (encoded string), to get around tdehtml's caching
//debug() << "Encoding imageUrl: " << imageUrl << endl;
tqApp->lock();
const TQImage img( imageUrl, "PNG" );

2
amarok/src/covermanager.cpp

@ -42,7 +42,7 @@
#include <klistview.h>
#include <klocale.h>
#include <kmessagebox.h> //showCoverMenu()
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kio/netaccess.h>
#include <kpopupmenu.h> //showCoverMenu()
#include <kprogress.h>

2
amarok/src/engine/nmm/HostList.cpp

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

2
amarok/src/engine/nmm/HostList.h

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

4
amarok/src/engine/nmm/HostListItem.cpp

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -111,7 +111,7 @@ TQString HostListItem::prettyStatus( int error )
st += i18n("An error appeared during video playback initialization. Make sure the <b>XDisplayNode</b> is present on your system. If it is present, the command <b>serverregistry -s</b> in a console will list <b>XDisplayNode</b> as <b>available</b>.<br/>");
if( error )
st += i18n("In general have a look at the <a href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">Configuration and tests</a> instructions.");
st += i18n("In general have a look at the <a href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">Configuration and tests</a> instructions.");
st += "</body></html>";
return st;

2
amarok/src/engine/nmm/HostListItem.h

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

2
amarok/src/engine/nmm/NmmLocation.cpp

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

2
amarok/src/engine/nmm/NmmLocation.h

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

2
amarok/src/engine/nmm/ServerregistryPing.cpp

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

2
amarok/src/engine/nmm/ServerregistryPing.h

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* Maintainer: Robert Gogolok <gogo@graphics.cs.uni-sb.de>
*

2
amarok/src/engine/nmm/amarok_nmmengine_plugin.desktop

@ -113,7 +113,7 @@ ServiceTypes=Amarok/Plugin
X-TDE-Amarok-plugintype=engine
X-TDE-Amarok-name=nmm-engine
X-TDE-Amarok-authors=NMM work group http://www.networkmultimedia.org
X-TDE-Amarok-authors=NMM work group http://www.networtdemultimedia.org
X-TDE-Amarok-email=nmm-dev@graphics.cs.uni-sb.de
X-TDE-Amarok-rank=50
X-TDE-Amarok-version=1

2
amarok/src/engine/nmm/nmm_configdialog.cpp

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

2
amarok/src/engine/nmm/nmm_configdialog.h

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

4
amarok/src/engine/nmm/nmm_engine.cpp

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* Maintainer: Robert Gogolok <gogo@graphics.cs.uni-sb.de>
*
@ -142,7 +142,7 @@ void NmmEngine::checkSecurity()
if( !writepaths_set )
str += "<b>allowedwritepaths option is not set</b>. NMM plugins are therefore allowed to write every file or directory the process running NMM is allowed.<br/>";
str += "<br/>See <a href=\"http://www.networkmultimedia.org/Download/\">http://www.networkmultimedia.org/Download/</a> for general security instructions in the correspoding <i>configure and test NMM</i> section depending on your chosen installation method.";
str += "<br/>See <a href=\"http://www.networtdemultimedia.org/Download/\">http://www.networtdemultimedia.org/Download/</a> for general security instructions in the correspoding <i>configure and test NMM</i> section depending on your chosen installation method.";
str += "</body></html>";
if( !writepaths_set || !readpaths_set )

2
amarok/src/engine/nmm/nmm_engine.h

@ -4,7 +4,7 @@
* NMM work group,
* Computer Graphics Lab,
* Saarland University, Germany
* http://www.networkmultimedia.org
* http://www.networtdemultimedia.org
*
* Maintainer: Robert Gogolok <gogo@graphics.cs.uni-sb.de>
*

6
amarok/src/htmlview.h

@ -6,9 +6,9 @@
#ifndef AMAROK_HTMLVIEW_H
#define AMAROK_HTMLVIEW_H
#include <khtml_events.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_events.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
class KAction;
class KTempFile;

2
amarok/src/iconloader.cpp

@ -47,7 +47,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
iconMap["configure"] = "configure";
iconMap["covermanager"] = "covermanager";
iconMap["device"] = "usbpendrive_unmount";
iconMap["download"] = "khtml_kget";
iconMap["download"] = "tdehtml_kget";
iconMap["dynamic"] = "dynamic";
iconMap["edit"] = "edit";
iconMap["editcopy"] = "editcopy";

2
amarok/src/konquisidebar/CMakeLists.txt

@ -35,6 +35,6 @@ tde_add_kpart( konqsidebar_universalamarok AUTOMOC
SOURCES
universalamarok.cpp
${CMAKE_SOURCE_DIR}/amarok/src/amarokcore/amarokdcopiface.stub
LINK konqsidebarplugin-shared khtml-shared
LINK konqsidebarplugin-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
amarok/src/konquisidebar/universalamarok.cpp

@ -42,7 +42,7 @@
#include <tqslider.h>
#include <kdebug.h>
#include <kurldrag.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#define HTML_FILE TDEGlobal::dirs()->saveLocation( "data", "amarok/", true ) + "contextbrowser.html"

4
amarok/src/konquisidebar/universalamarok.h

@ -20,12 +20,12 @@
#ifndef KONQUERORSIDEBAR_H
#define KONQUERORSIDEBAR_H
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <konqsidebarplugin.h>
#include <dcopclient.h>
#include <tqslider.h>
#include <tqvbox.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kurl.h>
#include "amarokdcopiface_stub.h"

2
amarok/src/loader/Makefile.am

@ -10,7 +10,7 @@ amarok_LDADD = \
$(LIB_QT) \
$(LIB_TDEUI)
amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO

2
amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp

@ -21,7 +21,7 @@
#include "magnatuneartistinfobox.h"
#include "magnatunedatabasehandler.h"
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <tqfile.h>

2
amarok/src/magnatunebrowser/magnatuneartistinfobox.h

@ -24,7 +24,7 @@
#include "magnatunetypes.h"
#include "statusbar.h"
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kio/jobclasses.h>
#include <kio/job.h>

2
amarok/src/mediabrowser.cpp

@ -67,7 +67,7 @@
#include <kio/job.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kpopupmenu.h>
#include <kprocess.h>
#include <kprogress.h>

2
amarok/src/mediadevice/daap/CMakeLists.txt

@ -51,7 +51,7 @@ install( FILES
tde_add_kpart( libamarok_daap-mediadevice AUTOMOC
SOURCES
addhostbase.ui daapclient.cpp daapserver.cpp proxy.cpp
LINK daapreader-static amarok-shared kdnssd-shared
LINK daapreader-static amarok-shared tdednssd-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
DEPENDENCIES amarokcore-static
)

2
amarok/src/mediadevice/daap/daapreader/Makefile.am

@ -12,7 +12,7 @@ libdaapreader_la_LIBADD = \
$(LIB_TDEUI) \
$(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la
libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO

2
amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am

@ -15,7 +15,7 @@ libauthentication_la_LIBADD = \
$(LIB_TDECORE) \
$(LIB_TDEUI)
libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO

2
amarok/src/multitabbar.cpp

@ -1,5 +1,5 @@
/***************************************************************************
kmultitabbar.cpp - description
tdemultitabbar.cpp - description
-------------------
begin : 2001
copyright : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>

2
amarok/src/multitabbar.h

@ -1,5 +1,5 @@
/***************************************************************************
kmultitabbar.h - description
tdemultitabbar.h - description
-------------------
begin : 2001
copyright : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>

2
amarok/src/multitabbar_p.h

@ -1,5 +1,5 @@
/***************************************************************************
kmultitabbar_p.h - description
tdemultitabbar_p.h - description
-------------------
begin : 2003
copyright : (C) 2003 by Joseph Wenninger <jowenn@kde.org>

2
amarok/src/playlistbrowser.cpp

@ -53,7 +53,7 @@
#include <klocale.h>
#include <kmessagebox.h> //renamePlaylist(), deleteSelectedPlaylist()
#include <kmimetype.h>
#include <kmultipledrag.h> //dragObject()
#include <tdemultipledrag.h> //dragObject()
#include <kpopupmenu.h>
#include <kpushbutton.h>
#include <kstandarddirs.h> //TDEGlobal::dirs()

2
amarok/src/playlistwindow.cpp

@ -59,7 +59,7 @@
#include <kapplication.h> //kapp
#include <kfiledialog.h> //savePlaylist(), openPlaylist()
#include <kglobal.h>
#include <khtml_part.h> //Welcome Tab
#include <tdehtml_part.h> //Welcome Tab
#include <kiconloader.h> //ClearFilter button
#include <kinputdialog.h> //slotAddStream()
#include <klocale.h>

6
amarok/src/scriptmanager.cpp

@ -415,8 +415,8 @@ ScriptManager::slotInstallScript( const TQString& path )
if( path.isNull() ) {
_path = KFileDialog::getOpenFileName( TQString(),
"*.amarokscript.tar *.amarokscript.tar.bz2 *.amarokscript.tar.gz|"
+ i18n( "Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, *.amarokscript.tar.gz)" )
"*.amarotdescript.tar *.amarotdescript.tar.bz2 *.amarotdescript.tar.gz|"
+ i18n( "Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, *.amarotdescript.tar.gz)" )
, this
, i18n( "Select Script Package" ) );
if( _path.isNull() ) return false;
@ -501,7 +501,7 @@ ScriptManager::slotRetrieveScript()
// you have to do this by hand when providing your own Engine
KNS::ProviderLoader *p = new KNS::ProviderLoader( this );
TQObject::connect( p, TQT_SIGNAL( providersLoaded(Provider::List*) ), d, TQT_SLOT( slotProviders (Provider::List *) ) );
p->load( "amarok/script", "http://amarok.kde.org/knewstuff/amarokscripts-providers.xml" );
p->load( "amarok/script", "http://amarok.kde.org/knewstuff/amarotdescripts-providers.xml" );
d->exec();
}

2
amarok/src/scripts/graphequalizer/Makefile.am

@ -21,7 +21,7 @@ graphequalizer_LDADD = \
$(LIB_TDEUI) \
$(LIB_TDECORE)
graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO

2
amarok/src/statistics.cpp

@ -24,7 +24,7 @@
#include <tdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep
#include <kiconloader.h>
#include <klocale.h>
#include <kmultipledrag.h> //startDrag()
#include <tdemultipledrag.h> //startDrag()
#include <kpopupmenu.h>
#include <kstringhandler.h> //paintCell
#include <ktoolbarbutton.h> //ctor

2
amarok/src/tagdialog.cpp

@ -35,7 +35,7 @@
#include <kcombobox.h>
#include <kcursor.h>
#include <kglobal.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <ktabwidget.h>
#include <ktextedit.h>

2
amarok/src/tagdialog.h

@ -20,7 +20,7 @@
#include <tqmap.h>
#include <tqptrlist.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
class PlaylistItem;

6
doc/amarok/advanced.docbook

@ -1068,9 +1068,9 @@ item from the context menu use the DCOP call
<sect2 id="script-packaging">
<title>Packaging</title>
<para>&amarok;'s Script Manager is able to install script packages that the user has downloaded from a web server. Packages are just normal tarballs (.tar), optionally compressed with bzip2 (.bz2). We strongly recommend using a filename like myscript.amarokscript.tar.bz2, so the user can easily identify the package as an Amarok script.</para>
<para>&amarok;'s Script Manager is able to install script packages that the user has downloaded from a web server. Packages are just normal tarballs (.tar), optionally compressed with bzip2 (.bz2). We strongly recommend using a filename like myscript.amarotdescript.tar.bz2, so the user can easily identify the package as an Amarok script.</para>
<note><para>&amarok; 1.3 will only accept script packages with the amarokscript extension, so it is better to use it right from the start.</para></note>
<note><para>&amarok; 1.3 will only accept script packages with the amarotdescript extension, so it is better to use it right from the start.</para></note>
<para>The tarball's content must be organized as follows:</para>
@ -1090,7 +1090,7 @@ myscript/
<para>The main script must have executable (+x) permissions set, while additional modules which the script loads should not be executable. To preserve the file permissions in the tarball, you should use tar with the -p flag:</para>
<programlisting>tar -cf myscript.amarokscript.tar -p myscript</programlisting>
<programlisting>tar -cf myscript.amarotdescript.tar -p myscript</programlisting>
<note><para>&amarok; will not be able to install the script if the permissions are not correctly set.</para></note>

2
doc/amarok/requirements.docbook

@ -25,7 +25,7 @@
<listitem><para><ulink url="http://libvisual.sf.net">Libvisual 0.2.0 and Libvisual plugins</ulink></para></listitem>
<listitem><para><ulink url="http://www.mediaapplicationserver.net">MAS 0.6.3</ulink></para></listitem>
<listitem><para><ulink url="http://www.mysql.com">MySQL 4</ulink></para></listitem>
<listitem><para><ulink url="http://www.networkmultimedia.org">NMM 0.7.0</ulink></para></listitem>
<listitem><para><ulink url="http://www.networtdemultimedia.org">NMM 0.7.0</ulink></para></listitem>
<listitem><para>OpenGL accelerated X-Server</para></listitem>
<listitem><para><ulink url="http://xmms-projectm.sourceforge.netm">ProjectM 0.96</ulink></para></listitem>
<listitem><para><ulink url="http://www.real.com">Real Player 10</ulink></para></listitem>

6
doc/da/advanced.docbook

@ -1605,11 +1605,11 @@ til at fjerne et objekt fra den sammenhængsafhængige menu.
>Pakning</title>
<para
>Scripthåndteringen i &amarok; kan installere scriptpakker som brugeren har hentet ned fra en webserver. Pakker er blot sædvanlige arkiver (.tar), valgfrit komprimerede med bzip2 (.bz2). Vi anbefaler stærkt at bruge et filnavn såsom mit-script.amarokscript.tar.bz2, så brugeren læt kan identificere pakken som et script for Amarok.</para>
>Scripthåndteringen i &amarok; kan installere scriptpakker som brugeren har hentet ned fra en webserver. Pakker er blot sædvanlige arkiver (.tar), valgfrit komprimerede med bzip2 (.bz2). Vi anbefaler stærkt at bruge et filnavn såsom mit-script.amarotdescript.tar.bz2, så brugeren læt kan identificere pakken som et script for Amarok.</para>
<note
><para
>&amarok; 1.3 accepterer kun scriptpakker med filendelsen amarokscript, det er altså bedre at bruge det lige fra begyndelsen.</para
>&amarok; 1.3 accepterer kun scriptpakker med filendelsen amarotdescript, det er altså bedre at bruge det lige fra begyndelsen.</para
></note>
<para
@ -1634,7 +1634,7 @@ til at fjerne et objekt fra den sammenhængsafhængige menu.
>Hovedscriptet skal have kørerettigheder (+x) indstillede,mens yderligere moduler som scriptet indlæser ikke skal have kørerettigheder. For at bevare filrettigheder i arkivet, skal du bruge tar med flaget -p.</para>
<programlisting
>tar -cf mitt-script.amarokscript.tar -p mit-script</programlisting>
>tar -cf mitt-script.amarotdescript.tar -p mit-script</programlisting>
<note
><para

2
doc/da/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/de/advanced.docbook

@ -1628,12 +1628,12 @@ Eintrag wieder zu entfernen verwendet man
>Skript-Pakete</title>
<para
>Amaroks Skript-Verwaltung kann auch Skript-Pakete installieren, die der Anwender &zb; von einem Webserver heruntergeladen hat. Solche Pakete sind im Grunde normale Tar-Archive (.tar), die optional auch mit bzip2 (.bz2) komprimiert sein können. Wir empfehlen einen Archivnamen wie z.&nbsp;B. meinskript.amarokscript.tar.bz2, damit der Benutzer das Archiv eindeutig als Amarok-Skript-Paket erkennen kann.</para>
>Amaroks Skript-Verwaltung kann auch Skript-Pakete installieren, die der Anwender &zb; von einem Webserver heruntergeladen hat. Solche Pakete sind im Grunde normale Tar-Archive (.tar), die optional auch mit bzip2 (.bz2) komprimiert sein können. Wir empfehlen einen Archivnamen wie z.&nbsp;B. meinskript.amarotdescript.tar.bz2, damit der Benutzer das Archiv eindeutig als Amarok-Skript-Paket erkennen kann.</para>
<note
><para
>&amarok; 1.3 wird nur Skript-Pakete mit der Erweitungerung <quote
>amarokscript</quote
>amarotdescript</quote
> akzeptieren. Aus diesem Grund sollten Sie Ihre Skript-Pakete gleich richtig benennen.</para
></note>
@ -1659,7 +1659,7 @@ Eintrag wieder zu entfernen verwendet man
>Das Hauptskript muss ausführbar sein (+x), die restlichen zu ladenden Module sollte nicht ausführbar sein. Verwenden Sie den Tar-Parameter -p um die Dateirechte zu erhalten:</para>
<programlisting
>tar -cf meinskript.amarokscript.tar -p meinskript</programlisting>
>tar -cf meinskript.amarotdescript.tar -p meinskript</programlisting>
<note
><para

2
doc/de/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/es/advanced.docbook

@ -1604,11 +1604,11 @@ elemento del menú contextual utilice la llamada DCOP
>Empaquetado</title>
<para
>El Gestor de scripts de &amarok; es capaz de instalar paquetes de programas que el usuario haya descargado del servidor web. Los paquetes son simplemente archivos comprimidos .tar, y opcionalmente archivos comprimidos con bzip2 (.bz2). Le recomendamos encarecidamente el uso de un nombre de archivo del estilo miscript.amarokscript.tar.bz2, de forma que el usuario pueda identificar con facilidad el paquete como un script de Amarok.</para>
>El Gestor de scripts de &amarok; es capaz de instalar paquetes de programas que el usuario haya descargado del servidor web. Los paquetes son simplemente archivos comprimidos .tar, y opcionalmente archivos comprimidos con bzip2 (.bz2). Le recomendamos encarecidamente el uso de un nombre de archivo del estilo miscript.amarotdescript.tar.bz2, de forma que el usuario pueda identificar con facilidad el paquete como un script de Amarok.</para>
<note
><para
>&amarok; 1.3 solo aceptará paquetes de script con la extensión amarokscript, por tanto, es mejor utilizarlo para comenzar.</para
>&amarok; 1.3 solo aceptará paquetes de script con la extensión amarotdescript, por tanto, es mejor utilizarlo para comenzar.</para
></note>
<para
@ -1633,7 +1633,7 @@ elemento del menú contextual utilice la llamada DCOP
>El script principal deber tener permisos de ejecución (+x), mientras que los módulos adicionales que cargue el script no deberían tener permisos de ejecución. Para preservar los permisos del archivo en el archivo comprimido, debería utilizar el parámetro -p.</para>
<programlisting
>tar -cf miscript.amarokscript.tar -p miscript</programlisting>
>tar -cf miscript.amarotdescript.tar -p miscript</programlisting>
<note
><para

2
doc/es/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/et/advanced.docbook

@ -1606,11 +1606,11 @@ Elemendi eemaldamiseks kontekstimenüüst kasuta DCOP-väljakutset
>Pakkimine</title>
<para
>&amarok;i skriptihaldur oskab paigaldada skriptipakke, mida kasutaja on veebist alla laadinud. Pakid on pakitud tavaliselt (.tar), lisaks on võimalik tihendada neid ka bzip2-ga (.bz2). Me soovitame tungivalt kasutada failinime kujul minuskript.amarokscript.tar.bz2, et kasutajad saaksid kohe aru, et tegemist on just Amaroki skriptiga.</para>
>&amarok;i skriptihaldur oskab paigaldada skriptipakke, mida kasutaja on veebist alla laadinud. Pakid on pakitud tavaliselt (.tar), lisaks on võimalik tihendada neid ka bzip2-ga (.bz2). Me soovitame tungivalt kasutada failinime kujul minuskript.amarotdescript.tar.bz2, et kasutajad saaksid kohe aru, et tegemist on just Amaroki skriptiga.</para>
<note
><para
>&amarok; 1.3 tunnustab ainult laiendiga amarokscript skriptipakke, nii et mõistlik oleks seda igal juhul kasutada.</para
>&amarok; 1.3 tunnustab ainult laiendiga amarotdescript skriptipakke, nii et mõistlik oleks seda igal juhul kasutada.</para
></note>
<para
@ -1635,7 +1635,7 @@ Elemendi eemaldamiseks kontekstimenüüst kasuta DCOP-väljakutset
>Põhiskriptil peab olema käivitamise õigus (+x), teised moodulid aga, mida skript laeb, ei tohi olla käivitamisõigusega. Failiõiguste säilitamiseks pakis tuleks see pakkida võtmega -p:</para>
<programlisting
>tar -cf minuskript.amarokscript.tar -p minuskript</programlisting>
>tar -cf minuskript.amarotdescript.tar -p minuskript</programlisting>
<note
><para

2
doc/et/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

2
doc/fr/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/it/advanced.docbook

@ -1606,11 +1606,11 @@ una voce dal menu contestuale bisogna utilizzare la funzione DCOP
>Pacchetti</title>
<para
>Il gestore degli script di &amarok; è in grado di installare pacchetti di script scaricati dall'utente da un server web. I pacchetti sono normali tarball (.tar), opzionalmente compressi con bzip2 (.bz2). Si consiglia vivamente di usare un nome file del tipo myscript.amarokscript.tar.bz2, in modo che l'utente possa facilmente identificare il pacchetto come uno script per Amarok.</para>
>Il gestore degli script di &amarok; è in grado di installare pacchetti di script scaricati dall'utente da un server web. I pacchetti sono normali tarball (.tar), opzionalmente compressi con bzip2 (.bz2). Si consiglia vivamente di usare un nome file del tipo myscript.amarotdescript.tar.bz2, in modo che l'utente possa facilmente identificare il pacchetto come uno script per Amarok.</para>
<note
><para
>&amarok; 1.3 accetterà solamente pacchetti di script con l'estensione amarokscript, in modo da usarlo più facilmente fin da subito.</para
>&amarok; 1.3 accetterà solamente pacchetti di script con l'estensione amarotdescript, in modo da usarlo più facilmente fin da subito.</para
></note>
<para
@ -1635,7 +1635,7 @@ una voce dal menu contestuale bisogna utilizzare la funzione DCOP
>Lo script principale deve avere i permessi di esecuzione (+x) impostati, mentre moduli addizionali che vengono caricati dallo script possono non esserlo. Per preservare i permessi dei file nel tarball bisogna usare tar con l'opzione -p:</para>
<programlisting
>tar -cf myscript.amarokscript.tar -p myscript</programlisting>
>tar -cf myscript.amarotdescript.tar -p myscript</programlisting>
<note
><para

2
doc/it/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/nl/advanced.docbook

@ -1607,11 +1607,11 @@ te verwijderen gebruikt u de DCOP-aanroep
>Packaging</title>
<para
>&amarok;'s Scriptbeheerder kan scriptpakketten installeren die de gebruiker heeft gedownload van een webserver. Pakketten zijn gewoon normale tar-archieven (.tar), optioneel gecomprimeerd met bzip2 (.bz2). Wij adviseren het gebruik van bestandsnamen als myscript.amarokscript.tar.bz2, zodat de gebruiker het pakket meteen kan identificeren als een amarok-script.</para>
>&amarok;'s Scriptbeheerder kan scriptpakketten installeren die de gebruiker heeft gedownload van een webserver. Pakketten zijn gewoon normale tar-archieven (.tar), optioneel gecomprimeerd met bzip2 (.bz2). Wij adviseren het gebruik van bestandsnamen als myscript.amarotdescript.tar.bz2, zodat de gebruiker het pakket meteen kan identificeren als een amarok-script.</para>
<note
><para
>&amarok; 1.3 zal alleen scriptpakketten accepteren met de amarokscript-extensie.</para
>&amarok; 1.3 zal alleen scriptpakketten accepteren met de amarotdescript-extensie.</para
></note>
<para
@ -1636,7 +1636,7 @@ te verwijderen gebruikt u de DCOP-aanroep
>Het hoofdscript moet de uitvoerrechten ingesteld hebben (+x), terwijl aanvullende modules die het script laat niet uitvoerbaar moeten zijn. Om de bestandstoegangsrechten in het tar-archieven te behouden gebruikt u tar met de vlag '-p':</para>
<programlisting
>tar -cf myscript.amarokscript.tar -p myscript</programlisting>
>tar -cf myscript.amarotdescript.tar -p myscript</programlisting>
<note
><para

2
doc/nl/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/pl/advanced.docbook

@ -1605,11 +1605,11 @@ menu kontekstowego, użyj funkcji DCOP
>Pakowanie</title>
<para
>Menedżer skryptów &amarok-dopelniacz; potrafi instalować paczki skryptów, które użytkownik pobrał z serwera WWW. Paczki to zwykłe tarball (.tar), opcjonalnie skompresowane za pomocą bzip2 (.bz2). Gorąco zachęcamy do używania nazw takich jak myscript.amarokscript.tar.bz2, tak aby użytkownik zidentyfikował paczkę jako skrypt programu Amarok.</para>
>Menedżer skryptów &amarok-dopelniacz; potrafi instalować paczki skryptów, które użytkownik pobrał z serwera WWW. Paczki to zwykłe tarball (.tar), opcjonalnie skompresowane za pomocą bzip2 (.bz2). Gorąco zachęcamy do używania nazw takich jak myscript.amarotdescript.tar.bz2, tak aby użytkownik zidentyfikował paczkę jako skrypt programu Amarok.</para>
<note
><para
>&amarok-mianownik; 1.3 zaakceptuje jedynie paczki z rozszerzeniem amarokscript, więc lepiej używać tego rozszerzenia już teraz.</para
>&amarok-mianownik; 1.3 zaakceptuje jedynie paczki z rozszerzeniem amarotdescript, więc lepiej używać tego rozszerzenia już teraz.</para
></note>
<para
@ -1634,7 +1634,7 @@ menu kontekstowego, użyj funkcji DCOP
>Główny skrypt musi posiadać zestaw zezwoleń wykonawczych (+x), podczas gdy dodatkowe moduły wczytywane przez skrypt nie powinny być wykonawcze. Aby chronić zezwolenia pliku w tarball, powinieneś użyć tar z -p flag:</para>
<programlisting
>tar -cf myscript.amarokscript.tar -p myscript</programlisting>
>tar -cf myscript.amarotdescript.tar -p myscript</programlisting>
<note
><para

2
doc/pl/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/pt/advanced.docbook

@ -1607,11 +1607,11 @@ um item do menu de contexto, use a chamada de DCOP
>Empacotamento</title>
<para
>O Gestor de 'Scripts' do &amarok; é capaz de instalar pacotes de programas que o utilizador tenha obtido de um servidor da Web. Os pacotes são ficheiros comprimidos perfeitamente normais (.tar), opcionalmente comprimidos com o bzip2 (.bz2). Recomenda-se em grande medida que use um nome de ficheiro do tipo o-meu-programa.amarokscript.tar.bz2, para que o utilizador consiga identificar facilmente o pacote como um programa do Amarok.</para>
>O Gestor de 'Scripts' do &amarok; é capaz de instalar pacotes de programas que o utilizador tenha obtido de um servidor da Web. Os pacotes são ficheiros comprimidos perfeitamente normais (.tar), opcionalmente comprimidos com o bzip2 (.bz2). Recomenda-se em grande medida que use um nome de ficheiro do tipo o-meu-programa.amarotdescript.tar.bz2, para que o utilizador consiga identificar facilmente o pacote como um programa do Amarok.</para>
<note
><para
>O &amarok; 1.3 só irá aceitar pacotes de 'scripts' com a extensão 'amarokscript', por isso é melhor é usá-la logo desde o início.</para
>O &amarok; 1.3 só irá aceitar pacotes de 'scripts' com a extensão 'amarotdescript', por isso é melhor é usá-la logo desde o início.</para
></note>
<para
@ -1636,7 +1636,7 @@ um item do menu de contexto, use a chamada de DCOP
>O programa principal deverá ter permissões de execução (+x) activas, enquanto os módulos adicionais que o programa carregar não deverão ser executáveis. Para preservar as permissões do ficheiro no pacote, deverá usar o 'tar' com a opção '-p':</para>
<programlisting
>tar -cf o-meu-programa.amarokscript.tar -p o-meu-programa</programlisting>
>tar -cf o-meu-programa.amarotdescript.tar -p o-meu-programa</programlisting>
<note
><para

2
doc/pt/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

2
doc/pt_BR/requirements.docbook

@ -82,7 +82,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.4.4</ulink
></para
></listitem>

2
doc/ru/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

6
doc/sv/advanced.docbook

@ -1605,11 +1605,11 @@ för att ta bort ett objekt från den sammanhangsberoende menyn.
>Paketering</title>
<para
>Skripthanteringen i &amarok; kan installera skriptpaket som användaren har laddat ner från en webbserver. Paketen är bara normala arkiv (.tar), valfritt komprimerade med bzip2 (.bz2). Vi rekommenderar starkt att använda ett filnamn som mitt-skript.amarokscript.tar.bz2, så att användaren lätt kan identifiera paketet som ett skript för Amarok.</para>
>Skripthanteringen i &amarok; kan installera skriptpaket som användaren har laddat ner från en webbserver. Paketen är bara normala arkiv (.tar), valfritt komprimerade med bzip2 (.bz2). Vi rekommenderar starkt att använda ett filnamn som mitt-skript.amarotdescript.tar.bz2, så att användaren lätt kan identifiera paketet som ett skript för Amarok.</para>
<note
><para
>&amarok; 1.3 accepterar bara skriptpaket med filändelsen amarokscript, det är alltså bättre att använda det ända från början.</para
>&amarok; 1.3 accepterar bara skriptpaket med filändelsen amarotdescript, det är alltså bättre att använda det ända från början.</para
></note>
<para
@ -1634,7 +1634,7 @@ för att ta bort ett objekt från den sammanhangsberoende menyn.
>Huvudskriptet måste har körrättigheter (+x) inställda,medan ytterligare moduler som skriptet laddar inte ska ha körrättigheter. För att bevara filrättigheter i arkivet, ska du använda tar med väljaren -p.</para>
<programlisting
>tar -cf mitt-skript.amarokscript.tar -p mitt-skript</programlisting>
>tar -cf mitt-skript.amarotdescript.tar -p mitt-skript</programlisting>
<note
><para

2
doc/sv/requirements.docbook

@ -88,7 +88,7 @@
></listitem>
<listitem
><para
><ulink url="http://www.networkmultimedia.org"
><ulink url="http://www.networtdemultimedia.org"
>NMM 0.7.0</ulink
></para
></listitem>

12
po/af/amarok.po

@ -1091,11 +1091,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Skript Pakette (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Skript Pakette (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4191,11 +4191,11 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""
"Kyk vir algemene agtergrond na <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Opstelling en toets</a> instruksies."
#: engine/nmm/HostListItem.cpp:166

10
po/ar/amarok.po

@ -1003,11 +1003,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"حزمات نصوص أوامر (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"حزمات نصوص أوامر (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
#, fuzzy
@ -3938,7 +3938,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

6
po/az/amarok.po

@ -1040,8 +1040,8 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
#: scriptmanager.cpp:421
@ -4135,7 +4135,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

10
po/be/amarok.po

@ -987,11 +987,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Пакеты сцэнараў (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Пакеты сцэнараў (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -3892,7 +3892,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

12
po/bg/amarok.po

@ -1081,11 +1081,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Пакети скриптове (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Пакети скриптове (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4164,11 +4164,11 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""
"Вижте инструкциите в <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Настройване и тестове</a>."
#: engine/nmm/HostListItem.cpp:166

10
po/bn/amarok.po

@ -1050,11 +1050,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"লিপি প্যাকেজ (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"লিপি প্যাকেজ (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4206,7 +4206,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

10
po/br/amarok.po

@ -1014,11 +1014,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Pakadoù urzhiaoueg (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Pakadoù urzhiaoueg (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4034,7 +4034,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

12
po/ca/amarok.po

@ -1089,11 +1089,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Paquets de seqüència (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Paquets de seqüència (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4201,11 +4201,11 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""
"En general podeu fer una ullada a les instruccions de <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuració i proves</a>."
#: engine/nmm/HostListItem.cpp:166

10
po/cs/amarok.po

@ -1030,11 +1030,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Balíčky se skripty (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Balíčky se skripty (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4107,7 +4107,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

6
po/cy/amarok.po

@ -1037,8 +1037,8 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
#: scriptmanager.cpp:421
@ -4117,7 +4117,7 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "
"href=\"http://www.networkmultimedia.org/Download/Binary/index.html#configure\">"
"href=\"http://www.networtdemultimedia.org/Download/Binary/index.html#configure\">"
"Configuration and tests</a> instructions."
msgstr ""

12
po/da/amarok.po

@ -1078,11 +1078,11 @@ msgstr ""
#: scriptmanager.cpp:419
msgid ""
"Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Script Packages (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
msgstr ""
"Scriptpakker (*.amarokscript.tar, *.amarokscript.tar.bz2, "
"*.amarokscript.tar.gz)"
"Scriptpakker (*.amarotdescript.tar, *.amarotdescript.tar.bz2, "
"*.amarotdescript.tar.gz)"
#: scriptmanager.cpp:421
msgid "Select Script Package"
@ -4165,11 +4165,11 @@ msgstr ""
#: engine/nmm/HostListItem.cpp:114
msgid ""
"In general have a look at the <a "