Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

54 files changed, 967 insertions, 23366 deletions

diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 5afccbcfb..011b94f3a 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=31
+pkgrel=32
 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 473fd3cce..c0a063e95 100755
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -2,13 +2,13 @@
 #Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 #Contributor: BlackEagle <ike.devolder@gmail.com>
 #Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-#Maintainer (Parabola): Kete <kete@ninthfloor.org>
-#Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+#Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+#Contributor (Parabola): Kete <kete@ninthfloor.org>
 
 _pkgname=clementine
 pkgname=clementine-libre
-pkgver=1.0.1
-pkgrel=7
+pkgver=1.1.0
+pkgrel=2
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -16,7 +16,7 @@ arch=('i686' 'x86_64')
 depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
          'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
          'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'mesa')
 optdepends=('gstreamer0.10-base-plugins: for more open formats'
             'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
             'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
@@ -25,37 +25,26 @@ replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
 source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
-        clementine-fix-albumcoverfetch-crash.patch
-        clementine-fresh-start.patch
-        imobiledevice.patch
-        remove-and-disable-spotify.patch
-        remove-nonfree-references-on-translations.patch)
-sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd'
-          'fddd2e784181ce1dcc7809e7122cbade0af7b01f'
-          'd8abab4b8fb2d5284a2f43107505325e62d4af5f'
-          'a04cec00e38651de78bfaa6b6d73532c3786de11'
-          '2fef46eaffa7b5cd61afbf19b1dc909d11972a34'
-          '745bc4fd639d7ef3230592c6275fb43b8956f3d5')
+        remove-and-disable-spotify.patch)
+sha1sums=('af446aba5ca89edd1541871969b3b6738ffbd05f'
+          '3980a00c02e406226f0d08ae9b7e581702c89838')
 install=clementine.install
 
 build() {
    cd "${srcdir}/${_pkgname}-${pkgver}"
 
-   # https://bugs.gentoo.org/401713?id=401713
-   patch -Np1 -i ../clementine-fresh-start.patch
-
-   # http://code.google.com/p/clementine-player/issues/detail?id=2752
-   patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch
-
-   # Use libimobiledevice new "udid" field instead of "uuid".
-   patch -Np1 -i ../imobiledevice.patch
-
-   # https://labs.parabola.nu/issues/99
+   # Remove nonfree spotify references on files
    patch -Np1 -i ../remove-and-disable-spotify.patch
-   patch -Np1 -i ../remove-nonfree-references-on-translations.patch
 
-   # Remove nonfree spotifyblob folder
-   rm -Rf "./spotifyblob"
+   # Remove nonfree spotifyblob folders
+   rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
+
+   # Remove nonfree spotify files
+   rm -v cmake/SpotifyVersion.cmake
+   rm -v data/icons/svg/spotify.svg
+   rm -v data/schema/schema-30.sql
+   rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
+   
 
    cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
    make
diff --git a/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch b/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch
deleted file mode 100755
index d7e64388c..000000000
--- a/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN clementine-1.0.1.old/src/covers/albumcoverfetcher.cpp clementine-1.0.1/src/covers/albumcoverfetcher.cpp
---- clementine-1.0.1.old/src/covers/albumcoverfetcher.cpp	2011-12-02 16:24:44.000000000 -0500
-+++ clementine-1.0.1/src/covers/albumcoverfetcher.cpp	2012-02-26 11:37:56.351044572 -0500
-@@ -108,12 +108,16 @@ void AlbumCoverFetcher::StartRequests()
-
- void AlbumCoverFetcher::SingleSearchFinished(quint64 request_id, CoverSearchResults results) {
-   AlbumCoverFetcherSearch* search = active_requests_.take(request_id);
-+  if (!search)
-+    return;
-   search->deleteLater();
-   emit SearchFinished(request_id, results, search->statistics());
- }
-
- void AlbumCoverFetcher::SingleCoverFetched(quint64 request_id, const QImage& image) {
-   AlbumCoverFetcherSearch* search = active_requests_.take(request_id);
-+  if (!search)
-+    return;
-   search->deleteLater();
-   emit AlbumCoverFetched(request_id, image, search->statistics());
- }
diff --git a/libre/clementine-libre/clementine-fresh-start.patch b/libre/clementine-libre/clementine-fresh-start.patch
deleted file mode 100755
index 9bf12973d..000000000
--- a/libre/clementine-libre/clementine-fresh-start.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -rupN clementine-0.7.1.old/data/schema/schema.sql clementine-0.7.1/data/schema/schema.sql
---- clementine-0.7.1.old/data/schema/schema.sql	2011-03-29 15:16:12.000000000 -0400
-+++ clementine-0.7.1/data/schema/schema.sql	2012-01-12 19:15:39.889374607 -0500
-@@ -35,4 +35,5 @@ CREATE TABLE songs (
- CREATE TABLE schema_version (
-   version INTEGER NOT NULL
- );
-+
- INSERT INTO schema_version (version) VALUES (0);
diff --git a/libre/clementine-libre/imobiledevice.patch b/libre/clementine-libre/imobiledevice.patch
deleted file mode 100755
index 9d387fd2f..000000000
--- a/libre/clementine-libre/imobiledevice.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- clementine-1.0.1/src/CMakeLists.txt.orig	2012-04-12 09:26:47.932990539 +0100
-+++ clementine-1.0.1/src/CMakeLists.txt	2012-04-12 09:28:40.553993173 +0100
-@@ -17,6 +17,10 @@
-   include_directories(../3rdparty/qtwin)
- endif(WIN32)
- 
-+if(ENABLE_IMOBILEDEVICE AND IMOBILEDEVICE_VERSION VERSION_GREATER 1.1.1)
-+  set(IMOBILEDEVICE_USES_UDIDS ON)
-+endif()
-+
- include_directories(${CMAKE_BINARY_DIR})
- include_directories(${GLIB_INCLUDE_DIRS})
- include_directories(${LIBXML_INCLUDE_DIRS})
-@@ -1008,6 +1012,7 @@
-     ${USBMUXD_LIBRARIES}
-     gstafcsrc
-   )
-+  link_directories(${IMOBILEDEVICE_LIBRARY_DIRS})
-   link_directories(${USBMUXD_LIBRARY_DIRS})
- endif(HAVE_IMOBILEDEVICE)
- 
---- clementine-1.0.1/src/config.h.in.orig	2011-12-02 21:24:43.000000000 +0000
-+++ clementine-1.0.1/src/config.h.in	2012-04-12 09:28:40.554993154 +0100
-@@ -38,6 +38,7 @@
- #cmakedefine HAVE_SPOTIFY
- #cmakedefine HAVE_STATIC_SQLITE
- #cmakedefine HAVE_WIIMOTEDEV
-+#cmakedefine IMOBILEDEVICE_USES_UDIDS
- #cmakedefine LEOPARD
- #cmakedefine SNOW_LEOPARD
- #cmakedefine USE_INSTALL_PREFIX
---- clementine-1.0.1/src/devices/ilister.cpp.orig	2012-04-12 09:28:38.407993781 +0100
-+++ clementine-1.0.1/src/devices/ilister.cpp	2012-04-12 09:28:40.554993154 +0100
-@@ -1,3 +1,4 @@
-+#include "config.h"
- #include "ilister.h"
- #include "imobiledeviceconnection.h"
- 
-@@ -17,7 +18,11 @@
- void iLister::EventCallback(const idevice_event_t* event, void* context) {
-   iLister* me = reinterpret_cast<iLister*>(context);
- 
-+#ifdef IMOBILEDEVICE_USES_UDIDS
-+  const char* uuid = event->udid;
-+#else
-   const char* uuid = event->uuid;
-+#endif
- 
-   switch (event->event) {
-     case IDEVICE_DEVICE_ADD:
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-and-disable-spotify.patch
index 9cfc3092a..e006e14c5 100755
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-and-disable-spotify.patch
@@ -9,46 +9,28 @@ diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-li
  		@"com.apple.iTunes",
  		@"com.apple.QuickTimePlayerX",
  		@"com.apple.quicktimeplayer",
-diff -rauN clementine-1.0.1/Changelog clementine-libre-1.0.1/Changelog
---- clementine-1.0.1/Changelog	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/Changelog	2012-05-28 13:50:10.422664725 -0300
-@@ -1,3 +1,7 @@
-+Version 1.0.1 (libre version):
-+  Major features:
-+    * Disabled and removed Spotify.
-+
- Version 1.0.1:
-   Bugfixes:
-     * Use Chromaprinter and Acoustid instead of Echoprint and MusicDNS.
-diff -rauN clementine-1.0.1/cmake/SpotifyVersion.cmake /dev/null
---- clementine-1.0.1/cmake/SpotifyVersion.cmake	2011-12-02 19:24:43.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,3 +0,0 @@
--# Increment this whenever the user needs to download a new blob
--# Remember to upload and sign the new version of the blob.
--set(SPOTIFY_BLOB_VERSION 11)
-diff -rauN clementine-1.0.1/CMakeLists.txt clementine-libre-1.0.1/CMakeLists.txt
---- clementine-1.0.1/CMakeLists.txt	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/CMakeLists.txt	2012-05-28 17:32:48.690568781 -0300
-@@ -6,7 +6,6 @@
+diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
+--- clementine-1.1.0/CMakeLists.txt	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/CMakeLists.txt	2012-10-26 01:58:08.725496264 -0200
+@@ -7,7 +7,6 @@
  include(cmake/Version.cmake)
  include(cmake/Deb.cmake)
  include(cmake/Rpm.cmake)
 -include(cmake/SpotifyVersion.cmake)
  include(cmake/OptionalSource.cmake)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
  
- if (UNIX AND NOT APPLE)
-@@ -66,7 +65,6 @@
+@@ -55,7 +54,6 @@
  pkg_check_modules(USBMUXD libusbmuxd)
  pkg_check_modules(LIBMTP libmtp>=1.0)
  pkg_check_modules(INDICATEQT indicate-qt)
--pkg_check_modules(SPOTIFY libspotify>=10.1.16)
+-pkg_check_modules(SPOTIFY libspotify>=12.1.45)
  pkg_check_modules(CDIO libcdio)
  pkg_check_modules(QCA qca2)
  pkg_check_modules(CHROMAPRINT libchromaprint)
-@@ -90,13 +88,6 @@
-     set(HAVE_SPARKLE ON)
-   endif (ENABLE_SPARKLE AND SPARKLE)
+@@ -81,13 +79,6 @@
+   find_library(GROWL Growl)
+   find_library(SPARKLE Sparkle)
  
 -  find_library(SPOTIFY libspotify)
 -  if (SPOTIFY)
@@ -60,468 +42,137 @@ diff -rauN clementine-1.0.1/CMakeLists.txt clementine-libre-1.0.1/CMakeLists.txt
    add_subdirectory(3rdparty/SPMediaKeyTap)
    set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
    set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)  
-@@ -191,8 +182,8 @@
- option(ENABLE_LIBLASTFM "Use liblastfm for fetching song info, scrobbling and radio streams" ON)
- option(ENABLE_REMOTE "Enable support for using remote controls with Clementine" OFF)
- option(ENABLE_BREAKPAD "Enable crash reporting" OFF)
--option(ENABLE_SPOTIFY_BLOB "Build the spotify non-GPL binary" ON)
--option(ENABLE_SPOTIFY "Enable spotify support" ON)
-+option(ENABLE_SPOTIFY_BLOB "Build the spotify non-GPL binary" OFF)
-+option(ENABLE_SPOTIFY "Enable spotify support" OFF)
- option(ENABLE_PLASMARUNNER "Enable plasma krunner global search" OFF)
+@@ -224,26 +215,16 @@
+   DEPENDS "D-Bus support" HAVE_DBUS
+ )
  
- if(WIN32)
-@@ -235,24 +226,6 @@
-   set(HAVE_BREAKPAD ON)
- endif(ENABLE_BREAKPAD)
+-optional_component(SPOTIFY ON "Spotify support: core code"
++optional_component(SPOTIFY OFF "Spotify support: core code"
+   DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
+ )
  
--if(ENABLE_SPOTIFY AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
--  set(HAVE_SPOTIFY ON)
--endif(ENABLE_SPOTIFY AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
--
--if(ENABLE_SPOTIFY_BLOB AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE AND SPOTIFY_FOUND)
--  set(HAVE_SPOTIFY_BLOB ON)
--endif(ENABLE_SPOTIFY_BLOB AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE AND SPOTIFY_FOUND)
--
--if((NOT HAVE_SPOTIFY_BLOB) AND (NOT QCA_FOUND))
--  # If we're not bundling the spotify blob then we must ensure QCA is available
--  # so we can verify the blob we download at runtime.
--  unset(HAVE_SPOTIFY)
--endif((NOT HAVE_SPOTIFY_BLOB) AND (NOT QCA_FOUND))
+-optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
++optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper"
+   DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
+   DEPENDS "libspotify" SPOTIFY_FOUND
+   DEPENDS "Spotify support: core code" HAVE_SPOTIFY
+ )
+ 
+-set(NEED_SPOTIFY_DOWNLOADER OFF)
+-if(HAVE_SPOTIFY AND NOT HAVE_SPOTIFY_BLOB)
+-  set(NEED_SPOTIFY_DOWNLOADER ON)
+-endif()
 -
--if(QCA_FOUND AND HAVE_SPOTIFY)
--  set(HAVE_QCA ON)
--endif(QCA_FOUND AND HAVE_SPOTIFY)
+-optional_component(SPOTIFY_DOWNLOADER
+-  ${NEED_SPOTIFY_DOWNLOADER} "Spotify support: blob downloader"
+-  DEPENDS "qca2" QCA_FOUND
+-)
 -
- 
- if(ENABLE_VISUALISATIONS)
-   # When/if upstream accepts our patches then these options can be used to link
-@@ -391,14 +364,6 @@
+ optional_component(MOODBAR ON "Moodbar support"
+   DEPENDS "fftw3" FFTW3_FOUND
+ )
+@@ -411,14 +392,6 @@
    add_subdirectory(3rdparty/google-breakpad)
  endif(HAVE_BREAKPAD)
  
 -if(HAVE_SPOTIFY)
--  add_subdirectory(spotifyblob/common)
+-  add_subdirectory(ext/libclementine-spotifyblob)
 -endif(HAVE_SPOTIFY)
 -
 -if(HAVE_SPOTIFY_BLOB)
--  add_subdirectory(spotifyblob/blob)
+-  add_subdirectory(ext/clementine-spotifyblob)
 -endif(HAVE_SPOTIFY_BLOB)
 -
- # This goes after everything else because KDE fucks everything else up with its
- # cmake includes.
- find_package(KDE4 4.3.60)
-@@ -430,8 +395,6 @@
- summary_add("Devices: GIO backend" HAVE_GIO)
- summary_add("Gnome sound menu integration" HAVE_LIBINDICATE)
- summary_add("Last.fm support" HAVE_LIBLASTFM)
--summary_add("Spotify support: core code" HAVE_SPOTIFY)
--summary_add("Spotify support: non-GPL binary helper" HAVE_SPOTIFY_BLOB)
- summary_add("Visualisations" ENABLE_VISUALISATIONS)
- summary_add("Wiimote support" HAVE_WIIMOTEDEV)
- summary_add("(KDE) Plasma global search" HAVE_PLASMARUNNER)
-diff -rauN clementine-1.0.1/data/data.qrc clementine-libre-1.0.1/data/data.qrc
---- clementine-1.0.1/data/data.qrc	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/data/data.qrc	2012-05-28 17:50:22.768352061 -0300
-@@ -49,9 +49,6 @@
-         <file>providers/magnatune.png</file>
-         <file>schema/schema-8.sql</file>
-         <file>schema/schema-9.sql</file>
+ if(HAVE_MOODBAR)
+   add_subdirectory(gst/moodbar)
+ endif()
+diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
+--- clementine-1.1.0/data/data.qrc	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/data/data.qrc	2012-10-26 01:59:52.333078474 -0200
+@@ -1,7 +1,6 @@
+ <RCC>
+     <qresource prefix="/">
+         <file>blank.ttf</file>
+-        <file>clementine-spotify-public.pem</file>
+         <file>currenttrack_bar_left.png</file>
+         <file>currenttrack_bar_mid.png</file>
+         <file>currenttrack_bar_right.png</file>
+@@ -76,7 +75,6 @@
+         <file>icons/22x22/phone-nokia-n900.png</file>
+         <file>icons/22x22/phone-palm-pre.png</file>
+         <file>icons/22x22/phone.png</file>
 -        <file>icons/22x22/spotify.png</file>
+         <file>icons/22x22/user-away.png</file>
+         <file>icons/22x22/view-choose.png</file>
+         <file>icons/22x22/view-fullscreen.png</file>
+@@ -153,7 +151,6 @@
+         <file>icons/32x32/phone-palm-pre.png</file>
+         <file>icons/32x32/phone.png</file>
+         <file>icons/32x32/search.png</file>
 -        <file>icons/32x32/spotify.png</file>
+         <file>icons/32x32/tools-wizard.png</file>
+         <file>icons/32x32/view-choose.png</file>
+         <file>icons/32x32/view-fullscreen.png</file>
+@@ -229,7 +226,6 @@
+         <file>icons/48x48/phone-nokia-n900.png</file>
+         <file>icons/48x48/phone-palm-pre.png</file>
+         <file>icons/48x48/phone.png</file>
 -        <file>icons/48x48/spotify.png</file>
-         <file>icons/22x22/application-exit.png</file>
-         <file>icons/22x22/applications-internet.png</file>
-         <file>icons/22x22/configure.png</file>
-@@ -320,7 +317,6 @@
-         <file>icons/32x32/edit-find.png</file>
-         <file>icons/48x48/edit-find.png</file>
+         <file>icons/48x48/view-choose.png</file>
+         <file>icons/48x48/view-fullscreen.png</file>
+         <file>icons/48x48/view-media-equalizer.png</file>
+@@ -318,7 +314,6 @@
+         <file>schema/schema-28.sql</file>
+         <file>schema/schema-29.sql</file>
+         <file>schema/schema-2.sql</file>
+-        <file>schema/schema-30.sql</file>
+         <file>schema/schema-31.sql</file>
+         <file>schema/schema-32.sql</file>
          <file>schema/schema-33.sql</file>
+@@ -339,7 +334,6 @@
+         <file>smartplaylistsearchterm.css</file>
+         <file>songinfo.css</file>
+         <file>spinner.gif</file>
 -        <file>spotify-core-logo-128x128.png</file>
-         <file>icons/22x22/dialog-warning.png</file>
-         <file>icons/22x22/dialog-ok-apply.png</file>
-         <file>schema/schema-34.sql</file>
-@@ -331,7 +327,6 @@
-         <file>providers/grooveshark.png</file>
-         <file>allthethings.png</file>
-         <file>globalsearch.css</file>
--        <file>clementine-spotify-public.pem</file>
-         <file>icons/22x22/user-away.png</file>
-         <file>icons/32x32/search.png</file>
-         <file>schema/schema-35.sql</file>
-diff -rauN clementine-1.0.1/data/icons/svg/spotify.svg /dev/null
---- clementine-1.0.1/data/icons/svg/spotify.svg	2011-12-02 19:24:43.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,285 +0,0 @@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg
--   xmlns:dc="http://purl.org/dc/elements/1.1/"
--   xmlns:cc="http://creativecommons.org/ns#"
--   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--   xmlns:svg="http://www.w3.org/2000/svg"
--   xmlns="http://www.w3.org/2000/svg"
--   xmlns:xlink="http://www.w3.org/1999/xlink"
--   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
--   width="48"
--   height="48"
--   id="svg2"
--   sodipodi:version="0.32"
--   inkscape:version="0.46"
--   version="1.0"
--   sodipodi:docname="spotify.svg"
--   inkscape:output_extension="org.inkscape.output.svg.inkscape">
--  <defs
--     id="defs4">
--    <linearGradient
--       inkscape:collect="always"
--       id="linearGradient7729">
--      <stop
--         style="stop-color:#467700;stop-opacity:1"
--         offset="0"
--         id="stop7731" />
--      <stop
--         style="stop-color:#518900;stop-opacity:1"
--         offset="1"
--         id="stop7733" />
--    </linearGradient>
--    <linearGradient
--       inkscape:collect="always"
--       id="linearGradient7721">
--      <stop
--         style="stop-color:#1a4300;stop-opacity:1"
--         offset="0"
--         id="stop7723" />
--      <stop
--         style="stop-color:#215300;stop-opacity:1"
--         offset="1"
--         id="stop7725" />
--    </linearGradient>
--    <linearGradient
--       inkscape:collect="always"
--       id="linearGradient7713">
--      <stop
--         style="stop-color:#193d00;stop-opacity:1"
--         offset="0"
--         id="stop7715" />
--      <stop
--         style="stop-color:#1f4b00;stop-opacity:1"
--         offset="1"
--         id="stop7717" />
--    </linearGradient>
--    <linearGradient
--       inkscape:collect="always"
--       id="linearGradient6355">
--      <stop
--         style="stop-color:#23371c;stop-opacity:1"
--         offset="0"
--         id="stop6357" />
--      <stop
--         style="stop-color:#004100;stop-opacity:1"
--         offset="1"
--         id="stop6359" />
--    </linearGradient>
--    <linearGradient
--       inkscape:collect="always"
--       id="linearGradient6347">
--      <stop
--         style="stop-color:#abd033;stop-opacity:1"
--         offset="0"
--         id="stop6349" />
--      <stop
--         style="stop-color:#9ec02d;stop-opacity:0;"
--         offset="1"
--         id="stop6351" />
--    </linearGradient>
--    <linearGradient
--       id="linearGradient5519">
--      <stop
--         style="stop-color:#88ae04;stop-opacity:1"
--         offset="0"
--         id="stop5521" />
--      <stop
--         style="stop-color:#73a400;stop-opacity:1"
--         offset="1"
--         id="stop5523" />
--    </linearGradient>
--    <inkscape:perspective
--       sodipodi:type="inkscape:persp3d"
--       inkscape:vp_x="0 : 526.18109 : 1"
--       inkscape:vp_y="0 : 1000 : 0"
--       inkscape:vp_z="744.09448 : 526.18109 : 1"
--       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
--       id="perspective10" />
--    <inkscape:perspective
--       id="perspective5505"
--       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
--       inkscape:vp_z="744.09448 : 526.18109 : 1"
--       inkscape:vp_y="0 : 1000 : 0"
--       inkscape:vp_x="0 : 526.18109 : 1"
--       sodipodi:type="inkscape:persp3d" />
--    <linearGradient
--       inkscape:collect="always"
--       xlink:href="#linearGradient5519"
--       id="linearGradient6853"
--       gradientUnits="userSpaceOnUse"
--       x1="119.5"
--       y1="91.362183"
--       x2="102.5"
--       y2="128.36218" />
--    <radialGradient
--       inkscape:collect="always"
--       xlink:href="#linearGradient6355"
--       id="radialGradient6855"
--       gradientUnits="userSpaceOnUse"
--       gradientTransform="matrix(1.1318093,0.197699,-0.1703116,0.9750189,-125.44033,-100.50883)"
--       cx="147.76869"
--       cy="120.16964"
--       fx="147.76869"
--       fy="120.16964"
--       r="14.451495" />
--    <linearGradient
--       inkscape:collect="always"
--       xlink:href="#linearGradient6347"
--       id="linearGradient6857"
--       gradientUnits="userSpaceOnUse"
--       gradientTransform="translate(-125.45979,-77.491488)"
--       x1="149.09062"
--       y1="85.104187"
--       x2="139.1649"
--       y2="106.61218" />
--    <filter
--       inkscape:collect="always"
--       id="filter7655"
--       x="-1.0712544"
--       width="3.1425087"
--       y="-1.0712544"
--       height="3.1425087">
--      <feGaussianBlur
--         inkscape:collect="always"
--         stdDeviation="20.086019"
--         id="feGaussianBlur7657" />
--    </filter>
--    <linearGradient
--       inkscape:collect="always"
--       xlink:href="#linearGradient7713"
--       id="linearGradient7719"
--       x1="38.714096"
--       y1="17.417631"
--       x2="31.1127"
--       y2="15.165503"
--       gradientUnits="userSpaceOnUse"
--       gradientTransform="matrix(0.999924,1.232938e-2,-1.232938e-2,0.999924,0.2587749,-0.2864042)" />
--    <linearGradient
--       inkscape:collect="always"
--       xlink:href="#linearGradient7721"
--       id="linearGradient7727"
--       x1="35.708893"
--       y1="25.90625"
--       x2="27.400389"
--       y2="22.312458"
--       gradientUnits="userSpaceOnUse"
--       gradientTransform="matrix(0.965063,1.1899533e-2,-1.232938e-2,0.999924,1.1112913,-0.2758924)" />
--    <linearGradient
--       inkscape:collect="always"
--       xlink:href="#linearGradient7729"
--       id="linearGradient7735"
--       x1="35.607697"
--       y1="31.414557"
--       x2="23.13369"
--       y2="26.433243"
--       gradientUnits="userSpaceOnUse"
--       gradientTransform="matrix(0.8596429,1.059967e-2,-1.232938e-2,0.999924,3.5039934,-0.2463897)" />
--    <filter
--       inkscape:collect="always"
--       id="filter7785"
--       x="-0.089479765"
--       width="1.1789595"
--       y="-0.14834692"
--       height="1.2966938">
--      <feGaussianBlur
--         inkscape:collect="always"
--         stdDeviation="1.5684595"
--         id="feGaussianBlur7787" />
--    </filter>
--  </defs>
--  <sodipodi:namedview
--     id="base"
--     pagecolor="#ffffff"
--     bordercolor="#666666"
--     borderopacity="1.0"
--     gridtolerance="10000"
--     guidetolerance="10"
--     objecttolerance="10"
--     inkscape:pageopacity="0.0"
--     inkscape:pageshadow="2"
--     inkscape:zoom="5.6568542"
--     inkscape:cx="-0.10040691"
--     inkscape:cy="47.355194"
--     inkscape:document-units="px"
--     inkscape:current-layer="layer1"
--     showgrid="false"
--     inkscape:snap-bbox="true"
--     inkscape:snap-nodes="false"
--     inkscape:window-width="1440"
--     inkscape:window-height="853"
--     inkscape:window-x="0"
--     inkscape:window-y="25">
--    <inkscape:grid
--       type="xygrid"
--       id="grid5511"
--       visible="true"
--       enabled="true" />
--  </sodipodi:namedview>
--  <metadata
--     id="metadata7">
--    <rdf:RDF>
--      <cc:Work
--         rdf:about="">
--        <dc:format>image/svg+xml</dc:format>
--        <dc:type
--           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
--      </cc:Work>
--    </rdf:RDF>
--  </metadata>
--  <g
--     inkscape:label="Layer 1"
--     inkscape:groupmode="layer"
--     id="layer1">
--    <g
--       id="g6847"
--       transform="translate(-0.29021,-0.7456946)">
--      <path
--         sodipodi:type="arc"
--         style="opacity:0.64566926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter7655);enable-background:accumulate"
--         id="path6363"
--         sodipodi:cx="112.5"
--         sodipodi:cy="109.86218"
--         sodipodi:rx="22.5"
--         sodipodi:ry="22.5"
--         d="M 135,109.86218 A 22.5,22.5 0 1 1 90,109.86218 A 22.5,22.5 0 1 1 135,109.86218 z"
--         transform="matrix(0.4666666,0,0,0.111111,-28.709782,33.038802)" />
--      <path
--         transform="translate(-88.70979,-85.616488)"
--         d="M 135,109.86218 A 22.5,22.5 0 1 1 90,109.86218 A 22.5,22.5 0 1 1 135,109.86218 z"
--         sodipodi:ry="22.5"
--         sodipodi:rx="22.5"
--         sodipodi:cy="109.86218"
--         sodipodi:cx="112.5"
--         id="path5513"
--         style="opacity:1;fill:url(#linearGradient6853);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
--         sodipodi:type="arc" />
--      <path
--         sodipodi:nodetypes="csccscc"
--         id="path5529"
--         d="M 7.6378996,39.420202 C 8.1682296,39.420202 11.29843,32.092852 23.23086,33.507062 C 35.16329,34.921272 36.54089,42.778952 36.54089,42.778952 C 34.49039,44.179572 32.3092,45.405922 29.55821,45.872552 C 29.55821,45.872552 26.55929,40.325532 21.1676,40.679082 C 15.77591,41.032632 13.91347,44.193172 13.91347,44.193172 C 11.14188,43.198092 8.9957096,41.593432 7.6378996,39.420202 z"
--         style="fill:url(#radialGradient6855);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
--      <path
--         sodipodi:nodetypes="cccc"
--         id="path5531"
--         d="M 2.6652096,29.120692 C 35.315841,10.631207 30.66521,27.370692 44.66521,26.495692 C 44.14296,15.562843 35.20292,3.7456934 23.66521,3.7456934 C 6.6997296,4.3119254 1.9479196,20.58416 2.6652096,29.120692 z"
--         style="fill:url(#linearGradient6857);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7785)" />
--    </g>
--    <path
--       style="opacity:1;fill:url(#linearGradient7719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
--       d="M 10.300245,11.619555 C 8.241027,12.012805 7.9425774,15.355405 10.765465,15.313073 C 21.977063,13.20149 31.048724,15.49889 39.670046,19.826041 C 40.808245,20.378971 42.647611,18.028703 41.02047,16.758511 C 31.316836,11.614062 19.960975,9.8780472 10.300245,11.619555 z"
--       id="path7661"
--       sodipodi:nodetypes="ccccc" />
--    <path
--       style="opacity:1;fill:url(#linearGradient7727);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
--       d="M 12.303532,19.144827 C 10.172718,19.381037 9.829391,22.969311 12.56196,22.64828 C 21.903655,21.50982 27.85363,22.62879 35.683323,25.808592 C 37.647192,26.873264 38.724998,23.482585 36.929338,22.604961 C 28.133565,18.889799 21.412131,18.726151 12.303532,19.144827 z"
--       id="path7666"
--       sodipodi:nodetypes="ccccc" />
--    <path
--       style="opacity:1;fill:url(#linearGradient7735);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
--       d="M 14.447653,25.703011 C 12.75416,26.30833 13.053805,29.148649 14.863112,29.052139 C 17.870832,28.722372 20.153948,28.706138 23.615532,29.097554 C 27.126432,29.494545 29.233258,30.435974 32.157356,31.453048 C 33.350406,31.961876 34.447173,29.764482 33.187538,28.528027 C 29.966426,27.274723 27.415802,26.174879 23.388506,25.719498 C 20.084015,25.348048 17.755584,25.371512 14.447653,25.703011 z"
--       id="path7668"
--       sodipodi:nodetypes="ccscccc" />
--  </g>
--</svg>
-diff -rauN clementine-1.0.1/data/schema/schema-30.sql clementine-libre-1.0.1/data/schema/schema-30.sql
---- clementine-1.0.1/data/schema/schema-30.sql	2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/data/schema/schema-30.sql	2012-05-28 17:55:40.840489308 -0300
-@@ -1,45 +1 @@
--CREATE TABLE spotify_search_songs (
--  title TEXT,
--  album TEXT,
--  artist TEXT,
--  albumartist TEXT,
--  composer TEXT,
--  track INTEGER,
--  disc INTEGER,
--  bpm REAL,
--  year INTEGER,
--  genre TEXT,
--  comment TEXT,
--  compilation INTEGER,
--
--  length INTEGER,
--  bitrate INTEGER,
--  samplerate INTEGER,
--
--  directory INTEGER NOT NULL,
--  filename TEXT NOT NULL,
--  mtime INTEGER NOT NULL,
--  ctime INTEGER NOT NULL,
--  filesize INTEGER NOT NULL,
--  sampler INTEGER NOT NULL DEFAULT 0,
--  art_automatic TEXT,
--  art_manual TEXT,
--  filetype INTEGER NOT NULL DEFAULT 0,
--  playcount INTEGER NOT NULL DEFAULT 0,
--  lastplayed INTEGER,
--  rating INTEGER,
--  forced_compilation_on INTEGER NOT NULL DEFAULT 0,
--  forced_compilation_off INTEGER NOT NULL DEFAULT 0,
--  effective_compilation NOT NULL DEFAULT 0,
--  skipcount INTEGER NOT NULL DEFAULT 0,
--  score INTEGER NOT NULL DEFAULT 0,
--  beginning INTEGER NOT NULL DEFAULT 0,
--  cue_path TEXT
--);
--
--CREATE VIRTUAL TABLE spotify_search_songs_fts USING fts3 (
--  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,
--  tokenize=unicode
--);
--
- UPDATE schema_version SET version=30;
-diff -rauN clementine-1.0.1/dist/macdeploy.py clementine-libre-1.0.1/dist/macdeploy.py
---- clementine-1.0.1/dist/macdeploy.py	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/dist/macdeploy.py	2012-05-28 17:58:29.937662793 -0300
-@@ -367,11 +367,6 @@
- 
- FixPlugin(FindGstreamerPlugin('gst-plugin-scanner'), '.')
- 
--try:
+         <file>star-off.png</file>
+         <file>star-on.png</file>
+         <file>tiny-pause.png</file>
+diff -rauN clementine-1.1.0/dist/macdeploy.py clementine-libre-1.1.0/dist/macdeploy.py
+--- clementine-1.1.0/dist/macdeploy.py	2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/dist/macdeploy.py	2012-10-26 02:06:12.781965350 -0200
+@@ -387,10 +387,7 @@
+ FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules')
+ 
+ try:
 -  FixPlugin('clementine-spotifyblob', '.')
+   FixPlugin('clementine-tagreader', '.')
 -except:
--  print 'Failed to find spotify blob'
--
+-  print 'Failed to find blob: %s' % traceback.format_exc()
+ 
  for plugin in QT_PLUGINS:
    FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
- 
-diff -rauN clementine-1.0.1/dist/windows/clementine.nsi clementine-libre-1.0.1/dist/windows/clementine.nsi
---- clementine-1.0.1/dist/windows/clementine.nsi	2012-01-22 10:43:46.000000000 -0200
-+++ clementine-libre-1.0.1/dist/windows/clementine.nsi	2012-05-28 18:06:56.812551755 -0300
-@@ -95,7 +95,6 @@
+diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/dist/windows/clementine.nsi
+--- clementine-1.1.0/dist/windows/clementine.nsi	2012-10-22 04:27:00.000000000 -0200
++++ clementine-libre-1.1.0/dist/windows/clementine.nsi	2012-10-26 02:07:20.551540003 -0200
+@@ -94,9 +94,6 @@
+   Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
  
-   ; 1.0 prerelease
+-  ; 1.0 prerelease
 -  Delete "$INSTDIR\spotify.dll"
- 
+-
    ; 1.0
    Delete "$INSTDIR\libofa.dll"
-@@ -109,7 +108,6 @@
-   File "avformat-52.dll"
+   Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
+@@ -110,7 +107,6 @@
    File "avutil-50.dll"
    File "clementine.exe"
+   File "clementine-tagreader.exe"
 -  File "clementine-spotifyblob.exe"
    File "clementine.ico"
    File "glew32.dll"
    File "intl.dll"
-@@ -163,7 +161,6 @@
+@@ -164,7 +160,6 @@
    File "libqjson.dll"
    File "libsoup-2.4-1.dll"
    File "libspeex-1.dll"
@@ -529,15 +180,15 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi clementine-libre-1.0.1/d
    File "libtag.dll"
    File "libtasn1-3.dll"
    File "libusbmuxd.dll"
-@@ -949,7 +946,6 @@
-   Delete "$INSTDIR\avutil-50.dll"
+@@ -957,7 +952,6 @@
    Delete "$INSTDIR\clementine.ico"
    Delete "$INSTDIR\clementine.exe"
+   Delete "$INSTDIR\clementine-tagreader.exe"
 -  Delete "$INSTDIR\clementine-spotifyblob.exe"
    Delete "$INSTDIR\glew32.dll"
    Delete "$INSTDIR\intl.dll"
    Delete "$INSTDIR\libcdio-12.dll"
-@@ -1002,7 +998,6 @@
+@@ -1010,7 +1004,6 @@
    Delete "$INSTDIR\libqjson.dll"
    Delete "$INSTDIR\libsoup-2.4-1.dll"
    Delete "$INSTDIR\libspeex-1.dll"
@@ -545,26 +196,28 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi clementine-libre-1.0.1/d
    Delete "$INSTDIR\libtag.dll"
    Delete "$INSTDIR\libtasn1-3.dll"
    Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.0.1/dist/windows/clementine.nsi.in clementine-libre-1.0.1/dist/windows/clementine.nsi.in
---- clementine-1.0.1/dist/windows/clementine.nsi.in	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/dist/windows/clementine.nsi.in	2012-05-28 18:09:14.664818947 -0300
-@@ -95,7 +95,6 @@
+diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.0/dist/windows/clementine.nsi.in
+--- clementine-1.1.0/dist/windows/clementine.nsi.in	2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/dist/windows/clementine.nsi.in	2012-10-26 02:08:02.052572234 -0200
+@@ -94,9 +94,6 @@
+   Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
  
-   ; 1.0 prerelease
+-  ; 1.0 prerelease
 -  Delete "$INSTDIR\spotify.dll"
- 
+-
    ; 1.0
    Delete "$INSTDIR\libofa.dll"
-@@ -109,7 +108,6 @@
-   File "avformat-52.dll"
+   Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
+@@ -110,7 +107,6 @@
    File "avutil-50.dll"
    File "clementine.exe"
+   File "clementine-tagreader.exe"
 -  File "clementine-spotifyblob.exe"
    File "clementine.ico"
    File "glew32.dll"
    File "intl.dll"
-@@ -163,7 +161,6 @@
+@@ -164,7 +160,6 @@
    File "libqjson.dll"
    File "libsoup-2.4-1.dll"
    File "libspeex-1.dll"
@@ -572,15 +225,15 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi.in clementine-libre-1.0.
    File "libtag.dll"
    File "libtasn1-3.dll"
    File "libusbmuxd.dll"
-@@ -949,7 +946,6 @@
-   Delete "$INSTDIR\avutil-50.dll"
+@@ -957,7 +952,6 @@
    Delete "$INSTDIR\clementine.ico"
    Delete "$INSTDIR\clementine.exe"
+   Delete "$INSTDIR\clementine-tagreader.exe"
 -  Delete "$INSTDIR\clementine-spotifyblob.exe"
    Delete "$INSTDIR\glew32.dll"
    Delete "$INSTDIR\intl.dll"
    Delete "$INSTDIR\libcdio-12.dll"
-@@ -1002,7 +998,6 @@
+@@ -1010,7 +1004,6 @@
    Delete "$INSTDIR\libqjson.dll"
    Delete "$INSTDIR\libsoup-2.4-1.dll"
    Delete "$INSTDIR\libspeex-1.dll"
@@ -588,18 +241,18 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi.in clementine-libre-1.0.
    Delete "$INSTDIR\libtag.dll"
    Delete "$INSTDIR\libtasn1-3.dll"
    Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.0.1/src/CMakeLists.txt clementine-libre-1.0.1/src/CMakeLists.txt
---- clementine-1.0.1/src/CMakeLists.txt	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/CMakeLists.txt	2012-05-30 02:50:15.725755468 -0300
-@@ -552,7 +552,6 @@
-   internet/internetviewcontainer.ui
+diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeLists.txt
+--- clementine-1.1.0/src/CMakeLists.txt	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/CMakeLists.txt	2012-10-26 02:09:29.994361873 -0200
+@@ -630,7 +630,6 @@
    internet/magnatunedownloaddialog.ui
    internet/magnatunesettingspage.ui
+   internet/searchboxwidget.ui
 -  internet/spotifysettingspage.ui
  
    library/groupbydialog.ui
    library/libraryfilterwidget.ui
-@@ -690,23 +689,6 @@
+@@ -774,32 +773,6 @@
      internet/lastfmstationdialog.ui
  )
  
@@ -607,38 +260,52 @@ diff -rauN clementine-1.0.1/src/CMakeLists.txt clementine-libre-1.0.1/src/CMakeL
 -optional_source(HAVE_SPOTIFY
 -  SOURCES
 -    globalsearch/spotifysearchprovider.cpp
--    internet/spotifyblobdownloader.cpp
--    internet/spotifysearchplaylisttype.cpp
 -    internet/spotifyserver.cpp
 -    internet/spotifyservice.cpp
 -    internet/spotifysettingspage.cpp
 -  HEADERS
 -    globalsearch/spotifysearchprovider.h
--    internet/spotifyblobdownloader.h
 -    internet/spotifyserver.h
 -    internet/spotifyservice.h
 -    internet/spotifysettingspage.h
+-  INCLUDE_DIRECTORIES
+-    ${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob
+-    ${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob
+-)
+-
+-optional_source(HAVE_SPOTIFY_DOWNLOADER
+-  SOURCES
+-    internet/spotifyblobdownloader.cpp
+-  HEADERS
+-    internet/spotifyblobdownloader.h
+-  INCLUDE_DIRECTORIES
+-    ${QCA_INCLUDE_DIRS}
 -)
 -
- optional_source(HAVE_QCA INCLUDE_DIRECTORIES ${QCA_INCLUDE_DIRS})
- 
  # Platform specific - OS X
-@@ -1037,14 +1019,6 @@
+ optional_source(APPLE
+   INCLUDE_DIRECTORIES
+@@ -1141,19 +1114,6 @@
    endif (LINUX)
  endif(HAVE_BREAKPAD)
  
 -if(HAVE_SPOTIFY)
 -  target_link_libraries(clementine_lib
 -    clementine-spotifyblob-messages
+-  )
+-endif(HAVE_SPOTIFY)
+-
+-if(HAVE_SPOTIFY_DOWNLOADER)
+-  target_link_libraries(clementine_lib
 -    ${QCA_LIBRARIES}
 -  )
 -  link_directories(${QCA_LIBRARY_DIRS})
--endif(HAVE_SPOTIFY)
+-endif(HAVE_SPOTIFY_DOWNLOADER)
 -
  if (APPLE)
    target_link_libraries(clementine_lib
      ${GROWL}
-@@ -1118,11 +1092,6 @@
+@@ -1231,16 +1191,6 @@
    clementine_lib
  )
  
@@ -646,25 +313,31 @@ diff -rauN clementine-1.0.1/src/CMakeLists.txt clementine-libre-1.0.1/src/CMakeL
 -if(HAVE_SPOTIFY_BLOB)
 -  add_dependencies(clementine clementine-spotifyblob)
 -endif(HAVE_SPOTIFY_BLOB)
+-add_dependencies(clementine clementine-tagreader)
 -
- set_target_properties(clementine PROPERTIES
-   MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist"
- )
-diff -rauN clementine-1.0.1/src/config.h.in clementine-libre-1.0.1/src/config.h.in
---- clementine-1.0.1/src/config.h.in	2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/src/config.h.in	2012-05-28 18:17:13.027993639 -0300
-@@ -35,7 +35,6 @@
+-set_target_properties(clementine PROPERTIES
+-  MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist"
+-)
+-
+ if (APPLE)
+   install(FILES ../dist/clementine.icns
+     DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources")
+diff -rauN clementine-1.1.0/src/config.h.in clementine-libre-1.1.0/src/config.h.in
+--- clementine-1.1.0/src/config.h.in	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/config.h.in	2012-10-26 02:10:01.735935822 -0200
+@@ -38,8 +38,6 @@
  #cmakedefine HAVE_QCA
- #cmakedefine HAVE_REMOTE
+ #cmakedefine HAVE_SAC
  #cmakedefine HAVE_SPARKLE
 -#cmakedefine HAVE_SPOTIFY
+-#cmakedefine HAVE_SPOTIFY_DOWNLOADER
  #cmakedefine HAVE_STATIC_SQLITE
  #cmakedefine HAVE_WIIMOTEDEV
- #cmakedefine LEOPARD
-diff -rauN clementine-1.0.1/src/core/utilities.cpp clementine-libre-1.0.1/src/core/utilities.cpp
---- clementine-1.0.1/src/core/utilities.cpp	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/utilities.cpp	2012-05-28 18:25:43.252728803 -0300
-@@ -277,9 +277,6 @@
+ #cmakedefine IMOBILEDEVICE_USES_UDIDS
+diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/core/utilities.cpp
+--- clementine-1.1.0/src/core/utilities.cpp	2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/src/core/utilities.cpp	2012-10-26 02:10:38.303908540 -0200
+@@ -310,9 +310,6 @@
          return QDir::homePath();
        #endif
  
@@ -674,21 +347,21 @@ diff -rauN clementine-1.0.1/src/core/utilities.cpp clementine-libre-1.0.1/src/co
      default:
        qFatal("%s", Q_FUNC_INFO);
        return QString::null;
-diff -rauN clementine-1.0.1/src/core/utilities.h clementine-libre-1.0.1/src/core/utilities.h
---- clementine-1.0.1/src/core/utilities.h	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/utilities.h	2012-05-28 18:27:31.686659381 -0300
-@@ -88,7 +88,6 @@
+diff -rauN clementine-1.1.0/src/core/utilities.h clementine-libre-1.1.0/src/core/utilities.h
+--- clementine-1.1.0/src/core/utilities.h	2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/src/core/utilities.h	2012-10-26 02:11:04.965764358 -0200
+@@ -108,7 +108,6 @@
      Path_NetworkCache,
      Path_GstreamerRegistry,
      Path_DefaultMusicLibrary,
 -    Path_LocalSpotifyBlob,
+     Path_MoodbarCache,
    };
    QString GetConfigPath(ConfigPath config);
- 
-diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0.1/src/covers/albumcoverloader.cpp
---- clementine-1.0.1/src/covers/albumcoverloader.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/covers/albumcoverloader.cpp	2012-05-28 18:34:26.543457483 -0300
-@@ -28,10 +28,6 @@
+diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1.0/src/covers/albumcoverloader.cpp
+--- clementine-1.1.0/src/covers/albumcoverloader.cpp	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/covers/albumcoverloader.cpp	2012-10-26 03:59:14.488394050 -0200
+@@ -29,17 +29,12 @@
  #include <QUrl>
  #include <QNetworkReply>
  
@@ -699,17 +372,15 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
  
  AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
    : QObject(parent),
-@@ -40,8 +36,7 @@
-     scale_(true),
-     padding_(true),
-     next_id_(0),
+     stop_requested_(false),
+     next_id_(1),
 -    network_(new NetworkAccessManager(this)),
 -    connected_spotify_(false)
 +    network_(new NetworkAccessManager(this))
  {
  }
  
-@@ -148,46 +143,12 @@
+@@ -167,30 +162,6 @@
  
      remote_tasks_.insert(reply, task);
      return TryLoadResult(true, false, QImage());
@@ -740,7 +411,8 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
    }
  
    QImage image(filename);
-   return TryLoadResult(false, !image.isNull(), image.isNull() ? default_ : image);
+@@ -198,16 +169,6 @@
+                        image.isNull() ? task.options.default_output_image_: image);
  }
  
 -void AlbumCoverLoader::SpotifyImageLoaded(const QString& id, const QImage& image) {
@@ -748,7 +420,7 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
 -    return;
 -
 -  Task task = remote_spotify_tasks_.take(id);
--  QImage scaled = ScaleAndPad(image);
+-  QImage scaled = ScaleAndPad(task.options, image);
 -  emit ImageLoaded(task.id, scaled);
 -  emit ImageLoaded(task.id, scaled, image);
 -}
@@ -756,10 +428,10 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
  void AlbumCoverLoader::RemoteFetchFinished() {
    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
    if (!reply)
-diff -rauN clementine-1.0.1/src/covers/albumcoverloader.h clementine-libre-1.0.1/src/covers/albumcoverloader.h
---- clementine-1.0.1/src/covers/albumcoverloader.h	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/covers/albumcoverloader.h	2012-05-28 18:38:03.228006474 -0300
-@@ -65,7 +65,6 @@
+diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0/src/covers/albumcoverloader.h
+--- clementine-1.1.0/src/covers/albumcoverloader.h	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/covers/albumcoverloader.h	2012-10-26 02:13:19.304984280 -0200
+@@ -62,7 +62,6 @@
   protected slots:
    void ProcessTasks();
    void RemoteFetchFinished();
@@ -767,7 +439,7 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.h clementine-libre-1.0.1
  
   protected:
    enum State {
-@@ -108,13 +107,10 @@
+@@ -102,13 +101,10 @@
    QMutex mutex_;
    QQueue<Task> tasks_;
    QMap<QNetworkReply*, Task> remote_tasks_;
@@ -781,10 +453,10 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.h clementine-libre-1.0.1
    static const int kMaxRedirects = 3;
  };
  
-diff -rauN clementine-1.0.1/src/engines/gstenginepipeline.cpp clementine-libre-1.0.1/src/engines/gstenginepipeline.cpp
---- clementine-1.0.1/src/engines/gstenginepipeline.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/engines/gstenginepipeline.cpp	2012-05-28 18:51:35.779395089 -0300
-@@ -26,11 +26,6 @@
+diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp
+--- clementine-1.1.0/src/engines/gstenginepipeline.cpp	2012-10-25 03:04:21.000000000 -0200
++++ clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp	2012-10-26 02:14:35.834075631 -0200
+@@ -30,11 +30,6 @@
  #include "core/utilities.h"
  #include "internet/internetmodel.h"
  
@@ -793,10 +465,10 @@ diff -rauN clementine-1.0.1/src/engines/gstenginepipeline.cpp clementine-libre-1
 -#  include "internet/spotifyservice.h"
 -#endif
 -
- #include <QtConcurrentRun>
- 
  const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
-@@ -131,36 +126,6 @@
+ const int GstEnginePipeline::kFaderFudgeMsec = 2000;
+ 
+@@ -139,42 +134,11 @@
  bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
    GstElement* new_bin = NULL;
  
@@ -832,2349 +504,36 @@ diff -rauN clementine-1.0.1/src/engines/gstenginepipeline.cpp clementine-libre-1
 -  } else {
      new_bin = engine_->CreateElement("uridecodebin");
      g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL);
-     g_object_set(G_OBJECT(new_bin), "buffer-duration", buffer_duration_nanosec_, NULL);
-@@ -169,7 +134,6 @@
-     g_signal_connect(G_OBJECT(new_bin), "drained", G_CALLBACK(SourceDrainedCallback), this);
-     g_signal_connect(G_OBJECT(new_bin), "pad-added", G_CALLBACK(NewPadCallback), this);
-     g_signal_connect(G_OBJECT(new_bin), "notify::source", G_CALLBACK(SourceSetupCallback), this);
+     CHECKED_GCONNECT(G_OBJECT(new_bin), "drained", &SourceDrainedCallback, this);
+     CHECKED_GCONNECT(G_OBJECT(new_bin), "pad-added", &NewPadCallback, this);
+     CHECKED_GCONNECT(G_OBJECT(new_bin), "notify::source", &SourceSetupCallback, this);
 -  }
  
    return ReplaceDecodeBin(new_bin);
  }
-diff -rauN clementine-1.0.1/src/globalsearch/spotifysearchprovider.cpp /dev/null
---- clementine-1.0.1/src/globalsearch/spotifysearchprovider.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,208 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifysearchprovider.h"
--#include "core/logging.h"
--#include "internet/internetmodel.h"
--#include "internet/spotifyserver.h"
--#include "internet/spotifyservice.h"
--#include "playlist/songmimedata.h"
--#include "spotifyblob/common/spotifymessagehandler.h"
--
--SpotifySearchProvider::SpotifySearchProvider(QObject* parent)
--  : SearchProvider(parent),
--    server_(NULL),
--    service_(NULL)
--{
--  Init("Spotify", "spotify", QIcon(":icons/32x32/spotify.png"),
--       WantsDelayedQueries | WantsSerialisedArtQueries | ArtIsProbablyRemote |
--       CanShowConfig);
--}
--
--SpotifyServer* SpotifySearchProvider::server() {
--  if (server_)
--    return server_;
--
--  if (!service_)
--    service_ = InternetModel::Service<SpotifyService>();
--
--  if (service_->login_state() != SpotifyService::LoginState_LoggedIn)
--    return NULL;
--
--  server_ = service_->server();
--  connect(server_, SIGNAL(SearchResults(spotify_pb::SearchResponse)),
--          SLOT(SearchFinishedSlot(spotify_pb::SearchResponse)));
--  connect(server_, SIGNAL(ImageLoaded(QString,QImage)),
--          SLOT(ArtLoadedSlot(QString,QImage)));
--  connect(server_, SIGNAL(AlbumBrowseResults(spotify_pb::BrowseAlbumResponse)),
--          SLOT(AlbumBrowseResponse(spotify_pb::BrowseAlbumResponse)));
--  connect(server_, SIGNAL(destroyed()), SLOT(ServerDestroyed()));
--
--  return server_;
--}
--
--void SpotifySearchProvider::ServerDestroyed() {
--  server_ = NULL;
--}
--
--void SpotifySearchProvider::SearchAsync(int id, const QString& query) {
--  SpotifyServer* s = server();
--  if (!s) {
--    emit SearchFinished(id);
--    return;
--  }
--
--  PendingState state;
--  state.orig_id_ = id;
--  state.tokens_ = TokenizeQuery(query);
--
--  const QString query_string = state.tokens_.join(" ");
--  s->Search(query_string, 5, 5);
--  queries_[query_string] = state;
--}
--
--void SpotifySearchProvider::SearchFinishedSlot(const spotify_pb::SearchResponse& response) {
--  QString query_string = QString::fromUtf8(response.request().query().c_str());
--  QMap<QString, PendingState>::iterator it = queries_.find(query_string);
--  if (it == queries_.end())
--    return;
--
--  PendingState state = it.value();
--  queries_.erase(it);
--
--  ResultList ret;
--  for (int i=0; i < response.result_size() ; ++i) {
--    const spotify_pb::Track& track = response.result(i);
--
--    Result result(this);
--    result.type_ = globalsearch::Type_Track;
--    SpotifyService::SongFromProtobuf(track, &result.metadata_);
--    result.match_quality_ = MatchQuality(state.tokens_, result.metadata_.title());
--
--    ret << result;
--  }
--
--  for (int i=0 ; i<response.album_size() ; ++i) {
--    const spotify_pb::Album& album = response.album(i);
--
--    Result result(this);
--    result.type_ = globalsearch::Type_Album;
--    SpotifyService::SongFromProtobuf(album.metadata(), &result.metadata_);
--    result.match_quality_ =
--        qMin(MatchQuality(state.tokens_, result.metadata_.album()),
--             MatchQuality(state.tokens_, result.metadata_.artist()));
--    result.album_size_ = album.metadata().track();
--
--    for (int j=0; j < album.track_size() ; ++j) {
--      Song track_song;
--      SpotifyService::SongFromProtobuf(album.track(j), &track_song);
--      result.album_songs_ << track_song;
--    }
--
--    ret << result;
--  }
--
--  emit ResultsAvailable(state.orig_id_, ret);
--  emit SearchFinished(state.orig_id_);
--}
--
--void SpotifySearchProvider::LoadArtAsync(int id, const Result& result) {
--  SpotifyServer* s = server();
--  if (!s) {
--    emit ArtLoaded(id, QImage());
--    return;
--  }
--
--  QString image_id = QUrl(result.metadata_.art_automatic()).path();
--  if (image_id.startsWith('/'))
--    image_id.remove(0, 1);
--
--  pending_art_[image_id] = id;
--  s->LoadImage(image_id);
--}
--
--void SpotifySearchProvider::ArtLoadedSlot(const QString& id, const QImage& image) {
--  QMap<QString, int>::iterator it = pending_art_.find(id);
--  if (it == pending_art_.end())
--    return;
--
--  const int orig_id = it.value();
--  pending_art_.erase(it);
--
--  emit ArtLoaded(orig_id, ScaleAndPad(image));
--}
--
--void SpotifySearchProvider::LoadTracksAsync(int id, const Result& result) {
--  switch (result.type_) {
--  case globalsearch::Type_Track: {
--    SongMimeData* mime_data = new SongMimeData;
--    mime_data->songs = SongList() << result.metadata_;
--    emit TracksLoaded(id, mime_data);
--    break;
--  }
--
--  case globalsearch::Type_Album: {
--    SpotifyServer* s = server();
--    if (!s) {
--      emit TracksLoaded(id, NULL);
--      return;
--    }
--
--    QString uri = result.metadata_.url().toString();
--
--    pending_tracks_[uri] = id;
--    s->AlbumBrowse(uri);
--    break;
--  }
--
--  default:
--    break;
--  }
--}
--
--void SpotifySearchProvider::AlbumBrowseResponse(const spotify_pb::BrowseAlbumResponse& response) {
--  QString uri = QStringFromStdString(response.uri());
--  QMap<QString, int>::iterator it = pending_tracks_.find(uri);
--  if (it == pending_tracks_.end())
--    return;
--
--  const int orig_id = it.value();
--  pending_tracks_.erase(it);
--
--  SongMimeData* mime_data = new SongMimeData;
--
--  for (int i=0 ; i<response.track_size() ; ++i) {
--    Song song;
--    SpotifyService::SongFromProtobuf(response.track(i), &song);
--    mime_data->songs << song;
--  }
--
--  emit TracksLoaded(orig_id, mime_data);
--}
--
--bool SpotifySearchProvider::IsLoggedIn() {
--  if (server()) {
--    return service_->IsLoggedIn();
--  }
--  return false;
--}
--
--void SpotifySearchProvider::ShowConfig() {
--  if (service_) {
--    return service_->ShowConfig();
--  }
--}
-diff -rauN clementine-1.0.1/src/globalsearch/spotifysearchprovider.h /dev/null
---- clementine-1.0.1/src/globalsearch/spotifysearchprovider.h	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,60 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSEARCHPROVIDER_H
--#define SPOTIFYSEARCHPROVIDER_H
--
--#include "searchprovider.h"
--#include "spotifyblob/common/spotifymessages.pb.h"
--
--class SpotifyServer;
--class SpotifyService;
--
--
--class SpotifySearchProvider : public SearchProvider {
--  Q_OBJECT
--
--public:
--  SpotifySearchProvider(QObject* parent = 0);
--
--  void SearchAsync(int id, const QString& query);
--  void LoadArtAsync(int id, const Result& result);
--  void LoadTracksAsync(int id, const Result& result);
--
--  bool IsLoggedIn();
--  void ShowConfig();
--
--private slots:
--  void ServerDestroyed();
--  void SearchFinishedSlot(const spotify_pb::SearchResponse& response);
--  void ArtLoadedSlot(const QString& id, const QImage& image);
--
--  void AlbumBrowseResponse(const spotify_pb::BrowseAlbumResponse& response);
--
--private:
--  SpotifyServer* server();
--
--private:
--  SpotifyServer* server_;
--  SpotifyService* service_;
--
--  QMap<QString, PendingState> queries_;
--  QMap<QString, int> pending_art_;
--  QMap<QString, int> pending_tracks_;
--};
--
--#endif // SPOTIFYSEARCHPROVIDER_H
-diff -rauN clementine-1.0.1/src/internet/internetmodel.cpp clementine-libre-1.0.1/src/internet/internetmodel.cpp
---- clementine-1.0.1/src/internet/internetmodel.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/internet/internetmodel.cpp	2012-05-28 18:56:58.934758916 -0300
-@@ -32,9 +32,6 @@
+diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.0/src/internet/internetmodel.cpp
+--- clementine-1.1.0/src/internet/internetmodel.cpp	2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/internet/internetmodel.cpp	2012-10-26 02:15:18.005072563 -0200
+@@ -34,9 +34,6 @@
  #ifdef HAVE_LIBLASTFM
    #include "lastfmservice.h"
  #endif
 -#ifdef HAVE_SPOTIFY
 -  #include "spotifyservice.h"
 -#endif
- 
- #include <QMimeData>
- #include <QtDebug>
-@@ -75,9 +72,6 @@
-   AddService(new SavedRadio(this));
-   AddService(new SkyFmService(this));
-   AddService(new SomaFMService(this));
+ #ifdef HAVE_GOOGLE_DRIVE
+   #include "googledriveservice.h"
+ #endif
+@@ -79,9 +76,6 @@
+   AddService(new SkyFmService(app, this));
+   AddService(new SomaFMService(app, this));
+   AddService(new SoundCloudService(app, this));
 -#ifdef HAVE_SPOTIFY
--  AddService(new SpotifyService(this));
+-  AddService(new SpotifyService(app, this));
 -#endif
  }
  
  void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.0.1/src/internet/spotifyblobdownloader.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifyblobdownloader.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,222 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "config.h"
--#include "spotifyblobdownloader.h"
--#include "spotifyservice.h"
--#include "core/logging.h"
--#include "core/network.h"
--#include "core/utilities.h"
--
--#include <QDir>
--#include <QMessageBox>
--#include <QNetworkReply>
--#include <QProgressDialog>
--
--#ifdef HAVE_QCA
--  #include <QtCrypto>
--#endif // HAVE_QCA
--
--const char* SpotifyBlobDownloader::kSignatureSuffix = ".sha1";
--
--
--SpotifyBlobDownloader::SpotifyBlobDownloader(
--      const QString& version, const QString& path, QObject* parent)
--  : QObject(parent),
--    version_(version),
--    path_(path),
--    network_(new NetworkAccessManager(this)),
--    progress_(new QProgressDialog(tr("Downloading Spotify plugin"), tr("Cancel"), 0, 0))
--{
--  progress_->setWindowTitle(QCoreApplication::applicationName());
--  connect(progress_, SIGNAL(canceled()), SLOT(Cancel()));
--}
--
--SpotifyBlobDownloader::~SpotifyBlobDownloader() {
--  qDeleteAll(replies_);
--  replies_.clear();
--
--  delete progress_;
--}
--
--bool SpotifyBlobDownloader::Prompt() {
--  QMessageBox::StandardButton ret = QMessageBox::question(NULL,
--      tr("Spotify plugin not installed"),
--      tr("An additional plugin is required to use Spotify in Clementine.  Would you like to download and install it now?"),
--      QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
--  return ret == QMessageBox::Yes;
--}
--
--void SpotifyBlobDownloader::Start() {
--  qDeleteAll(replies_);
--  replies_.clear();
--
--  const QStringList filenames = QStringList()
--      << "blob"
--      << "blob" + QString(kSignatureSuffix)
--      << "libspotify.so.10.1.16"
--      << "libspotify.so.10.1.16" + QString(kSignatureSuffix);
--
--  foreach (const QString& filename, filenames) {
--    const QUrl url(SpotifyService::kBlobDownloadUrl + version_ + "/" + filename);
--    qLog(Info) << "Downloading" << url;
--
--    QNetworkReply* reply = network_->get(QNetworkRequest(url));
--    connect(reply, SIGNAL(finished()), SLOT(ReplyFinished()));
--    connect(reply, SIGNAL(downloadProgress(qint64,qint64)), SLOT(ReplyProgress()));
--
--    replies_ << reply;
--  }
--
--  progress_->show();
--}
--
--void SpotifyBlobDownloader::ReplyFinished() {
--  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
--  if (reply->error() != QNetworkReply::NoError) {
--    // Handle network errors
--    ShowError(reply->errorString());
--    return;
--  }
--
--  // Is everything finished?
--  foreach (QNetworkReply* reply, replies_) {
--    if (!reply->isFinished()) {
--      return;
--    }
--  }
--
--  // Read files into memory first.
--  QMap<QString, QByteArray> file_data;
--  QStringList signature_filenames;
--
--  foreach (QNetworkReply* reply, replies_) {
--    const QString filename = reply->url().path().section('/', -1, -1);
--
--    if (filename.endsWith(kSignatureSuffix)) {
--      signature_filenames << filename;
--    }
--
--    file_data[filename] = reply->readAll();
--  }
--
--#ifdef HAVE_QCA
--  // Load the public key
--  QCA::ConvertResult conversion_result;
--  QCA::PublicKey key = QCA::PublicKey::fromPEMFile(":/clementine-spotify-public.pem",
--                                                   &conversion_result);
--  if (QCA::ConvertGood != conversion_result) {
--    ShowError("Failed to load Spotify public key");
--    return;
--  }
--
--  // Verify signatures
--  foreach (const QString& signature_filename, signature_filenames) {
--    QString actual_filename = signature_filename;
--    actual_filename.remove(kSignatureSuffix);
--
--    qLog(Debug) << "Verifying" << actual_filename << "against" << signature_filename;
--
--    if (!key.verifyMessage(file_data[actual_filename],
--                           file_data[signature_filename],
--                           QCA::EMSA3_SHA1)) {
--      ShowError("Invalid signature: " + actual_filename);
--      return;
--    }
--  }
--#endif // HAVE_QCA
--
--  // Make the destination directory and write the files into it
--  QDir().mkpath(path_);
--
--  foreach (const QString& filename, file_data.keys()) {
--    const QString dest_path = path_ + "/" + filename;
--
--    if (filename.endsWith(kSignatureSuffix))
--      continue;
--
--    qLog(Info) << "Writing" << dest_path;
--
--    QFile file(dest_path);
--    if (!file.open(QIODevice::WriteOnly)) {
--      ShowError("Failed to open " + dest_path + " for writing");
--      return;
--    }
--
--    file.write(file_data[filename]);
--    file.close();
--    file.setPermissions(QFile::Permissions(0x7755));
--
--#ifdef Q_OS_UNIX
--    const int so_pos = filename.lastIndexOf(".so.");
--    if (so_pos != -1) {
--      QString link_path = path_ + "/" + filename.left(so_pos + 3);
--      QStringList version_parts = filename.mid(so_pos + 4).split('.');
--
--      while (!version_parts.isEmpty()) {
--        qLog(Debug) << "Linking" << dest_path << "to" << link_path;
--        int ret = symlink(dest_path.toLocal8Bit().constData(),
--                          link_path.toLocal8Bit().constData());
--
--        if (ret != 0) {
--          qLog(Warning) << "Creating symlink failed with return code" << ret;
--        }
--
--        link_path += "." + version_parts.takeFirst();
--      }
--    }
--#endif // Q_OS_UNIX
--  }
--
--  EmitFinished();
--}
--
--void SpotifyBlobDownloader::ReplyProgress() {
--  int progress = 0;
--  int total = 0;
--
--  foreach (QNetworkReply* reply, replies_) {
--    progress += reply->bytesAvailable();
--    total += reply->rawHeader("Content-Length").toInt();
--  }
--
--  progress_->setMaximum(total);
--  progress_->setValue(progress);
--}
--
--void SpotifyBlobDownloader::Cancel() {
--  deleteLater();
--}
--
--void SpotifyBlobDownloader::ShowError(const QString& message) {
--  // Stop any remaining replies before showing the dialog so they don't
--  // carry on in the background
--  foreach (QNetworkReply* reply, replies_) {
--    disconnect(reply, 0, this, 0);
--    reply->abort();
--  }
--
--  qLog(Warning) << message;
--  QMessageBox::warning(NULL, tr("Error downloading Spotify plugin"), message,
--                       QMessageBox::Close);
--  deleteLater();
--}
--
--void SpotifyBlobDownloader::EmitFinished() {
--  emit Finished();
--  deleteLater();
--}
-diff -rauN clementine-1.0.1/src/internet/spotifyblobdownloader.h /dev/null
---- clementine-1.0.1/src/internet/spotifyblobdownloader.h	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,63 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYBLOBDOWNLOADER_H
--#define SPOTIFYBLOBDOWNLOADER_H
--
--#include <QObject>
--
--class QNetworkAccessManager;
--class QNetworkReply;
--class QProgressDialog;
--
--class SpotifyBlobDownloader : public QObject {
--  Q_OBJECT
--
--public:
--  SpotifyBlobDownloader(const QString& version, const QString& path,
--                        QObject* parent = 0);
--  ~SpotifyBlobDownloader();
--
--  static const char* kSignatureSuffix;
--
--  static bool Prompt();
--
--  void Start();
--
--signals:
--  void Finished();
--
--private slots:
--  void ReplyFinished();
--  void ReplyProgress();
--  void Cancel();
--
--private:
--  void ShowError(const QString& message);
--  void EmitFinished();
--
--private:
--  QString version_;
--  QString path_;
--
--  QNetworkAccessManager* network_;
--  QList<QNetworkReply*> replies_;
--
--  QProgressDialog* progress_;
--};
--
--#endif // SPOTIFYBLOBDOWNLOADER_H
-diff -rauN clementine-1.0.1/src/internet/spotifysearchplaylisttype.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifysearchplaylisttype.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,49 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifysearchplaylisttype.h"
--#include "spotifyservice.h"
--
--const char* SpotifySearchPlaylistType::kName = "spotify-search";
--
--SpotifySearchPlaylistType::SpotifySearchPlaylistType(SpotifyService* service)
--  : service_(service) {
--}
--
--QIcon SpotifySearchPlaylistType::icon(Playlist* playlist) const {
--  return QIcon(":icons/32x32/spotify.png");
--}
--
--QString SpotifySearchPlaylistType::search_hint_text(Playlist* playlist) const {
--  return QObject::tr("Search Spotify");
--}
--
--QString SpotifySearchPlaylistType::empty_playlist_text(Playlist* playlist) const {
--  return QObject::tr("Start typing in the search box above to find music on %1.").arg("Spotify");
--}
--
--bool SpotifySearchPlaylistType::has_special_search_behaviour(Playlist* playlist) const {
--  return true;
--}
--
--void SpotifySearchPlaylistType::Search(const QString& text, Playlist* playlist) {
--  service_->Search(text, playlist);
--}
--
--void SpotifySearchPlaylistType::DidYouMeanClicked(const QString& text, Playlist* playlist) {
--  service_->Search(text, playlist, true);
--}
-diff -rauN clementine-1.0.1/src/internet/spotifysearchplaylisttype.h /dev/null
---- clementine-1.0.1/src/internet/spotifysearchplaylisttype.h	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,44 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSEARCHPLAYLISTTYPE_H
--#define SPOTIFYSEARCHPLAYLISTTYPE_H
--
--#include "playlist/specialplaylisttype.h"
--
--class SpotifyService;
--
--class SpotifySearchPlaylistType : public SpecialPlaylistType {
--public:
--  SpotifySearchPlaylistType(SpotifyService* service);
--
--  static const char* kName;
--  virtual QString name() const { return kName; }
--
--  virtual QIcon icon(Playlist* playlist) const;
--  virtual QString search_hint_text(Playlist* playlist) const;
--  virtual QString empty_playlist_text(Playlist* playlist) const;
--
--  virtual bool has_special_search_behaviour(Playlist* playlist) const;
--  virtual void Search(const QString& text, Playlist* playlist);
--  virtual void DidYouMeanClicked(const QString& text, Playlist* playlist);
--
--private:
--  SpotifyService* service_;
--};
--
--#endif // SPOTIFYSEARCHPLAYLISTTYPE_H
-diff -rauN clementine-1.0.1/src/internet/spotifyserver.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifyserver.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,261 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifyserver.h"
--#include "core/closure.h"
--#include "core/logging.h"
--
--#include "spotifyblob/common/spotifymessages.pb.h"
--#include "spotifyblob/common/spotifymessagehandler.h"
--
--#include <QTcpServer>
--#include <QTcpSocket>
--#include <QTimer>
--
--SpotifyServer::SpotifyServer(QObject* parent)
--  : QObject(parent),
--    server_(new QTcpServer(this)),
--    protocol_socket_(NULL),
--    handler_(NULL),
--    logged_in_(false)
--{
--  connect(server_, SIGNAL(newConnection()), SLOT(NewConnection()));
--}
--
--void SpotifyServer::Init() {
--  if (!server_->listen(QHostAddress::LocalHost)) {
--    qLog(Error) << "Couldn't open server socket" << server_->errorString();
--  }
--}
--
--int SpotifyServer::server_port() const {
--  return server_->serverPort();
--}
--
--void SpotifyServer::NewConnection() {
--  delete protocol_socket_;
--  delete handler_;
--
--  protocol_socket_ = server_->nextPendingConnection();
--  handler_ = new SpotifyMessageHandler(protocol_socket_, this);
--  connect(handler_, SIGNAL(MessageArrived(spotify_pb::SpotifyMessage)),
--          SLOT(HandleMessage(spotify_pb::SpotifyMessage)));
--
--  qLog(Info) << "Connection from port" << protocol_socket_->peerPort();
--
--  // Send any login messages that were queued before the client connected
--  foreach (const spotify_pb::SpotifyMessage& message, queued_login_messages_) {
--    SendMessage(message);
--  }
--  queued_login_messages_.clear();
--}
--
--void SpotifyServer::SendMessage(const spotify_pb::SpotifyMessage& message) {
--  const bool is_login_message = message.has_login_request();
--
--  QList<spotify_pb::SpotifyMessage>* queue =
--      is_login_message ? &queued_login_messages_ : &queued_messages_;
--
--  if (!protocol_socket_ || (!is_login_message && !logged_in_)) {
--    queue->append(message);
--  } else {
--    handler_->SendMessage(message);
--  }
--}
--
--void SpotifyServer::Login(const QString& username, const QString& password,
--                          spotify_pb::Bitrate bitrate, bool volume_normalisation) {
--  spotify_pb::SpotifyMessage message;
--
--  spotify_pb::LoginRequest* request = message.mutable_login_request();
--  request->set_username(DataCommaSizeFromQString(username));
--  if (!password.isEmpty()) {
--    request->set_password(DataCommaSizeFromQString(password));
--  }
--  request->mutable_playback_settings()->set_bitrate(bitrate);
--  request->mutable_playback_settings()->set_volume_normalisation(volume_normalisation);
--
--  SendMessage(message);
--}
--
--void SpotifyServer::SetPlaybackSettings(spotify_pb::Bitrate bitrate, bool volume_normalisation) {
--  spotify_pb::SpotifyMessage message;
--
--  spotify_pb::PlaybackSettings* request = message.mutable_set_playback_settings_request();
--  request->set_bitrate(bitrate);
--  request->set_volume_normalisation(volume_normalisation);
--
--  SendMessage(message);
--}
--
--void SpotifyServer::HandleMessage(const spotify_pb::SpotifyMessage& message) {
--  if (message.has_login_response()) {
--    const spotify_pb::LoginResponse& response = message.login_response();
--    logged_in_ = response.success();
--
--    if (response.success()) {
--      // Send any messages that were queued before the client logged in
--      foreach (const spotify_pb::SpotifyMessage& message, queued_messages_) {
--        SendMessage(message);
--      }
--      queued_messages_.clear();
--    }
--
--    emit LoginCompleted(response.success(), QStringFromStdString(response.error()),
--                        response.error_code());
--  } else if (message.has_playlists_updated()) {
--    emit PlaylistsUpdated(message.playlists_updated());
--  } else if (message.has_load_playlist_response()) {
--    const spotify_pb::LoadPlaylistResponse& response = message.load_playlist_response();
--
--    switch (response.request().type()) {
--      case spotify_pb::Inbox:
--        emit InboxLoaded(response);
--        break;
--
--      case spotify_pb::Starred:
--        emit StarredLoaded(response);
--        break;
--
--      case spotify_pb::UserPlaylist:
--        emit UserPlaylistLoaded(response);
--        break;
--    }
--  } else if (message.has_playback_error()) {
--    emit PlaybackError(QStringFromStdString(message.playback_error().error()));
--  } else if (message.has_search_response()) {
--    emit SearchResults(message.search_response());
--  } else if (message.has_image_response()) {
--    const spotify_pb::ImageResponse& response = message.image_response();
--    const QString id = QStringFromStdString(response.id());
--
--    if (response.has_data()) {
--      emit ImageLoaded(id, QImage::fromData(QByteArray(
--          response.data().data(), response.data().size())));
--    } else {
--      emit ImageLoaded(id, QImage());
--    }
--  } else if (message.has_sync_playlist_progress()) {
--    emit SyncPlaylistProgress(message.sync_playlist_progress());
--  } else if (message.has_browse_album_response()) {
--    emit AlbumBrowseResults(message.browse_album_response());
--  }
--}
--
--void SpotifyServer::LoadPlaylist(spotify_pb::PlaylistType type, int index) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::LoadPlaylistRequest* req = message.mutable_load_playlist_request();
--
--  req->set_type(type);
--  if (index != -1) {
--    req->set_user_playlist_index(index);
--  }
--
--  SendMessage(message);
--}
--
--void SpotifyServer::SyncPlaylist(
--    spotify_pb::PlaylistType type, int index, bool offline) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::SyncPlaylistRequest* req = message.mutable_sync_playlist_request();
--  req->mutable_request()->set_type(type);
--  if (index != -1) {
--    req->mutable_request()->set_user_playlist_index(index);
--  }
--  req->set_offline_sync(offline);
--
--  SendMessage(message);
--}
--
--void SpotifyServer::SyncInbox() {
--  SyncPlaylist(spotify_pb::Inbox, -1, true);
--}
--
--void SpotifyServer::SyncStarred() {
--  SyncPlaylist(spotify_pb::Starred, -1, true);
--}
--
--void SpotifyServer::SyncUserPlaylist(int index) {
--  Q_ASSERT(index >= 0);
--  SyncPlaylist(spotify_pb::UserPlaylist, index, true);
--}
--
--void SpotifyServer::LoadInbox() {
--  LoadPlaylist(spotify_pb::Inbox);
--}
--
--void SpotifyServer::LoadStarred() {
--  LoadPlaylist(spotify_pb::Starred);
--}
--
--void SpotifyServer::LoadUserPlaylist(int index) {
--  Q_ASSERT(index >= 0);
--  LoadPlaylist(spotify_pb::UserPlaylist, index);
--}
--
--void SpotifyServer::StartPlaybackLater(const QString& uri, quint16 port) {
--  QTimer* timer = new QTimer(this);
--  connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
--
--  timer->start(100); // lol
--  NewClosure(timer, SIGNAL(timeout()),
--             this, SLOT(StartPlayback(QString,quint16)),
--             uri, port);
--}
--
--void SpotifyServer::StartPlayback(const QString& uri, quint16 port) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::PlaybackRequest* req = message.mutable_playback_request();
--
--  req->set_track_uri(DataCommaSizeFromQString(uri));
--  req->set_media_port(port);
--  SendMessage(message);
--}
--
--void SpotifyServer::Seek(qint64 offset_bytes) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::SeekRequest* req = message.mutable_seek_request();
--
--  req->set_offset_bytes(offset_bytes);
--  SendMessage(message);
--}
--
--void SpotifyServer::Search(const QString& text, int limit, int limit_album) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::SearchRequest* req = message.mutable_search_request();
--
--  req->set_query(DataCommaSizeFromQString(text));
--  req->set_limit(limit);
--  req->set_limit_album(limit_album);
--  SendMessage(message);
--}
--
--void SpotifyServer::LoadImage(const QString& id) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::ImageRequest* req = message.mutable_image_request();
--
--  req->set_id(DataCommaSizeFromQString(id));
--  SendMessage(message);
--}
--
--void SpotifyServer::AlbumBrowse(const QString& uri) {
--  spotify_pb::SpotifyMessage message;
--  spotify_pb::BrowseAlbumRequest* req = message.mutable_browse_album_request();
--
--  req->set_uri(DataCommaSizeFromQString(uri));
--  SendMessage(message);
--}
-diff -rauN clementine-1.0.1/src/internet/spotifyserver.h /dev/null
---- clementine-1.0.1/src/internet/spotifyserver.h	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,91 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSERVER_H
--#define SPOTIFYSERVER_H
--
--#include "spotifyblob/common/spotifymessages.pb.h"
--
--#include <QImage>
--#include <QObject>
--
--class SpotifyMessageHandler;
--
--class QTcpServer;
--class QTcpSocket;
--
--class SpotifyServer : public QObject {
--  Q_OBJECT
--
--public:
--  SpotifyServer(QObject* parent = 0);
--
--  void Init();
--  void Login(const QString& username, const QString& password,
--             spotify_pb::Bitrate bitrate, bool volume_normalisation);
--
--  void LoadStarred();
--  void SyncStarred();
--  void LoadInbox();
--  void SyncInbox();
--  void LoadUserPlaylist(int index);
--  void SyncUserPlaylist(int index);
--  void StartPlaybackLater(const QString& uri, quint16 port);
--  void Search(const QString& text, int limit, int limit_album = 0);
--  void LoadImage(const QString& id);
--  void AlbumBrowse(const QString& uri);
--  void SetPlaybackSettings(spotify_pb::Bitrate bitrate, bool volume_normalisation);
--
--  int server_port() const;
--
--public slots:
--  void StartPlayback(const QString& uri, quint16 port);
--  void Seek(qint64 offset_bytes);
--
--signals:
--  void LoginCompleted(bool success, const QString& error,
--                      spotify_pb::LoginResponse_Error error_code);
--  void PlaylistsUpdated(const spotify_pb::Playlists& playlists);
--
--  void StarredLoaded(const spotify_pb::LoadPlaylistResponse& response);
--  void InboxLoaded(const spotify_pb::LoadPlaylistResponse& response);
--  void UserPlaylistLoaded(const spotify_pb::LoadPlaylistResponse& response);
--  void PlaybackError(const QString& message);
--  void SearchResults(const spotify_pb::SearchResponse& response);
--  void ImageLoaded(const QString& id, const QImage& image);
--  void SyncPlaylistProgress(const spotify_pb::SyncPlaylistProgress& progress);
--  void AlbumBrowseResults(const spotify_pb::BrowseAlbumResponse& response);
--
--private slots:
--  void NewConnection();
--  void HandleMessage(const spotify_pb::SpotifyMessage& message);
--
--private:
--  void LoadPlaylist(spotify_pb::PlaylistType type, int index = -1);
--  void SyncPlaylist(spotify_pb::PlaylistType type, int index, bool offline);
--  void SendMessage(const spotify_pb::SpotifyMessage& message);
--
--  QTcpServer* server_;
--  QTcpSocket* protocol_socket_;
--  SpotifyMessageHandler* handler_;
--  bool logged_in_;
--
--  QList<spotify_pb::SpotifyMessage> queued_login_messages_;
--  QList<spotify_pb::SpotifyMessage> queued_messages_;
--};
--
--#endif // SPOTIFYSERVER_H
-diff -rauN clementine-1.0.1/src/internet/spotifyservice.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifyservice.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,669 +0,0 @@
--#include "config.h"
--#include "internetmodel.h"
--#include "spotifyblobdownloader.h"
--#include "spotifyserver.h"
--#include "spotifyservice.h"
--#include "spotifysearchplaylisttype.h"
--#include "core/database.h"
--#include "core/logging.h"
--#include "core/player.h"
--#include "core/taskmanager.h"
--#include "core/timeconstants.h"
--#include "core/utilities.h"
--#include "globalsearch/globalsearch.h"
--#include "globalsearch/spotifysearchprovider.h"
--#include "playlist/playlist.h"
--#include "playlist/playlistcontainer.h"
--#include "playlist/playlistmanager.h"
--#include "spotifyblob/common/blobversion.h"
--#include "spotifyblob/common/spotifymessagehandler.h"
--#include "widgets/didyoumean.h"
--#include "ui/iconloader.h"
--
--#include <QCoreApplication>
--#include <QFile>
--#include <QFileInfo>
--#include <QMenu>
--#include <QMessageBox>
--#include <QProcess>
--#include <QSettings>
--#include <QVariant>
--
--Q_DECLARE_METATYPE(QStandardItem*);
--
--const char* SpotifyService::kServiceName = "Spotify";
--const char* SpotifyService::kSettingsGroup = "Spotify";
--const char* SpotifyService::kBlobDownloadUrl = "http://spotify.clementine-player.org/";
--const int SpotifyService::kSearchDelayMsec = 400;
--
--SpotifyService::SpotifyService(InternetModel* parent)
--    : InternetService(kServiceName, parent, parent),
--      server_(NULL),
--      blob_process_(NULL),
--      root_(NULL),
--      search_(NULL),
--      starred_(NULL),
--      inbox_(NULL),
--      login_task_id_(0),
--      pending_search_playlist_(NULL),
--      context_menu_(NULL),
--      search_delay_(new QTimer(this)),
--      login_state_(LoginState_OtherError),
--      bitrate_(spotify_pb::Bitrate320k),
--      volume_normalisation_(false)
--{
--  // Build the search path for the binary blob.
--  // Look for one distributed alongside clementine first, then check in the
--  // user's home directory for any that have been downloaded.
--#ifdef Q_OS_MAC
--  system_blob_path_ = QCoreApplication::applicationDirPath() +
--      "/../PlugIns/clementine-spotifyblob";
--#else
--  system_blob_path_ = QCoreApplication::applicationDirPath() +
--      "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
--#endif
--
--  local_blob_version_ = QString("version%1-%2bit").arg(SPOTIFY_BLOB_VERSION).arg(sizeof(void*) * 8);
--  local_blob_path_    = Utilities::GetConfigPath(Utilities::Path_LocalSpotifyBlob) +
--                        "/" + local_blob_version_ + "/blob";
--
--  qLog(Debug) << "Spotify system blob path:" << system_blob_path_;
--  qLog(Debug) << "Spotify local blob path:" << local_blob_path_;
--
--  model()->player()->playlists()->RegisterSpecialPlaylistType(
--        new SpotifySearchPlaylistType(this));
--
--  model()->global_search()->AddProvider(new SpotifySearchProvider(this));
--
--  search_delay_->setInterval(kSearchDelayMsec);
--  search_delay_->setSingleShot(true);
--  connect(search_delay_, SIGNAL(timeout()), SLOT(DoSearch()));
--}
--
--SpotifyService::~SpotifyService() {
--  if (blob_process_ && blob_process_->state() == QProcess::Running) {
--    qLog(Info) << "Terminating blob process...";
--    blob_process_->terminate();
--    blob_process_->waitForFinished(1000);
--  }
--}
--
--QStandardItem* SpotifyService::CreateRootItem() {
--  root_ = new QStandardItem(QIcon(":icons/22x22/spotify.png"), kServiceName);
--  root_->setData(true, InternetModel::Role_CanLazyLoad);
--  return root_;
--}
--
--void SpotifyService::LazyPopulate(QStandardItem* item) {
--  switch (item->data(InternetModel::Role_Type).toInt()) {
--    case InternetModel::Type_Service:
--      EnsureServerCreated();
--      break;
--
--    case Type_SearchResults:
--      break;
--
--    case Type_InboxPlaylist:
--      EnsureServerCreated();
--      server_->LoadInbox();
--      break;
--
--    case Type_StarredPlaylist:
--      EnsureServerCreated();
--      server_->LoadStarred();
--      break;
--
--    case InternetModel::Type_UserPlaylist:
--      EnsureServerCreated();
--      server_->LoadUserPlaylist(item->data(Role_UserPlaylistIndex).toInt());
--      break;
--
--    default:
--      break;
--  }
--
--  return;
--}
--
--QModelIndex SpotifyService::GetCurrentIndex() {
--  return QModelIndex();
--}
--
--void SpotifyService::Login(const QString& username, const QString& password) {
--  Logout();
--  EnsureServerCreated(username, password);
--}
--
--void SpotifyService::LoginCompleted(bool success, const QString& error,
--                                    spotify_pb::LoginResponse_Error error_code) {
--  if (login_task_id_) {
--    model()->task_manager()->SetTaskFinished(login_task_id_);
--    login_task_id_ = 0;
--  }
--
--  if (!success) {
--    bool show_error_dialog = true;
--    QString error_copy(error);
--
--    switch (error_code) {
--    case spotify_pb::LoginResponse_Error_BadUsernameOrPassword:
--      login_state_ = LoginState_BadCredentials;
--      break;
--
--    case spotify_pb::LoginResponse_Error_UserBanned:
--      login_state_ = LoginState_Banned;
--      break;
--
--    case spotify_pb::LoginResponse_Error_UserNeedsPremium:
--      login_state_ = LoginState_NoPremium;
--      break;
--
--    case spotify_pb::LoginResponse_Error_ReloginFailed:
--      if (login_state_ == LoginState_LoggedIn) {
--        // This is the first time the relogin has failed - show a message this
--        // time only.
--        error_copy = tr("You have been logged out of Spotify, please re-enter your password in the Settings dialog.");
--      } else {
--        show_error_dialog = false;
--      }
--
--      login_state_ = LoginState_ReloginFailed;
--      break;
--
--    default:
--      login_state_ = LoginState_OtherError;
--      break;
--    }
--
--    if (show_error_dialog) {
--      QMessageBox::warning(NULL, tr("Spotify login error"), error_copy, QMessageBox::Close);
--    }
--  } else {
--    login_state_ = LoginState_LoggedIn;
--  }
--
--  QSettings s;
--  s.beginGroup(kSettingsGroup);
--  s.setValue("login_state", login_state_);
--
--  emit LoginFinished(success);
--}
--
--void SpotifyService::BlobProcessError(QProcess::ProcessError error) {
--  qLog(Error) << "Spotify blob process failed:" << error;
--  blob_process_->deleteLater();
--  blob_process_ = NULL;
--
--  if (login_task_id_) {
--    model()->task_manager()->SetTaskFinished(login_task_id_);
--  }
--}
--
--void SpotifyService::ReloadSettings() {
--  QSettings s;
--  s.beginGroup(kSettingsGroup);
--
--  login_state_ = LoginState(s.value("login_state", LoginState_OtherError).toInt());
--  bitrate_ = static_cast<spotify_pb::Bitrate>(
--        s.value("bitrate", spotify_pb::Bitrate320k).toInt());
--  volume_normalisation_ = s.value("volume_normalisation", false).toBool();
--
--  if (server_ && blob_process_) {
--    server_->SetPlaybackSettings(bitrate_, volume_normalisation_);
--  }
--}
--
--void SpotifyService::EnsureServerCreated(const QString& username,
--                                         const QString& password) {
--  if (server_ && blob_process_) {
--    return;
--  }
--
--  delete server_;
--  server_ = new SpotifyServer(this);
--
--  connect(server_, SIGNAL(LoginCompleted(bool,QString,spotify_pb::LoginResponse_Error)),
--                   SLOT(LoginCompleted(bool,QString,spotify_pb::LoginResponse_Error)));
--  connect(server_, SIGNAL(PlaylistsUpdated(spotify_pb::Playlists)),
--          SLOT(PlaylistsUpdated(spotify_pb::Playlists)));
--  connect(server_, SIGNAL(InboxLoaded(spotify_pb::LoadPlaylistResponse)),
--          SLOT(InboxLoaded(spotify_pb::LoadPlaylistResponse)));
--  connect(server_, SIGNAL(StarredLoaded(spotify_pb::LoadPlaylistResponse)),
--          SLOT(StarredLoaded(spotify_pb::LoadPlaylistResponse)));
--  connect(server_, SIGNAL(UserPlaylistLoaded(spotify_pb::LoadPlaylistResponse)),
--          SLOT(UserPlaylistLoaded(spotify_pb::LoadPlaylistResponse)));
--  connect(server_, SIGNAL(PlaybackError(QString)),
--          SIGNAL(StreamError(QString)));
--  connect(server_, SIGNAL(SearchResults(spotify_pb::SearchResponse)),
--          SLOT(SearchResults(spotify_pb::SearchResponse)));
--  connect(server_, SIGNAL(ImageLoaded(QString,QImage)),
--          SIGNAL(ImageLoaded(QString,QImage)));
--  connect(server_, SIGNAL(SyncPlaylistProgress(spotify_pb::SyncPlaylistProgress)),
--          SLOT(SyncPlaylistProgress(spotify_pb::SyncPlaylistProgress)));
--
--  server_->Init();
--
--  login_task_id_ = model()->task_manager()->StartTask(tr("Connecting to Spotify"));
--
--  QString login_username = username;
--  QString login_password = password;
--
--  if (username.isEmpty()) {
--    QSettings s;
--    s.beginGroup(kSettingsGroup);
--
--    login_username = s.value("username").toString();
--    login_password = QString();
--  }
--
--  server_->Login(login_username, login_password, bitrate_, volume_normalisation_);
--
--  StartBlobProcess();
--}
--
--void SpotifyService::StartBlobProcess() {
--  // Try to find an executable to run
--  QString blob_path;
--  QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
--
--  // Look in the system search path first
--  if (QFile::exists(system_blob_path_)) {
--    blob_path = system_blob_path_;
--  }
--
--  // Next look in the local path
--  if (blob_path.isEmpty()) {
--    if (QFile::exists(local_blob_path_)) {
--      blob_path = local_blob_path_;
--      env.insert("LD_LIBRARY_PATH", QFileInfo(local_blob_path_).path());
--    }
--  }
--
--  if (blob_path.isEmpty()) {
--    // If the blob still wasn't found then we'll prompt the user to download one
--    if (login_task_id_) {
--      model()->task_manager()->SetTaskFinished(login_task_id_);
--    }
--
--    #ifdef Q_OS_LINUX
--      if (SpotifyBlobDownloader::Prompt()) {
--        InstallBlob();
--      }
--    #endif
--
--    return;
--  }
--
--  delete blob_process_;
--  blob_process_ = new QProcess(this);
--  blob_process_->setProcessChannelMode(QProcess::ForwardedChannels);
--  blob_process_->setProcessEnvironment(env);
--
--  connect(blob_process_,
--          SIGNAL(error(QProcess::ProcessError)),
--          SLOT(BlobProcessError(QProcess::ProcessError)));
--
--  qLog(Info) << "Starting" << blob_path;
--  blob_process_->start(
--        blob_path, QStringList() << QString::number(server_->server_port()));
--}
--
--bool SpotifyService::IsBlobInstalled() const {
--  return QFile::exists(system_blob_path_) ||
--         QFile::exists(local_blob_path_);
--}
--
--void SpotifyService::InstallBlob() {
--  // The downloader deletes itself when it finishes
--  SpotifyBlobDownloader* downloader = new SpotifyBlobDownloader(
--        local_blob_version_, QFileInfo(local_blob_path_).path(), this);
--  connect(downloader, SIGNAL(Finished()), SLOT(BlobDownloadFinished()));
--  connect(downloader, SIGNAL(Finished()), SIGNAL(BlobStateChanged()));
--  downloader->Start();
--}
--
--void SpotifyService::BlobDownloadFinished() {
--  EnsureServerCreated();
--}
--
--void SpotifyService::PlaylistsUpdated(const spotify_pb::Playlists& response) {
--  if (login_task_id_) {
--    model()->task_manager()->SetTaskFinished(login_task_id_);
--    login_task_id_ = 0;
--  }
--
--  // Create starred and inbox playlists if they're not here already
--  if (!search_) {
--    search_ = new QStandardItem(IconLoader::Load("edit-find"),
--                                tr("Search Spotify (opens a new tab)"));
--    search_->setData(Type_SearchResults, InternetModel::Role_Type);
--    search_->setData(InternetModel::PlayBehaviour_DoubleClickAction,
--                             InternetModel::Role_PlayBehaviour);
--
--    starred_ = new QStandardItem(QIcon(":/star-on.png"), tr("Starred"));
--    starred_->setData(Type_StarredPlaylist, InternetModel::Role_Type);
--    starred_->setData(true, InternetModel::Role_CanLazyLoad);
--
--    inbox_ = new QStandardItem(IconLoader::Load("mail-message"), tr("Inbox"));
--    inbox_->setData(Type_InboxPlaylist, InternetModel::Role_Type);
--    inbox_->setData(true, InternetModel::Role_CanLazyLoad);
--
--    root_->appendRow(search_);
--    root_->appendRow(starred_);
--    root_->appendRow(inbox_);
--  }
--
--  // Don't do anything if the playlists haven't changed since last time.
--  if (!DoPlaylistsDiffer(response)) {
--    qLog(Debug) << "Playlists haven't changed - not updating";
--    return;
--  }
--
--  // Remove and recreate the other playlists
--  foreach (QStandardItem* item, playlists_) {
--    item->parent()->removeRow(item->row());
--  }
--  playlists_.clear();
--
--  for (int i=0 ; i<response.playlist_size() ; ++i) {
--    const spotify_pb::Playlists::Playlist& msg = response.playlist(i);
--
--    QStandardItem* item = new QStandardItem(QStringFromStdString(msg.name()));
--    item->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
--    item->setData(true, InternetModel::Role_CanLazyLoad);
--    item->setData(msg.index(), Role_UserPlaylistIndex);
--    item->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
--
--    root_->appendRow(item);
--    playlists_ << item;
--
--    // Preload the playlist items so that drag & drop works immediately.
--    LazyPopulate(item);
--  }
--}
--
--bool SpotifyService::DoPlaylistsDiffer(const spotify_pb::Playlists& response) const {
--  if (playlists_.count() != response.playlist_size()) {
--    return true;
--  }
--
--  for (int i=0 ; i<response.playlist_size() ; ++i) {
--    const spotify_pb::Playlists::Playlist& msg = response.playlist(i);
--    const QStandardItem* item = PlaylistBySpotifyIndex(msg.index());
--
--    if (!item) {
--      return true;
--    }
--
--    if (QStringFromStdString(msg.name()) != item->text()) {
--      return true;
--    }
--  }
--
--  return false;
--}
--
--void SpotifyService::InboxLoaded(const spotify_pb::LoadPlaylistResponse& response) {
--  FillPlaylist(inbox_, response);
--}
--
--void SpotifyService::StarredLoaded(const spotify_pb::LoadPlaylistResponse& response) {
--  FillPlaylist(starred_, response);
--}
--
--QStandardItem* SpotifyService::PlaylistBySpotifyIndex(int index) const {
--  foreach (QStandardItem* item, playlists_) {
--    if (item->data(Role_UserPlaylistIndex).toInt() == index) {
--      return item;
--    }
--  }
--  return NULL;
--}
--
--void SpotifyService::UserPlaylistLoaded(const spotify_pb::LoadPlaylistResponse& response) {
--  // Find a playlist with this index
--  QStandardItem* item = PlaylistBySpotifyIndex(response.request().user_playlist_index());
--  if (item) {
--    FillPlaylist(item, response);
--  }
--}
--
--void SpotifyService::FillPlaylist(QStandardItem* item, const spotify_pb::LoadPlaylistResponse& response) {
--  qLog(Debug) << "Filling playlist:" << item->text();
--  if (item->hasChildren())
--    item->removeRows(0, item->rowCount());
--
--  for (int i=0 ; i<response.track_size() ; ++i) {
--    Song song;
--    SongFromProtobuf(response.track(i), &song);
--
--    QStandardItem* child = new QStandardItem(song.PrettyTitleWithArtist());
--    child->setData(Type_Track, InternetModel::Role_Type);
--    child->setData(QVariant::fromValue(song), InternetModel::Role_SongMetadata);
--    child->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
--    child->setData(song.url(), InternetModel::Role_Url);
--
--    item->appendRow(child);
--  }
--}
--
--void SpotifyService::SongFromProtobuf(const spotify_pb::Track& track, Song* song) {
--  song->set_rating(track.starred() ? 1.0 : 0.0);
--  song->set_title(QStringFromStdString(track.title()));
--  song->set_album(QStringFromStdString(track.album()));
--  song->set_length_nanosec(track.duration_msec() * kNsecPerMsec);
--  song->set_score(track.popularity());
--  song->set_disc(track.disc());
--  song->set_track(track.track());
--  song->set_year(track.year());
--  song->set_url(QUrl(QStringFromStdString(track.uri())));
--  song->set_art_automatic("spotify://image/" + QStringFromStdString(track.album_art_id()));
--
--  QStringList artists;
--  for (int i=0 ; i<track.artist_size() ; ++i) {
--    artists << QStringFromStdString(track.artist(i));
--  }
--
--  song->set_artist(artists.join(", "));
--
--  song->set_filetype(Song::Type_Stream);
--  song->set_valid(true);
--  song->set_directory_id(0);
--  song->set_mtime(0);
--  song->set_ctime(0);
--  song->set_filesize(0);
--}
--
--PlaylistItem::Options SpotifyService::playlistitem_options() const {
--  return PlaylistItem::PauseDisabled | PlaylistItem::SeekDisabled;
--}
--
--void SpotifyService::EnsureMenuCreated() {
--  if (context_menu_)
--    return;
--
--  context_menu_ = new QMenu;
--
--  context_menu_->addActions(GetPlaylistActions());
--  context_menu_->addSeparator();
--  context_menu_->addAction(IconLoader::Load("edit-find"), tr("Search Spotify (opens a new tab)..."), this, SLOT(OpenSearchTab()));
--  context_menu_->addSeparator();
--  context_menu_->addAction(IconLoader::Load("configure"), tr("Configure Spotify..."), this, SLOT(ShowConfig()));
--
--  playlist_context_menu_ = new QMenu;
--  playlist_sync_action_ = playlist_context_menu_->addAction(
--      IconLoader::Load("view-refresh"),
--      tr("Make playlist available offline"),
--      this,
--      SLOT(SyncPlaylist()));
--}
--
--void SpotifyService::SyncPlaylist() {
--  QStandardItem* item = playlist_sync_action_->data().value<QStandardItem*>();
--  Q_ASSERT(item);
--
--  switch (item->data(InternetModel::Role_Type).toInt()) {
--    case InternetModel::Type_UserPlaylist: {
--      int index = item->data(Role_UserPlaylistIndex).toInt();
--      server_->SyncUserPlaylist(index);
--      playlist_sync_ids_[index] =
--          model()->task_manager()->StartTask(tr("Syncing Spotify playlist"));
--      break;
--    }
--    case Type_InboxPlaylist:
--      server_->SyncInbox();
--      inbox_sync_id_ = model()->task_manager()->StartTask(tr("Syncing Spotify inbox"));
--      break;
--    case Type_StarredPlaylist:
--      server_->SyncStarred();
--      starred_sync_id_ = model()->task_manager()->StartTask(tr("Syncing Spotify starred tracks"));
--      break;
--    default:
--      break;
--  }
--}
--
--void SpotifyService::Search(const QString& text, Playlist* playlist, bool now) {
--  EnsureServerCreated();
--
--  pending_search_ = text;
--  pending_search_playlist_ = playlist;
--
--  if (now) {
--    search_delay_->stop();
--    DoSearch();
--  } else {
--    search_delay_->start();
--  }
--}
--
--void SpotifyService::DoSearch() {
--  if (!pending_search_.isEmpty()) {
--    server_->Search(pending_search_, 200);
--  }
--}
--
--void SpotifyService::SearchResults(const spotify_pb::SearchResponse& response) {
--  if (QStringFromStdString(response.request().query()) != pending_search_) {
--    qLog(Debug) << "Old search result for"
--                << QStringFromStdString(response.request().query())
--                << "expecting" << pending_search_;
--    return;
--  }
--  pending_search_.clear();
--
--  SongList songs;
--  for (int i=0 ; i<response.result_size() ; ++i) {
--    Song song;
--    SongFromProtobuf(response.result(i), &song);
--    songs << song;
--  }
--
--  qLog(Debug) << "Got" << songs.count() << "results";
--
--  pending_search_playlist_->Clear();
--  pending_search_playlist_->InsertSongs(songs);
--
--  const QString did_you_mean = QStringFromStdString(response.did_you_mean());
--  if (!did_you_mean.isEmpty()) {
--    model()->player()->playlists()->playlist_container()->did_you_mean()->Show(did_you_mean);
--  }
--}
--
--SpotifyServer* SpotifyService::server() const {
--  SpotifyService* nonconst_this = const_cast<SpotifyService*>(this);
--
--  if (QThread::currentThread() != thread()) {
--    metaObject()->invokeMethod(nonconst_this, "EnsureServerCreated",
--                               Qt::BlockingQueuedConnection);
--  } else {
--    nonconst_this->EnsureServerCreated();
--  }
--
--  return server_;
--}
--
--void SpotifyService::ShowContextMenu(const QModelIndex& index, const QPoint& global_pos) {
--  EnsureMenuCreated();
--  QStandardItem* item = model()->itemFromIndex(index);
--  if (item) {
--    int type = item->data(InternetModel::Role_Type).toInt();
--    if (type == Type_InboxPlaylist ||
--        type == Type_StarredPlaylist ||
--        type == InternetModel::Type_UserPlaylist) {
--      playlist_sync_action_->setData(qVariantFromValue(item));
--      playlist_context_menu_->popup(global_pos);
--      return;
--    }
--  }
--
--  context_menu_->popup(global_pos);
--}
--
--void SpotifyService::OpenSearchTab() {
--  model()->player()->playlists()->New(tr("Search Spotify"), SongList(),
--                                      SpotifySearchPlaylistType::kName);
--}
--
--void SpotifyService::ItemDoubleClicked(QStandardItem* item) {
--  if (item == search_) {
--    OpenSearchTab();
--  }
--}
--
--void SpotifyService::LoadImage(const QString& id) {
--  EnsureServerCreated();
--  server_->LoadImage(id);
--}
--
--void SpotifyService::SyncPlaylistProgress(
--    const spotify_pb::SyncPlaylistProgress& progress) {
--  qLog(Debug) << "Sync progress:" << progress.sync_progress();
--  int task_id = -1;
--  switch (progress.request().type()) {
--    case spotify_pb::Inbox:
--      task_id = inbox_sync_id_;
--      break;
--    case spotify_pb::Starred:
--      task_id = starred_sync_id_;
--      break;
--    case spotify_pb::UserPlaylist: {
--      QMap<int, int>::const_iterator it = playlist_sync_ids_.constFind(
--          progress.request().user_playlist_index());
--      if (it != playlist_sync_ids_.constEnd()) {
--        task_id = it.value();
--      }
--      break;
--    }
--    default:
--      break;
--  }
--  if (task_id == -1) {
--    qLog(Warning) << "Received sync progress for unknown playlist";
--    return;
--  }
--  model()->task_manager()->SetTaskProgress(task_id, progress.sync_progress(), 100);
--  if (progress.sync_progress() == 100) {
--    model()->task_manager()->SetTaskFinished(task_id);
--    if (progress.request().type() == spotify_pb::UserPlaylist) {
--      playlist_sync_ids_.remove(task_id);
--    }
--  }
--}
--
--void SpotifyService::ShowConfig() {
--  emit OpenSettingsAtPage(SettingsDialog::Page_Spotify);
--}
--
--void SpotifyService::Logout() {
--  delete server_;
--  delete blob_process_;
--  server_ = NULL;
--  blob_process_ = NULL;
--
--  login_state_ = LoginState_OtherError;
--
--  QSettings s;
--  s.beginGroup(kSettingsGroup);
--  s.setValue("login_state", login_state_);
--}
-diff -rauN clementine-1.0.1/src/internet/spotifyservice.h /dev/null
---- clementine-1.0.1/src/internet/spotifyservice.h	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,147 +0,0 @@
--#ifndef SPOTIFYSERVICE_H
--#define SPOTIFYSERVICE_H
--
--#include "internetmodel.h"
--#include "internetservice.h"
--#include "spotifyblob/common/spotifymessages.pb.h"
--
--#include <QProcess>
--#include <QTimer>
--
--#include <boost/shared_ptr.hpp>
--
--class Playlist;
--class SpotifyServer;
--
--class QMenu;
--
--class SpotifyService : public InternetService {
--  Q_OBJECT
--
--public:
--  SpotifyService(InternetModel* parent);
--  ~SpotifyService();
--
--  enum Type {
--    Type_SearchResults = InternetModel::TypeCount,
--    Type_StarredPlaylist,
--    Type_InboxPlaylist,
--    Type_Track,
--  };
--
--  enum Role {
--    Role_UserPlaylistIndex = InternetModel::RoleCount,
--  };
--
--  // Values are persisted - don't change.
--  enum LoginState {
--    LoginState_LoggedIn = 1,
--    LoginState_Banned = 2,
--    LoginState_BadCredentials = 3,
--    LoginState_NoPremium = 4,
--    LoginState_OtherError = 5,
--    LoginState_ReloginFailed = 6
--  };
--
--  static const char* kServiceName;
--  static const char* kSettingsGroup;
--  static const char* kBlobDownloadUrl;
--  static const int kSearchDelayMsec;
--
--  void ReloadSettings();
--
--  QStandardItem* CreateRootItem();
--  void LazyPopulate(QStandardItem* parent);
--  void ShowContextMenu(const QModelIndex& index, const QPoint& global_pos);
--  void ItemDoubleClicked(QStandardItem* item);
--  PlaylistItem::Options playlistitem_options() const;
--
--  void Logout();
--  void Login(const QString& username, const QString& password);
--  void Search(const QString& text, Playlist* playlist, bool now = false);
--  Q_INVOKABLE void LoadImage(const QString& id);
--
--  SpotifyServer* server() const;
--
--  bool IsBlobInstalled() const;
--  void InstallBlob();
--
--  // Persisted in the settings and updated on each Login().
--  LoginState login_state() const { return login_state_; }
--  bool IsLoggedIn() const { return login_state_ == LoginState_LoggedIn; }
--
--  static void SongFromProtobuf(const spotify_pb::Track& track, Song* song);
--
--signals:
--  void BlobStateChanged();
--  void LoginFinished(bool success);
--  void ImageLoaded(const QString& id, const QImage& image);
--
--public slots:
--  void ShowConfig();
--
--protected:
--  virtual QModelIndex GetCurrentIndex();
--
--private:
--  void StartBlobProcess();
--  void FillPlaylist(QStandardItem* item, const spotify_pb::LoadPlaylistResponse& response);
--  void EnsureMenuCreated();
--
--  QStandardItem* PlaylistBySpotifyIndex(int index) const;
--  bool DoPlaylistsDiffer(const spotify_pb::Playlists& response) const;
--
--private slots:
--  void EnsureServerCreated(const QString& username = QString(),
--                           const QString& password = QString());
--  void BlobProcessError(QProcess::ProcessError error);
--  void LoginCompleted(bool success, const QString& error,
--                      spotify_pb::LoginResponse_Error error_code);
--  void PlaylistsUpdated(const spotify_pb::Playlists& response);
--  void InboxLoaded(const spotify_pb::LoadPlaylistResponse& response);
--  void StarredLoaded(const spotify_pb::LoadPlaylistResponse& response);
--  void UserPlaylistLoaded(const spotify_pb::LoadPlaylistResponse& response);
--  void SearchResults(const spotify_pb::SearchResponse& response);
--  void SyncPlaylistProgress(const spotify_pb::SyncPlaylistProgress& progress);
--
--  void OpenSearchTab();
--  void DoSearch();
--
--  void SyncPlaylist();
--  void BlobDownloadFinished();
--
--private:
--  SpotifyServer* server_;
--
--  QString system_blob_path_;
--  QString local_blob_version_;
--  QString local_blob_path_;
--  QProcess* blob_process_;
--
--  QStandardItem* root_;
--  QStandardItem* search_;
--  QStandardItem* starred_;
--  QStandardItem* inbox_;
--  QList<QStandardItem*> playlists_;
--
--  int login_task_id_;
--  QString pending_search_;
--  Playlist* pending_search_playlist_;
--
--  QMenu* context_menu_;
--  QMenu* playlist_context_menu_;
--  QAction* playlist_sync_action_;
--  QModelIndex context_item_;
--
--  QTimer* search_delay_;
--
--  int inbox_sync_id_;
--  int starred_sync_id_;
--  QMap<int, int> playlist_sync_ids_;
--
--  LoginState login_state_;
--  spotify_pb::Bitrate bitrate_;
--  bool volume_normalisation_;
--};
--
--#endif
-diff -rauN clementine-1.0.1/src/internet/spotifysettingspage.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifysettingspage.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,172 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifysettingspage.h"
--
--#include "spotifyservice.h"
--#include "internetmodel.h"
--#include "ui_spotifysettingspage.h"
--#include "core/network.h"
--#include "spotifyblob/common/spotifymessages.pb.h"
--#include "ui/iconloader.h"
--
--#include <QMessageBox>
--#include <QNetworkReply>
--#include <QNetworkRequest>
--#include <QSettings>
--#include <QtDebug>
--
--SpotifySettingsPage::SpotifySettingsPage(SettingsDialog* dialog)
--  : SettingsPage(dialog),
--    network_(new NetworkAccessManager(this)),
--    ui_(new Ui_SpotifySettingsPage),
--    service_(InternetModel::Service<SpotifyService>()),
--    validated_(false)
--{
--  ui_->setupUi(this);
--
--  setWindowIcon(QIcon(":/icons/48x48/spotify.png"));
--
--  QFont bold_font(font());
--  bold_font.setBold(true);
--  ui_->blob_status->setFont(bold_font);
--
--  connect(ui_->download_blob, SIGNAL(clicked()), SLOT(DownloadBlob()));
--  connect(ui_->login, SIGNAL(clicked()), SLOT(Login()));
--  connect(ui_->login_state, SIGNAL(LogoutClicked()), SLOT(Logout()));
--  connect(ui_->login_state, SIGNAL(LoginClicked()), SLOT(Login()));
--
--  connect(service_, SIGNAL(LoginFinished(bool)), SLOT(LoginFinished(bool)));
--  connect(service_, SIGNAL(BlobStateChanged()), SLOT(BlobStateChanged()));
--
--  ui_->login_state->AddCredentialField(ui_->username);
--  ui_->login_state->AddCredentialField(ui_->password);
--  ui_->login_state->AddCredentialGroup(ui_->account_group);
--
--  ui_->bitrate->addItem("96 " + tr("kbps"), spotify_pb::Bitrate96k);
--  ui_->bitrate->addItem("160 " + tr("kbps"), spotify_pb::Bitrate160k);
--  ui_->bitrate->addItem("320 " + tr("kbps"), spotify_pb::Bitrate320k);
--
--  BlobStateChanged();
--}
--
--SpotifySettingsPage::~SpotifySettingsPage() {
--  delete ui_;
--}
--
--void SpotifySettingsPage::BlobStateChanged() {
--  const bool installed = service_->IsBlobInstalled();
--
--  ui_->account_group->setEnabled(installed);
--  ui_->blob_status->setText(installed ? tr("Installed") : tr("Not installed"));
--
--#ifdef Q_OS_LINUX
--  ui_->download_blob->setEnabled(!installed);
--#else
--  ui_->download_blob->setEnabled(false);
--#endif
--}
--
--void SpotifySettingsPage::DownloadBlob() {
--  service_->InstallBlob();
--}
--
--void SpotifySettingsPage::Login() {
--  if (!service_->IsBlobInstalled()) {
--    return;
--  }
--
--  if (ui_->username->text() == original_username_ &&
--      ui_->password->text() == original_password_ &&
--      service_->login_state() == SpotifyService::LoginState_LoggedIn) {
--    return;
--  }
--
--  ui_->login_state->SetLoggedIn(LoginStateWidget::LoginInProgress);
--  service_->Login(ui_->username->text(), ui_->password->text());
--}
--
--void SpotifySettingsPage::Load() {
--  QSettings s;
--  s.beginGroup(SpotifyService::kSettingsGroup);
--
--  original_username_ = s.value("username").toString();
--
--  ui_->username->setText(original_username_);
--  validated_ = false;
--
--  ui_->bitrate->setCurrentIndex(ui_->bitrate->findData(
--      s.value("bitrate", spotify_pb::Bitrate320k).toInt()));
--  ui_->volume_normalisation->setChecked(
--      s.value("volume_normalisation", false).toBool());
--
--  UpdateLoginState();
--}
--
--void SpotifySettingsPage::Save() {
--  QSettings s;
--  s.beginGroup(SpotifyService::kSettingsGroup);
--
--  s.setValue("username", ui_->username->text());
--  s.setValue("password", ui_->password->text());
--
--  s.setValue("bitrate", ui_->bitrate->itemData(ui_->bitrate->currentIndex()).toInt());
--  s.setValue("volume_normalisation", ui_->volume_normalisation->isChecked());
--}
--
--void SpotifySettingsPage::LoginFinished(bool success) {
--  validated_ = success;
--
--  Save();
--  UpdateLoginState();
--}
--
--void SpotifySettingsPage::UpdateLoginState() {
--  const bool logged_in =
--      service_->login_state() == SpotifyService::LoginState_LoggedIn;
--
--  ui_->login_state->SetLoggedIn(logged_in ? LoginStateWidget::LoggedIn
--                                          : LoginStateWidget::LoggedOut,
--                                ui_->username->text());
--  ui_->login_state->SetAccountTypeVisible(!logged_in);
--
--  switch (service_->login_state()) {
--  case SpotifyService::LoginState_NoPremium:
--    ui_->login_state->SetAccountTypeText(tr("You do not have a Spotify Premium account."));
--    break;
--
--  case SpotifyService::LoginState_Banned:
--  case SpotifyService::LoginState_BadCredentials:
--    ui_->login_state->SetAccountTypeText(tr("Your username or password was incorrect."));
--    break;
--
--  case SpotifyService::LoginState_ReloginFailed:
--    ui_->login_state->SetAccountTypeText(tr("You have been logged out of Spotify, please re-enter your password."));
--    break;
--
--  default:
--    ui_->login_state->SetAccountTypeText(tr("A Spotify Premium account is required."));
--    break;
--  }
--}
--
--void SpotifySettingsPage::Logout() {
--  service_->Logout();
--  UpdateLoginState();
--
--  ui_->username->clear();
--}
-diff -rauN clementine-1.0.1/src/internet/spotifysettingspage.h /dev/null
---- clementine-1.0.1/src/internet/spotifysettingspage.h	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,59 +0,0 @@
--/* This file is part of Clementine.
--   Copyright 2010, David Sansome <me@davidsansome.com>
--
--   Clementine is free software: you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, either version 3 of the License, or
--   (at your option) any later version.
--
--   Clementine is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSETTINGSPAGE_H
--#define SPOTIFYSETTINGSPAGE_H
--
--#include "ui/settingspage.h"
--
--class NetworkAccessManager;
--class Ui_SpotifySettingsPage;
--class SpotifyService;
--
--class SpotifySettingsPage : public SettingsPage {
--  Q_OBJECT
--
--public:
--  SpotifySettingsPage(SettingsDialog* dialog);
--  ~SpotifySettingsPage();
--
--  void Load();
--  void Save();
--
--public slots:
--  void BlobStateChanged();
--  void DownloadBlob();
--
--private slots:
--  void Login();
--  void LoginFinished(bool success);
--  void Logout();
--
--private:
--  void UpdateLoginState();
--
--private:
--  NetworkAccessManager* network_;
--  Ui_SpotifySettingsPage* ui_;
--  SpotifyService* service_;
--
--  bool validated_;
--  QString original_username_;
--  QString original_password_;
--};
--
--#endif // SPOTIFYSETTINGSPAGE_H
-diff -rauN clementine-1.0.1/src/internet/spotifysettingspage.ui /dev/null
---- clementine-1.0.1/src/internet/spotifysettingspage.ui	2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null	2012-05-28 12:50:04.796939473 -0300
-@@ -1,214 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<ui version="4.0">
-- <class>SpotifySettingsPage</class>
-- <widget class="QWidget" name="SpotifySettingsPage">
--  <property name="geometry">
--   <rect>
--    <x>0</x>
--    <y>0</y>
--    <width>545</width>
--    <height>458</height>
--   </rect>
--  </property>
--  <property name="windowTitle">
--   <string>Spotify</string>
--  </property>
--  <layout class="QVBoxLayout" name="verticalLayout_2">
--   <item>
--    <widget class="LoginStateWidget" name="login_state" native="true"/>
--   </item>
--   <item>
--    <widget class="QGroupBox" name="account_group">
--     <property name="title">
--      <string>Account details</string>
--     </property>
--     <layout class="QVBoxLayout" name="verticalLayout_3">
--      <item>
--       <widget class="QWidget" name="login_container" native="true">
--        <property name="enabled">
--         <bool>true</bool>
--        </property>
--        <layout class="QGridLayout" name="gridLayout">
--         <property name="margin">
--          <number>0</number>
--         </property>
--         <item row="1" column="0">
--          <widget class="QLabel" name="username_label">
--           <property name="text">
--            <string>Username</string>
--           </property>
--          </widget>
--         </item>
--         <item row="1" column="1">
--          <widget class="QLineEdit" name="username"/>
--         </item>
--         <item row="2" column="0">
--          <widget class="QLabel" name="password_label">
--           <property name="text">
--            <string>Password</string>
--           </property>
--          </widget>
--         </item>
--         <item row="2" column="1" colspan="2">
--          <widget class="QLineEdit" name="password">
--           <property name="echoMode">
--            <enum>QLineEdit::Password</enum>
--           </property>
--          </widget>
--         </item>
--         <item row="1" column="2">
--          <widget class="QPushButton" name="login">
--           <property name="text">
--            <string>Login</string>
--           </property>
--          </widget>
--         </item>
--        </layout>
--       </widget>
--      </item>
--     </layout>
--    </widget>
--   </item>
--   <item>
--    <widget class="QGroupBox" name="groupBox_2">
--     <property name="title">
--      <string>Spotify plugin</string>
--     </property>
--     <layout class="QVBoxLayout" name="verticalLayout">
--      <item>
--       <widget class="QLabel" name="label">
--        <property name="text">
--         <string>For licensing reasons Spotify support is in a separate plugin.</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <layout class="QHBoxLayout" name="horizontalLayout_2">
--        <item>
--         <widget class="QLabel" name="label_2">
--          <property name="text">
--           <string>Plugin status:</string>
--          </property>
--         </widget>
--        </item>
--        <item>
--         <widget class="QLabel" name="blob_status"/>
--        </item>
--        <item>
--         <spacer name="horizontalSpacer">
--          <property name="orientation">
--           <enum>Qt::Horizontal</enum>
--          </property>
--          <property name="sizeHint" stdset="0">
--           <size>
--            <width>40</width>
--            <height>20</height>
--           </size>
--          </property>
--         </spacer>
--        </item>
--        <item>
--         <widget class="QPushButton" name="download_blob">
--          <property name="text">
--           <string>Download...</string>
--          </property>
--         </widget>
--        </item>
--       </layout>
--      </item>
--     </layout>
--    </widget>
--   </item>
--   <item>
--    <widget class="QGroupBox" name="groupBox">
--     <property name="title">
--      <string>Preferences</string>
--     </property>
--     <layout class="QFormLayout" name="formLayout">
--      <item row="0" column="0">
--       <widget class="QLabel" name="label_4">
--        <property name="text">
--         <string>Preferred bitrate</string>
--        </property>
--       </widget>
--      </item>
--      <item row="0" column="1">
--       <widget class="QComboBox" name="bitrate"/>
--      </item>
--      <item row="1" column="0" colspan="2">
--       <widget class="QCheckBox" name="volume_normalisation">
--        <property name="text">
--         <string>Use volume normalisation</string>
--        </property>
--       </widget>
--      </item>
--     </layout>
--    </widget>
--   </item>
--   <item>
--    <spacer name="verticalSpacer">
--     <property name="orientation">
--      <enum>Qt::Vertical</enum>
--     </property>
--     <property name="sizeHint" stdset="0">
--      <size>
--       <width>20</width>
--       <height>30</height>
--      </size>
--     </property>
--    </spacer>
--   </item>
--   <item>
--    <layout class="QHBoxLayout" name="horizontalLayout_3">
--     <item>
--      <spacer name="horizontalSpacer_2">
--       <property name="orientation">
--        <enum>Qt::Horizontal</enum>
--       </property>
--       <property name="sizeHint" stdset="0">
--        <size>
--         <width>40</width>
--         <height>20</height>
--        </size>
--       </property>
--      </spacer>
--     </item>
--     <item>
--      <widget class="QLabel" name="label_3">
--       <property name="minimumSize">
--        <size>
--         <width>64</width>
--         <height>64</height>
--        </size>
--       </property>
--       <property name="maximumSize">
--        <size>
--         <width>64</width>
--         <height>64</height>
--        </size>
--       </property>
--       <property name="pixmap">
--        <pixmap resource="../../data/data.qrc">:/spotify-core-logo-128x128.png</pixmap>
--       </property>
--       <property name="scaledContents">
--        <bool>true</bool>
--       </property>
--      </widget>
--     </item>
--    </layout>
--   </item>
--  </layout>
-- </widget>
-- <customwidgets>
--  <customwidget>
--   <class>LoginStateWidget</class>
--   <extends>QWidget</extends>
--   <header>widgets/loginstatewidget.h</header>
--   <container>1</container>
--  </customwidget>
-- </customwidgets>
-- <resources>
--  <include location="../../data/data.qrc"/>
-- </resources>
-- <connections/>
--</ui>
 diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp
 --- clementine-1.0.1/src/ui/about.cpp	2012-01-22 10:43:26.000000000 -0200
 +++ clementine-libre-1.0.1/src/ui/about.cpp	2012-05-28 19:44:38.760244927 -0300
@@ -3191,23 +550,23 @@ diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about
    return ret;
  }
  
-diff -rauN clementine-1.0.1/src/ui/settingsdialog.cpp clementine-libre-1.0.1/src/ui/settingsdialog.cpp
---- clementine-1.0.1/src/ui/settingsdialog.cpp	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/settingsdialog.cpp	2012-05-28 19:46:49.506369764 -0300
+diff -rauN clementine-1.1.0/src/ui/settingsdialog.cpp clementine-libre-1.1.0/src/ui/settingsdialog.cpp
+--- clementine-1.1.0/src/ui/settingsdialog.cpp	2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.0/src/ui/settingsdialog.cpp	2012-10-26 02:16:32.400950434 -0200
 @@ -55,10 +55,6 @@
- # include "remote/remotesettingspage.h"
+ # include "wiimotedev/wiimotesettingspage.h"
  #endif
  
 -#ifdef HAVE_SPOTIFY
 -# include "internet/spotifysettingspage.h"
 -#endif
 -
- #include <QDesktopWidget>
- #include <QPainter>
- #include <QPushButton>
-@@ -140,10 +136,6 @@
- 
-   AddPage(Page_Grooveshark, new GroovesharkSettingsPage(this), providers);
+ #ifdef HAVE_GOOGLE_DRIVE
+ # include "internet/googledrivesettingspage.h"
+ #endif
+@@ -147,10 +143,6 @@
+   AddPage(Page_GoogleDrive, new GoogleDriveSettingsPage(this), providers);
+ #endif
  
 -#ifdef HAVE_SPOTIFY
 -  AddPage(Page_Spotify, new SpotifySettingsPage(this), providers);
@@ -3216,10 +575,10 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.cpp clementine-libre-1.0.1/src
    AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers);
    AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers);
    AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers);
-diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/ui/settingsdialog.h
---- clementine-1.0.1/src/ui/settingsdialog.h	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/settingsdialog.h	2012-05-28 19:48:55.399426104 -0300
-@@ -65,7 +65,6 @@
+diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/ui/settingsdialog.h
+--- clementine-1.1.0/src/ui/settingsdialog.h	2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.0/src/ui/settingsdialog.h	2012-10-26 02:16:56.596276994 -0200
+@@ -67,7 +67,6 @@
      Page_Library,
      Page_Lastfm,
      Page_Grooveshark,
@@ -3227,8 +586,9 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/u
      Page_Magnatune,
      Page_DigitallyImported,
      Page_BackgroundStreams,
---- clementine-1.0.1/src/core/logging.cpp	2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/logging.cpp	2012-05-30 03:09:25.554790760 -0300
+diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.cpp clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp
+--- clementine-1.1.0/ext/libclementine-common/core/logging.cpp	2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp	2012-10-26 02:20:08.682299778 -0200
 @@ -14,10 +14,6 @@
     limitations under the License.
  */
@@ -3237,12 +597,13 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/u
 -// it is used by the Spotify blob which links against libspotify and is not GPL
 -// compatible.
 -
+ #include <QtGlobal>
  
- #include <QCoreApplication>
- #include <QDateTime>
---- clementine-1.0.1/src/core/logging.h	2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/logging.h	2012-05-30 03:09:44.390404481 -0300
-@@ -14,10 +14,6 @@
+ #include <cxxabi.h>
+diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.h clementine-libre-1.1.0/ext/libclementine-common/core/logging.h
+--- clementine-1.1.0/ext/libclementine-common/core/logging.h	2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.h	2012-10-26 02:20:34.937511945 -0200
+@@ -14,11 +14,6 @@
     limitations under the License.
  */
  
@@ -3250,9 +611,11 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/u
 -// it is used by the Spotify blob which links against libspotify and is not GPL
 -// compatible.
 -
- 
+-
  #ifndef LOGGING_H
  #define LOGGING_H
+ 
+diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/core/timeconstants.h
 --- clementine-1.0.1/src/core/timeconstants.h	2011-12-02 19:24:44.000000000 -0200
 +++ clementine-libre-1.0.1/src/core/timeconstants.h	2012-05-30 03:10:10.338953893 -0300
 @@ -14,10 +14,6 @@
diff --git a/libre/clementine-libre/remove-nonfree-references-on-translations.patch b/libre/clementine-libre/remove-nonfree-references-on-translations.patch
deleted file mode 100755
index f80e7f5a7..000000000
--- a/libre/clementine-libre/remove-nonfree-references-on-translations.patch
+++ /dev/null
@@ -1,20088 +0,0 @@
-diff -rauN clementine-1.0.1/src/translations/ar.po clementine-libre-1.0.1/src/translations/ar.po
---- clementine-1.0.1/src/translations/ar.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ar.po	2012-05-28 22:09:35.427205715 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "ابدأ قئمة التشغيل اللتي تعمل حالياً"
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/be.po clementine-libre-1.0.1/src/translations/be.po
---- clementine-1.0.1/src/translations/be.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/be.po	2012-05-29 13:46:37.876404109 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -311,7 +307,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,12 +579,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -815,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1025,10 +1010,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Наладзіць калекцыю..."
-@@ -1046,10 +1027,6 @@
- msgid "Connect device"
- msgstr "Падлучэнне прылады"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1465,10 +1442,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1481,10 +1454,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Спампаваць каталог Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1634,10 +1603,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1819,10 +1784,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2085,10 +2046,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2117,10 +2074,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2423,7 +2376,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2499,10 +2451,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2759,10 +2707,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2897,7 +2841,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -3004,10 +2947,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3038,7 +2977,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3055,10 +2993,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3449,18 +3383,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3785,30 +3707,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3818,7 +3720,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3904,18 +3805,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4273,10 +4162,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4292,7 +4177,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4516,20 +4400,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4589,7 +4459,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4678,8 +4547,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/bg.po clementine-libre-1.0.1/src/translations/bg.po
---- clementine-1.0.1/src/translations/bg.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/bg.po	2012-05-29 13:48:35.013070898 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Необходим е Grooveshark Anywhere акаунт"
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Нуждаете се от премиум регистрация в Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Винаги да се започва възпроизвеждането"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"За да използвате Spotify в Clementine е необходима допълнителна приставка. "
--"Иската ли да я свалите и инсталирате сега?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Получи се грешка при копирането на iTunes базата данни от утройството"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Поддръжка на CUE листове"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Отказ"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Смени обложката"
-@@ -1038,10 +1021,6 @@
- msgid "Configure Shortcuts"
- msgstr "Настройване на бързите клавиши"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Настройване на Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Настройване на библиотека..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Свързване на устройство"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Свързване към Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Постоянен битов поток"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Сваляне на този албум..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Изтегляне..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Сваляне на icecast директорията"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Сваляне на каталог Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Изтегляне на приставка за Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Сваляне на метаданни"
-@@ -1654,10 +1621,6 @@
- msgid "Error deleting songs"
- msgstr "Грешка при изтриване на песни"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Грешка при изтеглянето на приставка за Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1839,12 +1802,6 @@
- msgid "Font size"
- msgstr "Размер на шрифта"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Поради причини, свързани с лицензирането, поддръжката на Spotify е като "
--"отделна приставка."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Принудително кодиране в моно"
-@@ -2117,10 +2074,6 @@
- "В динамичен режим новите песни ще бъдат избирани и добавяни към списъка с "
- "песни всеки път, когато свърши песента."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Входящи"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Включване на обложката в известяването"
-@@ -2149,10 +2102,6 @@
- msgid "Insert..."
- msgstr "Вмъкване..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Инсталирани"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Интернет"
-@@ -2459,7 +2408,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2535,10 +2483,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Списъкът с песни да е наличен в режим извън мрежа"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Грешка при отговора"
-@@ -2798,10 +2742,6 @@
- msgid "Not enough neighbors"
- msgstr "Недостатъчно съседи"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Не е инсталиран"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Не сте вписан"
-@@ -2936,7 +2876,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Парола"
-@@ -3043,10 +2982,6 @@
- msgid "Playlists"
- msgstr "Списъци с песни"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Състояние на приставката:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3077,7 +3012,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Настройки"
-@@ -3095,10 +3029,6 @@
- msgid "Preferred audio format"
- msgstr "Предпочитан аудио формат"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Предпочитан битов поток"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Предпочитан формат"
-@@ -3489,18 +3419,6 @@
- msgid "Search Magnatune"
- msgstr "Търси в Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Търсене в Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Търсене в Spotify (отваря нов подпрозорец)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Търсене в Spotify (отваря нов подпрозорец)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Търсене във всички източници (библиотека, интернет услуги, ...)"
-@@ -3826,30 +3744,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Грешка в вписване в Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Приставка за Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Приставката за Spotify не е инсталирана"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Стандартно"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Със звезда"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Стартиране на текущо възпроизвеждания списък с песни"
-@@ -3859,7 +3757,6 @@
- msgstr "Начало на прекодирането"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Започнете да пишете в полето за търсее за да намерите музика на %1."
-@@ -3945,18 +3842,6 @@
- msgid "Switch provider"
- msgstr "Смяна на доставчика"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Синхронизиране на входящата кутия на Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Синхронизиране на списъка с песни от Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Синхронизиране на оценените песни от Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Табовете отгоре"
-@@ -4342,10 +4227,6 @@
- msgid "Use the system proxy settings"
- msgstr "Използване на системните настройки за сървър-посредник"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Използване на нормализация на звука"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Използван"
-@@ -4361,7 +4242,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Потребителско име"
-@@ -4599,20 +4479,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Нямате Grooveshark Anywhere акаунт."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Нямате Spotify Premium акаунт."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr "Отписан сте от Spotify, моля въведете отново паролата си в Настройки."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Изписан сте от Spotify, моля въведете паролата си отново"
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Харесвате тази песен"
-@@ -4680,7 +4546,6 @@
- msgstr "Вашите слушания: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Вашето потребителско име или парола не съвпада."
- 
-@@ -4769,8 +4634,6 @@
- msgstr "в последните"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "килобита/сек"
- 
-diff -rauN clementine-1.0.1/src/translations/bn.po clementine-libre-1.0.1/src/translations/bn.po
---- clementine-1.0.1/src/translations/bn.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/bn.po	2012-05-29 13:50:28.419737684 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "এক্ টি স্পটীফাই অ্যাকাউন্ট প্রয়োজন"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -311,7 +307,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,14 +579,6 @@
- msgid "Always start playing"
- msgstr "স্থায়ী ভাবে সঙ্গীত চালু রাখুন"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"এক্ টি প্লাগ ইন প্রয়োজন। আপনি কি প্লাগ ইন টি ডাউনলোড করে ইন্সটল করতে ইচ্ছুক "
--"?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "iTune ডাটাবেস কপি করায় ত্রুটি র জন্য দুঃখিত ।"
-@@ -817,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1021,10 +1004,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1042,10 +1021,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1455,10 +1430,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1471,10 +1442,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1624,10 +1591,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1809,10 +1772,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2075,10 +2034,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2107,10 +2062,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2413,7 +2364,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2489,10 +2439,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2749,10 +2695,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2887,7 +2829,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2994,10 +2935,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3028,7 +2965,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3045,10 +2981,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3439,18 +3371,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3775,30 +3695,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3808,7 +3708,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3894,18 +3793,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4263,10 +4150,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4282,7 +4165,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4506,20 +4388,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4579,7 +4447,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4668,8 +4535,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/br.po clementine-libre-1.0.1/src/translations/br.po
---- clementine-1.0.1/src/translations/br.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/br.po	2012-05-29 13:51:23.959737744 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Ur c'hont Grooveshark a zo dleet"
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Ret eo deoc'h kaout ur kont Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -314,7 +310,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "Atav kregin da lenn"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Un enlugellad a zo ezhomm a-benn implij Spotify e-barzh Clementine. C'hoant "
--"ho peus pellgargañ ha staliañ anezhañ bremañ ?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "Kemer e kont ar CUE sheet"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Nullañ"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Kemmañ golo an albom"
-@@ -1040,10 +1023,6 @@
- msgid "Configure Shortcuts"
- msgstr "Kefluniañ ar Berradennoù"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Kefluniañ Spotify"
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Kefluniañ al levraoueg..."
-@@ -1061,10 +1040,6 @@
- msgid "Connect device"
- msgstr "An drobarzhell a zo o kennaskañ"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "O kennaskañ da Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "CBR"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Pellgkargañ an albom..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Pellgargañ"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "O pellgargañ katalog Icecast"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "O pellgargañ katalog Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "O pellgargañ enlugellad Spotify..."
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "O pellgargañ metadaveennoù"
-@@ -1653,10 +1620,6 @@
- msgid "Error deleting songs"
- msgstr "Ur gudenn a zo savet e-kerzh dilamidigezh an tonioù"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Ur gudenn a zo savet o pellgargañ enlugellad Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1841,10 +1804,6 @@
- msgid "Font size"
- msgstr "Ment an nodrezh"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Evit abegoù lañsav, meret eo Spotify gant un enlugellad distag."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forsiñ an enkodiñ mono"
-@@ -2119,10 +2078,6 @@
- "E stumm dinamek, roudennoù nevez a vo choazet hag ouzhpennet e fin al roll "
- "c'hoari bep taol ma vo echu gant un ton."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Boest degemer"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Diskouez an albom er gemenadenn"
-@@ -2151,10 +2106,6 @@
- msgid "Insert..."
- msgstr "Enlakaat..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Staliaet"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2458,7 +2409,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2534,10 +2484,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil pennañ (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Lakaat ar roll c'hoari da vezañ lennus ezlinenn"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Respont furmed fall"
-@@ -2798,10 +2744,6 @@
- msgid "Not enough neighbors"
- msgstr "N'eus ket trawalc'h a amezeizen"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "N'eo ket staliet"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "N'eo ket kannasket"
-@@ -2936,7 +2878,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Tremenger"
-@@ -3043,10 +2984,6 @@
- msgid "Playlists"
- msgstr "Rollioù c'hoari"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stad an enlugellad"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3077,7 +3014,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Gwellvezioù"
-@@ -3094,10 +3030,6 @@
- msgid "Preferred audio format"
- msgstr "Stumm audio gwellañ"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate gwellañ"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Stumm gwellañ"
-@@ -3488,18 +3420,6 @@
- msgid "Search Magnatune"
- msgstr "Klask Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Klask Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Klask Spotify (digeriñ un ivinel nevez)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Klask Spotify (digeriñ un ivinel nevez)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Klask e-touez holl o mammennoù (levraoueg, internet, servijoù...)"
-@@ -3824,30 +3744,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Kudenn kennaskañ gant Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Enlugellad Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Enlugellad Spotify n'eo ket staliet"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Boaz"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Gwellañ"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Kregiñ ar roll c'hoari"
-@@ -3857,7 +3757,6 @@
- msgstr "Kregin an transkodiñ"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Kregin da skrivañ er boest klask a-us evit kavout sonerezh war %1"
-@@ -3943,18 +3842,6 @@
- msgid "Switch provider"
- msgstr "Cheñch servij"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sinkronizadur ar boest degemer Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sinkronizadur ar roll c'hoari Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sinkronizadur tonioù gwellañ Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Ivinelloù a-us"
-@@ -4336,10 +4223,6 @@
- msgid "Use the system proxy settings"
- msgstr "Implij dibarzhioù dre ziouer ar proksi"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Implij normalizadur an ampled"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Implijet"
-@@ -4355,7 +4238,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Lezanv"
-@@ -4592,22 +4474,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "N'ho peus ket a kont Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "N'ho peus ket a kont Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen e-barzh prenestr ar "
--"c'hefluniadoù."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen mar plij."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Karout a rit ar roadenn-mañ"
-@@ -4675,7 +4541,6 @@
- msgstr "Ho scrobble: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Ho anv implijer pe ho tremenger a zo direizh."
- 
-@@ -4764,8 +4629,6 @@
- msgstr "etrezek ar re ziwezhañ"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbde"
- 
-diff -rauN clementine-1.0.1/src/translations/bs.po clementine-libre-1.0.1/src/translations/bs.po
---- clementine-1.0.1/src/translations/bs.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/bs.po	2012-05-29 13:52:24.389737809 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -311,7 +307,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,12 +579,6 @@
- msgid "Always start playing"
- msgstr "Uvjek počni sa slušanjem"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Desila se greška prilikom kopiranja iTunes baze podataka sa uređaja"
-@@ -815,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr "CUE lista podrška"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Promjeni omot"
-@@ -1029,10 +1014,6 @@
- msgid "Configure Shortcuts"
- msgstr "Podesi prečice"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Podesi biblioteku..."
-@@ -1050,10 +1031,6 @@
- msgid "Connect device"
- msgstr "Spoji uređaj"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1467,10 +1444,6 @@
- msgid "Download this album..."
- msgstr "Preuzmi ovaj album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Preuzimam Icecast fasciklu"
-@@ -1483,10 +1456,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Preuzimam Magnatune katalog"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1636,10 +1605,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1821,10 +1786,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2087,10 +2048,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2119,10 +2076,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2425,7 +2378,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2501,10 +2453,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2761,10 +2709,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2899,7 +2843,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -3006,10 +2949,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3040,7 +2979,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3057,10 +2995,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3451,18 +3385,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3787,30 +3709,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3820,7 +3722,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3906,18 +3807,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4275,10 +4164,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4294,7 +4179,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4518,20 +4402,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4591,7 +4461,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4680,8 +4549,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/ca.po clementine-libre-1.0.1/src/translations/ca.po
---- clementine-1.0.1/src/translations/ca.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ca.po	2012-05-29 14:27:32.546406760 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Us cal un compte Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Cal un compte Premium de Spotify"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -318,7 +314,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Començar sempre reproduint"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Cal un connector addicional per utilitzar Spotify a Clementine. Voleu "
--"descarregar-lo i instaŀlar-lo ara?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -827,10 +814,6 @@
- msgid "CUE sheet support"
- msgstr "Suport per a CUE sheet"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Canceŀla"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Canviar la imatge de la portada"
-@@ -1043,10 +1026,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configura dreceres"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configura l'Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configura la llibreria..."
-@@ -1064,10 +1043,6 @@
- msgid "Connect device"
- msgstr "Connecta el dispositiu"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connectant amb Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Taxa de bits constant"
-@@ -1483,10 +1458,6 @@
- msgid "Download this album..."
- msgstr "Descarrega aquest àlbum..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Descarrega..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Descarregant el directori d'Icecast"
-@@ -1499,10 +1470,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Descarregant el catàleg de Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Descarregant el connector d'Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Descarregant metadades"
-@@ -1654,10 +1621,6 @@
- msgid "Error deleting songs"
- msgstr "Error esborrant cançons"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1839,10 +1802,6 @@
- msgid "Font size"
- msgstr "Mida de la font"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Força la codificació mono"
-@@ -2110,10 +2069,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Safata d'entrafa"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incloure la caràtula a la notificació"
-@@ -2142,10 +2097,6 @@
- msgid "Insert..."
- msgstr "Insereix..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instaŀlat"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2450,7 +2401,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2526,10 +2476,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta malformada"
-@@ -2788,10 +2734,6 @@
- msgid "Not enough neighbors"
- msgstr "No hi ha prous veïns"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "No heu iniciat la sessió"
-@@ -2926,7 +2868,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Contrasenya"
-@@ -3033,10 +2974,6 @@
- msgid "Playlists"
- msgstr "Llistes de reproducció"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3067,7 +3004,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferències"
-@@ -3084,10 +3020,6 @@
- msgid "Preferred audio format"
- msgstr "Format d'àudio preferit"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Format preferit"
-@@ -3478,18 +3410,6 @@
- msgid "Search Magnatune"
- msgstr "Cercar a Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3814,30 +3734,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Error en iniciar sessió a Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Connector d'Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Connector d'Spotify no instaŀlat"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Estàndard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Destacat"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Inicia la llista de reproducció que s'està reproduint"
-@@ -3847,7 +3747,6 @@
- msgstr "Inicia transcodificació"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3933,18 +3832,6 @@
- msgid "Switch provider"
- msgstr "Canvia de proveïdor"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4314,10 +4201,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Usat"
-@@ -4333,7 +4216,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nom d'usuari"
-@@ -4560,20 +4442,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4636,7 +4504,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4725,8 +4592,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/cs.po clementine-libre-1.0.1/src/translations/cs.po
---- clementine-1.0.1/src/translations/cs.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/cs.po	2012-05-29 14:53:26.439741827 -0400
-@@ -257,10 +257,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Je požadován účet Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Je požadován účet Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -321,7 +317,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -594,14 +589,6 @@
- msgid "Always start playing"
- msgstr "Vždy začít přehrávat"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Pro používání Spotify v Clementine je vyžadován přídavný modul. Chcete jej "
--"stáhnout a nainstalovat nyní?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Při kopírování databáze iTunes ze zařízení nastala chyba"
-@@ -827,10 +814,6 @@
- msgid "CUE sheet support"
- msgstr "Podpora pro list CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Zrušit"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Změnit obal"
-@@ -1041,10 +1024,6 @@
- msgid "Configure Shortcuts"
- msgstr "Nastavit klávesové zkratky"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Nastavit Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Nastavit sbírku..."
-@@ -1062,10 +1041,6 @@
- msgid "Connect device"
- msgstr "Připojit zařízení"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Připojuje se k Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Stálý datový tok"
-@@ -1481,10 +1456,6 @@
- msgid "Download this album..."
- msgstr "Stáhnout toto album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Stáhnout..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Stahuje se adresář Icecast"
-@@ -1497,10 +1468,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Stahuje se katalog Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Stahuje se přídavný modul Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Stahují se metadata"
-@@ -1653,10 +1620,6 @@
- msgid "Error deleting songs"
- msgstr "Chyba při mazání písní"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Chyba při stahování přídavného modulu Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1838,11 +1801,6 @@
- msgid "Font size"
- msgstr "Velikost písma"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Z licenčních důvodů je podpora pro Spotify v odděleném přídavném modulu"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Vynutit monokódování"
-@@ -2115,10 +2073,6 @@
- "V dynamickém režimu budou nové skladby vybrány a přidány do seznamu skladeb "
- "pokaždé, když píseň skončí."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Doručená pošta"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Zahrnout obal alba do oznámení"
-@@ -2147,10 +2101,6 @@
- msgid "Insert..."
- msgstr "Vložit..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Nainstalován"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2456,7 +2406,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2532,12 +2481,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hlavní profil"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--"Zajistit, že seznam skladeb bude dostupný, i když počítač nebude připojen k "
--"internetu"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Poškozená odpověď"
-@@ -2796,10 +2739,6 @@
- msgid "Not enough neighbors"
- msgstr "Nedostatek sousedů"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nenainstalován"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Nepřihlášen"
-@@ -2934,7 +2873,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Heslo"
-@@ -3041,10 +2979,6 @@
- msgid "Playlists"
- msgstr "Seznamy skladeb"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stav přídavného modulu:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3075,7 +3009,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Nastavení"
-@@ -3092,10 +3025,6 @@
- msgid "Preferred audio format"
- msgstr "Upřednostňovaný zvukový formát"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Upřednostňovaný datový tok"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Upřednostňovaný formát"
-@@ -3486,18 +3415,6 @@
- msgid "Search Magnatune"
- msgstr "Hledat na Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Hledat v Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Hledat v Spotify (otevře novou kartu)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Hledat v Spotify (otevře novou kartu)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Hledat ve všech vašich zdrojích (sbírka, internetové služby, ...)"
-@@ -3822,30 +3739,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Chyba přihlášení k Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Přídavný modul Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Přídavný modul Spotify není nainstalován"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Obvyklý"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "S hvězdičkou"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Přehrát současnou skladbu v seznamu skladeb"
-@@ -3855,7 +3752,6 @@
- msgstr "Převést"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Začněte psát ve vyhledávacím poli pro nalezení hudby na %1."
-@@ -3941,18 +3837,6 @@
- msgid "Switch provider"
- msgstr "Přepnout poskytovatele"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronizuje se schránka Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronizuje se seznam skladeb Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronizují se skladby označené hvězdičkou na Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Karty nahoře"
-@@ -4329,10 +4213,6 @@
- msgid "Use the system proxy settings"
- msgstr "Použít systémové nastavení proxy"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Použít normalizaci hlasitosti"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Použito"
-@@ -4348,7 +4228,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Uživatelské jméno"
-@@ -4584,22 +4463,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Nemáte účet Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Nemáte účet Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo v dialogu pro "
--"nastavení znovu."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo znovu."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Tato skladba patří mezi vaše oblíbené"
-@@ -4667,7 +4530,6 @@
- msgstr "Váš počet přehrání: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Uživatelské jméno nebo heslo bylo nesprávné."
- 
-@@ -4756,8 +4618,6 @@
- msgstr "za posledních"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
- 
-diff -rauN clementine-1.0.1/src/translations/cy.po clementine-libre-1.0.1/src/translations/cy.po
---- clementine-1.0.1/src/translations/cy.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/cy.po	2012-05-29 14:57:59.696408611 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/da.po clementine-libre-1.0.1/src/translations/da.po
---- clementine-1.0.1/src/translations/da.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/da.po	2012-05-29 14:59:00.383075364 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "En Spotify Premium konto er påkrævet."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -315,7 +311,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,12 +583,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -819,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1023,10 +1008,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigurér Genveje"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Indstil bibliotek..."
-@@ -1044,10 +1025,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1457,10 +1434,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1473,10 +1446,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1628,10 +1597,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1813,10 +1778,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2079,10 +2040,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inkludér albumkunst i bekendtgørelsen"
-@@ -2111,10 +2068,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2417,7 +2370,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2493,10 +2445,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Misdannet svar"
-@@ -2753,10 +2701,6 @@
- msgid "Not enough neighbors"
- msgstr "Ikke nok naboer"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2891,7 +2835,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2998,10 +2941,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3032,7 +2971,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3049,10 +2987,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3443,18 +3377,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3781,30 +3703,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Start den spilleliste der afspiller nu"
-@@ -3814,7 +3716,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3900,18 +3801,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4270,10 +4159,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4289,7 +4174,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4513,20 +4397,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4586,7 +4456,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4675,8 +4544,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/de.po clementine-libre-1.0.1/src/translations/de.po
---- clementine-1.0.1/src/translations/de.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/de.po	2012-05-29 15:03:39.899742271 -0400
-@@ -258,10 +258,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Ein Grooveshark Anywhere-Konto wird benötigt."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Ein Spotify Premium-Konto ist erforderlich."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -323,7 +319,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -597,14 +592,6 @@
- msgid "Always start playing"
- msgstr "Immer mit der Wiedergabe beginnen"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Ein zusätzlich Plugin ist benötigt, um Spotify in Clementine zu benutzen. "
--"Möchten Sie es jetzt herunterladen und installieren?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -832,10 +819,6 @@
- msgid "CUE sheet support"
- msgstr "Unterstützung von Cuesheets"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Abbrechen"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Cover ändern"
-@@ -1048,10 +1031,6 @@
- msgid "Configure Shortcuts"
- msgstr "Tastenkürzel einrichten"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Spotify konfigurieren..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Musiksammlung einrichten..."
-@@ -1069,10 +1048,6 @@
- msgid "Connect device"
- msgstr "Gerät verbinden"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Verbindung mit Spotify wird aufgebaut"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstante Bitrate"
-@@ -1488,10 +1463,6 @@
- msgid "Download this album..."
- msgstr "Album herunterladen..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Herunterladen..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Lade Icecast-Verzeichnis herunter"
-@@ -1504,10 +1475,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune-Katalog wird geladen"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify-Plugin wird heruntergeladen"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Metadaten werden heruntergeladen"
-@@ -1662,10 +1629,6 @@
- msgid "Error deleting songs"
- msgstr "Fehler beim Löschen der Titel"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Fehler beim herunterladen von Spotify-Plugin"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1847,12 +1810,6 @@
- msgid "Font size"
- msgstr "Schriftgröße"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Aus lizenzrechtlichen Gründen, ist die Spotify-Unterstützung in einem "
--"Separaten Plugin enthalten."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono Encoding erzwingen"
-@@ -2125,10 +2082,6 @@
- "Im dynamischen Modus werden neue Stücke automatisch ausgewählt und an die "
- "Wiedergabeliste angehängt, sobald ein Titel zu Ende ist."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Posteingang"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Cover in der Benachrichtigung anzeigen"
-@@ -2157,10 +2110,6 @@
- msgid "Insert..."
- msgstr "Einfügen..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installiert"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2465,7 +2414,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2541,10 +2489,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Standard - Profil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Wiedergabeliste für die Offlinebenutzung verfügbar machen"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Ungültige Antwort"
-@@ -2803,10 +2747,6 @@
- msgid "Not enough neighbors"
- msgstr "Nicht genug Nachbarn"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nicht installiert"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Nicht angemeldet"
-@@ -2941,7 +2881,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Passwort"
-@@ -3049,10 +2988,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Plugin-Status"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3083,7 +3018,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Einstellungen"
-@@ -3100,10 +3034,6 @@
- msgid "Preferred audio format"
- msgstr "Bevorzugtes Dateiformat"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bevorzugte Bitrate"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Bevorzugtes Format"
-@@ -3494,18 +3424,6 @@
- msgid "Search Magnatune"
- msgstr "Magnatune durchsuchen"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Spotify-Suche"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Spotify-Suche (öffnet im neuen Tab)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Spotify-Suche (öffnet im neuen Tab)"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Alle Quellen durchsuchen (Sammlung, Internetdienste, …)"
-@@ -3832,30 +3750,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Fehler beim anmelden bei Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-Plugin"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify-Plugin nicht installiert"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Markiert"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Spiele das aktuelle Stück in der Wiedergabeliste ab"
-@@ -3865,7 +3763,6 @@
- msgstr "Konvertieren"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Benutzen Sie die Suchleiste um Musik auf %1 zu finden."
-@@ -3951,18 +3848,6 @@
- msgid "Switch provider"
- msgstr "Anbieter wechseln"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronisiere Spotify Postfach"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronisiere Spotify Wiedergabeliste"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronisiere markierte Stücke von Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Tabs oben"
-@@ -4345,10 +4230,6 @@
- msgid "Use the system proxy settings"
- msgstr "Verwende Proxy-Einstellungen des Betriebssystems"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Belegt"
-@@ -4364,7 +4245,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Benutzername"
-@@ -4602,20 +4482,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Sie haben kein Grooveshark Anywhere-Konto."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Sie haben kein Spotify Premium-Konto."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Sie lieben dieses Stück"
-@@ -4683,7 +4549,6 @@
- msgstr "Ihre Scrobbles: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Ihr Benutzername oder Kennwort sind ungültig."
- 
-@@ -4772,8 +4637,6 @@
- msgstr "in den letzten"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "Kb/s"
- 
-diff -rauN clementine-1.0.1/src/translations/el.po clementine-libre-1.0.1/src/translations/el.po
---- clementine-1.0.1/src/translations/el.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/el.po	2012-05-29 15:04:37.229742284 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Απαιτείτε ένας λογαρισμός Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Απαιτείται premium λογαριασμός Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -318,7 +314,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Έναρξη αναπαραγωγής πάντα"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Απαιτείται ένα πρόσθετο για να χρησιμοποιήσετε το Spotify. Θέλετε να το "
--"κατεβάσετε και να το εγκαταστήσετε τώρα;"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -827,10 +814,6 @@
- msgid "CUE sheet support"
- msgstr "Υποστήριξη φύλλων CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Άκυρο"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Αλλαγή εξώφυλλου καλλιτέχνη"
-@@ -1046,10 +1029,6 @@
- msgid "Configure Shortcuts"
- msgstr "Ρύθμιση συντομεύσεων"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Ρύθμιση του Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Παραμετροποίηση της βιβλιοθήκης"
-@@ -1069,10 +1048,6 @@
- msgid "Connect device"
- msgstr "Σύνδεση συσκευής"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Σύνδεση στο Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Σταθερός ρυθμός bit"
-@@ -1488,10 +1463,6 @@
- msgid "Download this album..."
- msgstr "Μεταφόρτωση αυτού του άλμπουμ..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Λήψη..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Μεταφόρτωση καταλόγου Icecast"
-@@ -1504,10 +1475,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Μεταφόρτωση καταλόγου του Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Λήψη πρόσθετου για το Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Λήψη μεταδεδομένων"
-@@ -1664,10 +1631,6 @@
- msgid "Error deleting songs"
- msgstr "Σφάλμα κατά την διαγραφή τραγουδιών"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Σφάλμα στην λήψη του πρόσθετου του Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1850,11 +1813,6 @@
- msgid "Font size"
- msgstr "Μέγεθος γραμματοσειράς"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Για λόγους αδειοδότησης η υποστήριξη για το Spotify γίνεται ξεχωριστά."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Επιβολή κωδικοποίησης mono"
-@@ -2129,10 +2087,6 @@
- "Στην δυναμική λειτουργία νέα κομμάτια θα επιλέγονται και τοποθετούνται στην "
- "λίστα κάθε φορά που ένα τραγούδι τελειώνει."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Εισερχόμενα"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Εμφάνιση του άλμπουμ (εικόνα) στην ειδοποίηση"
-@@ -2163,10 +2117,6 @@
- msgid "Insert..."
- msgstr "Εισαγωγή..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Εγκατεστημένο"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Διαδίκτυο"
-@@ -2471,7 +2421,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2547,10 +2496,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Κύριο προφίλ (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Η λίστα να είναι διαθέσιμη και εκτός σύνδεσης"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Παραμορφωμένη απάντηση"
-@@ -2812,10 +2757,6 @@
- msgid "Not enough neighbors"
- msgstr "Δεν υπάρχουν αρκετοί γείτονες"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Μη εγκατεστημένο"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Δεν είστε συνδεδεμένος"
-@@ -2950,7 +2891,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Συνθηματικό"
-@@ -3057,10 +2997,6 @@
- msgid "Playlists"
- msgstr "Λίστες"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Κατάσταση πρόσθετου:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3091,7 +3027,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Προτιμήσεις"
-@@ -3110,10 +3045,6 @@
- msgid "Preferred audio format"
- msgstr "Προτιμώμενη ηχητική διαμόρφωση"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Προτιμώμενος ρυθμός bit "
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Προτιμώμενη μορφή"
-@@ -3504,18 +3435,6 @@
- msgid "Search Magnatune"
- msgstr "Εύρεση στο Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Εύρεση Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Αναζήτηση σε όλες τις πηγές σας (βιβλιοθήκη, υπηρεσίες internet, ...)"
-@@ -3843,30 +3762,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Σφάλμα εισόδου στο Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Πρόσθετο Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Το πρόσθετο του Spotify μη εγκατεστημένο"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Κανονικό"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Με αστέρι"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Εκκίνηση της λίστας αναπαραγωγής που παίζει τώρα"
-@@ -3876,7 +3775,6 @@
- msgstr "Εκκίνηση επανακωδικοποίησης"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3964,18 +3862,6 @@
- msgid "Switch provider"
- msgstr "Αλλαγή παροχέα"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Συγχρονισμός εισερχομένων του Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Συγχρονισμός λίστας του Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Συγχρονισμός κομματιών επισημασμένων με αστέρι του Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Καρτέλες στην κορυφή"
-@@ -4361,10 +4247,6 @@
- msgid "Use the system proxy settings"
- msgstr "Χρήση ρυθμίσεων του διαμεσολαβητή του συστήματος"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Χρήση κανονικοποίησης ήχου"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Σε χρήση"
-@@ -4380,7 +4262,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Όνομα χρήστη"
-@@ -4617,22 +4498,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Δεν έχετε λογαριασμό στο GrooveShark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Δεν έχετε Premium λογαριασμό στο Spotify."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας στις "
--"ρυθμίσεις."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Λατρεύεις αυτό το κομμάτι"
-@@ -4699,7 +4564,6 @@
- msgstr "Τα scrobbles σου: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Το όνομα χρήστη ή το συνθηματικό ήταν λανθασμένο."
- 
-@@ -4788,8 +4652,6 @@
- msgstr "εντός των τελευταίων"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/en_CA.po clementine-libre-1.0.1/src/translations/en_CA.po
---- clementine-1.0.1/src/translations/en_CA.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/en_CA.po	2012-05-29 15:05:50.036409383 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configure Shortcuts"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configure library..."
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1452,10 +1429,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1468,10 +1441,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Downloading Magnatune catalogue"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1622,10 +1591,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1807,10 +1772,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2073,10 +2034,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Include album art in the notification"
-@@ -2105,10 +2062,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2411,7 +2364,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2487,10 +2439,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Malformed response"
-@@ -2748,10 +2696,6 @@
- msgid "Not enough neighbors"
- msgstr "Not enough neighbours"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2886,7 +2830,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2993,10 +2936,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3027,7 +2966,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3044,10 +2982,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3438,18 +3372,6 @@
- msgid "Search Magnatune"
- msgstr "Search Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3774,30 +3696,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Start the playlist currently playing"
-@@ -3807,7 +3709,6 @@
- msgstr "Start transcoding"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3893,18 +3794,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4262,10 +4151,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4281,7 +4166,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4578,7 +4448,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4667,8 +4536,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/en_GB.po clementine-libre-1.0.1/src/translations/en_GB.po
---- clementine-1.0.1/src/translations/en_GB.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/en_GB.po	2012-05-29 15:06:41.279742544 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "A Spotify Premium account is required."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -315,7 +311,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "Always start playing"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "An error occurred copying the iTunes database from the device"
-@@ -821,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr "CUE sheet support"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancel"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Change cover art"
-@@ -1026,10 +1009,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configure library..."
-@@ -1047,10 +1026,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1460,10 +1435,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1476,10 +1447,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1630,10 +1597,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1815,10 +1778,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2081,10 +2040,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Include album art in the notification"
-@@ -2113,10 +2068,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2419,7 +2370,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2495,10 +2445,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Malformed response"
-@@ -2755,10 +2701,6 @@
- msgid "Not enough neighbors"
- msgstr "Not enough neighbours"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2893,7 +2835,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -3000,10 +2941,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3034,7 +2971,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3051,10 +2987,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3445,18 +3377,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3781,30 +3701,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Start the playlist currently playing"
-@@ -3814,7 +3714,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3900,18 +3799,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4269,10 +4156,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4288,7 +4171,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4512,20 +4394,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4585,7 +4453,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4674,8 +4541,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/en.po clementine-libre-1.0.1/src/translations/en.po
---- clementine-1.0.1/src/translations/en.po	2011-12-02 16:24:44.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/en.po	2012-05-29 15:04:56.353075508 -0400
-@@ -178,9 +178,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
- "There are different types of smart playlist that offer different ways of "
-@@ -408,11 +405,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
- 
-@@ -720,9 +712,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--msgid "Configure Spotify..."
--msgstr ""
--
- msgid "Configure library..."
- msgstr ""
- 
-@@ -735,9 +724,6 @@
- msgid "Connect device"
- msgstr ""
- 
--msgid "Connecting to Spotify"
--msgstr ""
--
- msgid "Constant bitrate"
- msgstr ""
- 
-@@ -1045,9 +1031,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- msgid "Downloading metadata"
- msgstr ""
- 
-@@ -1152,9 +1135,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #, qt-format
- msgid "Error loading %1"
- msgstr ""
-@@ -1280,9 +1260,6 @@
- msgid "Font size"
- msgstr ""
- 
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- msgid "Force mono encoding"
- msgstr ""
- 
-@@ -2409,15 +2386,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--msgid "Search Spotify"
--msgstr ""
--
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- msgid "Search for album covers..."
- msgstr ""
- 
-@@ -2647,18 +2615,6 @@
- msgid "Speex"
- msgstr ""
- 
--msgid "Spotify"
--msgstr ""
--
--msgid "Spotify login error"
--msgstr ""
--
--msgid "Spotify plugin"
--msgstr ""
--
--msgid "Spotify plugin not installed"
--msgstr ""
--
- msgid "Standard"
- msgstr ""
- 
-@@ -2674,9 +2630,6 @@
- msgid "Start typing in the search box above to find music on Grooveshark."
- msgstr ""
- 
--msgid "Start typing in the search box above to find music on Spotify."
--msgstr ""
--
- #, qt-format
- msgid "Starting %1"
- msgstr ""
-@@ -2731,15 +2684,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- msgid "Tabs on top"
- msgstr ""
- 
-@@ -3180,9 +3124,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
- msgid ""
- "You have selected a Premium-only audio type but do not have any account "
- "details entered"
-diff -rauN clementine-1.0.1/src/translations/eo.po clementine-libre-1.0.1/src/translations/eo.po
---- clementine-1.0.1/src/translations/eo.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/eo.po	2012-05-29 15:18:59.993076631 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Eraro okazis dum kopiado de la iTunes-datumbazo el aparato"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/es.po clementine-libre-1.0.1/src/translations/es.po
---- clementine-1.0.1/src/translations/es.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/es.po	2012-05-29 15:22:56.383076862 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Se requiere una cuenta Grooveshrak Anywhere"
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Se requiere una cuenta Premium de Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -319,7 +315,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -592,14 +587,6 @@
- msgid "Always start playing"
- msgstr "Siempre empezar a reproducir"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Un plugin adicional es requerido para usar Spotify en Clementine. ¿Te "
--"gustaría descargarlo e instalarlo ahora?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -829,10 +816,6 @@
- msgid "CUE sheet support"
- msgstr "Soporte de hoja CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancelar"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Cambiar portada"
-@@ -1046,10 +1029,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar accesos rápidos"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurar Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar colección..."
-@@ -1067,10 +1046,6 @@
- msgid "Connect device"
- msgstr "Conectar dispositivo"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connectando con Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Flujo de bits constante"
-@@ -1486,10 +1461,6 @@
- msgid "Download this album..."
- msgstr "Descargar este álbum..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Descargar..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Descargar el directorio de Icecast"
-@@ -1502,10 +1473,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Descargando el catálogo de Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Descargando el plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Descargando metadatos"
-@@ -1657,10 +1624,6 @@
- msgid "Error deleting songs"
- msgstr "Error al borrar canciones"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Error descargando el plugin Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1844,12 +1807,6 @@
- msgid "Font size"
- msgstr "Tamaño de letra"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Por razones de licenciamiento, para usar Spotify se necesita un complemento "
--"separado."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forzar la codificación en mono"
-@@ -2123,10 +2080,6 @@
- "En el modo dinámico las canciones nuevas se elegirán y añadirán a la lista "
- "de reproducción cada vez que termine una canción."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Bandeja de entrada"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incluir carátula en la notificación"
-@@ -2155,10 +2108,6 @@
- msgid "Insert..."
- msgstr "Insertar..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalado"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2463,7 +2412,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2539,10 +2487,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Perfil principal (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Hacer disponible la lista de reproducción fuera de línea"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Respuesta malformada"
-@@ -2803,10 +2747,6 @@
- msgid "Not enough neighbors"
- msgstr "No hay suficientes vecinos"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "No instalado"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "No ha iniciado sesión"
-@@ -2941,7 +2881,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Contraseña"
-@@ -3048,10 +2987,6 @@
- msgid "Playlists"
- msgstr "Listas de reproducción"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Estado del complemento:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3082,7 +3017,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferencias"
-@@ -3099,10 +3033,6 @@
- msgid "Preferred audio format"
- msgstr "Formato de audio preferido"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferido"
-@@ -3493,18 +3423,6 @@
- msgid "Search Magnatune"
- msgstr "Buscar en Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Buscar en Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Buscar en Spotify (abre una nueva pestaña)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Buscar en Spotify (abre una pestaña nueva)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Buscar en todas tus fuentes(libreria, servicios de internet, ...) "
-@@ -3830,30 +3748,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Error de inicio de sesión de Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Complemento de Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "El complemento de Spotify no está instalado"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Estándar"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Destacado"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Iniciar la lista de reproducción actualmente reproduciendose"
-@@ -3863,7 +3761,6 @@
- msgstr "Comenzar conversión"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3951,18 +3848,6 @@
- msgid "Switch provider"
- msgstr "Cambiar proveedor"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sincronizando bandeja de entrada de Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sincronizando lista de reproducción de Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sincronizando canciones destacadas de Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Pestañas en la parte superior"
-@@ -4341,10 +4226,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utilizar la configuración para proxy del sistema"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Usado"
-@@ -4360,7 +4241,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nombre de Usuario"
-@@ -4599,20 +4479,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "No tienes una cuenta Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "No tienes una cuenta Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Amas esta canción"
-@@ -4680,7 +4546,6 @@
- msgstr "Sus scrobbles: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Tu nombre de usuario o contraseña es incorrecta."
- 
-@@ -4769,8 +4634,6 @@
- msgstr "en los últimos"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/et.po clementine-libre-1.0.1/src/translations/et.po
---- clementine-1.0.1/src/translations/et.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/et.po	2012-05-29 15:46:09.829745009 -0400
-@@ -251,10 +251,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -310,7 +306,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -583,12 +578,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -814,10 +803,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Loobu"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1018,10 +1003,6 @@
- msgid "Configure Shortcuts"
- msgstr "Kiirklahvide seadistamine"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1039,10 +1020,6 @@
- msgid "Connect device"
- msgstr "Ühenda seade"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1452,10 +1429,6 @@
- msgid "Download this album..."
- msgstr "Lae see album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1468,10 +1441,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1622,10 +1591,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1807,10 +1772,6 @@
- msgid "Font size"
- msgstr "Kirja suurus"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2073,10 +2034,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2105,10 +2062,6 @@
- msgid "Insert..."
- msgstr "Lisa..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Paigaldatud"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2411,7 +2364,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2487,10 +2439,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Vigane vastus"
-@@ -2748,10 +2696,6 @@
- msgid "Not enough neighbors"
- msgstr "Pole piisavalt naabreid"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2886,7 +2830,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parool"
-@@ -2993,10 +2936,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3027,7 +2966,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Seadistused"
-@@ -3044,10 +2982,6 @@
- msgid "Preferred audio format"
- msgstr "Eelistatud heli vorming"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Eelistatud vorming"
-@@ -3438,18 +3372,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3774,30 +3696,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3807,7 +3709,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3893,18 +3794,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4262,10 +4151,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Kasutuses"
-@@ -4281,7 +4166,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Kasutajanimi"
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4578,7 +4448,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4667,8 +4536,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/eu.po clementine-libre-1.0.1/src/translations/eu.po
---- clementine-1.0.1/src/translations/eu.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/eu.po	2012-05-29 15:47:59.699745177 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/fa.po clementine-libre-1.0.1/src/translations/fa.po
---- clementine-1.0.1/src/translations/fa.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/fa.po	2012-05-29 15:57:55.966412407 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "حساب کاربری «Spotify Premium» مورد نیاز است."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -315,7 +311,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "همواره پخش را شروع کن"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"کلمنتاین به افزونهٔ  دیگری برای استفادهٔ اسپاتیفای نیاز دارد.  آیا می‌خواهید"
--"  این افزونه را  بارگیری و نصب نمایید؟"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "مشکلی هنگام  کپی‌کردن بانک اطلاعاتی آی‌تیون از دستگاه پیش آمد"
-@@ -821,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr "برگهٔ پشتیبانی CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "لغو"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "تغییر جلد هنری"
-@@ -1035,10 +1018,6 @@
- msgid "Configure Shortcuts"
- msgstr "پیکربندی میان‌برها"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "پیکربندی Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "پیکربندی کتابخانه..."
-@@ -1056,10 +1035,6 @@
- msgid "Connect device"
- msgstr "اتصال دستگاه"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "اتصال به Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "ضرباهنگ ثابت"
-@@ -1475,10 +1450,6 @@
- msgid "Download this album..."
- msgstr "بارگیری این آلبوم..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "بارگیری..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "بارگیری پوشهٔ Icecast"
-@@ -1491,10 +1462,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "بارگیری کاتالوگ Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "بارگیری افزونهٔ Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "بارگیری ابرداده"
-@@ -1645,10 +1612,6 @@
- msgid "Error deleting songs"
- msgstr "خطا در پاک کردن آهنگ‌ها"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "خطا در بارگیری افزونهٔ Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1830,10 +1793,6 @@
- msgid "Font size"
- msgstr "اندازهٔ قلم"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "به دلایل اجازه‌نامه، پشتیبانی اسپاتیفای در افزونه‌ای جداگانه است."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "رمزینهٔ مونو پخش کن"
-@@ -2104,10 +2063,6 @@
- "در حالت دینامیک پس از پایان هر آهنگ، قطعه‌های تازه انتخاب و به لیست‌پخش "
- "افزوده می‌شوند."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "صندوق ورودی"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "آلبوم هنری را در آگاهساز قرار بده"
-@@ -2136,10 +2091,6 @@
- msgid "Insert..."
- msgstr "قرار دادن..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "نصب شد"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "اینترنت"
-@@ -2442,7 +2393,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2518,10 +2468,6 @@
- msgid "Main profile (MAIN)"
- msgstr "مشخصات اصلی (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "لیست‌پخش را بیرون‌خط در دسترس بگذار"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "پاسخ ناهنجار"
-@@ -2780,10 +2726,6 @@
- msgid "Not enough neighbors"
- msgstr "بدون همسایهٔ کافی"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "نصب نشده"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2918,7 +2860,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "کلمهٔ عبور"
-@@ -3025,10 +2966,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "وضعیت افزونه"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "پاپ"
-@@ -3059,7 +2996,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "تنظیمات‌"
-@@ -3076,10 +3012,6 @@
- msgid "Preferred audio format"
- msgstr "فرمت صوتی ترجیحی"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "فرمت ترجیحی"
-@@ -3470,18 +3402,6 @@
- msgid "Search Magnatune"
- msgstr "جستجوی Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "جستجوی Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3806,30 +3726,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "خطای ورود به سیستم Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "افزونهٔ Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "افزونهٔ Spotify نصب نیست"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "استاندارد"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "ستاره‌دار"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "شروع لیست‌پخش در حال پخش"
-@@ -3839,7 +3739,6 @@
- msgstr "شروع ترانسکد"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3925,18 +3824,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "همگام‌سازی صندوق ورودی اسپاتیفای"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "همگام‌سازی لیست‌پخش اسپاتیفای"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "همگام‌سازی قطعه‌های ستاره‌دار اسپاتیفای"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "باریکه‌ها در بالا"
-@@ -4314,10 +4201,6 @@
- msgid "Use the system proxy settings"
- msgstr "بکاربردن تنظیمات پراکسی سیستم"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "استفاده‌شده"
-@@ -4333,7 +4216,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "شناسه"
-@@ -4568,20 +4450,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "عاشق این آهنگ هستید"
-@@ -4648,7 +4516,6 @@
- msgstr "برونکشی‌های شما: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4737,8 +4604,6 @@
- msgstr "در آخرین"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/fi.po clementine-libre-1.0.1/src/translations/fi.po
---- clementine-1.0.1/src/translations/fi.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/fi.po	2012-05-29 16:22:14.749747287 -0400
-@@ -250,10 +250,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere tili vaaditaan käyttöön."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotifyn Premium-tili vaaditaan."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -311,7 +307,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,14 +579,6 @@
- msgid "Always start playing"
- msgstr "Aloita aina toisto"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Spotifyn käyttö Clementinessä vaatii lisäosan. Haluatko ladata ja asentaa "
--"sen nyt?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "iTunes-tietokantaa laitteesta ladatessa tapahtui virhe"
-@@ -819,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr "CUE-tiedostojen tuki"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Peru"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Vaihda kansikuvaa"
-@@ -1032,10 +1015,6 @@
- msgid "Configure Shortcuts"
- msgstr "Pikanäppäinten asetukset..."
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Muokkaa Spotifya..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Kirjaston asetukset..."
-@@ -1053,10 +1032,6 @@
- msgid "Connect device"
- msgstr "Yhdistä laite"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Yhdistetään Spotifyyn"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Pysyvä bittinopeus"
-@@ -1468,10 +1443,6 @@
- msgid "Download this album..."
- msgstr "Lataa tämä levy..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Lataa..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Ladataan Icecast-hakemistoa"
-@@ -1484,10 +1455,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Ladataan Magnatune-luetteloa"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Ladataan Spotify-liitännäistä"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Noudetaan metadataa"
-@@ -1638,10 +1605,6 @@
- msgid "Error deleting songs"
- msgstr "Virhe kappaleita poistaessa"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Virhe ladatessa Spotify-liitännäistä"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1825,10 +1788,6 @@
- msgid "Font size"
- msgstr "Kirjasinkoko"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Lisenssisyistä Spotify-tuki on erillinen liitännäinen."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Pakota monokoodaus"
-@@ -2097,10 +2056,6 @@
- "Dynaamisessa tilassa uusia kappaleita valitaan ja lisätään soittolistaan "
- "joka kerta kun yksi kappale on soitettu."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Saapuneet"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Näytä kansikuva ilmoituksen yhteydessä"
-@@ -2129,10 +2084,6 @@
- msgid "Insert..."
- msgstr "Lisää..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Asennettu"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2435,7 +2386,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2511,10 +2461,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Oletusprofiili (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Virheellinen vastaus"
-@@ -2775,10 +2721,6 @@
- msgid "Not enough neighbors"
- msgstr "Ei tarpeeksi naapureita"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Ei asennettu"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Ei kirjautunut"
-@@ -2913,7 +2855,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Salasana"
-@@ -3020,10 +2961,6 @@
- msgid "Playlists"
- msgstr "Soittolistat"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Liitännäisen tila:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3054,7 +2991,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Asetukset"
-@@ -3071,10 +3007,6 @@
- msgid "Preferred audio format"
- msgstr "Ensisijainen äänimuoto"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Ensisijainen muoto"
-@@ -3465,18 +3397,6 @@
- msgid "Search Magnatune"
- msgstr "Etsi Magnatunesta"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Etsi Spotifysta"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Etsi Spotifysta (avaa uuden välilehden)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Etsi Spotifysta (avaa uuden välilehden)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Etsi kaikista lähteistä (kirjasto, internet, ...)"
-@@ -3801,30 +3721,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify-kirjautumisvirhe"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-liitännäinen"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify-liitännäistä ei ole asennettu"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Normaali"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3834,7 +3734,6 @@
- msgstr "Aloita muunnos"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3920,18 +3819,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synkronoi Spotify saapuneet"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synkronoi Spotify soittolistan"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synkronoi Spotify arvostellut kappaleet"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Välilehdet ylhäällä"
-@@ -4306,10 +4193,6 @@
- msgid "Use the system proxy settings"
- msgstr "Käytä järjestelmän välityspalvelinasetuksia"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Käytetty"
-@@ -4325,7 +4208,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Käyttäjätunnus"
-@@ -4562,20 +4444,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Sinulla ei ole Grooveshark Anywhere tiliä."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Sinulla ei ole Spotify Premium tiliä."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Tykkäät tästä kappaleesta"
-@@ -4635,7 +4503,6 @@
- msgstr "Lähetyksesi: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Käyttäjätunnus tai salasana oli virheellinen."
- 
-@@ -4724,8 +4591,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
- 
-diff -rauN clementine-1.0.1/src/translations/fr.po clementine-libre-1.0.1/src/translations/fr.po
---- clementine-1.0.1/src/translations/fr.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/fr.po	2012-05-29 16:25:03.779747446 -0400
-@@ -258,10 +258,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Un compte Grooveshark Anywhere est nécessaire."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Un compte Spotify Premium est nécessaire."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -323,7 +319,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -597,14 +592,6 @@
- msgid "Always start playing"
- msgstr "Toujours commencer à lire"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Un module externe est requis pour pouvoir utiliser Spotify. Voulez-vous le "
--"télécharger et l'installer maintenant ?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -838,10 +825,6 @@
- msgid "CUE sheet support"
- msgstr "Support des CUE sheet."
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Annuler"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Changer la couverture de l'album"
-@@ -1056,10 +1039,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurer les raccourcis clavier"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurer Spotify…"
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurer votre bibliothèque..."
-@@ -1077,10 +1056,6 @@
- msgid "Connect device"
- msgstr "Connexion du périphérique"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connexion à Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Débit constant"
-@@ -1496,10 +1471,6 @@
- msgid "Download this album..."
- msgstr "Télécharger cet album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Télécharger..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Téléchargement du catalogue d'Icecast"
-@@ -1512,10 +1483,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Téléchargement du catalogue Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Téléchargement du module Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Téléchargement des métadonnées"
-@@ -1671,10 +1638,6 @@
- msgid "Error deleting songs"
- msgstr "Erreur lors de la suppression des morceaux"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Erreur lors du téléchargement du module Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1858,12 +1821,6 @@
- msgid "Font size"
- msgstr "Taille de la police"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Pour des raisons de licence, le support de Spotify est dans un module "
--"séparé."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forcer l’encodage en mono"
-@@ -2138,10 +2095,6 @@
- "En mode dynamique, de nouvelles pistes seront choisies et ajoutées à la fin "
- "de la liste de lecture chaque fois qu'un morceau se terminera."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Boîte de réception"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inclure la pochette de l'abum dans la fenêtre de notification"
-@@ -2170,10 +2123,6 @@
- msgid "Insert..."
- msgstr "Insérer..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installé(e)(s)"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2481,7 +2430,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2557,10 +2505,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil principal (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Rendre la liste de lecture accessible hors ligne"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Réponse mal formatée"
-@@ -2822,10 +2766,6 @@
- msgid "Not enough neighbors"
- msgstr "Voisins insuffisants"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Non installé"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Non connecté"
-@@ -2960,7 +2900,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Mot de passe"
-@@ -3067,10 +3006,6 @@
- msgid "Playlists"
- msgstr "Listes de lecture"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "État du module externe :"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3101,7 +3036,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Préférences"
-@@ -3118,10 +3052,6 @@
- msgid "Preferred audio format"
- msgstr "Format audio préféré"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Débit préféré"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Format préféré"
-@@ -3512,18 +3442,6 @@
- msgid "Search Magnatune"
- msgstr "Recherche Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Recherche Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Recherche Spotify (ouvre un nouvel onglet)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Recherche Spotify (ouvre un nouvel onglet)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3851,30 +3769,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Erreur lors de la connexion à Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Module externe Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Le module externe de Spotify n'est pas installé"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Favoris"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Commencer la liste de lecture jouée actuellement"
-@@ -3884,7 +3782,6 @@
- msgstr "Démarrer transcodage"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3972,18 +3869,6 @@
- msgid "Switch provider"
- msgstr "Changer de service"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronisation de la boîte de réception Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronisation de la liste de lecture Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronisation des morceaux Spotify préférés"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Onglets au dessus"
-@@ -4369,10 +4254,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utiliser les paramètres du système pour le serveur mandataire"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Utilisé"
-@@ -4388,7 +4269,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nom d'utilisateur"
-@@ -4629,23 +4509,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Vous n'avez pas de compte Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Vous n'avez pas de compte Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe "
--"dans la fenêtre des préférences."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Vous aimez cette piste"
-@@ -4713,7 +4576,6 @@
- msgstr "Vos scrobbles : %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Votre nom d'utilisateur ou mot de passe est incorrect."
- 
-@@ -4802,8 +4664,6 @@
- msgstr "parmi les derniers"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/gl.po clementine-libre-1.0.1/src/translations/gl.po
---- clementine-1.0.1/src/translations/gl.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/gl.po	2012-05-29 16:27:07.409747570 -0400
-@@ -251,10 +251,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -310,7 +306,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -583,12 +578,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Aconteceu un erro copiando a base de datos de iTunes do dispositivo"
-@@ -814,10 +803,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1022,10 +1007,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar a biblioteca..."
-@@ -1043,10 +1024,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1456,10 +1433,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1472,10 +1445,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1625,10 +1594,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1810,10 +1775,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2076,10 +2037,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2108,10 +2065,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2415,7 +2368,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2491,10 +2443,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta mal formada"
-@@ -2751,10 +2699,6 @@
- msgid "Not enough neighbors"
- msgstr "Viciños insuficientes"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2889,7 +2833,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2996,10 +2939,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3030,7 +2969,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3047,10 +2985,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3441,18 +3375,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3777,30 +3699,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Reproducir a playlist actualmente reproducindo"
-@@ -3810,7 +3712,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3896,18 +3797,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4265,10 +4154,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4284,7 +4169,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4508,20 +4392,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4581,7 +4451,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4670,8 +4539,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/he.po clementine-libre-1.0.1/src/translations/he.po
---- clementine-1.0.1/src/translations/he.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/he.po	2012-05-29 16:33:23.043081344 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -313,7 +309,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,12 +581,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "ארעה שגיאה בהעתקת מסד הנתונים של iTunes מההתקן"
-@@ -817,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "שינוי עטיפת האלבום"
-@@ -1025,10 +1010,6 @@
- msgid "Configure Shortcuts"
- msgstr "הגדר קיצורי מקשים"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "הגדר את הספרייה..."
-@@ -1046,10 +1027,6 @@
- msgid "Connect device"
- msgstr "חבר התקן"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1464,10 +1441,6 @@
- msgid "Download this album..."
- msgstr "הורד את האלבום הזה..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "מוריד תיקיית Icecast"
-@@ -1480,10 +1453,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "מוריד את הקטלוג של Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1633,10 +1602,6 @@
- msgid "Error deleting songs"
- msgstr "שגיאה במחיקת שירים"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1818,10 +1783,6 @@
- msgid "Font size"
- msgstr "גודל הגופן"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2086,10 +2047,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "אומנות אלבום בתוך ההתראה"
-@@ -2118,10 +2075,6 @@
- msgid "Insert..."
- msgstr "הוספה..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "אינטרנט"
-@@ -2424,7 +2377,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2500,10 +2452,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "תגובה שגויה"
-@@ -2761,10 +2709,6 @@
- msgid "Not enough neighbors"
- msgstr "אין מספיק שכנים"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2899,7 +2843,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "סיסמא"
-@@ -3006,10 +2949,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "פופ"
-@@ -3040,7 +2979,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "מאפיינים"
-@@ -3057,10 +2995,6 @@
- msgid "Preferred audio format"
- msgstr "פורמט אודיו מועדף"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "פורמט מועדף"
-@@ -3451,18 +3385,6 @@
- msgid "Search Magnatune"
- msgstr "חיפוש ב־Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3787,30 +3709,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "התחל את רשימת־ההשמעה המתנגנת כעת"
-@@ -3820,7 +3722,6 @@
- msgstr "התחלת הקידוד"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3906,18 +3807,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "לשוניות למעלה"
-@@ -4280,10 +4169,6 @@
- msgid "Use the system proxy settings"
- msgstr "שימוש בהגדרות הפרוקסי של המערכת"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "בשימוש"
-@@ -4299,7 +4184,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "שם משתמש"
-@@ -4532,20 +4416,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "אתה אוהב את הרצועה הזו"
-@@ -4608,7 +4478,6 @@
- msgstr "ה-scrobbles שלך: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4697,8 +4566,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "קילו־סיביות לשניה"
- 
-diff -rauN clementine-1.0.1/src/translations/hi.po clementine-libre-1.0.1/src/translations/hi.po
---- clementine-1.0.1/src/translations/hi.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hi.po	2012-05-29 16:34:21.266414734 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/hr.po clementine-libre-1.0.1/src/translations/hr.po
---- clementine-1.0.1/src/translations/hr.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hr.po	2012-05-29 16:50:07.443081990 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify Premium račun je obvezan."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Uvijek započinji reprodukciju glazbe"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Dodatni dodatak je potreban za korištenje Spotify-a u Clementine-u. Želite "
--"li preuzeti dodatak i instalirati sada?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Pogreška je nastala tijekom kopiranja iTunes baze podataka sa uređaja"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Podrška za CUE listu"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Otkaži"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Promijenite omot albuma"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Podesi prečace"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Podesite Spotify ..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Podesi zbirku..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Spoji uređaj"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Spajanje Spotify-a"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstantna brzina prijenosa"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Preuzmi ovaj album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Preuzmi..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Preuzimanje Icecast direktorija"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Preuzimanje Magnatune kataloga"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Preuzimanje Spotify dodatka"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Preuzimanje metapodataka"
-@@ -1649,10 +1616,6 @@
- msgid "Error deleting songs"
- msgstr "Pogreška u brisanju pjesama"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "pogreška pri preuzimanju Spotify dodatka"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1834,10 +1797,6 @@
- msgid "Font size"
- msgstr "Veličina slova"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Zbog razloga licenciranja Spotify-a podrška je u posebnom dodatak."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forsiraj mono enkodiranje"
-@@ -2108,10 +2067,6 @@
- "U dinamičkom modu nove pjesme će biti izabrane i dodane u popis izvođenja "
- "svaki puta kada je pjesma odsvirana."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Pristigle poruke"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Prikaži omot albuma u obavijesti"
-@@ -2140,10 +2095,6 @@
- msgid "Insert..."
- msgstr "Umetni..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalirano"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2446,7 +2397,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2522,10 +2472,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Glavni profil (GLAVNI)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Učini popis izvođenja dostupnim kada je veza prekinuta"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Pogreška u odgovoru"
-@@ -2784,10 +2730,6 @@
- msgid "Not enough neighbors"
- msgstr "Nema dovoljno susjeda"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nije instalirano"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2922,7 +2864,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Lozinka"
-@@ -3029,10 +2970,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status dodatka:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3063,7 +3000,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Opcije"
-@@ -3080,10 +3016,6 @@
- msgid "Preferred audio format"
- msgstr "Željeni audio format"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Željeni format"
-@@ -3474,18 +3406,6 @@
- msgid "Search Magnatune"
- msgstr "Pretražite Magnatune stanice"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Pretražite Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Pretražite Spotify (otvori u novoj kartici)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Pretražite Spotify (otvori u novoj kartici)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3811,30 +3731,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify pogreška kod prijave"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify dodatak"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify dodatak nije instaliran"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standardno"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Sa zvjezdicom"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Pokrenite popis izvođenja koji se trenutno izvodi"
-@@ -3844,7 +3744,6 @@
- msgstr "Započni enkodiranje"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3930,18 +3829,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sinkronizacija Spotify ulaznog spremnika"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sinkroniziranje Spotify popisa izvođenja"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sinkronizacija Spotify pjesama označenim zvjezdicama"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Kartice pri vrhu"
-@@ -4318,10 +4205,6 @@
- msgid "Use the system proxy settings"
- msgstr "Koristite proxy postavke od sustava"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Iskorišteno"
-@@ -4337,7 +4220,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Korisničko ime"
-@@ -4572,20 +4454,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Sviđa vam se ova pjesma"
-@@ -4653,7 +4521,6 @@
- msgstr "Vaši scrobbles: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4742,8 +4609,6 @@
- msgstr "u posljednjih"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/hu.po clementine-libre-1.0.1/src/translations/hu.po
---- clementine-1.0.1/src/translations/hu.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hu.po	2012-05-29 16:50:46.463082538 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere fiók szükséges."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify prémium fiók szükséges"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Mindig indítja a lejátszást"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"A Spotify használatához külön beépülő szükséges. Szeretnéd most letölteni és"
--" telepíteni?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Hiba történt az iTunes adatbázis másolása közben az eszközről"
-@@ -823,10 +810,6 @@
- msgid "CUE sheet support"
- msgstr "CUE fájl támogatás"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Mégsem"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Albumborító módosítása"
-@@ -1042,10 +1025,6 @@
- msgid "Configure Shortcuts"
- msgstr "Billentyűkombinációk beállítása"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Spotify beállítása..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Zenetár beállítása..."
-@@ -1065,10 +1044,6 @@
- msgid "Connect device"
- msgstr "Eszköz csatlakoztatása"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Csatlakozás a Spotifyhoz"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Állandó bitráta"
-@@ -1484,10 +1459,6 @@
- msgid "Download this album..."
- msgstr "Album letöltése..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Letöltés…"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast könyvtár letöltése"
-@@ -1500,10 +1471,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune katalógus letöltése"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify beépülő letöltése"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Metaadat letöltése"
-@@ -1656,10 +1623,6 @@
- msgid "Error deleting songs"
- msgstr "Hiba történt a számok törlése közben"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Hiba a Spotify beépülő letöltése közben"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1842,12 +1805,6 @@
- msgid "Font size"
- msgstr "Betűméret"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Licencelési okok miatt a Spotify támogatást külön beépülőben kell "
--"telepíteni."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono kódolás kényszerítése"
-@@ -2117,10 +2074,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Beérkezett üzenetek"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Albumborító megjelenítése az értesítésben"
-@@ -2149,10 +2102,6 @@
- msgid "Insert..."
- msgstr "Beszúrás..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Telepítve"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2455,7 +2404,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2531,10 +2479,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Fő profil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Hibásan formázott válasz"
-@@ -2793,10 +2737,6 @@
- msgid "Not enough neighbors"
- msgstr "Nincs elég szomszédja"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nincs telepítve"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2931,7 +2871,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Jelszó"
-@@ -3038,10 +2977,6 @@
- msgid "Playlists"
- msgstr "Lejátszási lista"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Beépülő állapot:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3007,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Beállítások"
-@@ -3089,10 +3023,6 @@
- msgid "Preferred audio format"
- msgstr "Előnyben részesített audio formátum"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Előnyben részesített formátum"
-@@ -3483,18 +3413,6 @@
- msgid "Search Magnatune"
- msgstr "Keresés a Magnatuneon"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Keresés Spotifyon"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Keresés Spotifyon (új lapot nyit)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Keresés Spotifyon (új lapot nyit)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3822,30 +3740,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Hiba a Spotifyra való bejelentkezéskor"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify beépülő"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "A Spotify beépülő nincs telepítve"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Normál"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Kedvenc"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Az éppen lejátszott lista indítása"
-@@ -3855,7 +3753,6 @@
- msgstr "Átkódolás indítása"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3941,18 +3838,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Spotify üzenetek szinkronizálása"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Spotify lejátszási lista szinkronizálása"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Spotify csillagozott számok szinronizálása"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Lapfülek felül"
-@@ -4327,10 +4212,6 @@
- msgid "Use the system proxy settings"
- msgstr "A rendszer proxy beállításainak használata"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Használt"
-@@ -4346,7 +4227,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Felhasználónév"
-@@ -4580,20 +4460,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Kedveled ezt a számot"
-@@ -4660,7 +4526,6 @@
- msgstr "Scrobblejaid: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4749,8 +4614,6 @@
- msgstr "az utóbbi"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/hy.po clementine-libre-1.0.1/src/translations/hy.po
---- clementine-1.0.1/src/translations/hy.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hy.po	2012-05-29 16:51:35.523082336 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/ia.po clementine-libre-1.0.1/src/translations/ia.po
---- clementine-1.0.1/src/translations/ia.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ia.po	2012-05-29 16:52:43.266415554 -0400
-@@ -250,10 +250,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -309,7 +305,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -582,12 +577,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -813,10 +802,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1017,10 +1002,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1038,10 +1019,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1451,10 +1428,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1467,10 +1440,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1620,10 +1589,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1805,10 +1770,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2071,10 +2032,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2103,10 +2060,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2409,7 +2362,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2485,10 +2437,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2745,10 +2693,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2883,7 +2827,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2990,10 +2933,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3024,7 +2963,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3041,10 +2979,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3435,18 +3369,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3771,30 +3693,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3804,7 +3706,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3890,18 +3791,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4259,10 +4148,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4278,7 +4163,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4502,20 +4386,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4575,7 +4445,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4664,8 +4533,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/id.po clementine-libre-1.0.1/src/translations/id.po
---- clementine-1.0.1/src/translations/id.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/id.po	2012-05-29 16:55:43.939749412 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Sebuah akun Premium Spotify diperlukan."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,12 +584,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -820,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1024,10 +1009,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1045,10 +1026,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1458,10 +1435,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1474,10 +1447,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1627,10 +1596,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1812,10 +1777,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2078,10 +2039,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2110,10 +2067,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2416,7 +2369,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2492,10 +2444,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2752,10 +2700,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2890,7 +2834,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2997,10 +2940,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3031,7 +2970,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3048,10 +2986,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3442,18 +3376,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3778,30 +3700,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3811,7 +3713,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3897,18 +3798,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4266,10 +4155,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4285,7 +4170,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4509,20 +4393,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4582,7 +4452,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4671,8 +4540,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/is.po clementine-libre-1.0.1/src/translations/is.po
---- clementine-1.0.1/src/translations/is.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/is.po	2012-05-29 16:56:42.033082876 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr "Alltaf hefja spilun"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Villa kom upp við afritun iTunes gagnagrunns af tæki"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/it.po clementine-libre-1.0.1/src/translations/it.po
---- clementine-1.0.1/src/translations/it.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/it.po	2012-05-29 16:57:27.279749567 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "È richiesto un account Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "È richiesto un account Premium di Spotify"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -318,7 +314,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Inizia sempre la riproduzione"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Un plugin aggiuntivo è richiesto per utilizzare Spotify in Clementine. Vuoi "
--"scaricarlo e installarlo subito?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -829,10 +816,6 @@
- msgid "CUE sheet support"
- msgstr "Supporto CUE sheet"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Annulla"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Cambia copertina"
-@@ -1044,10 +1027,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configura scorciatoie"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configura Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configura raccolta..."
-@@ -1065,10 +1044,6 @@
- msgid "Connect device"
- msgstr "Connetti dispositivo"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connessione a Spotify in corso"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Bitrate costante"
-@@ -1484,10 +1459,6 @@
- msgid "Download this album..."
- msgstr "Scarica questo album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Scarica..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Scaricamento directory Icecast in corso"
-@@ -1500,10 +1471,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Scaricamento catalogo Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Scarica il plugin di Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Scaricamento metadati in corso"
-@@ -1658,10 +1625,6 @@
- msgid "Error deleting songs"
- msgstr "Errore durante l'eliminazione dei brani"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Errore di scaricamento del plugin di Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1844,11 +1807,6 @@
- msgid "Font size"
- msgstr "Dimensione del carattere"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Per motivi di licenza, il supporto di Spotify è in un plugin separato."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forza codifica mono"
-@@ -2123,10 +2081,6 @@
- "Nella modalità dinamica le nuove tracce saranno scelte e aggiunte alla "
- "scaletta al termine di ogni brano."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "In arrivo"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Includi copertina nella notifica"
-@@ -2155,10 +2109,6 @@
- msgid "Insert..."
- msgstr "Inserisci..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installati"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2465,7 +2415,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2541,10 +2490,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profilo principale (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Rendi la scaletta disponibile non in linea"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Risposta non corretta"
-@@ -2804,10 +2749,6 @@
- msgid "Not enough neighbors"
- msgstr "Vicini non sufficienti"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Non installati"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Accesso non effettuato"
-@@ -2942,7 +2883,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Password"
-@@ -3049,10 +2989,6 @@
- msgid "Playlists"
- msgstr "Scalette"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stato del plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3083,7 +3019,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferenze"
-@@ -3100,10 +3035,6 @@
- msgid "Preferred audio format"
- msgstr "Formato audio preferito"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate preferito"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferito"
-@@ -3494,18 +3425,6 @@
- msgid "Search Magnatune"
- msgstr "Cerca in Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Cerca in Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Cerca in Spotify (apre una nuova scheda)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Cerca in Spotify (apre una nuova scheda)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Cerca in tutte le fonti (raccolta, servizi internet, ...)"
-@@ -3831,30 +3750,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Errore di accesso a Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin di Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Plugin di Spotify non installato"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Preferiti"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Avvia la scaletta attualmente in riproduzione"
-@@ -3864,7 +3763,6 @@
- msgstr "Avvia transcodifica"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3952,18 +3850,6 @@
- msgid "Switch provider"
- msgstr "Cambia fornitore"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sincronizzazione inbox di Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sincronizzazione scaletta di Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sincronizzazione tracce preferite di Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Schede in alto"
-@@ -4351,10 +4237,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utilizza le impostazioni di sistema del proxy"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Usa la normalizzazione del volume"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Utilizzato"
-@@ -4370,7 +4252,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nome utente"
-@@ -4607,22 +4488,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Non hai un account Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Non hai un account Premium Spotify."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Ti sei disconnesso da Spotify, reinserisci la password nella finestra "
--"Impostazioni."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Ti sei disconnesso da Spotify, reinserisci la password."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Ti piace questa traccia"
-@@ -4690,7 +4555,6 @@
- msgstr "I tuoi scrobble: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Nome utente o password non corretta."
- 
-@@ -4779,8 +4643,6 @@
- msgstr "negli ultimi"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/ja.po clementine-libre-1.0.1/src/translations/ja.po
---- clementine-1.0.1/src/translations/ja.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ja.po	2012-05-29 16:58:23.063082909 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere のアカウントが必要です。"
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify のプレミアムアカウントが必要です。"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -313,7 +309,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,12 +581,6 @@
- msgid "Always start playing"
- msgstr "常に再生を開始する"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr "Clementine で Spotify を利用するには追加のプラグインが必要です。今すぐダウンロードしてインストールしますか？"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "デバイスからの iTunes データベースのコピー エラーです"
-@@ -817,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "キャンセル"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "カバー アートの変更"
-@@ -1023,10 +1008,6 @@
- msgid "Configure Shortcuts"
- msgstr "ショートカットの構成"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "ライブラリの構成..."
-@@ -1044,10 +1025,6 @@
- msgid "Connect device"
- msgstr "デバイスの接続"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1461,10 +1438,6 @@
- msgid "Download this album..."
- msgstr "このアルバムをダウンロード..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast ディレクトリのダウンロード"
-@@ -1477,10 +1450,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune カタログのダウンロード"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify のプラグインをダウンロード中"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "メタデータをダウンロード中"
-@@ -1630,10 +1599,6 @@
- msgid "Error deleting songs"
- msgstr "曲の削除エラー"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1815,10 +1780,6 @@
- msgid "Font size"
- msgstr "フォント サイズ"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2081,10 +2042,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "通知にアルバム アートを含める"
-@@ -2113,10 +2070,6 @@
- msgid "Insert..."
- msgstr "挿入..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "インターネット"
-@@ -2419,7 +2372,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2495,10 +2447,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "不正な応答です"
-@@ -2755,10 +2703,6 @@
- msgid "Not enough neighbors"
- msgstr "ご近所さんが足りません"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2893,7 +2837,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "パスワード"
-@@ -3000,10 +2943,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3034,7 +2973,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "環境設定"
-@@ -3051,10 +2989,6 @@
- msgid "Preferred audio format"
- msgstr "優先するオーディオ形式"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "優先する形式"
-@@ -3445,18 +3379,6 @@
- msgid "Search Magnatune"
- msgstr "Magnatune の検索"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3781,30 +3703,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "現在再生中のプレイリストを開始する"
-@@ -3814,7 +3716,6 @@
- msgstr "トランスコードの開始"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3900,18 +3801,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "タブを上に配置"
-@@ -4271,10 +4160,6 @@
- msgid "Use the system proxy settings"
- msgstr "システムのプロキシ設定を使用する"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "使用中"
-@@ -4290,7 +4175,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "ユーザー名"
-@@ -4520,20 +4404,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "このトラックは Love されています"
-@@ -4595,7 +4465,6 @@
- msgstr "Scrobble 回数: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "ユーザネームまたはパスワードが間違っています。"
- 
-@@ -4684,8 +4553,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/ka.po clementine-libre-1.0.1/src/translations/ka.po
---- clementine-1.0.1/src/translations/ka.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ka.po	2012-05-29 16:59:47.116416380 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify-ის Premium ანგარიში აუცილებელია."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr "ყოველთვის დაიწყე დაკვრა"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "შეცდომა მოწყობილობიდან iTunes-ის მონაცემთა ბაზის კოპირებისას"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr "CUE sheet-ის მხარდაჭერა"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "გაუქმება"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "ალბომის ყდის შეცვლა"
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/kk.po clementine-libre-1.0.1/src/translations/kk.po
---- clementine-1.0.1/src/translations/kk.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/kk.po	2012-05-29 17:17:47.953084141 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/ko.po clementine-libre-1.0.1/src/translations/ko.po
---- clementine-1.0.1/src/translations/ko.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ko.po	2012-05-29 17:20:24.469750963 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify 프리미엄 계정이 필요합니다."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/lt.po clementine-libre-1.0.1/src/translations/lt.po
---- clementine-1.0.1/src/translations/lt.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/lt.po	2012-05-29 17:21:09.749751142 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Reikalingas mokamas Spotify vartotojas"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -313,7 +309,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,14 +581,6 @@
- msgid "Always start playing"
- msgstr "Visada pradėti grojant"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Kad naudotumėte Spotify Clementine grotuve, jums reikia papildomo išplėtimo."
--" Ar parsiųsti ir įdiegti jį dabar?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Iškilo klaida kopijuojant iTunes duomenų bazę iš įrenginio"
-@@ -819,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr "\"CUE sheet\" palaikymas"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Atšaukti"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Keisti viršelio paveikslėlį"
-@@ -1032,10 +1015,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigūruoti sparčiuosius klavišus"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfigūruoti Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfigūruoti fonoteką..."
-@@ -1053,10 +1032,6 @@
- msgid "Connect device"
- msgstr "Prijungti įrenginį"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Jungiamasi prie Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Pastovus bitų dažnis"
-@@ -1472,10 +1447,6 @@
- msgid "Download this album..."
- msgstr "Atsisiunčiamas šis albumas"
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Atsisiųsti..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Atsiunčiamas Icecast aplankas"
-@@ -1488,10 +1459,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Atsiunčiamas  Magnatune katalogas"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Siunčiamas Spotify plėtinys"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Atsiunčiami metaduomenys"
-@@ -1643,10 +1610,6 @@
- msgid "Error deleting songs"
- msgstr "Klaida trinant dainas"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Klaida siunčiant Spotify plėtinį"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1828,12 +1791,6 @@
- msgid "Font size"
- msgstr "Šrifto dydis"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Dėl licencijavimo priežasčių Spotify palaikymas yra įjungiamas per atskirą "
--"plėtinį."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Įjungti tik mono kodavimą"
-@@ -2104,10 +2061,6 @@
- "Dinamiškame režime nauji kūriniais bus parinkti ir pridėti į grojaraštį "
- "kaskart, kai dabar grojamas kūrinys baigsis."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Gautieji"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Rodyti albumo paveikslus pranešime"
-@@ -2136,10 +2089,6 @@
- msgid "Insert..."
- msgstr "Įterpti..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Įdiegta"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internetas"
-@@ -2444,7 +2393,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2520,10 +2468,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Pagrindinis profilis"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Padaryti šį grojaraštį prieinamą atsijungus"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Netinkamas atsakymas"
-@@ -2781,10 +2725,6 @@
- msgid "Not enough neighbors"
- msgstr "Nepakanka kaimynų"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Neįdiegta"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2919,7 +2859,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Slaptažodis"
-@@ -3026,10 +2965,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Plėtinio būklė:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3060,7 +2995,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Nustatymai"
-@@ -3078,10 +3012,6 @@
- msgid "Preferred audio format"
- msgstr "Pageidaujamas audio formatas"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Pageidaujamas formatas"
-@@ -3472,18 +3402,6 @@
- msgid "Search Magnatune"
- msgstr "Ieškoti Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Ieškoti Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Ieškoti Spotify (atveria naują kortelę)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Ieškoti Spotify (atveria naują kortelę)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3808,30 +3726,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify prisijungimo klaida"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify plėtinys"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify plėtinys neįdiegtas"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standartinis"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Su žvaigždute"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Pradėti grajaraštį nuo dabar grojančio"
-@@ -3841,7 +3739,6 @@
- msgstr "Perkoduoti"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3927,18 +3824,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Atnaujinama Spotify dėžutė"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Atnaujinama Spotify grojaraštis"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Atnaujinama Spotify pažymėti kūriniai"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Kortelės viršuje"
-@@ -4312,10 +4197,6 @@
- msgid "Use the system proxy settings"
- msgstr "Naudoti sistemos tarpinio serverio nustatymus"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Panaudota"
-@@ -4331,7 +4212,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Naudotojo vardas"
-@@ -4565,20 +4445,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Jūs mylite šį takelį"
-@@ -4645,7 +4511,6 @@
- msgstr "Jūsų pateikta informacija: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4734,8 +4599,6 @@
- msgstr "per paskutines"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/lv.po clementine-libre-1.0.1/src/translations/lv.po
---- clementine-1.0.1/src/translations/lv.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/lv.po	2012-05-29 17:21:57.143084399 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Nepieciešams Spotify Premium konts."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -315,7 +311,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "Vienmēr sākt atskaņošanu"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Lai lietotu Spotify, nepieciešams papildus spraudnis. Vai jūs vēlaties to "
--"lejupielādēt un instalēt?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Kļūda kopējot iTunes datubāzi no ierīces"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Atcelt"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Mainīt vāka attēlu"
-@@ -1035,10 +1018,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigurēt īsceļus"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfigurēt Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfigurēt bibliotēku..."
-@@ -1056,10 +1035,6 @@
- msgid "Connect device"
- msgstr "Pieslēgt ierīci"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Pieslēdzos Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstants bitreits"
-@@ -1475,10 +1450,6 @@
- msgid "Download this album..."
- msgstr "Lejupielādēt šo albumu..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Lejupielādēt..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Lejupielādē Icecast mapi"
-@@ -1491,10 +1462,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Lejupielādē Magnatude katalogu"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Lejupielādē Spotify spraudni"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Lejupielādē metadatus"
-@@ -1646,10 +1613,6 @@
- msgid "Error deleting songs"
- msgstr "Kļūda dzēšot dziesmas"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Kļūda lejupielādējot Spotify spraudni"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1832,10 +1795,6 @@
- msgid "Font size"
- msgstr "Fonta izmērs"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Licencēšanas nolūkā Spotify atbalsts pieejams kā atsevišķs spraudnis"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forsēt mono kodēšanu"
-@@ -2102,10 +2061,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Ienākošie"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Iekļaut vāku attēlus paziņojumos"
-@@ -2134,10 +2089,6 @@
- msgid "Insert..."
- msgstr "Ievietot..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Uzstādīts"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internets"
-@@ -2441,7 +2392,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2517,10 +2467,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Galvenais profils (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Izkropļota atbilde"
-@@ -2778,10 +2724,6 @@
- msgid "Not enough neighbors"
- msgstr "Nepietiek kaimiņu"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nav uzstādīta"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2916,7 +2858,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parole"
-@@ -3023,10 +2964,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Spraudņa statuss:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Popmūzika"
-@@ -3057,7 +2994,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Uzstādījumi"
-@@ -3074,10 +3010,6 @@
- msgid "Preferred audio format"
- msgstr "Vēlamais audio formāts"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Vēlamais formāts"
-@@ -3468,18 +3400,6 @@
- msgid "Search Magnatune"
- msgstr "Meklēt Magnatude"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Meklēt Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Meklēt Spotify (tiks atvērta jauna cilne)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Meklēt Spotify (tiks atvērta jauna cilne)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3804,30 +3724,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify pieslēgšanās kļūda"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify spraudnis"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify spraudnis nav uzstādīts"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standarts"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Novērtēts ar zvaigzni"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Sākt pašreiz atskaņoto dziesmu listi"
-@@ -3837,7 +3737,6 @@
- msgstr "Sākt kodēšanu"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3923,18 +3822,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Cilnes pa virsu"
-@@ -4304,10 +4191,6 @@
- msgid "Use the system proxy settings"
- msgstr "Lietot sistēmas starpniekservera uzstādījumus"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Izmantots"
-@@ -4323,7 +4206,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Lietotājvārds"
-@@ -4554,20 +4436,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Jūs mīlat šo dziesmu"
-@@ -4630,7 +4498,6 @@
- msgstr "Jūsu skrobli: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4719,8 +4586,6 @@
- msgstr "pēdējās"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
- 
-diff -rauN clementine-1.0.1/src/translations/mr.po clementine-libre-1.0.1/src/translations/mr.po
---- clementine-1.0.1/src/translations/mr.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/mr.po	2012-05-29 17:22:45.193084728 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/ms.po clementine-libre-1.0.1/src/translations/ms.po
---- clementine-1.0.1/src/translations/ms.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ms.po	2012-05-29 17:23:27.779751138 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Akaun Spotify Premium diperlukan"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -313,7 +309,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,14 +581,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Satu plugin tambahan diperlukan untuk menggunakan Spotify dalam Clementine. "
--"Inginkah anda memuat turun dan memasangnya sekarang?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Satu ralat berlaku semasa menyalin pangkalan data iTunes dari peranti"
-@@ -819,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Batal"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Ubahkan seni kulit muka"
-@@ -1030,10 +1013,6 @@
- msgid "Configure Shortcuts"
- msgstr "Tetapkan Pintasan"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1051,10 +1030,6 @@
- msgid "Connect device"
- msgstr "Sambung peranti"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Menyambung ke Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Kadar bit malar"
-@@ -1464,10 +1439,6 @@
- msgid "Download this album..."
- msgstr "Muat turun album ini..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Muat Turun..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Memuat turun direktori Icecast"
-@@ -1480,10 +1451,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Memuat turun katalog Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Memuat turun plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Memuatturun metadata"
-@@ -1633,10 +1600,6 @@
- msgid "Error deleting songs"
- msgstr "Ralat memadam lagu-lagu"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Ralat memuat turun plugin Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1822,11 +1785,6 @@
- msgid "Font size"
- msgstr "Saiz fon"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Atas sebab-sebab perlesenan sokongan Spotify berada dalam plugin berasingan."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2099,10 +2057,6 @@
- "Dalam mod dinamik trek-trek baru akan dipilih dan ditambah ke senarai main "
- "setiap kali lagu selesai."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Peti Masuk"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Sertakan hasil seni album dalam pemberitahuan"
-@@ -2131,10 +2085,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Terpasang"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2437,7 +2387,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2513,10 +2462,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Buatkan senarai main tersedia di luar talian"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2775,10 +2720,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Tidak dipasang"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2913,7 +2854,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Kata laluan"
-@@ -3020,10 +2960,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3054,7 +2990,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3071,10 +3006,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3465,18 +3396,6 @@
- msgid "Search Magnatune"
- msgstr "Cari Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Cari Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Cari Spotify (buka tab baru)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Cari Spotify (buka tab baru)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3801,30 +3720,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Ralat log masuk Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Plugin Spotify tidak dipasang"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Piawai"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Disukai"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3834,7 +3733,6 @@
- msgstr "Mulakan transkod"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3920,18 +3818,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Tab-tab di atas"
-@@ -4308,10 +4194,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4327,7 +4209,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nama pengguna"
-@@ -4555,20 +4436,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Anda suka trek ini"
-@@ -4628,7 +4495,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4717,8 +4583,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/nb.po clementine-libre-1.0.1/src/translations/nb.po
---- clementine-1.0.1/src/translations/nb.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/nb.po	2012-05-29 17:24:06.539751459 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Til dette trenger du en Grooveshark Anywhere-konto."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Til dette trenger du en Spotify Premium-konto."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Alltid start avspilling"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Det trengs et programtillegg for å bruke Spotify i Clementine. Ønsker du å "
--"laste ned og installere den nå?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "En feil oppsto under kopiering av iTunes databasen fra enheten"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Støtte for CUE-filer"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Avbryt"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Endre omslagsbilde"
-@@ -1038,10 +1021,6 @@
- msgid "Configure Shortcuts"
- msgstr "Oppsett av hurtigtaster"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfigurere Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Sett opp bibliotek..."
-@@ -1059,10 +1038,6 @@
- msgid "Connect device"
- msgstr "Koble til enhet"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Kobler til Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstant bitrate"
-@@ -1478,10 +1453,6 @@
- msgid "Download this album..."
- msgstr "Last ned dette albumet..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Last ned..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Laster ned Icecast-katalogen"
-@@ -1494,10 +1465,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Laster ned Magnatune-katalogen"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Laster ned Spotify-modul"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Laster ned metadata"
-@@ -1648,10 +1615,6 @@
- msgid "Error deleting songs"
- msgstr "Kunne ikke slette sanger"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Kunne ikke laste ned Spotify-modul"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1833,10 +1796,6 @@
- msgid "Font size"
- msgstr "Skriftstørrelse"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Av lisenshensyn er Spotify-støtte en egen innstikksmodul."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Tving monolyd-koding"
-@@ -2108,10 +2067,6 @@
- "I dynamisk modus vil nye spor bli valgt og lagt til spillelista hver gang en"
- " sang tar slutt."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Innboks"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inkludér cover i meldingen"
-@@ -2140,10 +2095,6 @@
- msgid "Insert..."
- msgstr "Sett inn..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installert"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internett"
-@@ -2446,7 +2397,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2522,10 +2472,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hovedprofil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Gjør spillelista tilgjengelig online"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Ugyldig svar"
-@@ -2782,10 +2728,6 @@
- msgid "Not enough neighbors"
- msgstr "Ikke nok naboer"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Ikke installert"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Ikke pålogget"
-@@ -2920,7 +2862,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Passord"
-@@ -3027,10 +2968,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Modulens status:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3061,7 +2998,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Innstillinger"
-@@ -3078,10 +3014,6 @@
- msgid "Preferred audio format"
- msgstr "Foretrukket lydformat"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Foretrukket format"
-@@ -3472,18 +3404,6 @@
- msgid "Search Magnatune"
- msgstr "Søk i Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Søk i Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Søk i Spotify (åpner en ny flik)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Søk i Spotify (åpner en ny flik...)"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3808,30 +3728,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Kunne ikke logge på Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-modul"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Har ikke installert Spotify-modul"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Har stjerner"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Begynn på spillelista nå"
-@@ -3841,7 +3741,6 @@
- msgstr "Start koding"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3927,18 +3826,6 @@
- msgid "Switch provider"
- msgstr "Switch-leverandør"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synkroniserer Spotify-innboksen"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synkroniserer Spotify-spillelista"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synkroniserer spor med sterner mot Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Fliker på toppen"
-@@ -4310,10 +4197,6 @@
- msgid "Use the system proxy settings"
- msgstr "Bruk standard proxy-innstillinger"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Brukt"
-@@ -4329,7 +4212,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Brukernavn"
-@@ -4565,20 +4447,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Du har ikke noen Grooveshark Anywhare-konto."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Du har ikke noen Spotify Premium-konto."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Du elsker dette sporet"
-@@ -4644,7 +4512,6 @@
- msgstr "Dine delte lyttevaner (\"scrobbles\"): %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Feil med din brukerinformasjon"
- 
-@@ -4733,8 +4600,6 @@
- msgstr "i de siste"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/nl.po clementine-libre-1.0.1/src/translations/nl.po
---- clementine-1.0.1/src/translations/nl.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/nl.po	2012-05-29 17:24:47.773084596 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Een Grooveshark Anywhere account is vereist."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Een Spotify Premium account is vereist."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -317,7 +313,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -592,14 +587,6 @@
- msgid "Always start playing"
- msgstr "Altijd afspelen"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Een extra plug-in is vereist om Spotify in Clementine te gebruiken. Wilt u "
--"deze nu downloaden en installeren?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -829,10 +816,6 @@
- msgid "CUE sheet support"
- msgstr "CUE-sheet ondersteuning"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Annuleren"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Albumhoes wijzigen"
-@@ -1047,10 +1030,6 @@
- msgid "Configure Shortcuts"
- msgstr "Sneltoetsen instellen"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configureer Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Bibliotheek configureren…"
-@@ -1068,10 +1047,6 @@
- msgid "Connect device"
- msgstr "Apparaat verbinden"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Met Spotify verbinden"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Constante bitrate"
-@@ -1487,10 +1462,6 @@
- msgid "Download this album..."
- msgstr "Dit album downloaden…"
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Downloaden…"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast-map aan het downloaden"
-@@ -1503,10 +1474,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune-catalogus downloaden"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "De Spotify plug-in aan het downloaden"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Metadata ophalen"
-@@ -1660,10 +1627,6 @@
- msgid "Error deleting songs"
- msgstr "Fout tijdens het verwijderen van de nummers"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Fout bij het downloaden van de Spotify plug-in"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1846,12 +1809,6 @@
- msgid "Font size"
- msgstr "Tekengrootte"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Vanwege licenties is Spotify-ondersteuning alleen via een plug-in "
--"beschikbaar."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono-encodering forceren"
-@@ -2126,10 +2083,6 @@
- "In ‘dynamische modus’ worden nieuwe nummers gekozen en aan de afspeellijst "
- "toegevoegd op het moment dat een nummer eindigt."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Inbox"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Albumhoes in de notificatie weergeven"
-@@ -2158,10 +2111,6 @@
- msgid "Insert..."
- msgstr "Invoegen…"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Geïnstalleerd"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2466,7 +2415,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2542,10 +2490,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Normaal profiel (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Afspeellijst offline beschikbaar maken"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Foutieve respons"
-@@ -2806,10 +2750,6 @@
- msgid "Not enough neighbors"
- msgstr "Onvoldoende buren"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Niet geïnstalleerd"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Niet ingelogd"
-@@ -2944,7 +2884,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Wachtwoord"
-@@ -3051,10 +2990,6 @@
- msgid "Playlists"
- msgstr "Afspeellijsten"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Plug-in status:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3085,7 +3020,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Voorkeuren"
-@@ -3103,10 +3037,6 @@
- msgid "Preferred audio format"
- msgstr "Audioformaat-voorkeur"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate voorkeur"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Voorkeursformaat"
-@@ -3497,18 +3427,6 @@
- msgid "Search Magnatune"
- msgstr "Zoeken op Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Doorzoek Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Doorzoek Spotify (open nieuw tabblad)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Doorzoek Spotify (open nieuw tabblad)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Doorzoek al uw bronnen (bibliotheek, internet bronnen, ...)"
-@@ -3833,30 +3751,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify inlogfout"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify plug-in"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify plug-in niet geïnstalleerd"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standaard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Met ster"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Momenteel spelende afspeellijst starten"
-@@ -3866,7 +3764,6 @@
- msgstr "Converteren starten"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Typ in de zoekbalk hierboven om naar muziek te zoeken op %1."
-@@ -3952,18 +3849,6 @@
- msgid "Switch provider"
- msgstr "Switch provider"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Spotify inbox synchroniseren"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Spotify afspeellijst synchroniseren"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Favoriete Spotify-nummers synchroniseren"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Tabs bovenaan"
-@@ -4350,10 +4235,6 @@
- msgid "Use the system proxy settings"
- msgstr "Globale proxy-instellingen gebruiken"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Volume normalisatie gebruiken"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Gebruikt"
-@@ -4369,7 +4250,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Gebruikersnaam"
-@@ -4607,22 +4487,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "U heeft geen Grooveshark Anywhere account."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "U heeft geen Spotify Premium account."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"U bent uitgelogd bij Spotify, voer in het voorkeuren venster nogmaals uw "
--"wachtwoord in."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "U bent uitgelogd bij Spotify, voer nogmaals uw wachtwoord in."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "U vindt dit nummer mooi"
-@@ -4690,7 +4554,6 @@
- msgstr "Uw scrobbles: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Uw gebruikersnaam of wachtwoord is niet correct."
- 
-@@ -4779,8 +4642,6 @@
- msgstr "in de laatste"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/oc.po clementine-libre-1.0.1/src/translations/oc.po
---- clementine-1.0.1/src/translations/oc.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/oc.po	2012-05-29 17:25:36.176417975 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar los acorchis de clavièr"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Sus Internet"
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/pa.po clementine-libre-1.0.1/src/translations/pa.po
---- clementine-1.0.1/src/translations/pa.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pa.po	2012-05-29 17:26:32.036418109 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/pl.po clementine-libre-1.0.1/src/translations/pl.po
---- clementine-1.0.1/src/translations/pl.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pl.po	2012-05-29 17:27:25.839751300 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Potrzebne jest konto Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Musisz posiadać konto Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -318,7 +314,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Odtwarzaj automatycznie"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Aby korzystać ze Spotify przy użyciu Clementine, wymagany jest dodatkowy "
--"skrypt. Czy chcesz go teraz pobrać?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Wystąpił błąd podczas kopiowania bazy danych iTunes z urządzenia"
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "obsługa arkuszy CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Anuluj"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Zmień okładkę"
-@@ -1041,10 +1024,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfiguracja skrótów klawiszowych"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfiguracja Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfiguruj bibliotekę..."
-@@ -1062,10 +1041,6 @@
- msgid "Connect device"
- msgstr "Podłącz urządzenie"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Połącz z Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Stały bitrate"
-@@ -1481,10 +1456,6 @@
- msgid "Download this album..."
- msgstr "Pobierz ten album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Pobierz..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Pobieranie katalogu Icecast"
-@@ -1497,10 +1468,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Pobieranie katalogu Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Pobierz plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Pobieranie metadanych"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Błąd przy usuwaniu utworów"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Plugin Spotify - nieudane pobieranie"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,11 +1800,6 @@
- msgid "Font size"
- msgstr "Rozmiar czcionki"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Ze względów licencyjnych Spotify obsługiwany jest przez oddzielny plugin"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Wymuś kodowanie mono"
-@@ -2114,10 +2072,6 @@
- "W trybie dynamicznym nowe utwory będą wybierane i dodawane do playlisty za "
- "każdym razem gdy skończy się odtwarzanie bieżącego utworu."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Skrzynka odbiorcza"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Dołącz okładkę albumu"
-@@ -2146,10 +2100,6 @@
- msgid "Insert..."
- msgstr "Wstaw..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Zainstalowano"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2404,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2479,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil główny (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Uczyń playlistę dostępną offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Nieprawidłowa odpowiedź"
-@@ -2793,10 +2738,6 @@
- msgid "Not enough neighbors"
- msgstr "Za mało sąsiadów"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nie zainstalowano"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2931,7 +2872,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Hasło"
-@@ -3038,10 +2978,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stan wtyczki:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3008,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Ustawienia"
-@@ -3090,10 +3025,6 @@
- msgid "Preferred audio format"
- msgstr "Preferowany format audio"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Preferowany format"
-@@ -3484,18 +3415,6 @@
- msgid "Search Magnatune"
- msgstr "Przeszukaj Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Szukaj w Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Szukaj w Spotify (nowa karta)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Szukaj w Spotify (nowa karta)"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3821,30 +3740,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Nieudane logowanie do Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Wtyczka Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Nie zainstalowano pluginu Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standardowy"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Oznaczone gwiazdką"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Rozpocznij aktualnie odtwarzaną listę"
-@@ -3854,7 +3753,6 @@
- msgstr "Rozpocznij transkodowanie"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3940,18 +3838,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronizowanie skrzynki Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronizowanie playlisty Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronizowanie utworów oznaczonych gwiazdką na Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Zakładki na górze"
-@@ -4326,10 +4212,6 @@
- msgid "Use the system proxy settings"
- msgstr "Użyj systemowych ustawień proxy"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Użyto"
-@@ -4345,7 +4227,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Użytkownik"
-@@ -4579,20 +4460,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Kochasz tę ścieżkę"
-@@ -4662,7 +4529,6 @@
- msgstr "Przesłane utwory: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4751,8 +4617,6 @@
- msgstr "w ostatnich"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/pt_BR.po clementine-libre-1.0.1/src/translations/pt_BR.po
---- clementine-1.0.1/src/translations/pt_BR.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pt_BR.po	2012-05-29 17:30:29.606418269 -0400
-@@ -251,10 +251,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "É necessária uma conta Premium Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -313,7 +309,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,14 +581,6 @@
- msgid "Always start playing"
- msgstr "Sempre começar tocando"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Um plugin adicional é necessário para usar Spotify no Clementine. Gostaria "
--"de fazer o download e instalá-lo agora?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -821,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr "Suporte a lista CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancelar"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Alterar capa"
-@@ -1036,10 +1019,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar atalhos"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurar Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar biblioteca"
-@@ -1057,10 +1036,6 @@
- msgid "Connect device"
- msgstr "Conectar dispositivo"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Conectando ao Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Taxa de bits constante"
-@@ -1476,10 +1451,6 @@
- msgid "Download this album..."
- msgstr "Baixar este álbum..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Baixar..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Baixando diretório Icecast"
-@@ -1492,10 +1463,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Baixando catálogo da Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Baixando plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Baixando metadados"
-@@ -1647,10 +1614,6 @@
- msgid "Error deleting songs"
- msgstr "Erro ao apagar músicas"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Erro ao baixar o plugin Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1834,12 +1797,6 @@
- msgid "Font size"
- msgstr "Tamanho da fonte"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Por motivos de licenciamento, o suporte ao Spotify está em um plugin "
--"separado."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forçar codificação em mono"
-@@ -2113,10 +2070,6 @@
- "No modo dinâmico, novas faixas serão escolhidas e adicionadas à lista de "
- "reprodução toda a vez que uma musica terminar."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Caixa de entrada"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incluir capa do álbum na notificação"
-@@ -2145,10 +2098,6 @@
- msgid "Insert..."
- msgstr "Inserir..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalado"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2453,7 +2402,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2529,10 +2477,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Meu perfil (PRINCIPAL)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Tornar lista de reprodução disponível offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta inválida"
-@@ -2793,10 +2737,6 @@
- msgid "Not enough neighbors"
- msgstr "Sem vizinhos o bastante"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Não instalado"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2931,7 +2871,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Senha"
-@@ -3038,10 +2977,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status do plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3007,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferências"
-@@ -3089,10 +3023,6 @@
- msgid "Preferred audio format"
- msgstr "Formato de áudio preferido"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferido"
-@@ -3483,18 +3413,6 @@
- msgid "Search Magnatune"
- msgstr "Pesquisar Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Procurar Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Procurar Spotify (abre um novo aba)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Procurar Spotify (abre um novo aba)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3819,30 +3737,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Erro ao conectar no Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin Spofity"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Plugin Spofity não instalado"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Padrão"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Favoritos"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Iniciar a lista que está em execução"
-@@ -3852,7 +3750,6 @@
- msgstr "Começar transcodificação"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3938,18 +3835,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sincronizando caixa de entrada do Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sincronizando listas de reprodução do Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sincronizando faixas favoritas do Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Mostrar abas no topo"
-@@ -4329,10 +4214,6 @@
- msgid "Use the system proxy settings"
- msgstr "Usar configurações de proxy do sistema"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Usado"
-@@ -4348,7 +4229,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nome de usuário"
-@@ -4582,20 +4462,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Você adora essa faixa"
-@@ -4661,7 +4527,6 @@
- msgstr "Seus scrobbles: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4750,8 +4615,6 @@
- msgstr "nos últimos"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/pt.po clementine-libre-1.0.1/src/translations/pt.po
---- clementine-1.0.1/src/translations/pt.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pt.po	2012-05-29 17:28:15.776418125 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Requer uma conta Grooveshark Anywhere"
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Requer uma conta Spotify Premium"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Iniciar sempre a reprodução"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Necessita de um \"plug-in\" para utilizar o Spotify no Clementine. Pretende "
--"transferir e instalar o \"plug-in\"?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -823,10 +810,6 @@
- msgid "CUE sheet support"
- msgstr "Suporte a ficheiros CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancelar"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Alterar capa do álbum"
-@@ -1040,10 +1023,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar atalhos"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurar Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar coleção..."
-@@ -1061,10 +1040,6 @@
- msgid "Connect device"
- msgstr "Ligar dispositivo"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Ligar ao Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Taxa de dados constante"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Transferir este álbum..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Transferir..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "A transferir o diretório Icecast"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "A transferir o catálogo Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "A transferir o \"plug-in\" Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "A transferir dados"
-@@ -1652,10 +1619,6 @@
- msgid "Error deleting songs"
- msgstr "Erro ao eliminar faixas"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Erro ao transferir o \"plug-in\""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,12 +1800,6 @@
- msgid "Font size"
- msgstr "Tamanho de letra"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Devido à sua licença, o \"plug-in\" do Spotify é disponibilizado "
--"separadamente"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forçar codificação mono"
-@@ -2114,10 +2071,6 @@
- "No modo dinâmico, as faixas são escolhidas e adicionadas à lista de "
- "reprodução assim que uma música termine"
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Caixa de entrada"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incluir capa do álbum na notificação"
-@@ -2146,10 +2099,6 @@
- msgid "Insert..."
- msgstr "Inserir..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalado"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2403,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2478,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Perfil principal (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Tornar lista de reprodução disponível localmente"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta inválida"
-@@ -2793,10 +2737,6 @@
- msgid "Not enough neighbors"
- msgstr "Vizinhos insuficientes"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Não instalado"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Sessão não iniciada"
-@@ -2931,7 +2871,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Senha"
-@@ -3038,10 +2977,6 @@
- msgid "Playlists"
- msgstr "Listas de reprodução"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Estado:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3007,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferências"
-@@ -3089,10 +3023,6 @@
- msgid "Preferred audio format"
- msgstr "Formato áudio preferido"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Taxa de dados preferencial"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferido"
-@@ -3483,18 +3413,6 @@
- msgid "Search Magnatune"
- msgstr "Pesquisar no Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Procurar no Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Procurar no Spotify (abre um novo separador)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Procurar no Spotify (abre um novo separador)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Procurar em todas as fontes (coleção, internet, ...)"
-@@ -3820,30 +3738,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Erro de autenticação Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "\"Plug-in\" Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "\"Plug-in\" Spotify não instalado"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Padrão"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Com estrela"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Iniciar lista de reprodução atual"
-@@ -3853,7 +3751,6 @@
- msgstr "Iniciar conversão"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Escreva algo na caixa de procura para descobrir músicas no %1"
-@@ -3939,18 +3836,6 @@
- msgid "Switch provider"
- msgstr "Trocar fornecedor"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "A sincronizar caixa de entrada Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "A sincronizar lista de reprodução Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "A sincronizar faixas Spotify assinaladas"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Separadores no topo"
-@@ -4333,10 +4218,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utilizar definições do sistema"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Utilizar normalização de volume"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Utilizado"
-@@ -4352,7 +4233,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Utilizador"
-@@ -4589,22 +4469,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Você não tem uma conta Grooveshark Anywhere"
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Você não tem uma conta Spotify Premium"
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Terminou a sessão no Spotify. Reintroduza a sua senha na caixa de diálogo de"
--" definições"
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Terminou a sessão no Spotify. Reintroduza a sua senha"
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Você gosta desta faixa"
-@@ -4671,7 +4535,6 @@
- msgstr "Os seus envios: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Utilizador e/ou senha inválida"
- 
-@@ -4760,8 +4623,6 @@
- msgstr "no(s) último(s)"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/ro.po clementine-libre-1.0.1/src/translations/ro.po
---- clementine-1.0.1/src/translations/ro.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ro.po	2012-05-29 17:31:07.169751658 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Este necesar un cont Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Este necesar un cont Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -317,7 +313,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -590,14 +585,6 @@
- msgid "Always start playing"
- msgstr "Începe redarea întotdeauna"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Este necesara activarea unui plugin pentru utlizarea Spotify in Clementine. "
--"Doriți să fie descărcat si instalat acum?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "A apărut o eroare de copiere a bazei de date iTunes de pe dispozitiv"
-@@ -823,10 +810,6 @@
- msgid "CUE sheet support"
- msgstr "CUE placa suport"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Anulare"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Schimbă imaginea coperții"
-@@ -1037,10 +1020,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurează scurtături"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurare Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurează biblioteca..."
-@@ -1058,10 +1037,6 @@
- msgid "Connect device"
- msgstr "Conectează un dispozitiv"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Se conectează la Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Rată de biți constantă"
-@@ -1477,10 +1452,6 @@
- msgid "Download this album..."
- msgstr "Descarcă acest album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Descărcare..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Descărcare dosarul Icecast"
-@@ -1493,10 +1464,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Descărcare catalog Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Se descarcă pluginul Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Descărcare metadata"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Eroare ștergere melodii"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Eroare la descărcarea pluginului Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1838,11 +1801,6 @@
- msgid "Font size"
- msgstr "Dimensiunea fontului"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Din motive de licență, suportul pentru Spotify este într-un plugin separat."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forțează codarea mono"
-@@ -2114,10 +2072,6 @@
- "În modul dinamic, melodii noi vor fi alese și adăugate la lista de redare de"
- " fiecare dată când se termină o melodie."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Includeți album de artă în notificare"
-@@ -2146,10 +2100,6 @@
- msgid "Insert..."
- msgstr "Introduce..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalat"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2452,7 +2402,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2528,10 +2477,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil principal (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2788,10 +2733,6 @@
- msgid "Not enough neighbors"
- msgstr "Nu sunt destui vecini"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Neinstalat"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2926,7 +2867,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parolă"
-@@ -3033,10 +2973,6 @@
- msgid "Playlists"
- msgstr "Liste de redare"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3067,7 +3003,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferinţe"
-@@ -3084,10 +3019,6 @@
- msgid "Preferred audio format"
- msgstr "Format audio preferat"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Rată de biți preferată"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Format preferat"
-@@ -3478,18 +3409,6 @@
- msgid "Search Magnatune"
- msgstr "Caută în Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Caută în Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Caută în Spotify (deschide o filă nouă)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Caută în Spotify (deschide o filă nouă)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3814,30 +3733,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Eroare la logarea în Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Pluginul Spotify nu este instalat"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Cu steluță"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3847,7 +3746,6 @@
- msgstr "Începe transcodare"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3933,18 +3831,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "File deasupra"
-@@ -4304,10 +4190,6 @@
- msgid "Use the system proxy settings"
- msgstr "Folosește setările de proxy ale sistemului"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4323,7 +4205,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nume de utilizator"
-@@ -4549,20 +4430,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Nu aveți un cont Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4622,7 +4489,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Parola sau numele de utilizator au fost incorecte."
- 
-@@ -4711,8 +4577,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/ru.po clementine-libre-1.0.1/src/translations/ru.po
---- clementine-1.0.1/src/translations/ru.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ru.po	2012-05-29 17:31:44.913085063 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Требуется учётная запись Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Требуется Premium аккаунт Spotify"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -320,7 +316,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -593,14 +588,6 @@
- msgid "Always start playing"
- msgstr "Всегда начинать воспроизведение"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Требуется дополнительный модуль для использования Spotify в Clementine. "
--"Скачать и установить его?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Произошла ошибка при загрузке данных iTunes с устройства"
-@@ -826,10 +813,6 @@
- msgid "CUE sheet support"
- msgstr "Поддержка файлов разметки CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Отмена"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Выберите обложку"
-@@ -1045,10 +1028,6 @@
- msgid "Configure Shortcuts"
- msgstr "Комбинации клавиш"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Настройка Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Настроить коллекцию..."
-@@ -1066,10 +1045,6 @@
- msgid "Connect device"
- msgstr "Подсоединение устройства"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Подключение к Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Постоянный битрейт"
-@@ -1485,10 +1460,6 @@
- msgid "Download this album..."
- msgstr "Загрузить этот альбом"
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Загрузить..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Загружаем директорию Icecast"
-@@ -1501,10 +1472,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Скачать каталог Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Загрузка модуля Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Загрузка метаданных"
-@@ -1658,10 +1625,6 @@
- msgid "Error deleting songs"
- msgstr "Ошибка удаления композиций"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Ошибка загрузки модуля Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1845,12 +1808,6 @@
- msgid "Font size"
- msgstr "Размер шрифта"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"По лицензионным соображениям поддержка Spotify реализована в виде отдельного"
--" плагина"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Принудительное кодирование в моно"
-@@ -2122,10 +2079,6 @@
- "В динамическом режиме новые треки выбираются и добавляются в список "
- "воспроизведения каждый раз, когда заканчивается очередная песня."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Входящие"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Показывать обложку альбома в уведомлении"
-@@ -2154,10 +2107,6 @@
- msgid "Insert..."
- msgstr "Вставить..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Установлено"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Интернет"
-@@ -2462,7 +2411,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2538,10 +2486,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Основной профиль (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Сделать плейлист доступным оффлайн"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Неправильный ответ"
-@@ -2800,10 +2744,6 @@
- msgid "Not enough neighbors"
- msgstr "Недостаточно соседей"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Не установлено"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Не был выполнен логин"
-@@ -2938,7 +2878,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Пароль"
-@@ -3045,10 +2984,6 @@
- msgid "Playlists"
- msgstr "Списки воспроизведения"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Статус модуля:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3079,7 +3014,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Настройки"
-@@ -3096,10 +3030,6 @@
- msgid "Preferred audio format"
- msgstr "Предпочитаемый аудио формат"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Предпочитаемый битрейт"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Предпочитаемый формат"
-@@ -3490,18 +3420,6 @@
- msgid "Search Magnatune"
- msgstr "Искать на Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Поиск на Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Поиск на Spotify (открывается в новой вкладке)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Поиск на Spotify (в новой вкладке)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Искать во всех источниках (библиотеке, интернет сервисах, ...)"
-@@ -3827,30 +3745,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Ошибка имени пользователя Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Модуль Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Модуль Spotify не установлен"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Стандартный"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Оцененные"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Запустить список воспроизведения проигрываемый в данный момент"
-@@ -3860,7 +3758,6 @@
- msgstr "Начать перекодирование"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Наберите начальные буквы наименования песни чтобы начать поиск в %1"
-@@ -3946,18 +3843,6 @@
- msgid "Switch provider"
- msgstr "Выбрать другой источник"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Синхронизация входящих Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Синхронизация плейлистов Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Синхронизация рейтингованных треков Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Вкладки вверху"
-@@ -4336,10 +4221,6 @@
- msgid "Use the system proxy settings"
- msgstr "Использовать системные настройки прокси"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Использовать выравнивание громкости"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Использовано"
-@@ -4355,7 +4236,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Имя пользователя"
-@@ -4591,23 +4471,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "У вас нет учетной записи Grooveshark Anywhere"
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "У вас нет учетной записи Spotify Premium"
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Подключение к сервису  Spotify было разорвано,  введите ваш пароль ещё раз в"
--" диалоге Настройки."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--"Подключение к сервису  Spotify было разорвано,  введите ваш пароль ещё раз."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Вам нравится эта композиция"
-@@ -4675,7 +4538,6 @@
- msgstr "Ваш скробблинг: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Имя пользователя или пароль неправильные."
- 
-@@ -4764,8 +4626,6 @@
- msgstr "в последние"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "кбит/с"
- 
-diff -rauN clementine-1.0.1/src/translations/sk.po clementine-libre-1.0.1/src/translations/sk.po
---- clementine-1.0.1/src/translations/sk.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sk.po	2012-05-29 17:32:30.349751863 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Je vyžadovaný Grooveshark Anywhere účet."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Je vyžadovaný prémium účet na Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -314,7 +310,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -587,14 +582,6 @@
- msgid "Always start playing"
- msgstr "Hneď začne hrať"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Aby sa dalo Spotify využiť v Clementine, je vyžadovaný ďalší plugin. Chcete "
--"ho teraz stiahnuť a nainštalovať?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Nastala chyba pri kopírovaní iTunes databázy zo zariadenia"
-@@ -820,10 +807,6 @@
- msgid "CUE sheet support"
- msgstr "podpora CUE zoznamu"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Zrušiť"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Zmeniť obal albumu"
-@@ -1034,10 +1017,6 @@
- msgid "Configure Shortcuts"
- msgstr "Klávesové skratky"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Nastaviť Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Nastaviť zbierku..."
-@@ -1055,10 +1034,6 @@
- msgid "Connect device"
- msgstr "Pripojiť zariadenie"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Pripájanie k Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konštantný dátový tok"
-@@ -1474,10 +1449,6 @@
- msgid "Download this album..."
- msgstr "Stiahnuť tento album..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Stiahnuť..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Sťahuje sa Icecast priečinok"
-@@ -1490,10 +1461,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Sťahuje sa Magnatune katalóg"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Sťahuje sa Spotify plugin"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Sťahujú sa metadáta"
-@@ -1648,10 +1615,6 @@
- msgid "Error deleting songs"
- msgstr "Chyba pri vymazávaní piesní"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Chyba pri sťahovaní Spotify pluginu."
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1834,10 +1797,6 @@
- msgid "Font size"
- msgstr "Veľkosť písma"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Kvôli licenčným dôvodom je podpora Spotify v oddelenom plugine."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Vynútiť mono enkódovanie"
-@@ -2109,10 +2068,6 @@
- "V dynamickom režime budú nové skladby vybraté a pridané do playlistu "
- "zakaždým keď skončí pieseň."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Doručené"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Zahrnúť obal do upozornenia"
-@@ -2141,10 +2096,6 @@
- msgid "Insert..."
- msgstr "Vložiť..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Nainštalované"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2447,7 +2398,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2523,10 +2473,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hlavný profil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Urobiť playlist dostupný offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Poškodená odpoveď"
-@@ -2785,10 +2731,6 @@
- msgid "Not enough neighbors"
- msgstr "Nedostatok susedov"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nenainštalované"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Nieprihlásený"
-@@ -2923,7 +2865,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Heslo"
-@@ -3030,10 +2971,6 @@
- msgid "Playlists"
- msgstr "Playlisty"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stav pluginu:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3064,7 +3001,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Nastavenia"
-@@ -3081,10 +3017,6 @@
- msgid "Preferred audio format"
- msgstr "Preferovaný formát zvuku"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Preferovaný dátový tok"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Preferovaný formát"
-@@ -3475,18 +3407,6 @@
- msgid "Search Magnatune"
- msgstr "Hľadať na Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Hľadať v Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Hľadať v Spotify (otvorí novú kartu)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Hľadať v Spotify (otvorí novú kartu)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3812,30 +3732,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Chyba pri prihlasovaní na Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify plugin"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify plugin nieje nainštalovaný"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Štandardný"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "S hviezdičkou"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Začať playlist práve prehrávanou"
-@@ -3845,7 +3745,6 @@
- msgstr "Začať transkódovanie"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3932,18 +3831,6 @@
- msgid "Switch provider"
- msgstr "Zmeniť poskytovateľa"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronizuje sa Spotify schránka"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronizuje sa Spotify playlist"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronizujú sa skladby ohviezdičkované na Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Karty na vrchu"
-@@ -4325,10 +4212,6 @@
- msgid "Use the system proxy settings"
- msgstr "Použiť systémové nastavenia proxy"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Použiť normalizáciu hlasitosti"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Použitých"
-@@ -4344,7 +4227,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Meno používateľa"
-@@ -4580,22 +4462,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Nemáte Grooveshark Anywhere účet."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Nemáte Spotify prémium účet."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Boli ste odhlásení zo Spotify, prosím, zadajte heslo znovu v dialógu "
--"Nastavenia."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Boli ste odhlásený zo Spotify, prosím znovu zadajte heslo."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Milujete túto pieseň"
-@@ -4663,7 +4529,6 @@
- msgstr "Skroblujete: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Vaše meno používateľa alebo heslo bolo nesprávne."
- 
-@@ -4752,8 +4617,6 @@
- msgstr "za posledných"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/sl.po clementine-libre-1.0.1/src/translations/sl.po
---- clementine-1.0.1/src/translations/sl.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sl.po	2012-05-29 17:41:04.549752271 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Zahtevan je račun Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -314,7 +310,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -587,14 +582,6 @@
- msgid "Always start playing"
- msgstr "Vedno začni s predvajanjem"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Da lahko uporabite Spotify v Clementine, potrebujete dodaten vstavek. Ga "
--"želite prejeti in namestiti zdaj?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Podpora predlogam CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Prekliči"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Spremeni ovitek albuma"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Nastavi bližnjice"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Nastavi Spotify ..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Nastavi knjižnico ..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Priklopi napravo"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Povezovanje na Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Stalna bitna hitrost"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Prejmi ta album ..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Prejmi ..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Prejemanje imenika Icecast"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Prejemanje kataloga Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Prejemanje vstavka Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Prejemanje metapodatkov"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Napaka pri brisanju skladb"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Napaka med prejemanjem vstavka Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1836,10 +1799,6 @@
- msgid "Font size"
- msgstr "Velikost pisave"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Zaradi licence je podpora Spotify v ločenem vstavku."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Vsili mono kodiranje"
-@@ -2111,10 +2070,6 @@
- "V dinamičnem načinu bodo nove skladbe izbrane in dodane na seznam "
- "predvajanja vsakič, ko se prejšnja skladba konča."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Prejeto"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Vključi ovitek albuma v obvestilo"
-@@ -2143,10 +2098,6 @@
- msgid "Insert..."
- msgstr "Vstavi ..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Nameščeno"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Medmrežje"
-@@ -2449,7 +2400,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2525,10 +2475,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Glavni profil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Seznam predvajanja naj bo na voljo tudi brez povezave"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Nepravilno oblikovan odziv"
-@@ -2787,10 +2733,6 @@
- msgid "Not enough neighbors"
- msgstr "Ni dovolj sosedov"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Ni nameščeno"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2925,7 +2867,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Geslo"
-@@ -3032,10 +2973,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stanje vstavka:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3066,7 +3003,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Možnosti"
-@@ -3083,10 +3019,6 @@
- msgid "Preferred audio format"
- msgstr "Prednostna vrsta zvoka"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Prednostna vrsta"
-@@ -3477,18 +3409,6 @@
- msgid "Search Magnatune"
- msgstr "Išči na Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Išči po Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Išči po Spotify (odpre nov zavihek)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Išči po Spotify (odpre nov zavihek) ..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3814,30 +3734,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Napaka med prijavo na Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Vstavek Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Vstavek Spotify ni nameščen"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Običajno"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Z zvezdico"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Predvajaj skladbo, ki je označena v predvajalnem seznamu"
-@@ -3847,7 +3747,6 @@
- msgstr "Začni s prekodiranjem"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3933,18 +3832,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Usklajevanje mape Spotify - prejeto"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Usklajevanje seznama predvajanja Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Usklajevanje označenih skladb v Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Zavihki na vrhu"
-@@ -4322,10 +4209,6 @@
- msgid "Use the system proxy settings"
- msgstr "Uporabi nastavitve posredniškega strežnika sistema"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Uporabljeno"
-@@ -4341,7 +4224,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Uporabniško ime"
-@@ -4575,20 +4457,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "To je vaša priljubljena skladba"
-@@ -4655,7 +4523,6 @@
- msgstr "Vaši seznami predvajanih skladb: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4744,8 +4611,6 @@
- msgstr "v zadnjih"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
- 
-diff -rauN clementine-1.0.1/src/translations/sr@latin.po clementine-libre-1.0.1/src/translations/sr@latin.po
---- clementine-1.0.1/src/translations/sr@latin.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sr@latin.po	2012-05-29 17:42:43.256419021 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4663,8 +4532,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/sr.po clementine-libre-1.0.1/src/translations/sr.po
---- clementine-1.0.1/src/translations/sr.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sr.po	2012-05-29 17:41:46.463085756 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Потребан је Spotify Premium налог"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -311,7 +307,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,14 +579,6 @@
- msgid "Always start playing"
- msgstr "Увек почни да свираш"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Додатак је потребан да би се користио Spotify у Клементини. Да ли желиш да "
--"га преузмеш и одмах уградиш?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Дошло је до грешке услед копирања базе података iTunes из уређаја"
-@@ -817,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr "CUE подршка листа"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Otkaži"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Промени слику насловне"
-@@ -1030,10 +1013,6 @@
- msgid "Configure Shortcuts"
- msgstr "Подеси пречице"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Подеси Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Подеси библиотеку"
-@@ -1051,10 +1030,6 @@
- msgid "Connect device"
- msgstr "Повежи уређај"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Повежи се на Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Константан битни проток"
-@@ -1470,10 +1445,6 @@
- msgid "Download this album..."
- msgstr "Preuzmi ovaj albm"
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Preuzmi..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Преузимање Icecast директоријума"
-@@ -1486,10 +1457,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Преузми Магнатјунов каталог"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Преузимање Spotify додатка"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Преузимање метаподатака"
-@@ -1641,10 +1608,6 @@
- msgid "Error deleting songs"
- msgstr "Грешка при брисању песама"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Грешка преузимања Spotify додатка"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1828,10 +1791,6 @@
- msgid "Font size"
- msgstr "Veličina fonta"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Због лиценцираниг разлога Spotify подршка је на посебном додатку."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Присили моно енкодирање"
-@@ -2102,10 +2061,6 @@
- "У промењивом режиму нове нумере ће бити изабране и додате листи сваки пут "
- "кад се песма заврши."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Сандуче"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Укључи омоте албума у обавештења"
-@@ -2134,10 +2089,6 @@
- msgid "Insert..."
- msgstr "Убаци..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalirano"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Интернет"
-@@ -2441,7 +2392,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2517,10 +2467,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Главни налог (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Направи листу доступну ван мреже"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Лош одговор"
-@@ -2778,10 +2724,6 @@
- msgid "Not enough neighbors"
- msgstr "Нема довољно комшија"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Није уграђен"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2916,7 +2858,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Лозинка"
-@@ -3023,10 +2964,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Статус додатка:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3057,7 +2994,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Поставке"
-@@ -3074,10 +3010,6 @@
- msgid "Preferred audio format"
- msgstr "Пожељни формат звука"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Жељени формат"
-@@ -3468,18 +3400,6 @@
- msgid "Search Magnatune"
- msgstr "Претражи Магнатјун"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Потражи Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Потражи Spotify (отвара нову картицу)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Потражи Spotify (отвара нову картицу)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3804,30 +3724,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify грешка пријављивања"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify додатак"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify додатак није уграђен"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Стандард"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Звездицом"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Почни листу тренутно пуштаним"
-@@ -3837,7 +3737,6 @@
- msgstr "Започни транскодирање"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3923,18 +3822,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Усаглашавање Spotify сандучета"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Усаглашавање Spotify листе"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Усаглашавање Spotify оцењених нумера"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Картице на врх"
-@@ -4313,10 +4200,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "искоришћено"
-@@ -4332,7 +4215,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Корисничко име"
-@@ -4560,20 +4442,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4633,7 +4501,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4722,8 +4589,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
- 
-diff -rauN clementine-1.0.1/src/translations/sv.po clementine-libre-1.0.1/src/translations/sv.po
---- clementine-1.0.1/src/translations/sv.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sv.po	2012-05-29 17:43:39.719752433 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Ett Grooveshark Anywhere konto krävs."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Kräver ett Spotify Premium-konto."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -316,7 +312,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Starta alltid att spela"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Ett ytterligare insticksprogram krävs för att använda Spotify i Clementine. "
--"Vill du ladda ner och installera det nu?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Ett fel uppstod vid kopiering av iTunes-databasen från enheten"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Stöd för CUE-filer"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Avbryt"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Ändra omslag"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigurera snabbtangenter"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Anpassa Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfigurera biblioteket..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Anslut enhet"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Ansluter till Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstant bithastighet"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Ladda ner det här albumet ..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Ladda ner..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Ladda ner Icecast-katalog"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Hämtar katalog från Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Laddar ner Spotify-insticket"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Hämtar metadata"
-@@ -1650,10 +1617,6 @@
- msgid "Error deleting songs"
- msgstr "Fel vid borttagning av låtar"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Fel vid hämtning av Spotify-insticket"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1835,10 +1798,6 @@
- msgid "Font size"
- msgstr "Typsnittsstorlek"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Av licensskäl finns Spotify-stöd i ett separat insticksprogram."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Tvinga enkanalskodning"
-@@ -2109,10 +2068,6 @@
- "I dynamiskt läge kommer nya spår väljas och läggas till i spellistan varje "
- "gång en låt tar slut."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Inkorg"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inkludera albumomslag i notifieringen"
-@@ -2141,10 +2096,6 @@
- msgid "Insert..."
- msgstr "Infoga..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installerad"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2447,7 +2398,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2523,10 +2473,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Huvudprofil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Gör spellista tillgänglig offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Felformaterat svar"
-@@ -2784,10 +2730,6 @@
- msgid "Not enough neighbors"
- msgstr "Inte tillräckligt med grannar"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Inte installerad"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2922,7 +2864,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Lösenord"
-@@ -3029,10 +2970,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Instickstatus:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3063,7 +3000,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Inställningar"
-@@ -3080,10 +3016,6 @@
- msgid "Preferred audio format"
- msgstr "Önskat ljudformat"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Önskat format"
-@@ -3474,18 +3406,6 @@
- msgid "Search Magnatune"
- msgstr "Sök i Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Sök på Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Sök på Spotify (öppnar en ny flik)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Sök på Spotify (öppnar en ny flik)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3810,30 +3730,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Fel vid inloggning på Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-insticksprogram"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify-insticksprogrammet är inte installerat"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Stjärnmärkta"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Starta spellistan som spelas för närvarande"
-@@ -3843,7 +3743,6 @@
- msgstr "Starta omkodning"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3929,18 +3828,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synkroniserar Spotify-inkorg"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synkroniserar Spotify-spellista"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synkroniserar stjärnmärkta spår i Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Flikar längst upp"
-@@ -4321,10 +4208,6 @@
- msgid "Use the system proxy settings"
- msgstr "Använd systemets proxy inställningar"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Använd"
-@@ -4340,7 +4223,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Användarnamn"
-@@ -4574,20 +4456,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Du älskar detta spår"
-@@ -4655,7 +4523,6 @@
- msgstr "Dina skrobblingar: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4744,8 +4611,6 @@
- msgstr "de senaste"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/translations.pot clementine-libre-1.0.1/src/translations/translations.pot
---- clementine-1.0.1/src/translations/translations.pot	2012-01-22 07:43:21.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/translations.pot	2012-05-29 17:45:10.709752528 -0400
-@@ -239,10 +239,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -297,7 +293,6 @@
- 
- #: ../mingw/src/ui_groovesharksettingspage.h:113
- #: ../mingw/src/ui_magnatunesettingspage.h:155
--#: ../mingw/src/ui_spotifysettingspage.h:209
- #: ../mingw/src/ui_remotesettingspage.h:203
- #: ../mingw/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -571,12 +566,6 @@
- msgid "Always start playing"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -803,10 +792,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../mingw/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1005,10 +990,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:490
- msgid "Configure library..."
- msgstr ""
-@@ -1026,10 +1007,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../mingw/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1431,10 +1408,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../mingw/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1447,10 +1420,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1600,10 +1569,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1785,10 +1750,6 @@
- msgid "Font size"
- msgstr ""
- 
--#: ../mingw/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../mingw/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2053,10 +2014,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../mingw/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2086,10 +2043,6 @@
- msgid "Insert..."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:252
- msgid "Internet"
- msgstr ""
-@@ -2391,7 +2344,6 @@
- #: ../mingw/src/ui_digitallyimportedsettingspage.h:163
- #: ../mingw/src/ui_groovesharksettingspage.h:116
- #: ../mingw/src/ui_magnatunesettingspage.h:164
--#: ../mingw/src/ui_spotifysettingspage.h:212
- #: ../mingw/src/ui_remotesettingspage.h:205
- #: ../mingw/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2468,10 +2420,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2730,10 +2678,6 @@
- msgid "Not enough neighbors"
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2868,7 +2812,6 @@
- 
- #: ../mingw/src/ui_groovesharksettingspage.h:115
- #: ../mingw/src/ui_magnatunesettingspage.h:165
--#: ../mingw/src/ui_spotifysettingspage.h:211
- #: ../mingw/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2975,10 +2918,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../mingw/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3009,7 +2948,6 @@
- 
- #: ../mingw/src/ui_digitallyimportedsettingspage.h:166
- #: ../mingw/src/ui_magnatunesettingspage.h:166
--#: ../mingw/src/ui_spotifysettingspage.h:217
- #: ../mingw/src/ui_settingsdialog.h:115
- #: ../mingw/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
-@@ -3027,10 +2965,6 @@
- msgid "Preferred audio format"
- msgstr ""
- 
--#: ../mingw/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../mingw/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3422,18 +3356,6 @@
- msgid "Search Magnatune"
- msgstr ""
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../mingw/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3756,30 +3678,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../mingw/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../mingw/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../mingw/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:145
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3789,7 +3691,6 @@
- msgstr ""
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3875,18 +3776,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4246,10 +4135,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
- 
--#: ../mingw/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4265,7 +4150,6 @@
- 
- #: ../mingw/src/ui_groovesharksettingspage.h:114
- #: ../mingw/src/ui_magnatunesettingspage.h:163
--#: ../mingw/src/ui_spotifysettingspage.h:210
- #: ../mingw/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4489,20 +4373,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4562,7 +4432,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4651,8 +4520,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
- 
-diff -rauN clementine-1.0.1/src/translations/tr.po clementine-libre-1.0.1/src/translations/tr.po
---- clementine-1.0.1/src/translations/tr.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/tr.po	2012-05-29 17:44:19.953085826 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere hesabı gereklidir."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify üyeliği gerekli."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -318,7 +314,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Her zaman çalarak başlat"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Spotify'ın Clementine'de kullanılması için harici bir eklenti gerekmektedir."
--"  Şimdi indirmek ve kurulumunu yapmak ister misiniz?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Aygıttan iTunes veritabanı kopyalanırken hata oluştu"
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "CUE desteği"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "İptal"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Kapak resmini değiştir"
-@@ -1038,10 +1021,6 @@
- msgid "Configure Shortcuts"
- msgstr "Kısayolları Yapılandır"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Spotify Ayarları..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Kütüphaneyi düzenle..."
-@@ -1059,10 +1038,6 @@
- msgid "Connect device"
- msgstr "Aygıtı bağla"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Spotify'a bağlanılıyor."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Sabit bithızı"
-@@ -1478,10 +1453,6 @@
- msgid "Download this album..."
- msgstr "Bu albümü indirin..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "İndir..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast dizini indiriliyor"
-@@ -1494,10 +1465,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune kataloğu indiriliyor"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify eklentisi indiriliyor"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Üstveri indiriliyor"
-@@ -1652,10 +1619,6 @@
- msgid "Error deleting songs"
- msgstr "Şarkılar silinirken hata"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Spotify eklentisini indirirken hata"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,10 +1800,6 @@
- msgid "Font size"
- msgstr "Yazı tipi boyutu"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Lisans sebepleri dolayısıyla Spotify desteği ayrı bir eklentidir."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono çözümlemeye zorla"
-@@ -2112,10 +2071,6 @@
- "Dinamik modda yeni şarkılar seçilerek, her şarkı bittiğinde çalma listesine "
- "eklenecektir."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Gelen Kutusu"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Bildirimde albüm resimlendirmesini göster"
-@@ -2144,10 +2099,6 @@
- msgid "Insert..."
- msgstr "Ekle..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Kuruldu"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2405,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2480,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Ana profil (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Çalma listesini çevrim dışındayken kullanılabilir yap"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Bozuk yanıt"
-@@ -2792,10 +2738,6 @@
- msgid "Not enough neighbors"
- msgstr "Yeterli komşu yok"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Kurulu değil"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Giriş yapmadınız"
-@@ -2930,7 +2872,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parola"
-@@ -3037,10 +2978,6 @@
- msgid "Playlists"
- msgstr "Çalma listeleri"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Eklenti durumu:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3071,7 +3008,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Tercihler"
-@@ -3088,10 +3024,6 @@
- msgid "Preferred audio format"
- msgstr "Tercih edilen ses biçimleri"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Tercih edilen bit oranı"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Tercih edilen biçim"
-@@ -3482,18 +3414,6 @@
- msgid "Search Magnatune"
- msgstr "Magnatune'da Ara"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Spotify'i ara"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Spotify'i ara (yeni sekme açar)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Spotify'i ara (yeni sekme açar)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Tüm kaynaklarınızda arayın (kütüphane, internet servisleri, ...)"
-@@ -3818,30 +3738,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify giriş hatası"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify eklentisi"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify eklentisi kurulu değil"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Yıldızlı"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Çalma listesini mevcut çalınanla başlat"
-@@ -3851,7 +3751,6 @@
- msgstr "Dönüştürmeye başla"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Müzik bulmak için yukarıdaki arama kutusuna yazarak başlayın %1 "
-@@ -3937,18 +3836,6 @@
- msgid "Switch provider"
- msgstr "Anahtar sağlayıcı"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Spotify gelen kutusu eşleniyor"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Spotify çalma listesi eşleniyor"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Spotify yıldızlı şarkılar eşleniyor"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Üstteki sekmeler"
-@@ -4320,10 +4207,6 @@
- msgid "Use the system proxy settings"
- msgstr "Sistem vekil sunucu ayarlarını kullan"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Ses normalleştirme kullan"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Kullanılan"
-@@ -4339,7 +4222,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Kullanıcı Adı"
-@@ -4574,22 +4456,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Bir Grooveshark Anywhere hesabınız yok"
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Spotify Premium hesabınız yok."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Spotify servisinden çıktınız, lütfen Ayarlar ekranında parolanızı yeniden "
--"girin."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Spotify servisinden çıktınız, lütfen parolanızı yeniden girin."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Bu şarkıyı seviyorsunuz"
-@@ -4656,7 +4522,6 @@
- msgstr "Skroplarınız: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Kullanıcı adı veya parolanız yanlış."
- 
-@@ -4745,8 +4610,6 @@
- msgstr "Sonuncu"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/uk.po clementine-libre-1.0.1/src/translations/uk.po
---- clementine-1.0.1/src/translations/uk.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/uk.po	2012-05-29 17:45:51.199752577 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Потрібен обліковий запис Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Потрібен обліковий запис Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -318,7 +314,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Завжди починати відтворення"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Для користування Spotify в Clementine, потрібний додатковий модуль. "
--"Завантажити і встановити його зараз?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Виникла помилка копіювання бази даних iTunes з пристрою"
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "Підтримка листів CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Скасувати"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Змінити обкладинку"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Налаштування комбінацій клавіш"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Налаштування Spotify…"
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Налаштувати фонотеку"
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "З’єднати пристрій"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "З'єднання зі Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Стала бітова швидкість"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Завантажити цей альбом…"
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Звантажити…"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Завантажую каталог Icecast"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Завантаження каталогу Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Завантаження модуля Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Завантажую метадані"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Помилка вилучення композицій"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Помилка завантаження модуля Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,11 +1800,6 @@
- msgid "Font size"
- msgstr "Розмір шрифту"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"З підстав ліцензування, для підтримки Spotify потрібен спеціальний модуль."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Примусове моно-кодування"
-@@ -2113,10 +2071,6 @@
- "У динамічному режимі нові доріжку буде обрано та додано до списку "
- "відтворення кожного разу як завершується пісня."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Вхідні"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Показувати обкладинку в повідомлені"
-@@ -2145,10 +2099,6 @@
- msgid "Insert..."
- msgstr "Вставити…"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Встановлено"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Інтернет"
-@@ -2451,7 +2401,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2527,10 +2476,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Основний профіль (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Зробити список відтворення доступним онлайн"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Спотворений відгук"
-@@ -2789,10 +2734,6 @@
- msgid "Not enough neighbors"
- msgstr "Недостатньо сусідів"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Не встановлено"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Вхід не здійснено"
-@@ -2927,7 +2868,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Пароль"
-@@ -3034,10 +2974,6 @@
- msgid "Playlists"
- msgstr "Списки відтворення"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Статус модуля:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3068,7 +3004,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Параметри"
-@@ -3085,10 +3020,6 @@
- msgid "Preferred audio format"
- msgstr "Бажаний аудіо формат"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Бажана бітова швидкість"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Бажаний формат"
-@@ -3479,18 +3410,6 @@
- msgid "Search Magnatune"
- msgstr "Пошук на Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Пошук в Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Пошук в Spotify (у новій вкладці)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Пошук в Spotify (у новій вкладці)…"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Шукати у всіх джерелах даних (бібліотеці, на службах інтернету тощо)"
-@@ -3816,30 +3735,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Помилка входу до Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Модуль Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Модуль Spotify не встановлено"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Типово"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Оцінені"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Запустити список відтворення, що відтворюється на цей час"
-@@ -3849,7 +3748,6 @@
- msgstr "Почати перекодування"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3937,18 +3835,6 @@
- msgid "Switch provider"
- msgstr "Перемкнути джерело"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Синхронізація вхідних Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Синхронізація списку відтворення Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Синхронізація оцінених доріжок Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Вкладки зверху"
-@@ -4323,10 +4209,6 @@
- msgid "Use the system proxy settings"
- msgstr "Використовувати системні налаштування проксі"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Використати нормалізацію гучності"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Використано"
-@@ -4342,7 +4224,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Користувач"
-@@ -4579,21 +4460,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "У вас немає облікового запису Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "У вас немає облікового запису Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Ви вийшли зі Spotify, введіть ваш пароль знов у налаштуваннях, будь ласка."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Ви вийшли зі Spotify, введіть ваш пароль знов, будь ласка."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Улюблена композиція"
-@@ -4661,7 +4527,6 @@
- msgstr "%1 відтворень у вас"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Вами вказано помилкове ім’я користувача або пароль."
- 
-@@ -4750,8 +4615,6 @@
- msgstr "за останні"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "кбіт/с"
- 
-diff -rauN clementine-1.0.1/src/translations/vi.po clementine-libre-1.0.1/src/translations/vi.po
---- clementine-1.0.1/src/translations/vi.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/vi.po	2012-05-29 17:46:32.973085951 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Cần có tài khoản Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Yêu cầu một tài khoản Premium của Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -320,7 +316,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -593,14 +588,6 @@
- msgid "Always start playing"
- msgstr "Bắt đầu phát nhạc"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--"Cần phải có một trình cắm thêm để sử dụng Spotify trong Clementine. Bạn có "
--"muốn tải nó về và cài đặt ngay không?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Một lỗi đã xảy ra khi sao chép cơ sở dữ liệu iTunes từ thiết bị"
-@@ -826,10 +813,6 @@
- msgid "CUE sheet support"
- msgstr "Hỗ trợ danh sách CUE"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Hủy bỏ"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Đổi ảnh bìa"
-@@ -1040,10 +1023,6 @@
- msgid "Configure Shortcuts"
- msgstr "Phím tắt"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Cấu hình Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Cấu hình thư viện..."
-@@ -1061,10 +1040,6 @@
- msgid "Connect device"
- msgstr "Kết nối thiết bị"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Kết nối đến Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Bitrate cố định"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Tải album này..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Tải về..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Đang tải thư mục Icecast"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Đang tải mục lục Magnatune"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Tải trình cắm thêm Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Đang tải thông tin dữ liệu"
-@@ -1653,10 +1620,6 @@
- msgid "Error deleting songs"
- msgstr "Lỗi xóa các bài hát"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Lỗi khi tải trình cắm thêm Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1841,10 +1804,6 @@
- msgid "Font size"
- msgstr "Kích cỡ phông chữ"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Vì lí do giấy phép nên Spotify được hỗ trợ trong một trình cắm riêng."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Buộc mã hóa đơn kênh"
-@@ -2116,10 +2075,6 @@
- "Trong chế độ năng động, các bài hát mới sẽ được chọn và thêm vào danh sách "
- "mỗi khi một bài hát được phát xong."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Hộp thư đến"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Kèm theo ảnh bìa album trong thông báo"
-@@ -2148,10 +2103,6 @@
- msgid "Insert..."
- msgstr "Nhập..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Đã cài đặt"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2405,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2480,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hồ sơ chính (MAIN)"
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Danh sách sẵn sàng ngoại tuyến"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Phản hồi có vẻ xấu"
-@@ -2792,10 +2738,6 @@
- msgid "Not enough neighbors"
- msgstr "Chưa đủ những người lân cận"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Chưa cài đặt"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Chưa đăng nh"
-@@ -2930,7 +2872,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Mật khẩu"
-@@ -3037,10 +2978,6 @@
- msgid "Playlists"
- msgstr "Danh sách"
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Trạng thái trình cắm:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3071,7 +3008,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Thiết lập"
-@@ -3089,10 +3025,6 @@
- msgid "Preferred audio format"
- msgstr "Định dạng âm thanh được ưu tiên"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate ưu tiên"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Định dạng được ưu tiên"
-@@ -3483,18 +3415,6 @@
- msgid "Search Magnatune"
- msgstr "Tìm kiếm trên Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Tìm kiếm trong Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Tìm kiếm trong Spotify (mở trong tab mới)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Tìm kiếm trong Spotify (mở trong tab mới)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Tìm từ tất cả các nguồn (thư viện, các dịch vụ internet, ...)"
-@@ -3819,30 +3739,10 @@
- msgid "Speex"
- msgstr "Speex"
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Lỗi đăng nhập Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Trình cắm Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Trình cắm thêm Spotify chưa được cài đặt"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Chuẩn"
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Đã bắt đầu"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Bắt đầu danh sách hiện đang phát"
-@@ -3852,7 +3752,6 @@
- msgstr "Bắt đầu chuyển mã"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Nhập vào hộp tìm kiếm ở trên để tìm nhạc trên %1."
-@@ -3938,18 +3837,6 @@
- msgid "Switch provider"
- msgstr "Đổi nhà cung cấp"
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Đang đồng bộ hộp thư đến Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Đang đồng bộ danh sách Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Đang đồng bộ các bài hát được đánh dấu sao của Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Các tab ở phía trên"
-@@ -4328,10 +4215,6 @@
- msgid "Use the system proxy settings"
- msgstr "Sử dụng thiết lập proxy của hệ thống"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Sử dụng cân bằng âm lượng"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Đã dùng"
-@@ -4347,7 +4230,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Tên người dùng"
-@@ -4584,22 +4466,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Bạn không có tài khoản Grooveshark Anywhere."
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Bạn không có tài khoản cao cấp của Spotify."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu trong hộp thoại Thiết "
--"lập."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Bạn thích bài hát này"
-@@ -4666,7 +4532,6 @@
- msgstr "Thông tin bài hát của bạn: %1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Tên người dùng hay mật khẩu không đúng."
- 
-@@ -4755,8 +4620,6 @@
- msgstr "cuối"
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/zh_CN.po clementine-libre-1.0.1/src/translations/zh_CN.po
---- clementine-1.0.1/src/translations/zh_CN.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/zh_CN.po	2012-05-29 17:47:24.893086011 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -308,7 +304,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr "总是开始播放"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr "Clementine需要安装额外的插件才能使用Spotify.现在就下载并安装吗?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "从 iTunes 复制数据库出错"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr "CUE 支持"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "更改封面"
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr "配置快捷键"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "配置Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "配置音乐库..."
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr "连接设备"
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "连接Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "固定位速率"
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr "下载此专辑..."
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "下载..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "正在下载 Icecast 目录"
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "正在下载 Magnatune 分类"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "下载Spotify插件中"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "下载元数据"
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr "删除曲目出错"
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "下载Spotify插件出错"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr "字号"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr "在动态模式中, 每次歌曲播放完之后会被选择并添加新歌曲到播放列表.使用动态模式将忽略您的播放列表大小设定值."
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "收件夹"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "在提示中中加入专辑封面"
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr "插入..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "互联网"
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "无效的响应"
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr "邻居不足"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "密码"
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "插件状态:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "流行"
-@@ -3023,7 +2962,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "首选项"
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr "首选音乐格式"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "首选格式"
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr "搜索 Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "在新标签栏中查找Spotify..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "potify 插件未安装"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr "开始转换"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "标签在上"
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr "使用系统代理设置"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "已使用"
-@@ -4277,7 +4162,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "用户名"
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "您喜爱这个音轨"
-@@ -4579,7 +4449,6 @@
- msgstr "提交的音轨:%1"
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4668,8 +4537,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
-diff -rauN clementine-1.0.1/src/translations/zh_TW.po clementine-libre-1.0.1/src/translations/zh_TW.po
---- clementine-1.0.1/src/translations/zh_TW.po	2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/zh_TW.po	2012-05-29 17:48:16.866419419 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library.  "
-@@ -312,7 +308,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -585,12 +580,6 @@
- msgid "Always start playing"
- msgstr "總是開始播放"
- 
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine.  Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -816,10 +805,6 @@
- msgid "CUE sheet support"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1020,10 +1005,6 @@
- msgid "Configure Shortcuts"
- msgstr "設定快速鍵"
- 
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "設定音樂庫"
-@@ -1041,10 +1022,6 @@
- msgid "Connect device"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1454,10 +1431,6 @@
- msgid "Download this album..."
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1470,10 +1443,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "下載 Magnatune目錄"
- 
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "正在下載元數據"
-@@ -1623,10 +1592,6 @@
- msgid "Error deleting songs"
- msgstr ""
- 
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1808,10 +1773,6 @@
- msgid "Font size"
- msgstr "字型大小"
- 
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2074,10 +2035,6 @@
- "time a song finishes."
- msgstr ""
- 
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "包括專輯封面的通知"
-@@ -2106,10 +2063,6 @@
- msgid "Insert..."
- msgstr "插入..."
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "網際網路"
-@@ -2412,7 +2365,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2488,10 +2440,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "格式不正確的反應"
-@@ -2748,10 +2696,6 @@
- msgid "Not enough neighbors"
- msgstr "沒有足夠的鄰居"
- 
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2886,7 +2830,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "密碼"
-@@ -2993,10 +2936,6 @@
- msgid "Playlists"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "流行音樂"
-@@ -3027,7 +2966,6 @@
- 
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "偏好設定"
-@@ -3044,10 +2982,6 @@
- msgid "Preferred audio format"
- msgstr "首選的音頻格式"
- 
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3438,18 +3372,6 @@
- msgid "Search Magnatune"
- msgstr "搜尋 Magnatune"
- 
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3774,30 +3696,10 @@
- msgid "Speex"
- msgstr ""
- 
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "開始播放目前播放清單"
-@@ -3807,7 +3709,6 @@
- msgstr "開始轉碼"
- 
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3893,18 +3794,6 @@
- msgid "Switch provider"
- msgstr ""
- 
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "標籤在上面"
-@@ -4262,10 +4151,6 @@
- msgid "Use the system proxy settings"
- msgstr "使用系統代理伺服器設置"
- 
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "已用"
-@@ -4281,7 +4166,6 @@
- 
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "帳號"
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
- 
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "您愛這首歌曲"
-@@ -4578,7 +4448,6 @@
- msgstr ""
- 
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
- 
-@@ -4667,8 +4536,6 @@
- msgstr ""
- 
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
- 
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 32be5dd3c..6fc74fe5a 100755
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167924 2012-10-03 20:35:33Z tomegun $
+# $Id: PKGBUILD 169557 2012-10-23 14:38:06Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
 pkgver=2012.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -13,7 +13,7 @@ url='https://parabolagnulinux.org'
 groups=('base')
 install='filesystem.install'
 makedepends=('asciidoc')
-depends=('iana-etc' 'bash' 'coreutils')
+depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname')
 backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
@@ -92,12 +92,12 @@ package() {
 }
 md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
          '6be47d893fd49b2e4a8c0e811b350861'
-         '13753e4e0964f3652b0cc60a28528bdf'
+         '9e4533df61f0c82d6b2e2371f7376282'
          '4c4540eeb748bf1f71d631b8c1dcf0b3'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
          '455b78cada80f40b6f6968f5cbd97a2e'
-         'b8355d9d2782f424f4cedcf682651be0'
+         '01249bb0ba4468f95e2cc3a627f5e6e3'
          'ca716f853860199c1286e7939b2f2666'
          '1745349eb24ed21b4cfaa6f423bddb76'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
@@ -108,5 +108,5 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
          '677523dbe94b79299aa91b35ed8203b6'
          'f3b6ae7db8adffaaa4bffc6099dcbd50'
          'a8a962370cd0128465d514e6a1f74130'
-         '3674fcb22044d2946934e7826aa0c632'
+         '9f445ef4f7785d04504886fb223ee401'
          '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf
index 6e459adb6..4a4f5770d 100755
--- a/libre/filesystem/nsswitch.conf
+++ b/libre/filesystem/nsswitch.conf
@@ -6,7 +6,7 @@ shadow: files
 
 publickey: files
 
-hosts: files dns
+hosts: files dns myhostname
 networks: files
 
 protocols: files
diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt
index f7da03147..23a44bb22 100644
--- a/libre/filesystem/parabola.7.txt
+++ b/libre/filesystem/parabola.7.txt
@@ -17,22 +17,21 @@ DESCRIPTION
 Parabola exposes the user to the system without hiding any details. This manpage gives a
 brief overview of the configuration files that should be set up on a fresh install.
 
-INITSCRIPTS[[I]]
-----------------
-The initscripts are configured in rc.conf. Here you configure what daemons to start on boot, what storage
-technologies should be enabled and, optionally, a basic network setup.
+SYSTEM SERVICES[[S]]
+--------------------
+System services to be started at boot can be enabled using 'systemctl enable <name>.service'. To view
+available services use 'systemctl list-unit-files'.
 
 HOSTNAME[[H]]
 -------------
-The hostname of the machine should be set in /etc/hostname. Additionally, either /etc/hosts should be
-configured accordingly, or nss-myhostname should be used. This is needed so the hostname can always
-be resolved to the current machine, which is required by some programs.
+The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'. It will then be
+written to /etc/hostname.
 
 LOCALIZATION[[L]]
 -----------------
 Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used
-can be configured in /etc/locale.conf. These settings can be overridden on a par-user basis by keeping a
-user-spcefic locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
+can be configured in /etc/locale.conf. These settings can be overridden on a per-user basis by keeping a
+user-specific locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
 
 VIRTUAL CONSOLE[[V]]
 --------------------
@@ -41,13 +40,13 @@ other things. Note that these settings only apply to the console, and not if you
 
 TIME[[T]]
 ---------
-The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under
-/usr/share/zoneinfo/. E.g.,
+The local timezone is configured by calling 'timedatectl set-timezone <Region/City>'. A *symlink* is then created
+from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g.,
 
-    /etc/localtime -> /usr/share/zoneinfo/Europe/Paris
+    /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris
 
 The real-time clock, which keeps track of time when the computer is off, can be configured to either
-be in UTC or in localtime in /etc/adjtime. The default is UTC.
+be in UTC or in localtime by calling 'timedatectl set-local-rtc <false|true>'. The default is UTC.
 
 FILESYSTEMS[[F]]
 ----------------
@@ -73,8 +72,8 @@ and modules to be blacklisted from auto-loading can be configured in /etc/modpro
 SEE ALSO
 --------
 
-rc.conf(5), hostname(5), hosts(5), nsswitch.conf(5), locale.conf(5), vconsole.conf(5), timezone(3), hwclock(8), fstab(5), crypttab(5),
-mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
+systemctl(1), hostnamectl(1), hostname(5), locale.conf(5), vconsole.conf(5), timedatectl(1), timezone(3), hwclock(8), fstab(5),
+crypttab(5), mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
 
 AUTHORS
 -------
diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow
index ccab68d33..5eff4935c 100755
--- a/libre/filesystem/shadow
+++ b/libre/filesystem/shadow
@@ -4,4 +4,5 @@ daemon:x:14871::::::
 mail:x:14871::::::
 ftp:x:14871::::::
 http:x:14871::::::
+uuidd:x:14871::::::
 nobody:x:14871::::::
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 78ac80d82..6aaa1aa04 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.9
+_debver=2.7.10
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ pkgbase=iceape-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.9
+_pkgver=2.7.10
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('9ac6e3351e0d3d32e351a359e4f91062'
-         '9c2e0cbcd9759554d78fd050c2c30fa7'
-         '0ebf63ad1eeb338bc87f1abd34bc59e4'
-         '70c3e008980aad34875c62a8c4d1857a'
-         '7811bc669dd7f2ba73331b3b65258d2b'
-         'd50a27578ea43b9cc926e7cae5ef4b6f'
-         '9afe72fe36fe5da2c1246d19e43e8158'
-         '9a7b0c16665e4b7b6ea20267cb7dfeaf'
-         'd79e0f519763edb4c9c88528241c49f4'
-         '714f8c028b633e25be32c0c60f5d4ee9'
-         'b84f5f9616b37c4f6b868255d214b029'
-         '5725445a70d4e6e1f18438e6b164eaa0'
-         '839ea776b1d21990bcaf67bfefbbdeeb'
-         '14b20bf9388eb918ed094836306ea424'
-         '0fcc5b00ad23e2fd823b6e32a4d5fa86'
-         'd9ee55e4b53d182be6ecda64bac3686b'
-         '44d6a193b3c3b6a95898a455ff8d092a'
-         'ebe5a81f03658b44c301a15ba2a7c7e4'
-         '8c4c87c2e944f850b7f6561c866bef0d'
-         '8072fd0512358da3bd679afb0f7b5d68'
-         '292b42caa14502f420bc400291af075d'
-         'cbe874781488f0b95f4a84bb33b3e4c2'
-         'faabe8d25b70381d6620716450203cdf')
+md5sums=('6499aa420d5fa855a3884c657066c443'
+         'c4b98806b5a6cce75878bdf0668f5a4a'
+         'ac1a19ed29bda42f66e533ca9ee79fac'
+         '6116bd1b7c51d9414c68e1807d264f35'
+         '621dc719068050b479ad0fb9060d39e6'
+         'b184194c4e69dc00ee9f3b15dee71d92'
+         '84058513ab8884d0f279aa2990c10327'
+         '5be7810ca391eb31d26f5ab46c2f8fea'
+         '58737d11a2c0852d6701549d22f071b6'
+         'ac5994cd318ca2692823f91908eee101'
+         '5a07c756674b24b0b33af1e26a8e59ee'
+         '9178d335fa9f998f157a2e7f27384b15'
+         '2e40229a1ef5386574d98b243260f266'
+         'ff8c27d6afc9911af03737c23a0eae5d'
+         '611702c6dd5638154ff8a5c99e909da0'
+         '217fd6fd1e46eefb524457566f124074'
+         '09bb4d6d36403f97b923625055767884'
+         'cebd80d880c87862d9a8baf97c3c5b7b'
+         '023750f204d9f0ac89c62987b41532f4'
+         '0d753213210d92a8f751b3221fe34dad'
+         '4b180802effa63316c54e5ec904405c7'
+         '8be48ada576dfd9a37e6b3c0bc55c298'
+         'af08b7f96b175c560bba71ab59e1a3dc')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 69711ed71..eedd8f584 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.9
+_debver=2.7.10
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('5fb6b60dd8a87057c04fd8ff5251883b'
-         '0412e9645fc06264955b78613cea0e4b'
+md5sums=('63596601fd01000c842d9543ea8dfd56'
+         'f8de6b9e1906c8349e8799f819503897'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 899c009f6..6fd6aaf03 100755
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,18 +9,18 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=16.0.1
+_debver=16.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
-_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=16.0.1
+_pkgver=16.0.2
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -56,90 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('2f40a462c2850b50a604371e875fc47c'
-         'b49d42e9000a1163fd74d213624d8e86'
-         '385aa5d0bb43d43abb5ccddaae45bdf6'
-         'fce90fb3c7fddc26aa50978182f8b831'
-         '163277191a666f36a2885cf92a163961'
-         'e99bb607fd025990604e3229ce9aa8f6'
-         '35dcd2dd926b6e87dda1c11405b66472'
-         'debafd1aeb232448241953c66b89e63b'
-         'd23722619bb0d7f94894d2357060f629'
-         'cad3e2bf6d1d97fc8dd76426591e4511'
-         '72b529f4aa744b2368703c19080940f7'
-         'f0b1b1ee217230bd735c80b881657c92'
-         '9335e2678d66366a03ddfb4028b5c15e'
-         'a173f9f07df4cc614e23694b0e2f3ca1'
-         '5cd9492c24fe0476431ecb83dfa660ee'
-         '9f7c84b8269c756ac9feb96e59e4c903'
-         'a7dc03ef8409f2da04fc3a0a52016631'
-         '10e89e4953f1b9269e873345f03b867b'
-         'd893c8d240fc27a60b39f91f53a309cc'
-         '34b2d538d41fdcfd01d34a7cfb147135'
-         '1ce5f6b8a2e3e4921263d5af004f40bb'
-         'e59d36431f7f12eed4b7c89e2597fa6e'
-         '68684fce0eb66875f6d64f93b2e5fb4f'
-         'ecbf294dc3ac7bc558969479b3619501'
-         'a6226b0ab4b404d5e15194b7fd613604'
-         'a7234e85380e6cb647026a40275416e9'
-         '7b2877ea2915bdbabd2748ef4b180755'
-         '2adee8f256369fe890445eeffcd361c6'
-         'd9b1853f350d4124e5ebc2561beb8814'
-         'df6fa75a7165973d426c7d74e6c06cee'
-         '8ca0f965013836a32e4583da92149099'
-         'f007c9402015858a7a817be7f9038bbe'
-         'a7e87b3320cfea4d7b5d95b3f6769cd7'
-         '05659f1784f63c55dfe6735823b2e23a'
-         'a08a8a2504a8b5f2e419ed9f969a32be'
-         'ce7d8708af5982b26d645b7cd7e5b33b'
-         '77d7d6a32bffdcd46e8d4444f05b645d'
-         '5fcf6fd003938edeea07be704c92de74'
-         '8a83c45d55ee7b69cb895e33db3cfeb4'
-         '561255aeb09362d5ed5b3c4bfdf8f293'
-         '77f3d9c38dca64141d32babed3c4afb7'
-         'c30689f2cf263d4780bd106af2a68d0c'
-         'd25d040fd7d824f848b3b9a5fbddb446'
-         '30af6b1339fdda31b1acffa87a914363'
-         '582116acc9c6e38226bc8e256ab6bb9b'
-         '51811e3139cc4e514cf3d8c29e468e7c'
-         '987fab8eccf60ffbbb685e7af297030b'
-         '60f217af071d95743aad066daadc1a95'
-         '649e1a6e583aed2811427f3493b0aa74'
-         '33ba3c51cff806110324d0f27a63848f'
-         '8dbd143d46cc51b373f6b61f1a27d6f4'
-         '3fb0bec111ccc6dabe6c785810c40620'
-         'fc71d03873e7e1d4099702c1ab24c6da'
-         '775894f40a434b91f3489ff19f8237ee'
-         '71416fc9bf41b2c6719bc0b3c55e7b7b'
-         '30f988322526cfc25b15cb9179d69be4'
-         '195a1099a613215160c8be5f63169ce3'
-         'b59a10c70e33920d08750b76349ae764'
-         'd9f0b1dd204b34a78faca8b0de73fe2a'
-         'dd3eae36828975d87477fe465406e1e6'
-         'f8fbcee8171a6f7e0e81f8e0e3a381df'
-         'd5e5b6d7f4018b34fe01980548221332'
-         '7db06a1a09551d6ad943feb398affe57'
-         '7e7e0ccae292b3423d5d1a5dd848abe0'
-         '8397c0e05c04c6b054de4fe524a95c42'
-         '89becfa004fb398d2409800f5fb15179'
-         'd90fbc489d9993177a36ae788f9f23ed'
-         'b5aa84fbfa8e7ab12417b23f003fb17e'
-         'faf8056065dcf815e9a305b2739d0063'
-         '2e42ba1813720717da72041989c02880'
-         'a37d32a8cd3b8a5d4247527e6bc82380'
-         'd651717b27c2ffd4ce52d3c51b18dd85'
-         '2cc13f741a6910db6c3d00e7c53fb575'
-         '31755af06ea85ac187588076d20fa991'
-         'ff2ff3b748ef2dab4371897bfdc96dd4'
-         '2f38fda847f928bee7fba4772360699b'
-         '4e8c459c0c5d009c633e843a0420d113'
-         '4ce85d3534267db686f7d8181c499f17'
-         '465dd984f2f96407213c174ec832e51d'
-         'aade2355978099d9fc25d0aebb3add7f'
-         'c66934fca336e18aa90938b0bc5991d7'
-         'cc128b35d45e14047f769ee6f0c7af76'
-         '2357b049d7a7eb241b1a86f359aaa576'
-         '78f9371eb4c4c48a9ecd35f9e5c90461'
-         '9c06a7d81fb49995b56a3dfb4c77db9d'
-         '4af51a779abaa49a6bae6b90ccdb3fd8'
-         '3ee205c981dcc548f3e501aa06167df4')
+md5sums=('7917e479db04573f738d25d9a57cb049'
+         'ec1fadd5879ebbd7884b00c15e8148a8'
+         'fc281450b90d5e7861ac4f555d5ea871'
+         '1fe8f0d56b76f2bd627627098813ace2'
+         'fb3a5c73b806bbd7bd50a64a5894c831'
+         '84e222c9a5caa3cfd30b8c79cf49ae20'
+         '7a8b1160c2ac40dac7bb3ef788d7e2d0'
+         '3b974c5d14de638a36ee6b6e3a1fab94'
+         '6b40f968cd7c4a19ddc252fedf88dcbc'
+         'd6f533690c8570150ea193e4784fa37e'
+         '75bcfbbacde730ec498345994d5da699'
+         '322971c545da5815bfaf9c9f5b380ea4'
+         '7da8514ff56ad89db85cf160bc02d8cc'
+         '8b748543ca637db910531f35fcc7eb1e'
+         '3a5188077b07d50a60c19a9be34fef2e'
+         'c2f01b10da3a49049dadf13e7d62194b'
+         '97045cfea1caf0730557171a2dbc1384'
+         '969c813859367a254d7edbb16e323d62'
+         '479b9f915480af5c4cda1477bcc745f6'
+         '081f3d13f05b9d44d5bb2d7842998d68'
+         'c527200432799e3a37180439074f7616'
+         '6b688e726d273c21bb08f9e09a3dae48'
+         'b912eedaed384be13d99cbe769bb3683'
+         '9d828a0459fbb3997ade5a2c4bcfff35'
+         '67b79482d42d8057d0e66a8d00314efb'
+         'da9661e6211765ca9d503d1ff0aaeec1'
+         'e31f997e78fc2069b91a25cf71ee4a43'
+         '5207746c0154fc737d3bbeb5d468651b'
+         '191e284c168827fd4344f25c287f21d1'
+         'ebcb9f2fb2571d045d3e19ee9d8cbb9f'
+         '81c5e660d89148f0ca7da1186f1cda3a'
+         'ca8a2f10358da70d30c8a6af7bc44d54'
+         '8581d1f7e7e3a850d360e4da7506d166'
+         'd4811aef8cdc90b6661a669ffad2ead8'
+         '41a9cd0e8ea9d71f4d82ac0f4e4911c0'
+         'e00759dd17ea1647afe40c1b9f676187'
+         'b145a19de88d7c62e319e5719cc079d5'
+         '817beaa2dab8f01cfcc5f034d537f97b'
+         '48257dba1a8ca1ccd9e75cf5d00819df'
+         '2036c221e16ea942795eae837a690615'
+         'fc879e816fd4e831f47d14a3ed2442d7'
+         '1851131108d0f9665cddaf636c5de826'
+         '557c1a2d9176bde516c45112ae4632e8'
+         '9142dcd98b5ec1783d72ffcb1326aae7'
+         'f4c0f20255fd7f715a923cd6f81301ca'
+         '1f65f925300b5e4317018d80d147fb46'
+         '955cba749d29a3608fb70e5914835f2b'
+         '7ad38d60e90f96404860ef281bddfe17'
+         'd14126daf1067c19297ff1a94dc91e27'
+         'a1e55184abcd990206c5c82d7445b53e'
+         '9e1eeb91fb680c4b09ed1439c8af4265'
+         'b313eb3158561713f00eec0b3ff82739'
+         'e42c798d9371109be8595653c87a96e6'
+         '499cb790565eb93e4387120815bc0d3f'
+         'efed1f452372a569002282819f2828e8'
+         '6e6e1215ffcc77fbd5deac9b3856ecff'
+         '5905c1911035d9576e84791ac4416f23'
+         'd7a49fa9daec5c4c403633e04ec03b49'
+         '58d91d27d4e9bb8106534bac2562c566'
+         '73fe09d52c99ede62bd8fd07c4780ee4'
+         '19eb3d4c88d80035645bbd6a992bf938'
+         '51a35fae949c997b5a300211a967d36d'
+         '579a02556b1200fc749600390dfb9d97'
+         '2d7f14c47a9b974a69bfb5f821c6f04b'
+         '8622ac1bb52fb56af89e26f2d2a98ffd'
+         'f5073a3e7bbbc71184a29d567c3d0914'
+         '8979aaa64b9300ef245cb6368f1e3275'
+         '1444fd6ec5639b51fc4c15c3fc7d41ec'
+         '0eb171065c77b27c5aed4aa11fa2a6f4'
+         '4b2a490537405ceb2935225807d4bde9'
+         '69db8437023d658c5da0cf7388b1f579'
+         '8d6bf855d5070624268cc175f3e86a14'
+         '3edd9eea3d25fecb21787ce83499c994'
+         '3ab336a082a86f9c7df7a7873f40a6e9'
+         'b798317e831b5b9a06161bdaf119ad4d'
+         'e86a78e5bfcba6f45b9f0bbf42c5ad89'
+         '8f0a46cdd135c0d8858c409cbca4e9cd'
+         '0a78294d15ef47fb1916ca129c5348c0'
+         '625fb622c634c035f4b326928c776392'
+         '6b528ef1c3427e799d924b12a5e1fb39'
+         'c790339622a85b5b307fb4a8fa496fe7'
+         '56021c871cce43c64bc6ddff5f794f31'
+         'babbd7cde37d24463ea5d8a389abd512'
+         '6eb58fc54626a3b8d58c03f37dfc2ec1'
+         '782d556e773cb97298592fedabdc9a7f'
+         'f2cf5e5a2b244d0afab2edd193209039'
+         '973c9e08c3329ba51625272db30d9d6c'
+         '28055c70eda06dcf371f0399dce94e8b')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index fc68357e7..e7cdb2249 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=16.0.1
+_debver=16.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
-         'ddfcf225ea0e3d7b4b377f4a63d5e8c4'
+md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
+         'ee38477dd7ede1c32e559ee74139b5c9'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index d63eb96f7..2a4f28f33 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167425 2012-10-02 09:09:06Z andrea $
+# $Id: PKGBUILD 169397 2012-10-20 10:02:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -16,7 +16,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
         'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
         'media-player-info' 'libxtst')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 provides=("kdelibs=$pkgver")
 replaces=('kdelibs')
 conflicts=('kdelibs')
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 2aaf0e3fc..c420c2070 100755
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -5,8 +5,8 @@
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-libre-api-headers
-_basekernel=3.5
-_sublevel=5
+_basekernel=3.6
+_sublevel=3
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 pkgdesc="Kernel libre headers sanitized for use in userspace"
@@ -18,8 +18,8 @@ conflicts=('linux-api-headers')
 replaces=('linux-api-headers')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
-md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '2e138b46c5855fff8e0d7afe760a4150')
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+         '844bd14e9f58225274e096c31bbb8a8f')
 
 build() {
   cd ${srcdir}/linux-${_basekernel}
@@ -37,7 +37,7 @@ package() {
   make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
 
   # use headers from libdrm
-  rm -rf ${pkgdir}/usr/include/drm
+  rm -r ${pkgdir}/usr/include/drm
   
   # clean-up unnecessary files generated during install
   find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index fc86511e9..64b57eed5 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,9 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.6.2
+_kernver=3.6.4
+_kernrel=1
 pkgname=('linux-libre-kmod-alx')
+_pkgver=2012-10-03
 pkgver=20121003
-pkgrel=1
+pkgrel=3
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
@@ -11,7 +13,7 @@ license=('GPL2')
 depends=("linux-libre=$_kernver")
 makedepends=("linux-libre-headers=$_kernver")
 install=linux-libre-kmod-alx.install
-source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-10-03-pc.tar.bz2)
+source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2)
 
 md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
 
@@ -20,17 +22,17 @@ build() {
 	# current extramodules version
 	_extraver=extramodules-3.6-LIBRE
 
-	cd ${srcdir}/compat-wireless-2012-10-03-pc
+	cd $srcdir/compat-wireless-$_pkgver-pc
 
 	# replacing to specific linux-libre kernel version
-	sed -i -e 's/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/3.6.2-1-LIBRE/' Makefile
+	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile
 
 	./scripts/driver-select alx
 	make
-	cd ${srcdir}/compat-wireless-2012-10-03-pc/compat
+	cd $srcdir/compat-wireless-$_pkgver-pc/compat
 	gzip -9 compat.ko
-	install -D -m 0644 compat.ko.gz ${pkgdir}/lib/modules/$_extraver/compat.ko.gz
-	cd ${srcdir}/compat-wireless-2012-10-03-pc/drivers/net/ethernet/atheros/alx
+	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
+	cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx
 	gzip -9 alx.ko
-	install -D -m 0644 alx.ko.gz ${pkgdir}/lib/modules/$_extraver/alx.ko.gz
+	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
 }
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 646b3658a..90bc2061a 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,9 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.46
+_kernver=3.0.48
+_kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
+_pkgver=2012-10-03
 pkgver=20121003
-pkgrel=1
+pkgrel=3
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
@@ -11,7 +13,7 @@ license=('GPL2')
 depends=("linux-libre-lts=$_kernver")
 makedepends=("linux-libre-lts-headers=$_kernver")
 install=linux-libre-lts-kmod-alx.install
-source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2012-10-03-pc.tar.bz2)
+source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2)
 
 md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
 
@@ -20,17 +22,17 @@ build() {
 	# current extramodules version
 	_extraver=extramodules-3.0-LIBRE-LTS
 
-	cd ${srcdir}/compat-wireless-2012-10-03-pc
+	cd ${srcdir}/compat-wireless-$_pkgver-pc
 
 	# replacing to specific linux-libre-lts kernel version
-	sed -i -e 's/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/3.0.46-1-LIBRE-LTS/' Makefile
+	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile
 
 	./scripts/driver-select alx
 	make
-	cd ${srcdir}/compat-wireless-2012-10-03-pc/compat
+	cd $srcdir/compat-wireless-$_pkgver-pc/compat
 	gzip -9 compat.ko
-	install -D -m 0644 compat.ko.gz ${pkgdir}/lib/modules/$_extraver/compat.ko.gz
-	cd ${srcdir}/compat-wireless-2012-10-03-pc/drivers/net/ethernet/atheros/alx
+	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
+	cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx
 	gzip -9 alx.ko
-	install -D -m 0644 alx.ko.gz ${pkgdir}/lib/modules/$_extraver/alx.ko.gz
+	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
 }
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index d544abb26..1a0d031c1 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=46
+_sublevel=49
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.45 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.48 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -28,9 +28,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
         'ext4-options.patch'
+        'module-symbol-waiting-3.0.patch'
+        'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'a2ced38cb23963b9efef79100f5885c5'
+         '29c9749f200e1679f52118b239fa4491'
          'aed25ab047e1c0b020a1516c235c6a74'
          '7d37e8ce0f4bd5a957172b12ae742ea0'
          'c072b17032e80debc6a8626299245d46'
@@ -40,7 +42,9 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         '2fb6f217d649733bd5d977bf32c1f292')
+         '670931649c60fcb3ef2e0119ed532bd4'
+         '8a71abc4224f575008f974a099b5cf6f'
+         'e584ba40e137198ed196e58772838262')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -78,6 +82,11 @@ build() {
   # https://bugs.archlinux.org/task/28653
   patch -Np1 -i "${srcdir}/ext4-options.patch"
 
+  # fix module initialisation
+  # https://bugs.archlinux.org/task/32122
+  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
+  patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 57f19a417..e718a1f5f 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.46-1-LIBRE-LTS
+KERNEL_VERSION=3.0.49-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre-lts/module-init-wait-3.0.patch b/libre/linux-libre-lts/module-init-wait-3.0.patch
new file mode 100644
index 000000000..1bcfd2491
--- /dev/null
+++ b/libre/linux-libre-lts/module-init-wait-3.0.patch
@@ -0,0 +1,77 @@
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
+Subject: module: wait when loading a module which is currently initializing.
+X-Git-Tag: v3.7-rc1~2^2~32
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
+
+module: wait when loading a module which is currently initializing.
+
+The original module-init-tools module loader used a fnctl lock on the
+.ko file to avoid attempts to simultaneously load a module.
+Unfortunately, you can't get an exclusive fcntl lock on a read-only
+fd, making this not work for read-only mounted filesystems.
+module-init-tools has a hacky sleep-and-loop for this now.
+
+It's not that hard to wait in the kernel, and only return -EEXIST once
+the first module has finished loading (or continue loading the module
+if the first one failed to initialize for some reason).  It's also
+consistent with what we do for dependent modules which are still loading.
+
+Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 63cf6e7..74bc195 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
+ 	return module_finalize(info->hdr, info->sechdrs, mod);
+ }
+ 
++/* Is this module of this name done loading?  No locks held. */
++static bool finished_loading(const char *name)
++{
++	struct module *mod;
++	bool ret;
++
++	mutex_lock(&module_mutex);
++	mod = find_module(name);
++	ret = !mod || mod->state != MODULE_STATE_COMING;
++	mutex_unlock(&module_mutex);
++
++	return ret;
++}
++
+ /* Allocate and load the module: note that size of section 0 is always
+    zero, and we rely on this for optional sections. */
+ static struct module *load_module(void __user *umod,
+@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
+ 				  const char __user *uargs)
+ {
+ 	struct load_info info = { NULL, };
+-	struct module *mod;
++	struct module *mod, *old;
+ 	long err;
+ 
+ 	pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
+@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
+ 	 * function to insert in a way safe to concurrent readers.
+ 	 * The mutex protects against concurrent writers.
+ 	 */
++again:
+ 	mutex_lock(&module_mutex);
+-	if (find_module(mod->name)) {
++	if ((old = find_module(mod->name)) != NULL) {
++		if (old->state == MODULE_STATE_COMING) {
++			/* Wait in case it fails to load. */
++			mutex_unlock(&module_mutex);
++			err = wait_event_interruptible(module_wq,
++					       finished_loading(mod->name));
++			if (err)
++				goto free_arch_cleanup;
++			goto again;
++		}
+ 		err = -EEXIST;
+ 		goto unlock;
+ 	}
diff --git a/libre/linux-libre-lts/module-symbol-waiting-3.0.patch b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
new file mode 100644
index 000000000..b87a38ff5
--- /dev/null
+++ b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
@@ -0,0 +1,66 @@
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
+Subject: module: fix symbol waiting when module fails before init
+X-Git-Tag: v3.7-rc1~2^2~33
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
+
+module: fix symbol waiting when module fails before init
+
+We use resolve_symbol_wait(), which blocks if the module containing
+the symbol is still loading.  However:
+
+1) The module_wq we use is only woken after calling the modules' init
+   function, but there are other failure paths after the module is
+   placed in the linked list where we need to do the same thing.
+
+2) wake_up() only wakes one waiter, and our waitqueue is shared by all
+   modules, so we need to wake them all.
+
+3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
+   it after we've grabbed and dropped the module_mutex, not just after
+   the state assignment.
+
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 7f2ee45f..63cf6e7 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
+ 	/* Unlink carefully: kallsyms could be walking list. */
+ 	list_del_rcu(&mod->list);
+ 	module_bug_cleanup(mod);
+-
++	wake_up_all(&module_wq);
+  ddebug:
+ 	dynamic_debug_remove(info.debug);
+  unlock:
+@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 		blocking_notifier_call_chain(&module_notify_list,
+ 					     MODULE_STATE_GOING, mod);
+ 		free_module(mod);
+-		wake_up(&module_wq);
++		wake_up_all(&module_wq);
+ 		return ret;
+ 	}
+ 	if (ret > 0) {
+@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 		dump_stack();
+ 	}
+ 
+-	/* Now it's a first class citizen!  Wake up anyone waiting for it. */
++	/* Now it's a first class citizen! */
+ 	mod->state = MODULE_STATE_LIVE;
+-	wake_up(&module_wq);
+ 	blocking_notifier_call_chain(&module_notify_list,
+ 				     MODULE_STATE_LIVE, mod);
+ 
+@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 	mod->init_ro_size = 0;
+ 	mod->init_text_size = 0;
+ 	mutex_unlock(&module_mutex);
++	wake_up_all(&module_wq);
+ 
+ 	return 0;
+ }
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index a0f8777e6..c48d12472 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.6
-_sublevel=2
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -29,17 +29,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
+        'module-symbol-waiting-3.6.patch'
+        'module-init-wait-3.6.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '1014a197e2bea449600d7b2cca415eec'
-         '600af9b069c8a1c18dd5ef1f25bf7080'
-         'c18004748092bf4ee57ade7e25fdef22'
+         '71451d3fdb67db17581393a061bf9516'
+         'e4a3a4677e1fac6ecf0e0fb44c41ca08'
+         '68fc36a4efb6ade0eca409b9444fef0c'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '1690532ad271b11a87e8824f7da65101')
+         '670931649c60fcb3ef2e0119ed532bd4'
+         '8a71abc4224f575008f974a099b5cf6f'
+         'ba95fd06943438f0cf54d1818e034fcc')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -64,6 +68,11 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix module initialisation
+  # https://bugs.archlinux.org/task/32122
+  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
+  patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e553c3d44..6533b0402 100755
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.6.0 Kernel Configuration
+# Linux/i386 3.6.3 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -134,7 +134,10 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 479c39929..fbc1c7588 100755
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.0 Kernel Configuration
+# Linux/x86_64 3.6.3 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -136,7 +136,10 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index e5af2a1bd..681b322af 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.6.2-1-LIBRE
+KERNEL_VERSION=3.6.4-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/module-init-wait-3.6.patch b/libre/linux-libre/module-init-wait-3.6.patch
new file mode 100644
index 000000000..1bcfd2491
--- /dev/null
+++ b/libre/linux-libre/module-init-wait-3.6.patch
@@ -0,0 +1,77 @@
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
+Subject: module: wait when loading a module which is currently initializing.
+X-Git-Tag: v3.7-rc1~2^2~32
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
+
+module: wait when loading a module which is currently initializing.
+
+The original module-init-tools module loader used a fnctl lock on the
+.ko file to avoid attempts to simultaneously load a module.
+Unfortunately, you can't get an exclusive fcntl lock on a read-only
+fd, making this not work for read-only mounted filesystems.
+module-init-tools has a hacky sleep-and-loop for this now.
+
+It's not that hard to wait in the kernel, and only return -EEXIST once
+the first module has finished loading (or continue loading the module
+if the first one failed to initialize for some reason).  It's also
+consistent with what we do for dependent modules which are still loading.
+
+Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 63cf6e7..74bc195 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
+ 	return module_finalize(info->hdr, info->sechdrs, mod);
+ }
+ 
++/* Is this module of this name done loading?  No locks held. */
++static bool finished_loading(const char *name)
++{
++	struct module *mod;
++	bool ret;
++
++	mutex_lock(&module_mutex);
++	mod = find_module(name);
++	ret = !mod || mod->state != MODULE_STATE_COMING;
++	mutex_unlock(&module_mutex);
++
++	return ret;
++}
++
+ /* Allocate and load the module: note that size of section 0 is always
+    zero, and we rely on this for optional sections. */
+ static struct module *load_module(void __user *umod,
+@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
+ 				  const char __user *uargs)
+ {
+ 	struct load_info info = { NULL, };
+-	struct module *mod;
++	struct module *mod, *old;
+ 	long err;
+ 
+ 	pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
+@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
+ 	 * function to insert in a way safe to concurrent readers.
+ 	 * The mutex protects against concurrent writers.
+ 	 */
++again:
+ 	mutex_lock(&module_mutex);
+-	if (find_module(mod->name)) {
++	if ((old = find_module(mod->name)) != NULL) {
++		if (old->state == MODULE_STATE_COMING) {
++			/* Wait in case it fails to load. */
++			mutex_unlock(&module_mutex);
++			err = wait_event_interruptible(module_wq,
++					       finished_loading(mod->name));
++			if (err)
++				goto free_arch_cleanup;
++			goto again;
++		}
+ 		err = -EEXIST;
+ 		goto unlock;
+ 	}
diff --git a/libre/linux-libre/module-symbol-waiting-3.6.patch b/libre/linux-libre/module-symbol-waiting-3.6.patch
new file mode 100644
index 000000000..b87a38ff5
--- /dev/null
+++ b/libre/linux-libre/module-symbol-waiting-3.6.patch
@@ -0,0 +1,66 @@
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
+Subject: module: fix symbol waiting when module fails before init
+X-Git-Tag: v3.7-rc1~2^2~33
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
+
+module: fix symbol waiting when module fails before init
+
+We use resolve_symbol_wait(), which blocks if the module containing
+the symbol is still loading.  However:
+
+1) The module_wq we use is only woken after calling the modules' init
+   function, but there are other failure paths after the module is
+   placed in the linked list where we need to do the same thing.
+
+2) wake_up() only wakes one waiter, and our waitqueue is shared by all
+   modules, so we need to wake them all.
+
+3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
+   it after we've grabbed and dropped the module_mutex, not just after
+   the state assignment.
+
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 7f2ee45f..63cf6e7 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
+ 	/* Unlink carefully: kallsyms could be walking list. */
+ 	list_del_rcu(&mod->list);
+ 	module_bug_cleanup(mod);
+-
++	wake_up_all(&module_wq);
+  ddebug:
+ 	dynamic_debug_remove(info.debug);
+  unlock:
+@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 		blocking_notifier_call_chain(&module_notify_list,
+ 					     MODULE_STATE_GOING, mod);
+ 		free_module(mod);
+-		wake_up(&module_wq);
++		wake_up_all(&module_wq);
+ 		return ret;
+ 	}
+ 	if (ret > 0) {
+@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 		dump_stack();
+ 	}
+ 
+-	/* Now it's a first class citizen!  Wake up anyone waiting for it. */
++	/* Now it's a first class citizen! */
+ 	mod->state = MODULE_STATE_LIVE;
+-	wake_up(&module_wq);
+ 	blocking_notifier_call_chain(&module_notify_list,
+ 				     MODULE_STATE_LIVE, mod);
+ 
+@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 	mod->init_ro_size = 0;
+ 	mod->init_text_size = 0;
+ 	mutex_unlock(&module_mutex);
++	wake_up_all(&module_wq);
+ 
+ 	return 0;
+ }
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index d4d91c412..2d7f3be5f 100755
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=31
+pkgrel=34
 epoch=1
 _extramodules=extramodules-3.6-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
@@ -121,4 +121,4 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          'dab8a73bcc5fd5479d8750493d8d97dc'
          'c2e20fe68b034df752dba2773db16ebe'
          '07131d117fcfe9dcd50c453c3a5e9531'
-         'febf25c154a7d36f01159e84f26c2d9a')
\ No newline at end of file
+         'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 9d77543ce..fb048355c 100755
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=20121012
+pkgver=20121024
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -16,5 +16,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('386550a6b179ebd158bc7469362bf0b8'
-         '4794d17dd40d51069eca315c2243528b')
+md5sums=('7aebac7b4735117617f718058e0602f5'
+         '3b0183f30e786ea7197427199f9fa4f6')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index cfb39d703..c1beccdf9 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,17 +8,24 @@
 
 pkgname=parabolaweb-utils
 pkgver=`_get_pkgver`
-pkgrel=2
+pkgrel=4
 pkgdesc="Utils for the Parabola website"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
 license=('GPL2')
-depends=('python2' 'python2-flup' 'git' 'libretools' `_get_depends`)
+depends=(
+    'python2'      # duh
+    'python2-flup' # for fcgi
+    'postgresql'   # for database
+    'git'          # used in parabolaweb-update
+    'libretools'   # used in parabolaweb-update
+    `_get_depends`)
 backup=('etc/conf.d/parabolaweb')
 
 export pkgver
 
 source=(git://parabolagnulinux.org/parabolaweb.git
+	parabolaweb-download
 	parabolaweb-update
 	parabolaweb-fcgi
 	parabolaweb.rc
@@ -31,16 +38,18 @@ build() {
 
 package() {
 	cd "${srcdir}"
-	install -Dm755 parabolaweb-update  "${pkgdir}/usr/sbin/parabolaweb-update"
-	install -Dm755 parabolaweb-fcgi    "${pkgdir}/usr/sbin/parabolaweb-fcgi"
-	install -Dm755 parabolaweb.rc      "${pkgdir}/etc/rc.d/parabolaweb"
-	install -Dm644 parabolaweb.service "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
-	install -Dm644 parabolaweb.conf    "${pkgdir}/etc/conf.d/parabolaweb"
+	install -Dm755 parabolaweb-download  "${pkgdir}/usr/sbin/parabolaweb-download"
+	install -Dm755 parabolaweb-update    "${pkgdir}/usr/sbin/parabolaweb-update"
+	install -Dm755 parabolaweb-fcgi      "${pkgdir}/usr/sbin/parabolaweb-fcgi"
+	install -Dm755 parabolaweb.rc        "${pkgdir}/etc/rc.d/parabolaweb"
+	install -Dm644 parabolaweb.service   "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
+	install -Dm644 parabolaweb.conf      "${pkgdir}/etc/conf.d/parabolaweb"
 }
 
 md5sums=('SKIP'
-         'dd05d6a4ea7cff7fdd789f59aeb9059a'
-         '520e20b8bbca64042b3afa76b0bec55f'
-         '1bce8fb832ad9e61cf8b96426ce843b5'
-         'c7e292d2d1c3e846e5cfcd7283de0fe4'
-         'fb291168d3f57a85f82216c4e74c9ccf')
+         '01bed679a4fd768e720bfd0f3c7d6694'
+         'a73063b14746720b77fdbab851f5c161'
+         'd5294495f42df29d29519ebd0a8f6093'
+         'cc15e153f99fba82e7bb032896f655c2'
+         'a468016a7155b5da46521dcfc6428384'
+         '9b565ef07e44d395bf7a0e484e3d19d1')
diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download
new file mode 100644
index 000000000..823a18811
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb-download
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/conf.d/parabolaweb
+. /usr/bin/libremessages
+
+dir=$WEBDIR
+repo=git://parabolagnulinux.org/parabolaweb.git
+ref=master
+
+cd_safe() {
+	if ! cd "$1"; then
+		error "$(gettext "Failed to change to directory %s")" "$1"
+		plain "$(gettext "Aborting...")"
+		exit 1
+	fi
+}
+
+download_git() {
+	if [[ ! -d "$dir/.git" ]] ; then
+		msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
+		if ! git clone "$repo" "$dir"; then
+			error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"
+			plain "$(gettext "Aborting...")"
+			exit 1
+		fi
+	else
+		cd_safe "$dir"
+		# Make sure we are fetching the right repo
+		# if [[ "$repo" != "$(git config --get remote.origin.url)"  ]] ; then
+		# 	error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
+		# 	plain "$(gettext "Aborting...")"
+		# 	exit 1
+		# fi
+		msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
+		if ! git pull origin "$ref"; then
+			# only warn on failure to allow offline builds
+			warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git"
+		fi
+	fi
+}
+
+main() {
+	[[ -d "${dir%/*}" ]] || mkdir -p "${dir%/*}"
+	download_git
+}
+
+main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi
index 3dec02e10..e42aec3cd 100644
--- a/libre/parabolaweb-utils/parabolaweb-fcgi
+++ b/libre/parabolaweb-utils/parabolaweb-fcgi
@@ -3,9 +3,9 @@ set -e
 
 . /etc/conf.d/parabolaweb
 
-[[ -e /srv/http/web/manage.py ]]
+[[ -e ${WEBDIR}/manage.py ]]
 
-sudo -u "${WEBUSER:-$USER}" python2 /srv/http/web/manage.py runfcgi \
+sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \
 	host=${HOST} \
 	port=${PORT} \
 	--settings=settings \
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
index e4d65c2d9..45e17c4f2 100644
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ b/libre/parabolaweb-utils/parabolaweb-update
@@ -1,37 +1,31 @@
 #!/bin/bash
 set -e
 
-_install_dir=/srv/http
-_gitname=web
-_gitroot=git://parabolagnulinux.org/parabolaweb.git
-_gitbranch=master
-
+. /etc/conf.d/parabolaweb
 . /usr/bin/libremessages
 
-download() {
-	msg "Connecting to GIT server...."
-	cd "$_install_dir"
-	if [[ -d ${_gitname} ]]; then
-		msg2 "Updating existing tree"
-		cd ${_gitname} && git pull ${_gitroot}
-	else
-		msg2 "Cloning tree"
-		git clone ${_gitroot} ${_gitname}
-		cd ${_gitname}
-	fi
-	git checkout ${_gitbranch}
-	msg "GIT checkout done or server timeout"
+find_makefiles() {
+	pushd "$WEBDIR" > /dev/null
+	echo ./sitestatic
+	find . -name static -type d | while read dir; do
+		if [[ -e "$WEBDIR/$dir/Makefile" ]]; then
+			printf '%s\n' "$dir"
+		fi
+	done
 }
 
 clean() {
 	msg "Purging old .pyc files...."
-	cd "$_install_dir/$_gitname"
+	cd "$WEBDIR"
 	find . -name '*.pyc' -delete
+	for dir in `find_makefiles`; do
+		make -C "$WEBDIR/$dir" clean
+	done
 }
 
 configure() {
 	msg "Checking configuration...."
-	cd "$_install_dir/$_gitname"
+	cd "$WEBDIR"
 	if [[ ! -f local_settings.py ]]; then
 		msg2 "Configuration file missing, opening editor..."
 		cp local_settings.py.example local_settings.tmp.$$.py
@@ -49,33 +43,38 @@ configure() {
 	fi
 }
 
-migrate() {
+update-database() {
 	msg "Updating database...."
+	cd "$WEBDIR"
 	msg2 "Running migrations...."
 	./manage.py migrate
 	msg2 "Loading fixtures...."
 	./manage.py loaddata */fixtures/*.json
 }
 
+update-filesystem() {
+	msg "Updating filesystem..."
+	for dir in `find_makefiles`; do
+		msg2 "Updating $dir with GNU Make..."
+		make -C "$WEBDIR/$dir"
+	done
+	cd "$WEBDIR"
+	msg2 "Collecting static files..."
+	echo yes | ./manage.py collectstatic -l
+}
+
 main() {
 	if [[ -z "$EDITOR" ]]; then
 		error 'Please set the $EDITOR variable'
 		exit 1
 	fi
 
-	[[ ! -d "$_install_dir" ]] && mkdir "$_install_dir"
-
-	download
+	parabolaweb-download
 	clean
 	configure
 	clean
-	migrate
-
-	msg "Checking media/admin_media symlink...."
-	if [ ! -e media/admin-media ]; then
-		rm media/admin_media
-		ln -s /usr/lib/python2.7/site-packages/django/contrib/admin/media media/admin_media
-	fi
+	update-database
+	update-filesystem
 }
 
 main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf
index c53b19cb8..467e62e2c 100644
--- a/libre/parabolaweb-utils/parabolaweb.conf
+++ b/libre/parabolaweb-utils/parabolaweb.conf
@@ -1,3 +1,4 @@
 HOST=127.0.0.1
 PORT=8090 # 80 is nginx
+WEBDIR=/srv/http/web
 WEBUSER=nobody
diff --git a/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc
index 087a3fcb0..5e310b01d 100644
--- a/libre/parabolaweb-utils/parabolaweb.rc
+++ b/libre/parabolaweb-utils/parabolaweb.rc
@@ -8,6 +8,7 @@ PIDFILE=/run/web/parabolaweb.pid
 case $1 in
 start)
 	stat_busy "Starting ParabolaWeb"
+	install -dm777 ${PIDFILE%/*}
 	if parabolaweb-fcgi pidfile=${PIDFILE}; then
 		add_daemon parabolaweb
 		stat_done
diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service
index d145e53d8..a59d58512 100644
--- a/libre/parabolaweb-utils/parabolaweb.service
+++ b/libre/parabolaweb-utils/parabolaweb.service
@@ -1,10 +1,13 @@
 [Unit]
+Requires=postgresql.service
+After=postgresql.service
 Description=ParabolaWeb
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid
 PIDFile=/run/web/parabolaweb.pid
+ExecStartPre=/usr/bin/install -dm777 /run/web
+ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 91ae34864..fbff59b80 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
-pkgrel=9
+pkgrel=9.2
 pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 4c8910c2b..9db910c9e 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,7 +11,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=9
+pkgrel=10
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index f35ba99c9..ba6448702 100755
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.6-LIBRE
-pkgrel=12
+pkgrel=13
 pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 7a95b4c7b..e080feb02 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.2
+pkgver=4.2.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh
index 87aefbff0..4c3c29e30 100755
--- a/libre/virtualbox-libre-modules-lts/build.sh
+++ b/libre/virtualbox-libre-modules-lts/build.sh
@@ -6,13 +6,11 @@ if (( $# != 1 )); then
   exit 1
 fi
 
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 3fcbd7069..1ecee7b2c 100755
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.2
-pkgrel=1
+pkgver=4.2.4
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
index 87aefbff0..f798a615d 100755
--- a/libre/virtualbox-libre-modules/build.sh
+++ b/libre/virtualbox-libre-modules/build.sh
@@ -6,13 +6,11 @@ if (( $# != 1 )); then
   exit 1
 fi
 
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
diff --git a/libre/virtualbox-libre/003-remove_qt_fa_IR.patch b/libre/virtualbox-libre/003-remove_qt_fa_IR.patch
deleted file mode 100644
index 58e6235d5..000000000
--- a/libre/virtualbox-libre/003-remove_qt_fa_IR.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# seblu 10/2012 - fucking farci removing patch
-
---- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk   2012-10-18 16:22:52.000000000 +0200
-+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk   2012-10-19 03:03:52.640867388 +0200
-@@ -23,7 +23,6 @@
- 	de    \
- 	en    \
- 	es    \
--	fa_IR \
- 	hu    \
- 	it    \
- 	ja    \
-
---- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro	2012-10-18 16:22:47.000000000 +0200
-+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro	2012-10-20 02:48:37.525765901 +0200
-@@ -63,7 +63,6 @@
- 	nls/VirtualBox_es.ts \
- 	nls/VirtualBox_eu.ts \
- 	nls/VirtualBox_fi.ts \
--	nls/VirtualBox_fa_IR.ts \
- 	nls/VirtualBox_fr.ts \
- 	nls/VirtualBox_gl_ES.ts \
- 	nls/VirtualBox_hu.ts \
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 9e1d74cac..54978ea3c 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-host-source'
          'virtualbox-libre-guest-utils'
          'virtualbox-libre-guest-source')
-pkgver=4.2.2
+pkgver=4.2.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
@@ -58,7 +58,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
-        '003-remove_qt_fa_IR.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -79,7 +78,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
+md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -91,7 +90,6 @@ md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          '4f1692638d6740df4c4ad9766ba4e179'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '866ce76a94fb22cc7b625e07e571f0ad'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
          'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -113,9 +111,6 @@ md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
          '85141ccd2621a8e004b8f55c9a1f83eb'
          'c7b29fbf4c24a00e8646ca6dd73f38a1')
 
-#_extramodules=extramodules-3.5-LIBRE
-#_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
-
 build() {
     cd "VirtualBox-$pkgver"
 
@@ -169,7 +164,15 @@ build() {
 
 package_virtualbox-libre() {
     pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
-    depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng')
+    depends=('curl'
+             'libpng'
+             'libvncserver'
+             'libxcursor'
+             'libxinerama'
+             'libxml2'
+             'libxmu'
+             'sdl-libre'
+             'virtualbox-libre-host-modules')
     optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 0d5f817e6..745723604 100755
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=16.0.1
+_debver=16.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -30,8 +30,8 @@ options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${_debver}")
 replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
-         'ddfcf225ea0e3d7b4b377f4a63d5e8c4'
+md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
+         'ee38477dd7ede1c32e559ee74139b5c9'
          'f2f4f4a573f549e8b494e33b3ad226bc'
          '27271ce647a83906ef7a24605e840d61'
          '0a31239f1008038df5057982fe745dec')
diff --git a/~lukeshu/etckeeper/.gitignore b/pcr/etckeeper/.gitignore
index b4a9ca909..b4a9ca909 100644
--- a/~lukeshu/etckeeper/.gitignore
+++ b/pcr/etckeeper/.gitignore
diff --git a/~lukeshu/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
index a359500b5..163c320db 100644
--- a/~lukeshu/etckeeper/PKGBUILD
+++ b/pcr/etckeeper/PKGBUILD
@@ -1,26 +1,31 @@
-#Contributor: Danie Roux <accounts@danieroux.com>
-#Maintainer: Buce <dmbuce@gmail.com>
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Buce <dmbuce@gmail.com>
+# Contributor: Danie Roux <accounts@danieroux.com>
 
-# This requires lukeshu's modified makepkg to build
+# This requires makepkg newer than 4.0.3, which at this time means from git
 
 pkgname=etckeeper
-pkgver=0.63
-pkgrel=2.3
+pkgver=0.64
 pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
-arch=('any')
-backup=('etc/etckeeper/etckeeper.conf')
 url="http://kitenet.net/~joey/code/etckeeper/"
 license=('GPL2')
-provides=('etckeeper')
+
+pkgrel=1
+arch=('any')
 depends=('inetutils' 'python2')
 makedepends=('bzr') # bzr must be there at compile time to have bzr support
 optdepends=('git' 'hg' 'bzr' 'darcs')
+backup=(etc/etckeeper/etckeeper.conf)
 source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}"
+        etckeeper-pacman.patch
         etckeeper-archlinux.conf)
 
 build() {
   cd "$srcdir/etckeeper-$pkgver"
 
+  # add pacman support to list-to `list-installed`
+  patch -p0 -i "$srcdir/etckeeper-pacman.patch"
+
   # use python2
   sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py
 
@@ -34,4 +39,5 @@ package() {
 }
 
 md5sums=('SKIP'
+         'f1f00bf9331d1ef7f29b0ac29cdfcbda'
          '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/~lukeshu/etckeeper/etckeeper-archlinux.conf b/pcr/etckeeper/etckeeper-archlinux.conf
index 83e2c577d..83e2c577d 100644
--- a/~lukeshu/etckeeper/etckeeper-archlinux.conf
+++ b/pcr/etckeeper/etckeeper-archlinux.conf
diff --git a/pcr/etckeeper/etckeeper-pacman.patch b/pcr/etckeeper/etckeeper-pacman.patch
new file mode 100644
index 000000000..1fb4acb62
--- /dev/null
+++ b/pcr/etckeeper/etckeeper-pacman.patch
@@ -0,0 +1,9 @@
+--- list-installed.d/50list-installed.orig	2012-10-21 23:45:30.000000000 -0400
++++ list-installed.d/50list-installed	2012-10-21 23:45:39.000000000 -0400
+@@ -7,4 +7,6 @@
+ 		egrep '(ok installed|ok config-files)' | cut -f2,3
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ 	rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
++elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
++	{ pacman -Qd|sed 's/.*/& (dep)/'; pacman -Qe|sed 's/.*/& (explicit)/'; } |sort
+ fi
diff --git a/social/babeld/PKGBUILD b/social/babeld/PKGBUILD
new file mode 100644
index 000000000..5aa25f07f
--- /dev/null
+++ b/social/babeld/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
+# Maintainer (Parabola): fauno <fauno@parabola.nu>
+pkgname=babeld
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="Loop-free distance-vector routing protocol"
+arch=(i686 x86_64 mips64el)
+url="http://www.pps.jussieu.fr/~jch/software/babel/"
+license=('custom')
+depends=(glibc)
+source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz{,.asc})
+install=babeld.install
+md5sums=('37be1cbcc23cd00ee47efc9157c58795'
+         'e2dfae49b497ba70c0c1014feae80f3a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -e "s,/man/,/share&,g" -i Makefile
+
+  make PREFIX=/usr CFLAGS="$CFLAGS"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make PREFIX=/usr TARGET=$pkgdir install
+
+  gzip -f $pkgdir/usr/share/man/man8/$pkgname.8
+
+  install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
+}
diff --git a/social/babeld/babeld.install b/social/babeld/babeld.install
new file mode 100644
index 000000000..686153617
--- /dev/null
+++ b/social/babeld/babeld.install
@@ -0,0 +1,18 @@
+compatibility_warning() {
+  echo "PLEASE NOTE:"
+  echo " "
+  echo "-------------------------------------------------------------"
+  echo " This version uses the IANA-allocated UDP port and multicast"
+  echo " group and is therefore incompatible with older versions."
+  echo "-------------------------------------------------------------"
+}
+
+post_upgrade() {
+  major=$(echo $2 | cut -d '.' -f1)
+  minor=$(echo $2 | cut -d '.' -f2)
+  if [ $major -lt 1 ]; then
+    compatibility_warning
+  elif [ $major -eq 1 -a $minor -lt 1 ]; then
+    compatibility_warning
+  fi	
+}