summaryrefslogtreecommitdiff
path: root/libre/clementine-libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <andre@pc-01.localdomain>2012-05-28 21:11:38 -0300
committerAndré Fabian Silva Delgado <andre@pc-01.localdomain>2012-05-28 21:11:38 -0300
commitb4d31c628f35512bb4f467023dc38fdaac93e8c1 (patch)
tree6c505187ff0a78edfcadc12e0525a228a0ceadf1 /libre/clementine-libre
parent4fe36dd9ca7bb29b54a474f815b2fd1adea7ed92 (diff)
clementine-libre-1.0.1-3.1: adding a complete patch by kete
Diffstat (limited to 'libre/clementine-libre')
-rw-r--r--libre/clementine-libre/PKGBUILD15
-rw-r--r--libre/clementine-libre/remove-and-disable-spotify.patch24400
2 files changed, 24409 insertions, 6 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 89201cf74..2fc816bef 100644
--- 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): André Silva <andre.paulista@adinet.com.uy>
-#Contributor (Parabola): Kete <kete@ninthfloor.org>
+#Maintainer (Parabola): Kete <kete@ninthfloor.org>
+#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.0.1
-pkgrel=3
+pkgrel=3.1
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
@@ -27,11 +27,11 @@ provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
clementine-fix-albumcoverfetch-crash.patch
clementine-fresh-start.patch
- disable-spotify.patch)
+ remove-and-disable-spotify.patch)
sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd'
'fddd2e784181ce1dcc7809e7122cbade0af7b01f'
'd8abab4b8fb2d5284a2f43107505325e62d4af5f'
- 'ae796afc31bbd97c03513496cee335cb2601dca4')
+ '2c723f14f438d356398bc729d0bc2ac43feed911')
install=clementine.install
build() {
@@ -44,7 +44,10 @@ build() {
patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch
# https://labs.parabola.nu/issues/99
- patch -Np1 -i ../disable-spotify.patch
+ patch -Np1 -i ../remove-and-disable-spotify.patch
+
+ # Remove nonfree spotifyblob folder
+ rm -Rf "./spotifyblob"
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON
make
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-and-disable-spotify.patch
new file mode 100644
index 000000000..3892c5b9d
--- /dev/null
+++ b/libre/clementine-libre/remove-and-disable-spotify.patch
@@ -0,0 +1,24400 @@
+diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
+--- clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m 2011-12-02 19:24:43.000000000 -0200
++++ clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m 2012-05-28 17:19:14.612750904 -0300
+@@ -98,7 +98,6 @@
+ {
+ return [NSArray arrayWithObjects:
+ [[NSBundle mainBundle] bundleIdentifier], // your app
+- @"com.spotify.client",
+ @"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 @@
+ include(cmake/Version.cmake)
+ include(cmake/Deb.cmake)
+ include(cmake/Rpm.cmake)
+-include(cmake/SpotifyVersion.cmake)
+ include(cmake/OptionalSource.cmake)
+
+ if (UNIX AND NOT APPLE)
+@@ -66,7 +65,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(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)
+
+- find_library(SPOTIFY libspotify)
+- if (SPOTIFY)
+- set (SPOTIFY_FOUND ON)
+- set (SPOTIFY_INCLUDE_DIRS ${SPOTIFY})
+- set (SPOTIFY_LIBRARIES ${SPOTIFY})
+- endif (SPOTIFY)
+-
+ 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)
+
+ if(WIN32)
+@@ -235,24 +226,6 @@
+ set(HAVE_BREAKPAD ON)
+ endif(ENABLE_BREAKPAD)
+
+-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))
+-
+-if(QCA_FOUND AND HAVE_SPOTIFY)
+- set(HAVE_QCA ON)
+-endif(QCA_FOUND AND HAVE_SPOTIFY)
+-
+
+ if(ENABLE_VISUALISATIONS)
+ # When/if upstream accepts our patches then these options can be used to link
+@@ -391,14 +364,6 @@
+ add_subdirectory(3rdparty/google-breakpad)
+ endif(HAVE_BREAKPAD)
+
+-if(HAVE_SPOTIFY)
+- add_subdirectory(spotifyblob/common)
+-endif(HAVE_SPOTIFY)
+-
+-if(HAVE_SPOTIFY_BLOB)
+- add_subdirectory(spotifyblob/blob)
+-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>
+- <file>icons/22x22/spotify.png</file>
+- <file>icons/32x32/spotify.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>schema/schema-33.sql</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:
+- FixPlugin('clementine-spotifyblob', '.')
+-except:
+- print 'Failed to find spotify blob'
+-
+ 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 @@
+ Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
+
+ ; 1.0 prerelease
+- Delete "$INSTDIR\spotify.dll"
+
+ ; 1.0
+ Delete "$INSTDIR\libofa.dll"
+@@ -109,7 +108,6 @@
+ File "avformat-52.dll"
+ File "avutil-50.dll"
+ File "clementine.exe"
+- File "clementine-spotifyblob.exe"
+ File "clementine.ico"
+ File "glew32.dll"
+ File "intl.dll"
+@@ -163,7 +161,6 @@
+ File "libqjson.dll"
+ File "libsoup-2.4-1.dll"
+ File "libspeex-1.dll"
+- File "libspotify.dll"
+ File "libtag.dll"
+ File "libtasn1-3.dll"
+ File "libusbmuxd.dll"
+@@ -949,7 +946,6 @@
+ Delete "$INSTDIR\avutil-50.dll"
+ Delete "$INSTDIR\clementine.ico"
+ Delete "$INSTDIR\clementine.exe"
+- Delete "$INSTDIR\clementine-spotifyblob.exe"
+ Delete "$INSTDIR\glew32.dll"
+ Delete "$INSTDIR\intl.dll"
+ Delete "$INSTDIR\libcdio-12.dll"
+@@ -1002,7 +998,6 @@
+ Delete "$INSTDIR\libqjson.dll"
+ Delete "$INSTDIR\libsoup-2.4-1.dll"
+ Delete "$INSTDIR\libspeex-1.dll"
+- Delete "$INSTDIR\libspotify.dll"
+ 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 @@
+ Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
+
+ ; 1.0 prerelease
+- Delete "$INSTDIR\spotify.dll"
+
+ ; 1.0
+ Delete "$INSTDIR\libofa.dll"
+@@ -109,7 +108,6 @@
+ File "avformat-52.dll"
+ File "avutil-50.dll"
+ File "clementine.exe"
+- File "clementine-spotifyblob.exe"
+ File "clementine.ico"
+ File "glew32.dll"
+ File "intl.dll"
+@@ -163,7 +161,6 @@
+ File "libqjson.dll"
+ File "libsoup-2.4-1.dll"
+ File "libspeex-1.dll"
+- File "libspotify.dll"
+ File "libtag.dll"
+ File "libtasn1-3.dll"
+ File "libusbmuxd.dll"
+@@ -949,7 +946,6 @@
+ Delete "$INSTDIR\avutil-50.dll"
+ Delete "$INSTDIR\clementine.ico"
+ Delete "$INSTDIR\clementine.exe"
+- Delete "$INSTDIR\clementine-spotifyblob.exe"
+ Delete "$INSTDIR\glew32.dll"
+ Delete "$INSTDIR\intl.dll"
+ Delete "$INSTDIR\libcdio-12.dll"
+@@ -1002,7 +998,6 @@
+ Delete "$INSTDIR\libqjson.dll"
+ Delete "$INSTDIR\libsoup-2.4-1.dll"
+ Delete "$INSTDIR\libspeex-1.dll"
+- Delete "$INSTDIR\libspotify.dll"
+ 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-28 21:04:56.037937194 -0300
+@@ -73,7 +73,6 @@
+ core/globalshortcutbackend.cpp
+ core/globalshortcuts.cpp
+ core/gnomeglobalshortcutbackend.cpp
+- core/logging.cpp
+ core/mergedproxymodel.cpp
+ core/multisortfilterproxy.cpp
+ core/musicstorage.cpp
+@@ -552,7 +551,6 @@
+ internet/internetviewcontainer.ui
+ internet/magnatunedownloaddialog.ui
+ internet/magnatunesettingspage.ui
+- internet/spotifysettingspage.ui
+
+ library/groupbydialog.ui
+ library/libraryfilterwidget.ui
+@@ -690,23 +688,6 @@
+ internet/lastfmstationdialog.ui
+ )
+
+-# Spotify
+-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
+-)
+-
+ optional_source(HAVE_QCA INCLUDE_DIRECTORIES ${QCA_INCLUDE_DIRS})
+
+ # Platform specific - OS X
+@@ -1037,14 +1018,6 @@
+ endif (LINUX)
+ endif(HAVE_BREAKPAD)
+
+-if(HAVE_SPOTIFY)
+- target_link_libraries(clementine_lib
+- clementine-spotifyblob-messages
+- ${QCA_LIBRARIES}
+- )
+- link_directories(${QCA_LIBRARY_DIRS})
+-endif(HAVE_SPOTIFY)
+-
+ if (APPLE)
+ target_link_libraries(clementine_lib
+ ${GROWL}
+@@ -1118,11 +1091,6 @@
+ clementine_lib
+ )
+
+-# macdeploy.py relies on the blob being built first.
+-if(HAVE_SPOTIFY_BLOB)
+- add_dependencies(clementine clementine-spotifyblob)
+-endif(HAVE_SPOTIFY_BLOB)
+-
+ 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 @@
+ #cmakedefine HAVE_QCA
+ #cmakedefine HAVE_REMOTE
+ #cmakedefine HAVE_SPARKLE
+-#cmakedefine HAVE_SPOTIFY
+ #cmakedefine HAVE_STATIC_SQLITE
+ #cmakedefine HAVE_WIIMOTEDEV
+ #cmakedefine LEOPARD
+diff -rauN clementine-1.0.1/src/core/logging.cpp /dev/null
+--- clementine-1.0.1/src/core/logging.cpp 2011-12-02 19:24:43.000000000 -0200
++++ /dev/null 2012-05-28 12:50:04.796939473 -0300
+@@ -1,180 +0,0 @@
+-/* This file is part of Clementine.
+- Copyright 2011, David Sansome <me@davidsansome.com>
+-
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+- http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+-*/
+-
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+-
+-#include <QCoreApplication>
+-#include <QDateTime>
+-#include <QStringList>
+-
+-#include <glib.h>
+-
+-#include "logging.h"
+-
+-
+-namespace logging {
+-
+-static Level sDefaultLevel = Level_Debug;
+-static QMap<QString, Level>* sClassLevels = NULL;
+-static QIODevice* sNullDevice = NULL;
+-
+-const char* kDefaultLogLevels = "GstEnginePipeline:2,*:3";
+-
+-static const char* kMessageHandlerMagic = "__logging_message__";
+-static const int kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
+-static QtMsgHandler sOriginalMessageHandler = NULL;
+-
+-
+-void GLog(const char* domain, int level, const char* message, void* user_data) {
+- switch (level) {
+- case G_LOG_FLAG_RECURSION:
+- case G_LOG_FLAG_FATAL:
+- case G_LOG_LEVEL_ERROR:
+- case G_LOG_LEVEL_CRITICAL: qLog(Error) << message; break;
+- case G_LOG_LEVEL_WARNING: qLog(Warning) << message; break;
+- case G_LOG_LEVEL_MESSAGE:
+- case G_LOG_LEVEL_INFO: qLog(Info) << message; break;
+- case G_LOG_LEVEL_DEBUG:
+- default: qLog(Debug) << message; break;
+- }
+-}
+-
+-static void MessageHandler(QtMsgType type, const char* message) {
+- if (strncmp(kMessageHandlerMagic, message, kMessageHandlerMagicLength) == 0) {
+- fprintf(stderr, "%s\n", message + kMessageHandlerMagicLength);
+- return;
+- }
+-
+- Level level = Level_Debug;
+- switch (type) {
+- case QtFatalMsg:
+- case QtCriticalMsg: level = Level_Error; break;
+- case QtWarningMsg: level = Level_Warning; break;
+- case QtDebugMsg:
+- default: level = Level_Debug; break;
+- }
+-
+- foreach (const QString& line, QString::fromLocal8Bit(message).split('\n')) {
+- CreateLogger(level, "unknown", -1) << line.toLocal8Bit().constData();
+- }
+-
+- if (type == QtFatalMsg) {
+- abort();
+- }
+-}
+-
+-
+-void Init() {
+- delete sClassLevels;
+- delete sNullDevice;
+-
+- sClassLevels = new QMap<QString, Level>();
+- sNullDevice = new NullDevice;
+-
+- // Catch other messages from Qt
+- if (!sOriginalMessageHandler) {
+- sOriginalMessageHandler = qInstallMsgHandler(MessageHandler);
+- }
+-}
+-
+-void SetLevels(const QString& levels) {
+- if (!sClassLevels)
+- return;
+-
+- foreach (const QString& item, levels.split(',')) {
+- const QStringList class_level = item.split(':');
+-
+- QString class_name;
+- bool ok = false;
+- int level = Level_Error;
+-
+- if (class_level.count() == 1) {
+- level = class_level.last().toInt(&ok);
+- } else if (class_level.count() == 2) {
+- class_name = class_level.first();
+- level = class_level.last().toInt(&ok);
+- }
+-
+- if (!ok || level < Level_Error || level > Level_Debug) {
+- continue;
+- }
+-
+- if (class_name.isEmpty() || class_name == "*") {
+- sDefaultLevel = (Level) level;
+- } else {
+- sClassLevels->insert(class_name, (Level) level);
+- }
+- }
+-}
+-
+-QString ParsePrettyFunction(const char * pretty_function) {
+- // Get the class name out of the function name.
+- QString class_name = pretty_function;
+- const int paren = class_name.indexOf('(');
+- if (paren != -1) {
+- const int colons = class_name.lastIndexOf("::", paren);
+- if (colons != -1) {
+- class_name = class_name.left(colons);
+- } else {
+- class_name = class_name.left(paren);
+- }
+- }
+-
+- const int space = class_name.lastIndexOf(' ');
+- if (space != -1) {
+- class_name = class_name.mid(space+1);
+- }
+-
+- return class_name;
+-}
+-
+-QDebug CreateLogger(Level level, const QString& class_name, int line) {
+- // Map the level to a string
+- const char* level_name = NULL;
+- switch (level) {
+- case Level_Debug: level_name = " DEBUG "; break;
+- case Level_Info: level_name = " INFO "; break;
+- case Level_Warning: level_name = " WARN "; break;
+- case Level_Error: level_name = " ERROR "; break;
+- }
+-
+- // Check the settings to see if we're meant to show or hide this message.
+- Level threshold_level = sDefaultLevel;
+- if (sClassLevels && sClassLevels->contains(class_name)) {
+- threshold_level = sClassLevels->value(class_name);
+- }
+-
+- if (level > threshold_level) {
+- return QDebug(sNullDevice);
+- }
+-
+- QString function_line = class_name;
+- if (line != -1) {
+- function_line += ":" + QString::number(line);
+- }
+-
+- QDebug ret(QtDebugMsg);
+- ret.nospace() << kMessageHandlerMagic
+- << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toAscii().constData()
+- << level_name << function_line.leftJustified(32).toAscii().constData();
+-
+- return ret.space();
+-}
+-
+-} // namespace logging
+diff -rauN clementine-1.0.1/src/core/logging.h /dev/null
+--- clementine-1.0.1/src/core/logging.h 2011-12-02 19:24:43.000000000 -0200
++++ /dev/null 2012-05-28 12:50:04.796939473 -0300
+@@ -1,60 +0,0 @@
+-/* This file is part of Clementine.
+- Copyright 2011, David Sansome <me@davidsansome.com>
+-
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+- http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+-*/
+-
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+-
+-#ifndef LOGGING_H
+-#define LOGGING_H
+-
+-#include <QDebug>
+-
+-#ifdef QT_NO_DEBUG_STREAM
+-# define qLog(level) while (false) QNoDebug()
+-#else
+-# define qLog(level) \
+- logging::CreateLogger(logging::Level_##level, \
+- logging::ParsePrettyFunction(__PRETTY_FUNCTION__), __LINE__)
+-#endif
+-
+-namespace logging {
+- class NullDevice : public QIODevice {
+- protected:
+- qint64 readData(char*, qint64) { return -1; }
+- qint64 writeData(const char*, qint64 len) { return len; }
+- };
+-
+- enum Level {
+- Level_Error = 0,
+- Level_Warning,
+- Level_Info,
+- Level_Debug,
+- };
+-
+- void Init();
+- void SetLevels(const QString& levels);
+-
+- QString ParsePrettyFunction(const char* pretty_function);
+- QDebug CreateLogger(Level level, const QString& class_name, int line);
+-
+- void GLog(const char* domain, int level, const char* message, void* user_data);
+-
+- extern const char* kDefaultLogLevels;
+-}
+-
+-#endif // LOGGING_H
+diff -rauN clementine-1.0.1/src/core/timeconstants.h /dev/null
+--- clementine-1.0.1/src/core/timeconstants.h 2011-12-02 19:24:44.000000000 -0200
++++ /dev/null 2012-05-28 12:50:04.796939473 -0300
+@@ -1,34 +0,0 @@
+-/* This file is part of Clementine.
+- Copyright 2011, David Sansome <me@davidsansome.com>
+-
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+- http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+-*/
+-
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+-#ifndef TIMECONSTANTS_H
+-#define TIMECONSTANTS_H
+-
+-#include <QtGlobal>
+-
+-// Use these to convert between time units
+-const qint64 kMsecPerSec = 1000ll;
+-const qint64 kUsecPerMsec = 1000ll;
+-const qint64 kUsecPerSec = 1000000ll;
+-const qint64 kNsecPerUsec = 1000ll;
+-const qint64 kNsecPerMsec = 1000000ll;
+-const qint64 kNsecPerSec = 1000000000ll;
+-
+-#endif // TIMECONSTANTS_H
+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 @@
+ return QDir::homePath();
+ #endif
+
+- case Path_LocalSpotifyBlob:
+- return GetConfigPath(Path_Root) + "/spotifyblob";
+-
+ 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 @@
+ Path_NetworkCache,
+ Path_GstreamerRegistry,
+ Path_DefaultMusicLibrary,
+- Path_LocalSpotifyBlob,
+ };
+ 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 @@
+ #include <QUrl>
+ #include <QNetworkReply>
+
+-#ifdef HAVE_SPOTIFY
+-# include "internet/spotifyservice.h"
+-#endif
+-
+
+ AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
+ : QObject(parent),
+@@ -40,8 +36,7 @@
+ scale_(true),
+ padding_(true),
+ next_id_(0),
+- network_(new NetworkAccessManager(this)),
+- connected_spotify_(false)
++ network_(new NetworkAccessManager(this))
+ {
+ }
+
+@@ -148,46 +143,12 @@
+
+ remote_tasks_.insert(reply, task);
+ return TryLoadResult(true, false, QImage());
+- } else if (filename.toLower().startsWith("spotify://image/")) {
+- // HACK: we should add generic image URL handlers
+- #ifdef HAVE_SPOTIFY
+- SpotifyService* spotify = InternetModel::Service<SpotifyService>();
+-
+- if (!connected_spotify_) {
+- connect(spotify, SIGNAL(ImageLoaded(QString,QImage)),
+- SLOT(SpotifyImageLoaded(QString,QImage)));
+- connected_spotify_ = true;
+- }
+-
+- QString id = QUrl(filename).path();
+- if (id.startsWith('/')) {
+- id.remove(0, 1);
+- }
+- remote_spotify_tasks_.insert(id, task);
+-
+- // Need to schedule this in the spotify service's thread
+- QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection,
+- Q_ARG(QString, id));
+- return TryLoadResult(true, false, QImage());
+- #else
+- return TryLoadResult(false, false, QImage());
+- #endif
+ }
+
+ QImage image(filename);
+ return TryLoadResult(false, !image.isNull(), image.isNull() ? default_ : image);
+ }
+
+-void AlbumCoverLoader::SpotifyImageLoaded(const QString& id, const QImage& image) {
+- if (!remote_spotify_tasks_.contains(id))
+- return;
+-
+- Task task = remote_spotify_tasks_.take(id);
+- QImage scaled = ScaleAndPad(image);
+- emit ImageLoaded(task.id, scaled);
+- emit ImageLoaded(task.id, scaled, image);
+-}
+-
+ 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 @@
+ protected slots:
+ void ProcessTasks();
+ void RemoteFetchFinished();
+- void SpotifyImageLoaded(const QString& url, const QImage& image);
+
+ protected:
+ enum State {
+@@ -108,13 +107,10 @@
+ QMutex mutex_;
+ QQueue<Task> tasks_;
+ QMap<QNetworkReply*, Task> remote_tasks_;
+- QMap<QString, Task> remote_spotify_tasks_;
+ quint64 next_id_;
+
+ NetworkAccessManager* network_;
+
+- bool connected_spotify_;
+-
+ 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 @@
+ #include "core/utilities.h"
+ #include "internet/internetmodel.h"
+
+-#ifdef HAVE_SPOTIFY
+-# include "internet/spotifyserver.h"
+-# include "internet/spotifyservice.h"
+-#endif
+-
+ #include <QtConcurrentRun>
+
+ const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
+@@ -131,36 +126,6 @@
+ bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
+ GstElement* new_bin = NULL;
+
+- if (url.scheme() == "spotify") {
+- #ifdef HAVE_SPOTIFY
+- new_bin = gst_bin_new("spotify_bin");
+-
+- // Create elements
+- GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
+- GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
+- if (!src || !gdp)
+- return false;
+-
+- // Pick a port number
+- const int port = Utilities::PickUnusedPort();
+- g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL);
+- g_object_set(G_OBJECT(src), "port", port, NULL);
+-
+- // Link the elements
+- gst_element_link(src, gdp);
+-
+- // Add a ghost pad
+- GstPad* pad = gst_element_get_static_pad(gdp, "src");
+- gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad));
+- gst_object_unref(GST_OBJECT(pad));
+-
+- // Tell spotify to start sending data to us.
+- InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port);
+- #else // HAVE_SPOTIFY
+- qLog(Error) << "Tried to play a spotify:// url, but spotify support is not compiled in";
+- return false;
+- #endif
+- } 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);
+- }
+
+ 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 @@
+ #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_SPOTIFY
+- AddService(new SpotifyService(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/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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -311,7 +309,7 @@
+
+ #: ../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,11 +582,7 @@
+ 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"
+@@ -815,9 +809,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1025,9 +1017,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1046,9 +1036,7 @@
+ msgid "Connect device"
+ msgstr "Падлучэнне прылады"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1465,9 +1453,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1481,9 +1467,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Спампаваць каталог Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1634,9 +1618,7 @@
+ 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
+@@ -1819,9 +1801,7 @@
+ 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"
+@@ -2085,9 +2065,7 @@
+ "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"
+@@ -2117,9 +2095,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2423,7 +2399,7 @@
+ #: ../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,9 +2475,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2759,9 +2733,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2897,7 +2869,7 @@
+
+ #: ../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,9 +2976,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3038,7 +3008,7 @@
+
+ #: ../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,9 +3025,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3449,17 +3417,11 @@
+ 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, ...)"
+@@ -3785,29 +3747,19 @@
+ 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"
+@@ -3818,7 +3770,7 @@
+ 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,17 +3856,11 @@
+ 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"
+@@ -4273,9 +4219,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4292,7 +4236,7 @@
+
+ #: ../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,19 +4460,11 @@
+ 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"
+@@ -4589,7 +4525,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4678,8 +4614,7 @@
+ 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-05 19:34:04.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,13 +587,7 @@
+ 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"
+@@ -822,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr "Поддръжка на CUE листове"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Отказ"
++ Отказ"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1038,9 +1028,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Настройване на бързите клавиши"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Настройване на Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1060,9 +1048,7 @@
+ msgid "Connect device"
+ msgstr "Свързване на устройство"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Свързване към Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1480,9 +1466,7 @@
+ msgid "Download this album..."
+ msgstr "Сваляне на този албум..."
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Изтегляне..."
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1496,9 +1480,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Сваляне на каталог Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Изтегляне на приставка за Spotify"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1654,9 +1636,7 @@
+ 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
+@@ -1839,11 +1819,7 @@
+ 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"
+@@ -2117,9 +2093,7 @@
+ "В динамичен режим новите песни ще бъдат избирани и добавяни към списъка с "
+ "песни всеки път, когато свърши песента."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Входящи"
++ Входящи"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2149,9 +2123,7 @@
+ msgid "Insert..."
+ msgstr "Вмъкване..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Инсталирани"
++ Инсталирани"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2459,7 +2431,7 @@
+ #: ../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,9 +2507,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Списъкът с песни да е наличен в режим извън мрежа"
++ Списъкът с песни да е наличен в режим извън мрежа"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2798,9 +2768,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Недостатъчно съседи"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Не е инсталиран"
++ Не е инсталиран"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2936,7 +2904,7 @@
+
+ #: ../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,9 +3011,7 @@
+ msgid "Playlists"
+ msgstr "Списъци с песни"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Състояние на приставката:"
++ Състояние на приставката:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3077,7 +3043,7 @@
+
+ #: ../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,9 +3061,7 @@
+ msgid "Preferred audio format"
+ msgstr "Предпочитан аудио формат"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Предпочитан битов поток"
++ Предпочитан битов поток"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3489,17 +3453,7 @@
+ 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, ...)"
+@@ -3826,29 +3780,13 @@
+ 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"
+@@ -3859,7 +3797,7 @@
+ 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,17 +3883,7 @@
+ 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"
+@@ -4342,9 +4270,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "Използване на системните настройки за сървър-посредник"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Използване на нормализация на звука"
++ Използване на нормализация на звука"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4361,7 +4287,7 @@
+
+ #: ../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,19 +4525,7 @@
+ 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"
+@@ -4680,7 +4594,7 @@
+ msgstr "Вашите слушания: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr "Вашето потребителско име или парола не съвпада."
+
+@@ -4769,8 +4683,7 @@
+ 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-05 15:32:06.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -311,7 +309,7 @@
+
+ #: ../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,11 +582,7 @@
+ 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 ""
++
+ "এক্ টি প্লাগ ইন প্রয়োজন। আপনি কি প্লাগ ইন টি ডাউনলোড করে ইন্সটল করতে ইচ্ছুক "
+ "?"
+
+@@ -817,9 +811,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1021,9 +1013,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1042,9 +1032,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1455,9 +1443,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1471,9 +1457,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1624,9 +1608,7 @@
+ 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
+@@ -1809,9 +1791,7 @@
+ 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"
+@@ -2075,9 +2055,7 @@
+ "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"
+@@ -2107,9 +2085,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2413,7 +2389,7 @@
+ #: ../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,9 +2465,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2749,9 +2723,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2887,7 +2859,7 @@
+
+ #: ../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,9 +2966,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3028,7 +2998,7 @@
+
+ #: ../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,9 +3015,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3439,17 +3407,11 @@
+ 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, ...)"
+@@ -3775,29 +3737,19 @@
+ 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"
+@@ -3808,7 +3760,7 @@
+ 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,17 +3846,11 @@
+ 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"
+@@ -4263,9 +4209,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4282,7 +4226,7 @@
+
+ #: ../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,19 +4450,11 @@
+ 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"
+@@ -4579,7 +4515,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4668,8 +4604,7 @@
+ 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-05 19:27:58.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -314,7 +312,7 @@
+
+ #: ../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,13 +586,7 @@
+ 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"
+@@ -824,9 +816,7 @@
+ msgid "CUE sheet support"
+ msgstr "Kemer e kont ar CUE sheet"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Nullañ"
++ Nullañ"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1040,9 +1030,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Kefluniañ ar Berradennoù"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Kefluniañ Spotify"
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1061,9 +1049,7 @@
+ 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"
+@@ -1480,9 +1466,7 @@
+ 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"
+@@ -1496,9 +1480,7 @@
+ 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"
+@@ -1653,9 +1635,7 @@
+ 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
+@@ -1841,9 +1821,7 @@
+ 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"
+@@ -2119,9 +2097,7 @@
+ "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"
++ Boest degemer"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2151,9 +2127,7 @@
+ msgid "Insert..."
+ msgstr "Enlakaat..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Staliaet"
++ Staliaet"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2458,7 +2432,7 @@
+ #: ../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,9 +2508,7 @@
+ 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"
++ Lakaat ar roll c'hoari da vezañ lennus ezlinenn"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2798,9 +2770,7 @@
+ msgid "Not enough neighbors"
+ msgstr "N'eus ket trawalc'h a amezeizen"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "N'eo ket staliet"
++ N'eo ket staliet"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2936,7 +2906,7 @@
+
+ #: ../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,9 +3013,7 @@
+ msgid "Playlists"
+ msgstr "Rollioù c'hoari"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stad an enlugellad"
++ Stad an enlugellad"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3077,7 +3045,7 @@
+
+ #: ../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,9 +3062,7 @@
+ msgid "Preferred audio format"
+ msgstr "Stumm audio gwellañ"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate gwellañ"
++ Bitrate gwellañ"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3488,17 +3454,7 @@
+ 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, ...)"
+@@ -3824,29 +3780,13 @@
+ 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"
+@@ -3857,7 +3797,7 @@
+ 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,17 +3883,7 @@
+ 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"
+@@ -4336,9 +4266,7 @@
+ 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"
++ Implij normalizadur an ampled"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4355,7 +4283,7 @@
+
+ #: ../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,21 +4520,7 @@
+ 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"
+@@ -4675,7 +4589,7 @@
+ 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 +4678,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -311,7 +309,7 @@
+
+ #: ../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,11 +582,7 @@
+ 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"
+@@ -815,9 +809,7 @@
+ 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"
+@@ -1029,9 +1021,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Podesi prečice"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1050,9 +1040,7 @@
+ 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"
+@@ -1467,9 +1455,7 @@
+ 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"
+@@ -1483,9 +1469,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Preuzimam Magnatune katalog"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1636,9 +1620,7 @@
+ 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
+@@ -1821,9 +1803,7 @@
+ 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"
+@@ -2087,9 +2067,7 @@
+ "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"
+@@ -2119,9 +2097,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2425,7 +2401,7 @@
+ #: ../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,9 +2477,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2761,9 +2735,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2899,7 +2871,7 @@
+
+ #: ../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,9 +2978,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3040,7 +3010,7 @@
+
+ #: ../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,9 +3027,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3451,17 +3419,11 @@
+ 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, ...)"
+@@ -3787,29 +3749,19 @@
+ 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"
+@@ -3820,7 +3772,7 @@
+ 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,17 +3858,11 @@
+ 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"
+@@ -4275,9 +4221,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4294,7 +4238,7 @@
+
+ #: ../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,19 +4462,11 @@
+ 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"
+@@ -4591,7 +4527,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4680,8 +4616,7 @@
+ 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-05 18:36:54.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -318,7 +316,7 @@
+
+ #: ../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,13 +589,7 @@
+ 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"
+@@ -827,9 +819,7 @@
+ msgid "CUE sheet support"
+ msgstr "Suport per a CUE sheet"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Canceŀla"
++ Canceŀla"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1043,9 +1033,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configura dreceres"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configura l'Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1064,9 +1052,7 @@
+ 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"
+@@ -1483,9 +1469,7 @@
+ 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"
+@@ -1499,9 +1483,7 @@
+ 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"
+@@ -1654,9 +1636,7 @@
+ 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
+@@ -1839,9 +1819,7 @@
+ 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"
+@@ -2110,9 +2088,7 @@
+ "time a song finishes."
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Safata d'entrafa"
++ Safata d'entrafa"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2142,9 +2118,7 @@
+ msgid "Insert..."
+ msgstr "Insereix..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instaŀlat"
++ Instaŀlat"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2450,7 +2424,7 @@
+ #: ../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,9 +2500,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2788,9 +2760,7 @@
+ 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"
+@@ -2926,7 +2896,7 @@
+
+ #: ../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,9 +3003,7 @@
+ msgid "Playlists"
+ msgstr "Llistes de reproducció"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3067,7 +3035,7 @@
+
+ #: ../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,9 +3052,7 @@
+ 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"
+@@ -3478,17 +3444,11 @@
+ 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, ...)"
+@@ -3814,29 +3774,13 @@
+ 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"
+@@ -3847,7 +3791,7 @@
+ 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,17 +3877,11 @@
+ 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"
+@@ -4314,9 +4252,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4333,7 +4269,7 @@
+
+ #: ../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,19 +4496,11 @@
+ 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"
+@@ -4636,7 +4564,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4725,8 +4653,7 @@
+ 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-05 18:37:10.000000000 -0400
+@@ -257,9 +257,7 @@
+ 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 ""
+@@ -321,7 +319,7 @@
+
+ #: ../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,13 +592,7 @@
+ 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"
+@@ -827,9 +819,7 @@
+ msgid "CUE sheet support"
+ msgstr "Podpora pro list CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Zrušit"
++ Zrušit"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1041,9 +1031,7 @@
+ 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..."
+@@ -1062,9 +1050,7 @@
+ 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"
+@@ -1481,9 +1467,7 @@
+ 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"
+@@ -1497,9 +1481,7 @@
+ 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"
+@@ -1653,9 +1635,7 @@
+ 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
+@@ -1838,10 +1818,7 @@
+ 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"
+@@ -2115,9 +2092,7 @@
+ "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"
++ Doručená pošta"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2147,9 +2122,7 @@
+ msgid "Insert..."
+ msgstr "Vložit..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Nainstalován"
++ Nainstalován"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2456,7 +2429,7 @@
+ #: ../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,9 +2505,7 @@
+ 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"
+
+@@ -2796,9 +2767,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nedostatek sousedů"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nenainstalován"
++ Nenainstalován"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2934,7 +2903,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Playlists"
+ msgstr "Seznamy skladeb"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stav přídavného modulu:"
++ Stav přídavného modulu:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3075,7 +3042,7 @@
+
+ #: ../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,9 +3059,7 @@
+ 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"
++ Upřednostňovaný datový tok"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3486,17 +3451,7 @@
+ 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, ...)"
+@@ -3822,29 +3777,13 @@
+ 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"
+@@ -3855,7 +3794,7 @@
+ 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,17 +3880,7 @@
+ 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"
+@@ -4329,9 +4258,7 @@
+ 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"
++ Použít normalizaci hlasitosti"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4348,7 +4275,7 @@
+
+ #: ../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,21 +4511,7 @@
+ 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"
+@@ -4667,7 +4580,7 @@
+ 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 +4669,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 17:48:48.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -315,7 +313,7 @@
+
+ #: ../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,11 +586,7 @@
+ 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"
+@@ -819,9 +813,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1023,9 +1015,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfigurér Genveje"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1044,9 +1034,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1457,9 +1445,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1473,9 +1459,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1628,9 +1612,7 @@
+ 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
+@@ -1813,9 +1795,7 @@
+ 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"
+@@ -2079,9 +2059,7 @@
+ "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"
+@@ -2111,9 +2089,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2417,7 +2393,7 @@
+ #: ../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,9 +2469,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2753,9 +2727,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Ikke nok naboer"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2891,7 +2863,7 @@
+
+ #: ../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,9 +2970,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3032,7 +3002,7 @@
+
+ #: ../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,9 +3019,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3443,17 +3411,11 @@
+ 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, ...)"
+@@ -3781,29 +3743,19 @@
+ 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"
+@@ -3814,7 +3766,7 @@
+ 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,17 +3852,11 @@
+ 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"
+@@ -4270,9 +4216,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4289,7 +4233,7 @@
+
+ #: ../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,19 +4457,11 @@
+ 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"
+@@ -4586,7 +4522,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4675,8 +4611,7 @@
+ 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-05 19:30:46.000000000 -0400
+@@ -258,9 +258,7 @@
+ 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 ""
+@@ -323,7 +321,7 @@
+
+ #: ../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,13 +595,7 @@
+ 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"
+@@ -832,9 +824,7 @@
+ msgid "CUE sheet support"
+ msgstr "Unterstützung von Cuesheets"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Abbrechen"
++ Abbrechen"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1048,9 +1038,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Tastenkürzel einrichten"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Spotify konfigurieren..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1069,9 +1057,7 @@
+ 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"
+@@ -1488,9 +1474,7 @@
+ 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"
+@@ -1504,9 +1488,7 @@
+ 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"
+@@ -1662,9 +1644,7 @@
+ 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
+@@ -1847,11 +1827,7 @@
+ 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"
+@@ -2125,9 +2101,7 @@
+ "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"
++ Posteingang"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2157,9 +2131,7 @@
+ msgid "Insert..."
+ msgstr "Einfügen..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installiert"
++ Installiert"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2465,7 +2437,7 @@
+ #: ../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,9 +2513,7 @@
+ 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"
+@@ -2803,9 +2773,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nicht genug Nachbarn"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nicht installiert"
++ Nicht installiert"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2941,7 +2909,7 @@
+
+ #: ../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,9 +3017,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Plugin-Status"
++ Plugin-Status"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3083,7 +3049,7 @@
+
+ #: ../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,9 +3066,7 @@
+ msgid "Preferred audio format"
+ msgstr "Bevorzugtes Dateiformat"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bevorzugte Bitrate"
++ Bevorzugte Bitrate"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3494,17 +3458,7 @@
+ 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, ...)"
+@@ -3832,29 +3786,13 @@
+ 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"
+@@ -3865,7 +3803,7 @@
+ 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,17 +3889,7 @@
+ 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"
+@@ -4345,9 +4273,7 @@
+ 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"
+@@ -4364,7 +4290,7 @@
+
+ #: ../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,19 +4528,7 @@
+ 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"
+@@ -4683,7 +4597,7 @@
+ 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 +4686,7 @@
+ 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-05 18:37:52.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -318,7 +316,7 @@
+
+ #: ../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,13 +589,7 @@
+ 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"
+@@ -827,9 +819,7 @@
+ msgid "CUE sheet support"
+ msgstr "Υποστήριξη φύλλων CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Άκυρο"
++ Άκυρο"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1046,9 +1036,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Ρύθμιση συντομεύσεων"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Ρύθμιση του Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1069,9 +1057,7 @@
+ msgid "Connect device"
+ msgstr "Σύνδεση συσκευής"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Σύνδεση στο Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1488,9 +1474,7 @@
+ msgid "Download this album..."
+ msgstr "Μεταφόρτωση αυτού του άλμπουμ..."
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Λήψη..."
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1504,9 +1488,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Μεταφόρτωση καταλόγου του Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Λήψη πρόσθετου για το Spotify"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1664,9 +1646,7 @@
+ 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
+@@ -1850,10 +1830,7 @@
+ 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"
+@@ -2129,9 +2106,7 @@
+ "Στην δυναμική λειτουργία νέα κομμάτια θα επιλέγονται και τοποθετούνται στην "
+ "λίστα κάθε φορά που ένα τραγούδι τελειώνει."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Εισερχόμενα"
++ Εισερχόμενα"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2163,9 +2138,7 @@
+ msgid "Insert..."
+ msgstr "Εισαγωγή..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Εγκατεστημένο"
++ Εγκατεστημένο"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2471,7 +2444,7 @@
+ #: ../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,9 +2520,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Κύριο προφίλ (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Η λίστα να είναι διαθέσιμη και εκτός σύνδεσης"
++ Η λίστα να είναι διαθέσιμη και εκτός σύνδεσης"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2812,9 +2783,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Δεν υπάρχουν αρκετοί γείτονες"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Μη εγκατεστημένο"
++ Μη εγκατεστημένο"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2950,7 +2919,7 @@
+
+ #: ../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,9 +3026,7 @@
+ msgid "Playlists"
+ msgstr "Λίστες"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Κατάσταση πρόσθετου:"
++ Κατάσταση πρόσθετου:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3091,7 +3058,7 @@
+
+ #: ../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,9 +3077,7 @@
+ msgid "Preferred audio format"
+ msgstr "Προτιμώμενη ηχητική διαμόρφωση"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Προτιμώμενος ρυθμός bit "
++ Προτιμώμενος ρυθμός bit "
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3504,17 +3469,7 @@
+ 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, ...)"
+@@ -3843,29 +3798,13 @@
+ 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"
+@@ -3876,7 +3815,7 @@
+ 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,17 +3903,7 @@
+ 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"
+@@ -4361,9 +4290,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "Χρήση ρυθμίσεων του διαμεσολαβητή του συστήματος"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Χρήση κανονικοποίησης ήχου"
++ Χρήση κανονικοποίησης ήχου"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4380,7 +4307,7 @@
+
+ #: ../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,21 +4544,7 @@
+ 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"
+@@ -4699,7 +4612,7 @@
+ msgstr "Τα scrobbles σου: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr "Το όνομα χρήστη ή το συνθηματικό ήταν λανθασμένο."
+
+@@ -4788,8 +4701,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configure Shortcuts"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1452,9 +1440,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1468,9 +1454,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Downloading Magnatune catalogue"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1622,9 +1606,7 @@
+ 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
+@@ -1807,9 +1789,7 @@
+ 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"
+@@ -2073,9 +2053,7 @@
+ "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"
+@@ -2105,9 +2083,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2411,7 +2387,7 @@
+ #: ../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,9 +2463,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2748,9 +2722,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Not enough neighbours"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2886,7 +2858,7 @@
+
+ #: ../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,9 +2965,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3027,7 +2997,7 @@
+
+ #: ../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,9 +3014,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3438,17 +3406,11 @@
+ 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, ...)"
+@@ -3774,29 +3736,19 @@
+ 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"
+@@ -3807,7 +3759,7 @@
+ 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,17 +3845,11 @@
+ 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"
+@@ -4262,9 +4208,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4281,7 +4225,7 @@
+
+ #: ../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,19 +4449,11 @@
+ 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"
+@@ -4578,7 +4514,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4667,8 +4603,7 @@
+ 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-05 17:50:58.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -315,7 +313,7 @@
+
+ #: ../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,13 +586,7 @@
+ 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"
+@@ -821,9 +813,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE sheet support"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancel"
++ Cancel"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1026,9 +1016,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1047,9 +1035,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1460,9 +1446,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1476,9 +1460,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1630,9 +1612,7 @@
+ 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
+@@ -1815,9 +1795,7 @@
+ 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"
+@@ -2081,9 +2059,7 @@
+ "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"
+@@ -2113,9 +2089,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2419,7 +2393,7 @@
+ #: ../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,9 +2469,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2755,9 +2727,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Not enough neighbours"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2893,7 +2863,7 @@
+
+ #: ../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,9 +2970,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3034,7 +3002,7 @@
+
+ #: ../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,9 +3019,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3445,17 +3411,11 @@
+ 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, ...)"
+@@ -3781,29 +3741,19 @@
+ 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"
+@@ -3814,7 +3764,7 @@
+ 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,17 +3850,11 @@
+ 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"
+@@ -4269,9 +4213,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4288,7 +4230,7 @@
+
+ #: ../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,19 +4454,11 @@
+ 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"
+@@ -4585,7 +4519,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4674,8 +4608,7 @@
+ 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-05 17:52:58.000000000 -0400
+@@ -178,8 +178,7 @@
+ 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. "
+@@ -408,10 +407,7 @@
+ 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,8 +716,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ msgid "Configure library..."
+ msgstr ""
+@@ -735,8 +730,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1045,8 +1039,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1152,8 +1145,7 @@
+ msgid "Error deleting songs"
+ msgstr ""
+
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
++
+
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1280,8 +1272,7 @@
+ msgid "Font size"
+ msgstr ""
+
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
++
+
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2409,14 +2400,7 @@
+ 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,17 +2631,7 @@
+ 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,8 +2648,7 @@
+ 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"
+@@ -2731,14 +2704,7 @@
+ 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,8 +3146,7 @@
+ 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 "
+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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 18:38:30.000000000 -0400
+@@ -254,9 +254,7 @@
+ 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 ""
+@@ -319,7 +317,7 @@
+
+ #: ../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,13 +590,7 @@
+ 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"
+@@ -829,9 +821,7 @@
+ msgid "CUE sheet support"
+ msgstr "Soporte de hoja CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancelar"
++ Cancelar"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1046,9 +1036,7 @@
+ 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..."
+@@ -1067,9 +1055,7 @@
+ 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"
+@@ -1486,9 +1472,7 @@
+ 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"
+@@ -1502,9 +1486,7 @@
+ 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"
+@@ -1657,9 +1639,7 @@
+ 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
+@@ -1844,11 +1824,7 @@
+ 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"
+@@ -2123,9 +2099,7 @@
+ "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"
++ Bandeja de entrada"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2155,9 +2129,7 @@
+ msgid "Insert..."
+ msgstr "Insertar..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalado"
++ Instalado"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2463,7 +2435,7 @@
+ #: ../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,9 +2511,7 @@
+ 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"
++ Hacer disponible la lista de reproducción fuera de línea"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2803,9 +2773,7 @@
+ msgid "Not enough neighbors"
+ msgstr "No hay suficientes vecinos"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "No instalado"
++ No instalado"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2941,7 +2909,7 @@
+
+ #: ../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,9 +3016,7 @@
+ msgid "Playlists"
+ msgstr "Listas de reproducción"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Estado del complemento:"
++ Estado del complemento:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3082,7 +3048,7 @@
+
+ #: ../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,9 +3065,7 @@
+ 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"
+@@ -3493,17 +3457,7 @@
+ 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, ...)"
+@@ -3830,29 +3784,13 @@
+ 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"
+@@ -3863,7 +3801,7 @@
+ 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,17 +3889,7 @@
+ 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"
+@@ -4341,9 +4269,7 @@
+ 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"
+@@ -4360,7 +4286,7 @@
+
+ #: ../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,19 +4525,7 @@
+ 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"
+@@ -4680,7 +4594,7 @@
+ 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 +4683,7 @@
+ 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-05 15:59:56.000000000 -0400
+@@ -251,9 +251,7 @@
+ 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 ""
+@@ -310,7 +308,7 @@
+
+ #: ../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,11 +581,7 @@
+ 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"
+@@ -814,9 +808,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Loobu"
++ Loobu"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1018,9 +1010,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Kiirklahvide seadistamine"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1039,9 +1029,7 @@
+ msgid "Connect device"
+ msgstr "Ühenda seade"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1452,9 +1440,7 @@
+ 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"
+@@ -1468,9 +1454,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1622,9 +1606,7 @@
+ 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
+@@ -1807,9 +1789,7 @@
+ 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"
+@@ -2073,9 +2053,7 @@
+ "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"
+@@ -2105,9 +2083,7 @@
+ msgid "Insert..."
+ msgstr "Lisa..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Paigaldatud"
++ Paigaldatud"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2411,7 +2387,7 @@
+ #: ../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,9 +2463,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2748,9 +2722,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Pole piisavalt naabreid"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2886,7 +2858,7 @@
+
+ #: ../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,9 +2965,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3027,7 +2997,7 @@
+
+ #: ../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,9 +3014,7 @@
+ 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"
+@@ -3438,17 +3406,11 @@
+ 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, ...)"
+@@ -3774,29 +3736,19 @@
+ 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"
+@@ -3807,7 +3759,7 @@
+ 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,17 +3845,11 @@
+ 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"
+@@ -4262,9 +4208,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4281,7 +4225,7 @@
+
+ #: ../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,19 +4449,11 @@
+ 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"
+@@ -4578,7 +4514,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4667,8 +4603,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 18:39:02.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -315,7 +313,7 @@
+
+ #: ../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,11 +586,7 @@
+ 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 ""
++
+ "کلمنتاین به افزونهٔ دیگری برای استفادهٔ اسپاتیفای نیاز دارد. آیا می‌خواهید"
+ " این افزونه را بارگیری و نصب نمایید؟"
+
+@@ -821,9 +815,7 @@
+ msgid "CUE sheet support"
+ msgstr "برگهٔ پشتیبانی CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "لغو"
++ لغو"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1035,9 +1027,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "پیکربندی میان‌برها"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "پیکربندی Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1056,9 +1046,7 @@
+ msgid "Connect device"
+ msgstr "اتصال دستگاه"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "اتصال به Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1475,9 +1463,7 @@
+ msgid "Download this album..."
+ msgstr "بارگیری این آلبوم..."
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "بارگیری..."
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1491,9 +1477,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "بارگیری کاتالوگ Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "بارگیری افزونهٔ Spotify"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1645,9 +1629,7 @@
+ 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
+@@ -1830,9 +1812,7 @@
+ 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"
+@@ -2104,9 +2084,7 @@
+ "در حالت دینامیک پس از پایان هر آهنگ، قطعه‌های تازه انتخاب و به لیست‌پخش "
+ "افزوده می‌شوند."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "صندوق ورودی"
++ صندوق ورودی"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2136,9 +2114,7 @@
+ msgid "Insert..."
+ msgstr "قرار دادن..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "نصب شد"
++ نصب شد"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2442,7 +2418,7 @@
+ #: ../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,9 +2494,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "مشخصات اصلی (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "لیست‌پخش را بیرون‌خط در دسترس بگذار"
++ لیست‌پخش را بیرون‌خط در دسترس بگذار"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2780,9 +2754,7 @@
+ msgid "Not enough neighbors"
+ msgstr "بدون همسایهٔ کافی"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "نصب نشده"
++ نصب نشده"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2918,7 +2890,7 @@
+
+ #: ../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,9 +2997,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "وضعیت افزونه"
++ وضعیت افزونه"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3059,7 +3029,7 @@
+
+ #: ../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,9 +3046,7 @@
+ msgid "Preferred audio format"
+ msgstr "فرمت صوتی ترجیحی"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3470,17 +3438,7 @@
+ 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, ...)"
+@@ -3806,29 +3764,13 @@
+ 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"
+@@ -3839,7 +3781,7 @@
+ 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,17 +3867,11 @@
+ 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"
+@@ -4314,9 +4250,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "بکاربردن تنظیمات پراکسی سیستم"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4333,7 +4267,7 @@
+
+ #: ../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,19 +4502,11 @@
+ 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"
+@@ -4648,7 +4574,7 @@
+ msgstr "برونکشی‌های شما: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4737,8 +4663,7 @@
+ 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-05 19:32:06.000000000 -0400
+@@ -250,9 +250,7 @@
+ 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 ""
+@@ -311,7 +309,7 @@
+
+ #: ../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,13 +582,7 @@
+ 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"
+@@ -819,9 +811,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE-tiedostojen tuki"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Peru"
++ Peru"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1032,9 +1022,7 @@
+ 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..."
+@@ -1053,9 +1041,7 @@
+ 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"
+@@ -1468,9 +1454,7 @@
+ 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"
+@@ -1484,9 +1468,7 @@
+ 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"
+@@ -1638,9 +1620,7 @@
+ 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
+@@ -1825,9 +1805,7 @@
+ 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"
+@@ -2097,9 +2075,7 @@
+ "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"
++ Saapuneet"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2129,9 +2105,7 @@
+ msgid "Insert..."
+ msgstr "Lisää..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Asennettu"
++ Asennettu"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2435,7 +2409,7 @@
+ #: ../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,9 +2485,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Oletusprofiili (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2775,9 +2747,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Ei tarpeeksi naapureita"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Ei asennettu"
++ Ei asennettu"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2913,7 +2883,7 @@
+
+ #: ../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,9 +2990,7 @@
+ msgid "Playlists"
+ msgstr "Soittolistat"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Liitännäisen tila:"
++ Liitännäisen tila:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3054,7 +3022,7 @@
+
+ #: ../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,9 +3039,7 @@
+ 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"
+@@ -3465,17 +3431,7 @@
+ 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, ...)"
+@@ -3801,29 +3757,13 @@
+ 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"
+@@ -3834,7 +3774,7 @@
+ 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,17 +3860,7 @@
+ 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"
+@@ -4306,9 +4236,7 @@
+ 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"
+@@ -4325,7 +4253,7 @@
+
+ #: ../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,19 +4490,7 @@
+ 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"
+@@ -4635,7 +4551,7 @@
+ 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 +4640,7 @@
+ 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-05 19:33:46.000000000 -0400
+@@ -258,9 +258,7 @@
+ 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 ""
+@@ -323,7 +321,7 @@
+
+ #: ../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,13 +595,7 @@
+ 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"
+@@ -838,9 +830,7 @@
+ msgid "CUE sheet support"
+ msgstr "Support des CUE sheet."
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Annuler"
++ Annuler"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1056,9 +1046,7 @@
+ 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..."
+@@ -1077,9 +1065,7 @@
+ 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"
+@@ -1496,9 +1482,7 @@
+ 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"
+@@ -1512,9 +1496,7 @@
+ 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"
+@@ -1671,9 +1653,7 @@
+ 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
+@@ -1858,11 +1838,7 @@
+ 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"
+@@ -2138,9 +2114,7 @@
+ "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"
++ Boîte de réception"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2170,9 +2144,7 @@
+ msgid "Insert..."
+ msgstr "Insérer..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installé(e)(s)"
++ Installé(e)(s)"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2481,7 +2453,7 @@
+ #: ../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,9 +2529,7 @@
+ 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"
++ Rendre la liste de lecture accessible hors ligne"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2822,9 +2792,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Voisins insuffisants"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Non installé"
++ Non installé"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2960,7 +2928,7 @@
+
+ #: ../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,9 +3035,7 @@
+ msgid "Playlists"
+ msgstr "Listes de lecture"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "État du module externe :"
++ État du module externe :"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3101,7 +3067,7 @@
+
+ #: ../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,9 +3084,7 @@
+ 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é"
++ Débit préféré"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3512,17 +3476,7 @@
+ 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, ...)"
+@@ -3851,29 +3805,13 @@
+ 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"
+@@ -3884,7 +3822,7 @@
+ 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,17 +3910,7 @@
+ 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"
+@@ -4369,9 +4297,7 @@
+ 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"
+@@ -4388,7 +4314,7 @@
+
+ #: ../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,22 +4555,7 @@
+ 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"
+@@ -4713,7 +4624,7 @@
+ 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 +4713,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -251,9 +251,7 @@
+ 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 ""
+@@ -310,7 +308,7 @@
+
+ #: ../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,11 +581,7 @@
+ 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"
+@@ -814,9 +808,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1022,9 +1014,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1043,9 +1033,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1456,9 +1444,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1472,9 +1458,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1625,9 +1609,7 @@
+ 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
+@@ -1810,9 +1792,7 @@
+ 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"
+@@ -2076,9 +2056,7 @@
+ "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"
+@@ -2108,9 +2086,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2415,7 +2391,7 @@
+ #: ../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,9 +2467,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2751,9 +2725,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Viciños insuficientes"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2889,7 +2861,7 @@
+
+ #: ../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,9 +2968,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3030,7 +3000,7 @@
+
+ #: ../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,9 +3017,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3441,17 +3409,11 @@
+ 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, ...)"
+@@ -3777,29 +3739,19 @@
+ 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"
+@@ -3810,7 +3762,7 @@
+ 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,17 +3848,11 @@
+ 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"
+@@ -4265,9 +4211,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4284,7 +4228,7 @@
+
+ #: ../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,19 +4452,11 @@
+ 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"
+@@ -4581,7 +4517,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4670,8 +4606,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -313,7 +311,7 @@
+
+ #: ../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,11 +584,7 @@
+ 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"
+@@ -817,9 +811,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1025,9 +1017,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "הגדר קיצורי מקשים"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1046,9 +1036,7 @@
+ msgid "Connect device"
+ msgstr "חבר התקן"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1464,9 +1452,7 @@
+ msgid "Download this album..."
+ msgstr "הורד את האלבום הזה..."
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1480,9 +1466,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "מוריד את הקטלוג של Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1633,9 +1617,7 @@
+ 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
+@@ -1818,9 +1800,7 @@
+ 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"
+@@ -2086,9 +2066,7 @@
+ "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"
+@@ -2118,9 +2096,7 @@
+ msgid "Insert..."
+ msgstr "הוספה..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2424,7 +2400,7 @@
+ #: ../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,9 +2476,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2761,9 +2735,7 @@
+ msgid "Not enough neighbors"
+ msgstr "אין מספיק שכנים"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2899,7 +2871,7 @@
+
+ #: ../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,9 +2978,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3040,7 +3010,7 @@
+
+ #: ../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,9 +3027,7 @@
+ msgid "Preferred audio format"
+ msgstr "פורמט אודיו מועדף"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3451,17 +3419,11 @@
+ 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, ...)"
+@@ -3787,29 +3749,19 @@
+ 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"
+@@ -3820,7 +3772,7 @@
+ 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,17 +3858,11 @@
+ 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"
+@@ -4280,9 +4226,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "שימוש בהגדרות הפרוקסי של המערכת"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4299,7 +4243,7 @@
+
+ #: ../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,19 +4476,11 @@
+ 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"
+@@ -4608,7 +4544,7 @@
+ msgstr "ה-scrobbles שלך: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4697,8 +4633,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 19:39:16.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,13 +587,7 @@
+ 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"
+@@ -822,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr "Podrška za CUE listu"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Otkaži"
++ Otkaži"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1039,9 +1029,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Podesi prečace"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Podesite Spotify ..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1060,9 +1048,7 @@
+ 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"
+@@ -1479,9 +1465,7 @@
+ 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"
+@@ -1495,9 +1479,7 @@
+ 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"
+@@ -1649,9 +1631,7 @@
+ 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
+@@ -1834,9 +1814,7 @@
+ 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"
+@@ -2108,9 +2086,7 @@
+ "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"
++ Pristigle poruke"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2140,9 +2116,7 @@
+ msgid "Insert..."
+ msgstr "Umetni..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalirano"
++ Instalirano"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2446,7 +2420,7 @@
+ #: ../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,9 +2496,7 @@
+ 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"
++ Učini popis izvođenja dostupnim kada je veza prekinuta"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2784,9 +2756,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nema dovoljno susjeda"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nije instalirano"
++ Nije instalirano"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2922,7 +2892,7 @@
+
+ #: ../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,9 +2999,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status dodatka:"
++ Status dodatka:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3063,7 +3031,7 @@
+
+ #: ../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,9 +3048,7 @@
+ 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"
+@@ -3474,17 +3440,7 @@
+ 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, ...)"
+@@ -3811,29 +3767,13 @@
+ 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"
+@@ -3844,7 +3784,7 @@
+ 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,17 +3870,7 @@
+ 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"
+@@ -4318,9 +4248,7 @@
+ 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"
+@@ -4337,7 +4265,7 @@
+
+ #: ../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,19 +4500,11 @@
+ 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"
+@@ -4653,7 +4573,7 @@
+ msgstr "Vaši scrobbles: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4742,8 +4662,7 @@
+ 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-05 19:39:30.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,13 +587,7 @@
+ 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"
+@@ -823,9 +815,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE fájl támogatás"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Mégsem"
++ Mégsem"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1042,9 +1032,7 @@
+ 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..."
+@@ -1065,9 +1053,7 @@
+ 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"
+@@ -1484,9 +1470,7 @@
+ 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"
+@@ -1500,9 +1484,7 @@
+ 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"
+@@ -1656,9 +1638,7 @@
+ 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
+@@ -1842,11 +1822,7 @@
+ 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"
+@@ -2117,9 +2093,7 @@
+ "time a song finishes."
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Beérkezett üzenetek"
++ Beérkezett üzenetek"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2149,9 +2123,7 @@
+ msgid "Insert..."
+ msgstr "Beszúrás..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Telepítve"
++ Telepítve"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2455,7 +2427,7 @@
+ #: ../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,9 +2503,7 @@
+ 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"
+@@ -2793,9 +2763,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nincs elég szomszédja"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nincs telepítve"
++ Nincs telepítve"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2931,7 +2899,7 @@
+
+ #: ../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,9 +3006,7 @@
+ msgid "Playlists"
+ msgstr "Lejátszási lista"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Beépülő állapot:"
++ Beépülő állapot:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3072,7 +3038,7 @@
+
+ #: ../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,9 +3055,7 @@
+ 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"
+@@ -3483,17 +3447,7 @@
+ 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, ...)"
+@@ -3822,29 +3776,13 @@
+ 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"
+@@ -3855,7 +3793,7 @@
+ 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,17 +3879,7 @@
+ 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"
+@@ -4327,9 +4255,7 @@
+ 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"
+@@ -4346,7 +4272,7 @@
+
+ #: ../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,19 +4506,11 @@
+ 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"
+@@ -4660,7 +4578,7 @@
+ msgstr "Scrobblejaid: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4749,8 +4667,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -250,9 +250,7 @@
+ 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 ""
+@@ -309,7 +307,7 @@
+
+ #: ../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,11 +580,7 @@
+ 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"
+@@ -813,9 +807,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1017,9 +1009,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1038,9 +1028,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1451,9 +1439,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1467,9 +1453,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1620,9 +1604,7 @@
+ 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
+@@ -1805,9 +1787,7 @@
+ 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"
+@@ -2071,9 +2051,7 @@
+ "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"
+@@ -2103,9 +2081,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2409,7 +2385,7 @@
+ #: ../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,9 +2461,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2745,9 +2719,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2883,7 +2855,7 @@
+
+ #: ../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,9 +2962,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3024,7 +2994,7 @@
+
+ #: ../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,9 +3011,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3435,17 +3403,11 @@
+ 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, ...)"
+@@ -3771,29 +3733,19 @@
+ 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"
+@@ -3804,7 +3756,7 @@
+ 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,17 +3842,11 @@
+ 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"
+@@ -4259,9 +4205,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4278,7 +4222,7 @@
+
+ #: ../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,19 +4446,11 @@
+ 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"
+@@ -4575,7 +4511,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4664,8 +4600,7 @@
+ 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-05 17:57:50.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,11 +587,7 @@
+ 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"
+@@ -820,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1024,9 +1016,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1045,9 +1035,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1458,9 +1446,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1474,9 +1460,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1627,9 +1611,7 @@
+ 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
+@@ -1812,9 +1794,7 @@
+ 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"
+@@ -2078,9 +2058,7 @@
+ "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"
+@@ -2110,9 +2088,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2416,7 +2392,7 @@
+ #: ../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,9 +2468,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2752,9 +2726,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2890,7 +2862,7 @@
+
+ #: ../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,9 +2969,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3031,7 +3001,7 @@
+
+ #: ../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,9 +3018,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3442,17 +3410,11 @@
+ 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, ...)"
+@@ -3778,29 +3740,19 @@
+ 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"
+@@ -3811,7 +3763,7 @@
+ 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,17 +3849,11 @@
+ 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"
+@@ -4266,9 +4212,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4285,7 +4229,7 @@
+
+ #: ../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,19 +4453,11 @@
+ 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"
+@@ -4582,7 +4518,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4671,8 +4607,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 19:40:26.000000000 -0400
+@@ -256,9 +256,7 @@
+ 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 ""
+@@ -318,7 +316,7 @@
+
+ #: ../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,13 +589,7 @@
+ 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"
+@@ -829,9 +821,7 @@
+ msgid "CUE sheet support"
+ msgstr "Supporto CUE sheet"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Annulla"
++ Annulla"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1044,9 +1034,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configura scorciatoie"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configura Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1065,9 +1053,7 @@
+ 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"
+@@ -1484,9 +1470,7 @@
+ 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"
+@@ -1500,9 +1484,7 @@
+ 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"
+@@ -1658,9 +1640,7 @@
+ 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
+@@ -1844,10 +1824,7 @@
+ 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"
+@@ -2123,9 +2100,7 @@
+ "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"
++ In arrivo"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2155,9 +2130,7 @@
+ msgid "Insert..."
+ msgstr "Inserisci..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installati"
++ Installati"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2465,7 +2438,7 @@
+ #: ../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,9 +2514,7 @@
+ 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"
++ Rendi la scaletta disponibile non in linea"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2804,9 +2775,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Vicini non sufficienti"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Non installati"
++ Non installati"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2942,7 +2911,7 @@
+
+ #: ../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,9 +3018,7 @@
+ msgid "Playlists"
+ msgstr "Scalette"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stato del plugin:"
++ Stato del plugin:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3083,7 +3050,7 @@
+
+ #: ../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,9 +3067,7 @@
+ msgid "Preferred audio format"
+ msgstr "Formato audio preferito"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate preferito"
++ Bitrate preferito"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3494,17 +3459,7 @@
+ 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, ...)"
+@@ -3831,29 +3786,13 @@
+ 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"
+@@ -3864,7 +3803,7 @@
+ 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,17 +3891,7 @@
+ 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"
+@@ -4351,9 +4280,7 @@
+ 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"
++ Usa la normalizzazione del volume"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4370,7 +4297,7 @@
+
+ #: ../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,21 +4534,7 @@
+ 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"
+@@ -4690,7 +4603,7 @@
+ 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 +4692,7 @@
+ 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-05 17:58:56.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -313,7 +311,7 @@
+
+ #: ../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,11 +584,7 @@
+ 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"
+@@ -817,9 +811,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "キャンセル"
++ キャンセル"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1023,9 +1015,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "ショートカットの構成"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1044,9 +1034,7 @@
+ msgid "Connect device"
+ msgstr "デバイスの接続"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1461,9 +1449,7 @@
+ msgid "Download this album..."
+ msgstr "このアルバムをダウンロード..."
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1477,9 +1463,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Magnatune カタログのダウンロード"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Spotify のプラグインをダウンロード中"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1630,9 +1614,7 @@
+ 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
+@@ -1815,9 +1797,7 @@
+ 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"
+@@ -2081,9 +2061,7 @@
+ "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"
+@@ -2113,9 +2091,7 @@
+ msgid "Insert..."
+ msgstr "挿入..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2419,7 +2395,7 @@
+ #: ../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,9 +2471,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2755,9 +2729,7 @@
+ msgid "Not enough neighbors"
+ msgstr "ご近所さんが足りません"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2893,7 +2865,7 @@
+
+ #: ../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,9 +2972,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3034,7 +3004,7 @@
+
+ #: ../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,9 +3021,7 @@
+ msgid "Preferred audio format"
+ msgstr "優先するオーディオ形式"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3445,17 +3413,11 @@
+ 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, ...)"
+@@ -3781,29 +3743,19 @@
+ 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"
+@@ -3814,7 +3766,7 @@
+ 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,17 +3852,11 @@
+ 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"
+@@ -4271,9 +4217,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "システムのプロキシ設定を使用する"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4290,7 +4234,7 @@
+
+ #: ../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,19 +4464,11 @@
+ 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"
+@@ -4595,7 +4531,7 @@
+ msgstr "Scrobble 回数: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr "ユーザネームまたはパスワードが間違っています。"
+
+@@ -4684,8 +4620,7 @@
+ 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-05 17:59:02.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE sheet-ის მხარდაჭერა"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "გაუქმება"
++ გაუქმება"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 17:59:10.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 19:41:04.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -313,7 +311,7 @@
+
+ #: ../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,13 +584,7 @@
+ 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"
+@@ -819,9 +811,7 @@
+ msgid "CUE sheet support"
+ msgstr "\"CUE sheet\" palaikymas"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Atšaukti"
++ Atšaukti"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1032,9 +1022,7 @@
+ 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..."
+@@ -1053,9 +1041,7 @@
+ 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"
+@@ -1472,9 +1458,7 @@
+ 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"
+@@ -1488,9 +1472,7 @@
+ 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"
+@@ -1643,9 +1625,7 @@
+ 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
+@@ -1828,11 +1808,7 @@
+ 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"
+@@ -2104,9 +2080,7 @@
+ "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"
++ Gautieji"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2136,9 +2110,7 @@
+ msgid "Insert..."
+ msgstr "Įterpti..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Įdiegta"
++ Įdiegta"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2444,7 +2416,7 @@
+ #: ../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,9 +2492,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Pagrindinis profilis"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Padaryti šį grojaraštį prieinamą atsijungus"
++ Padaryti šį grojaraštį prieinamą atsijungus"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2781,9 +2751,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nepakanka kaimynų"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Neįdiegta"
++ Neįdiegta"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2919,7 +2887,7 @@
+
+ #: ../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,9 +2994,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Plėtinio būklė:"
++ Plėtinio būklė:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3060,7 +3026,7 @@
+
+ #: ../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,9 +3044,7 @@
+ 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"
+@@ -3472,17 +3436,7 @@
+ 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, ...)"
+@@ -3808,29 +3762,13 @@
+ 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"
+@@ -3841,7 +3779,7 @@
+ 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,17 +3865,7 @@
+ 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"
+@@ -4312,9 +4240,7 @@
+ 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"
+@@ -4331,7 +4257,7 @@
+
+ #: ../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,19 +4491,11 @@
+ 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"
+@@ -4645,7 +4563,7 @@
+ msgstr "Jūsų pateikta informacija: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4734,8 +4652,7 @@
+ 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-05 19:41:24.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -315,7 +313,7 @@
+
+ #: ../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,13 +586,7 @@
+ 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"
+@@ -822,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Atcelt"
++ Atcelt"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1035,9 +1025,7 @@
+ 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..."
+@@ -1056,9 +1044,7 @@
+ 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"
+@@ -1475,9 +1461,7 @@
+ 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"
+@@ -1491,9 +1475,7 @@
+ 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"
+@@ -1646,9 +1628,7 @@
+ 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
+@@ -1832,9 +1812,7 @@
+ 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"
+@@ -2102,9 +2080,7 @@
+ "time a song finishes."
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Ienākošie"
++ Ienākošie"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2134,9 +2110,7 @@
+ msgid "Insert..."
+ msgstr "Ievietot..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Uzstādīts"
++ Uzstādīts"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2441,7 +2415,7 @@
+ #: ../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,9 +2491,7 @@
+ 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"
+@@ -2778,9 +2750,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nepietiek kaimiņu"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nav uzstādīta"
++ Nav uzstādīta"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2916,7 +2886,7 @@
+
+ #: ../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,9 +2993,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Spraudņa statuss:"
++ Spraudņa statuss:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3057,7 +3025,7 @@
+
+ #: ../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,9 +3042,7 @@
+ 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"
+@@ -3468,17 +3434,7 @@
+ 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, ...)"
+@@ -3804,29 +3760,13 @@
+ 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"
+@@ -3837,7 +3777,7 @@
+ 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,17 +3863,11 @@
+ 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"
+@@ -4304,9 +4238,7 @@
+ 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"
+@@ -4323,7 +4255,7 @@
+
+ #: ../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,19 +4486,11 @@
+ 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"
+@@ -4630,7 +4554,7 @@
+ msgstr "Jūsu skrobli: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4719,8 +4643,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 19:42:04.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -313,7 +311,7 @@
+
+ #: ../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,13 +584,7 @@
+ 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"
+@@ -819,9 +811,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Batal"
++ Batal"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1030,9 +1020,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Tetapkan Pintasan"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1051,9 +1039,7 @@
+ 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"
+@@ -1464,9 +1450,7 @@
+ 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"
+@@ -1480,9 +1464,7 @@
+ 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"
+@@ -1633,9 +1615,7 @@
+ 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
+@@ -1822,10 +1802,7 @@
+ 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"
+@@ -2099,9 +2076,7 @@
+ "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"
++ Peti Masuk"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2131,9 +2106,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Terpasang"
++ Terpasang"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2437,7 +2410,7 @@
+ #: ../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,9 +2486,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Buatkan senarai main tersedia di luar talian"
++ Buatkan senarai main tersedia di luar talian"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2775,9 +2746,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Tidak dipasang"
++ Tidak dipasang"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2913,7 +2882,7 @@
+
+ #: ../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,9 +2989,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status plugin:"
++ Status plugin:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3054,7 +3021,7 @@
+
+ #: ../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,9 +3038,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3465,17 +3430,7 @@
+ 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, ...)"
+@@ -3801,29 +3756,13 @@
+ 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"
+@@ -3834,7 +3773,7 @@
+ 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,17 +3859,11 @@
+ 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"
+@@ -4308,9 +4241,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4327,7 +4258,7 @@
+
+ #: ../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,19 +4486,11 @@
+ 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"
+@@ -4628,7 +4551,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4717,8 +4640,7 @@
+ 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-05 19:42:36.000000000 -0400
+@@ -254,9 +254,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,13 +587,7 @@
+ 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"
+@@ -822,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr "Støtte for CUE-filer"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Avbryt"
++ Avbryt"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1038,9 +1028,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Oppsett av hurtigtaster"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Konfigurere Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1059,9 +1047,7 @@
+ 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"
+@@ -1478,9 +1464,7 @@
+ 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"
+@@ -1494,9 +1478,7 @@
+ 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"
+@@ -1648,9 +1630,7 @@
+ 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
+@@ -1833,9 +1813,7 @@
+ 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"
+@@ -2108,9 +2086,7 @@
+ "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"
++ Innboks"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2140,9 +2116,7 @@
+ msgid "Insert..."
+ msgstr "Sett inn..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installert"
++ Installert"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2446,7 +2420,7 @@
+ #: ../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,9 +2496,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Hovedprofil (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Gjør spillelista tilgjengelig online"
++ Gjør spillelista tilgjengelig online"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2782,9 +2754,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Ikke nok naboer"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Ikke installert"
++ Ikke installert"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2920,7 +2890,7 @@
+
+ #: ../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,9 +2997,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Modulens status:"
++ Modulens status:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3061,7 +3029,7 @@
+
+ #: ../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,9 +3046,7 @@
+ 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"
+@@ -3472,17 +3438,7 @@
+ 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, ...)"
+@@ -3808,29 +3764,13 @@
+ 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"
+@@ -3841,7 +3781,7 @@
+ 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,17 +3867,7 @@
+ 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"
+@@ -4310,9 +4240,7 @@
+ 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"
+@@ -4329,7 +4257,7 @@
+
+ #: ../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,19 +4493,7 @@
+ 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"
+@@ -4644,7 +4560,7 @@
+ 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 +4649,7 @@
+ 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-05 18:35:06.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -317,7 +315,7 @@
+
+ #: ../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,13 +590,7 @@
+ 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"
+@@ -829,9 +821,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE-sheet ondersteuning"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Annuleren"
++ Annuleren"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1047,9 +1037,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Sneltoetsen instellen"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configureer Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1068,9 +1056,7 @@
+ 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"
+@@ -1487,9 +1473,7 @@
+ 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"
+@@ -1503,9 +1487,7 @@
+ 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"
+@@ -1660,9 +1642,7 @@
+ 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
+@@ -1846,11 +1826,7 @@
+ 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"
+@@ -2126,9 +2102,7 @@
+ "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"
++ Inbox"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2158,9 +2132,7 @@
+ msgid "Insert..."
+ msgstr "Invoegen…"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Geïnstalleerd"
++ Geïnstalleerd"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2466,7 +2438,7 @@
+ #: ../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,9 +2514,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Normaal profiel (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Afspeellijst offline beschikbaar maken"
++ Afspeellijst offline beschikbaar maken"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2806,9 +2776,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Onvoldoende buren"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Niet geïnstalleerd"
++ Niet geïnstalleerd"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2944,7 +2912,7 @@
+
+ #: ../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,9 +3019,7 @@
+ msgid "Playlists"
+ msgstr "Afspeellijsten"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Plug-in status:"
++ Plug-in status:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3085,7 +3051,7 @@
+
+ #: ../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,9 +3069,7 @@
+ msgid "Preferred audio format"
+ msgstr "Audioformaat-voorkeur"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate voorkeur"
++ Bitrate voorkeur"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3497,17 +3461,7 @@
+ 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, ...)"
+@@ -3833,29 +3787,13 @@
+ 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"
+@@ -3866,7 +3804,7 @@
+ 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,17 +3890,7 @@
+ 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"
+@@ -4350,9 +4278,7 @@
+ 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"
+@@ -4369,7 +4295,7 @@
+
+ #: ../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,21 +4533,7 @@
+ 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"
+@@ -4690,7 +4602,7 @@
+ 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 +4691,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ 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..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 18:34:52.000000000 -0400
+@@ -254,9 +254,7 @@
+ 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 ""
+@@ -318,7 +316,7 @@
+
+ #: ../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,13 +589,7 @@
+ 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"
+@@ -824,9 +816,7 @@
+ msgid "CUE sheet support"
+ msgstr "obsługa arkuszy CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Anuluj"
++ Anuluj"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1041,9 +1031,7 @@
+ 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..."
+@@ -1062,9 +1050,7 @@
+ 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"
+@@ -1481,9 +1467,7 @@
+ 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"
+@@ -1497,9 +1481,7 @@
+ 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"
+@@ -1651,9 +1633,7 @@
+ 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
+@@ -1837,10 +1817,7 @@
+ 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"
+@@ -2114,9 +2091,7 @@
+ "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"
++ Skrzynka odbiorcza"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2146,9 +2121,7 @@
+ msgid "Insert..."
+ msgstr "Wstaw..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Zainstalowano"
++ Zainstalowano"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2454,7 +2427,7 @@
+ #: ../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,9 +2503,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Profil główny (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Uczyń playlistę dostępną offline"
++ Uczyń playlistę dostępną offline"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2793,9 +2764,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Za mało sąsiadów"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nie zainstalowano"
++ Nie zainstalowano"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2931,7 +2900,7 @@
+
+ #: ../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,9 +3007,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stan wtyczki:"
++ Stan wtyczki:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3072,7 +3039,7 @@
+
+ #: ../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,9 +3057,7 @@
+ 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"
+@@ -3484,17 +3449,7 @@
+ 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, ...)"
+@@ -3821,29 +3776,13 @@
+ 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"
+@@ -3854,7 +3793,7 @@
+ 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,17 +3879,7 @@
+ 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"
+@@ -4326,9 +4255,7 @@
+ 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"
+@@ -4345,7 +4272,7 @@
+
+ #: ../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,19 +4506,11 @@
+ 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"
+@@ -4662,7 +4581,7 @@
+ msgstr "Przesłane utwory: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4751,8 +4670,7 @@
+ 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-05 19:24:38.000000000 -0400
+@@ -251,9 +251,7 @@
+ 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 ""
+@@ -313,7 +311,7 @@
+
+ #: ../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,13 +584,7 @@
+ 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"
+@@ -821,9 +813,7 @@
+ msgid "CUE sheet support"
+ msgstr "Suporte a lista CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancelar"
++ Cancelar"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1036,9 +1026,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurar atalhos"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurar Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1057,9 +1045,7 @@
+ 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"
+@@ -1476,9 +1462,7 @@
+ 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"
+@@ -1492,9 +1476,7 @@
+ 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"
+@@ -1647,9 +1629,7 @@
+ 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
+@@ -1834,11 +1814,7 @@
+ 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"
+@@ -2113,9 +2089,7 @@
+ "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"
++ Caixa de entrada"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2145,9 +2119,7 @@
+ msgid "Insert..."
+ msgstr "Inserir..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalado"
++ Instalado"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2453,7 +2425,7 @@
+ #: ../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,9 +2501,7 @@
+ 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"
++ Tornar lista de reprodução disponível offline"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2793,9 +2763,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Sem vizinhos o bastante"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Não instalado"
++ Não instalado"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2931,7 +2899,7 @@
+
+ #: ../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,9 +3006,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status do plugin:"
++ Status do plugin:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3072,7 +3038,7 @@
+
+ #: ../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,9 +3055,7 @@
+ 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"
+@@ -3483,17 +3447,7 @@
+ 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, ...)"
+@@ -3819,29 +3773,13 @@
+ 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"
+@@ -3852,7 +3790,7 @@
+ 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,17 +3876,7 @@
+ 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"
+@@ -4329,9 +4257,7 @@
+ 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"
+@@ -4348,7 +4274,7 @@
+
+ #: ../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,19 +4508,11 @@
+ 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"
+@@ -4661,7 +4579,7 @@
+ msgstr "Seus scrobbles: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4750,8 +4668,7 @@
+ 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-05 18:34:36.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,13 +587,7 @@
+ 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"
+@@ -823,9 +815,7 @@
+ msgid "CUE sheet support"
+ msgstr "Suporte a ficheiros CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancelar"
++ Cancelar"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1040,9 +1030,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurar atalhos"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurar Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1061,9 +1049,7 @@
+ 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"
+@@ -1480,9 +1466,7 @@
+ 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"
+@@ -1496,9 +1480,7 @@
+ 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"
+@@ -1652,9 +1634,7 @@
+ 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\""
++ Erro ao transferir o \"plug-in\""
+
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+@@ -1837,11 +1817,7 @@
+ 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"
+@@ -2114,9 +2090,7 @@
+ "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"
++ Caixa de entrada"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2146,9 +2120,7 @@
+ msgid "Insert..."
+ msgstr "Inserir..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalado"
++ Instalado"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2454,7 +2426,7 @@
+ #: ../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,9 +2502,7 @@
+ 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"
++ Tornar lista de reprodução disponível localmente"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2793,9 +2763,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Vizinhos insuficientes"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Não instalado"
++ Não instalado"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2931,7 +2899,7 @@
+
+ #: ../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,9 +3006,7 @@
+ msgid "Playlists"
+ msgstr "Listas de reprodução"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Estado:"
++ Estado:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3072,7 +3038,7 @@
+
+ #: ../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,9 +3055,7 @@
+ msgid "Preferred audio format"
+ msgstr "Formato áudio preferido"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Taxa de dados preferencial"
++ Taxa de dados preferencial"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3483,17 +3447,7 @@
+ 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, ...)"
+@@ -3820,29 +3774,13 @@
+ 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"
+@@ -3853,7 +3791,7 @@
+ 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,17 +3877,7 @@
+ 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"
+@@ -4333,9 +4261,7 @@
+ 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"
++ Utilizar normalização de volume"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4352,7 +4278,7 @@
+
+ #: ../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,21 +4515,7 @@
+ 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"
+@@ -4671,7 +4583,7 @@
+ 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 +4672,7 @@
+ 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-05 18:34:12.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -317,7 +315,7 @@
+
+ #: ../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,13 +588,7 @@
+ 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"
+@@ -823,9 +815,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE placa suport"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Anulare"
++ Anulare"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1037,9 +1027,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurează scurtături"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurare Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1058,9 +1046,7 @@
+ 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"
+@@ -1477,9 +1463,7 @@
+ 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"
+@@ -1493,9 +1477,7 @@
+ 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"
+@@ -1651,9 +1633,7 @@
+ 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
+@@ -1838,10 +1818,7 @@
+ 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"
+@@ -2114,9 +2091,7 @@
+ "Î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"
+@@ -2146,9 +2121,7 @@
+ msgid "Insert..."
+ msgstr "Introduce..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalat"
++ Instalat"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2452,7 +2425,7 @@
+ #: ../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,9 +2501,7 @@
+ 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"
+@@ -2788,9 +2759,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nu sunt destui vecini"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Neinstalat"
++ Neinstalat"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2926,7 +2895,7 @@
+
+ #: ../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,9 +3002,7 @@
+ msgid "Playlists"
+ msgstr "Liste de redare"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status plugin:"
++ Status plugin:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3067,7 +3034,7 @@
+
+ #: ../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,9 +3051,7 @@
+ msgid "Preferred audio format"
+ msgstr "Format audio preferat"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Rată de biți preferată"
++ Rată de biți preferată"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3478,17 +3443,7 @@
+ 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, ...)"
+@@ -3814,29 +3769,13 @@
+ 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"
+@@ -3847,7 +3786,7 @@
+ 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,17 +3872,11 @@
+ 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"
+@@ -4304,9 +4237,7 @@
+ 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"
+@@ -4323,7 +4254,7 @@
+
+ #: ../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,19 +4480,7 @@
+ 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"
+@@ -4622,7 +4541,7 @@
+ 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 +4630,7 @@
+ 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-05 18:33:54.000000000 -0400
+@@ -256,9 +256,7 @@
+ 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 ""
+@@ -320,7 +318,7 @@
+
+ #: ../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,13 +591,7 @@
+ 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"
+@@ -826,9 +818,7 @@
+ msgid "CUE sheet support"
+ msgstr "Поддержка файлов разметки CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Отмена"
++ Отмена"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1045,9 +1035,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Комбинации клавиш"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Настройка Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1066,9 +1054,7 @@
+ msgid "Connect device"
+ msgstr "Подсоединение устройства"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Подключение к Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1485,9 +1471,7 @@
+ msgid "Download this album..."
+ msgstr "Загрузить этот альбом"
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Загрузить..."
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1501,9 +1485,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Скачать каталог Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Загрузка модуля Spotify"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1658,9 +1640,7 @@
+ 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
+@@ -1845,11 +1825,7 @@
+ 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"
+@@ -2122,9 +2098,7 @@
+ "В динамическом режиме новые треки выбираются и добавляются в список "
+ "воспроизведения каждый раз, когда заканчивается очередная песня."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Входящие"
++ Входящие"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2154,9 +2128,7 @@
+ msgid "Insert..."
+ msgstr "Вставить..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Установлено"
++ Установлено"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2462,7 +2434,7 @@
+ #: ../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,9 +2510,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Основной профиль (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Сделать плейлист доступным оффлайн"
++ Сделать плейлист доступным оффлайн"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2800,9 +2770,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Недостаточно соседей"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Не установлено"
++ Не установлено"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2938,7 +2906,7 @@
+
+ #: ../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,9 +3013,7 @@
+ msgid "Playlists"
+ msgstr "Списки воспроизведения"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Статус модуля:"
++ Статус модуля:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3079,7 +3045,7 @@
+
+ #: ../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,9 +3062,7 @@
+ msgid "Preferred audio format"
+ msgstr "Предпочитаемый аудио формат"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Предпочитаемый битрейт"
++ Предпочитаемый битрейт"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3490,17 +3454,7 @@
+ 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, ...)"
+@@ -3827,29 +3781,13 @@
+ 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"
+@@ -3860,7 +3798,7 @@
+ 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,17 +3884,7 @@
+ 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"
+@@ -4336,9 +4264,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "Использовать системные настройки прокси"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Использовать выравнивание громкости"
++ Использовать выравнивание громкости"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4355,7 +4281,7 @@
+
+ #: ../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,22 +4517,7 @@
+ 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"
+@@ -4675,7 +4586,7 @@
+ msgstr "Ваш скробблинг: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr "Имя пользователя или пароль неправильные."
+
+@@ -4764,8 +4675,7 @@
+ 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-05 19:07:58.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -314,7 +312,7 @@
+
+ #: ../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,13 +585,7 @@
+ 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"
+@@ -820,9 +812,7 @@
+ msgid "CUE sheet support"
+ msgstr "podpora CUE zoznamu"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Zrušiť"
++ Zrušiť"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1034,9 +1024,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Klávesové skratky"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Nastaviť Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1055,9 +1043,7 @@
+ 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"
+@@ -1474,9 +1460,7 @@
+ 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"
+@@ -1490,9 +1474,7 @@
+ 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"
+@@ -1648,9 +1630,7 @@
+ 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
+@@ -1834,9 +1814,7 @@
+ 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"
+@@ -2109,9 +2087,7 @@
+ "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é"
++ Doručené"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2141,9 +2117,7 @@
+ msgid "Insert..."
+ msgstr "Vložiť..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Nainštalované"
++ Nainštalované"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2447,7 +2421,7 @@
+ #: ../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,9 +2497,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Hlavný profil (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Urobiť playlist dostupný offline"
++ Urobiť playlist dostupný offline"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2785,9 +2757,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Nedostatok susedov"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nenainštalované"
++ Nenainštalované"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2923,7 +2893,7 @@
+
+ #: ../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,9 +3000,7 @@
+ msgid "Playlists"
+ msgstr "Playlisty"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stav pluginu:"
++ Stav pluginu:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3064,7 +3032,7 @@
+
+ #: ../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,9 +3049,7 @@
+ msgid "Preferred audio format"
+ msgstr "Preferovaný formát zvuku"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Preferovaný dátový tok"
++ Preferovaný dátový tok"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3475,17 +3441,7 @@
+ 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, ...)"
+@@ -3812,29 +3768,13 @@
+ 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"
+@@ -3845,7 +3785,7 @@
+ 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,17 +3872,7 @@
+ 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"
+@@ -4325,9 +4255,7 @@
+ 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"
++ Použiť normalizáciu hlasitosti"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4344,7 +4272,7 @@
+
+ #: ../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,21 +4508,7 @@
+ 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"
+@@ -4663,7 +4577,7 @@
+ 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 +4666,7 @@
+ 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-05 19:10:20.000000000 -0400
+@@ -252,9 +252,7 @@
+ 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 ""
+@@ -314,7 +312,7 @@
+
+ #: ../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,13 +585,7 @@
+ 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"
+@@ -822,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr "Podpora predlogam CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Prekliči"
++ Prekliči"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1039,9 +1029,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Nastavi bližnjice"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Nastavi Spotify ..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1060,9 +1048,7 @@
+ 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"
+@@ -1479,9 +1465,7 @@
+ 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"
+@@ -1495,9 +1479,7 @@
+ 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"
+@@ -1651,9 +1633,7 @@
+ 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
+@@ -1836,9 +1816,7 @@
+ 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"
+@@ -2111,9 +2089,7 @@
+ "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"
++ Prejeto"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2143,9 +2119,7 @@
+ msgid "Insert..."
+ msgstr "Vstavi ..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Nameščeno"
++ Nameščeno"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2449,7 +2423,7 @@
+ #: ../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,9 +2499,7 @@
+ 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"
++ Seznam predvajanja naj bo na voljo tudi brez povezave"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2787,9 +2759,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Ni dovolj sosedov"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Ni nameščeno"
++ Ni nameščeno"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2925,7 +2895,7 @@
+
+ #: ../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,9 +3002,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stanje vstavka:"
++ Stanje vstavka:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3066,7 +3034,7 @@
+
+ #: ../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,9 +3051,7 @@
+ 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"
+@@ -3477,17 +3443,7 @@
+ 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, ...)"
+@@ -3814,29 +3770,13 @@
+ 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"
+@@ -3847,7 +3787,7 @@
+ 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,17 +3873,7 @@
+ 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"
+@@ -4322,9 +4252,7 @@
+ 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"
+@@ -4341,7 +4269,7 @@
+
+ #: ../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,19 +4503,11 @@
+ 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"
+@@ -4655,7 +4575,7 @@
+ 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 +4664,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,11 @@
+ 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, ...)"
+@@ -3770,29 +3732,19 @@
+ 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"
+@@ -3803,7 +3755,7 @@
+ 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,17 +3841,11 @@
+ 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"
+@@ -4258,9 +4204,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4221,7 @@
+
+ #: ../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,19 +4445,11 @@
+ 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"
+@@ -4574,7 +4510,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4663,8 +4599,7 @@
+ 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-05 19:12:24.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -311,7 +309,7 @@
+
+ #: ../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,13 +582,7 @@
+ 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"
+@@ -817,9 +809,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE подршка листа"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Otkaži"
++ Otkaži"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1030,9 +1020,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Подеси пречице"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Подеси Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1051,9 +1039,7 @@
+ msgid "Connect device"
+ msgstr "Повежи уређај"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Повежи се на Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1470,9 +1456,7 @@
+ 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"
+@@ -1486,9 +1470,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Преузми Магнатјунов каталог"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Преузимање Spotify додатка"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1641,9 +1623,7 @@
+ 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
+@@ -1828,9 +1808,7 @@
+ 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"
+@@ -2102,9 +2080,7 @@
+ "У промењивом режиму нове нумере ће бити изабране и додате листи сваки пут "
+ "кад се песма заврши."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Сандуче"
++ Сандуче"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2134,9 +2110,7 @@
+ msgid "Insert..."
+ msgstr "Убаци..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalirano"
++ Instalirano"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2441,7 +2415,7 @@
+ #: ../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,9 +2491,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Главни налог (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Направи листу доступну ван мреже"
++ Направи листу доступну ван мреже"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2778,9 +2750,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Нема довољно комшија"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Није уграђен"
++ Није уграђен"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2916,7 +2886,7 @@
+
+ #: ../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,9 +2993,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Статус додатка:"
++ Статус додатка:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3057,7 +3025,7 @@
+
+ #: ../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,9 +3042,7 @@
+ msgid "Preferred audio format"
+ msgstr "Пожељни формат звука"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3468,17 +3434,7 @@
+ 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, ...)"
+@@ -3804,29 +3760,13 @@
+ 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"
+@@ -3837,7 +3777,7 @@
+ 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,17 +3863,7 @@
+ 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"
+@@ -4313,9 +4243,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4332,7 +4260,7 @@
+
+ #: ../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,19 +4488,11 @@
+ 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"
+@@ -4633,7 +4553,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4722,8 +4642,7 @@
+ 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-05 19:13:20.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -316,7 +314,7 @@
+
+ #: ../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,13 +587,7 @@
+ 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"
+@@ -822,9 +814,7 @@
+ msgid "CUE sheet support"
+ msgstr "Stöd för CUE-filer"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Avbryt"
++ Avbryt"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1039,9 +1029,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfigurera snabbtangenter"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Anpassa Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1060,9 +1048,7 @@
+ 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"
+@@ -1479,9 +1465,7 @@
+ 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"
+@@ -1495,9 +1479,7 @@
+ 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"
+@@ -1650,9 +1632,7 @@
+ 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
+@@ -1835,9 +1815,7 @@
+ 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"
+@@ -2109,9 +2087,7 @@
+ "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"
++ Inkorg"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2141,9 +2117,7 @@
+ msgid "Insert..."
+ msgstr "Infoga..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installerad"
++ Installerad"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2447,7 +2421,7 @@
+ #: ../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,9 +2497,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Huvudprofil (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Gör spellista tillgänglig offline"
++ Gör spellista tillgänglig offline"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2784,9 +2756,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Inte tillräckligt med grannar"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Inte installerad"
++ Inte installerad"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2922,7 +2892,7 @@
+
+ #: ../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,9 +2999,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Instickstatus:"
++ Instickstatus:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3063,7 +3031,7 @@
+
+ #: ../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,9 +3048,7 @@
+ 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"
+@@ -3474,17 +3440,7 @@
+ 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, ...)"
+@@ -3810,29 +3766,13 @@
+ 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"
+@@ -3843,7 +3783,7 @@
+ 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,17 +3869,7 @@
+ 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"
+@@ -4321,9 +4251,7 @@
+ 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"
+@@ -4340,7 +4268,7 @@
+
+ #: ../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,19 +4502,11 @@
+ 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"
+@@ -4655,7 +4575,7 @@
+ msgstr "Dina skrobblingar: %1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4744,8 +4664,7 @@
+ 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-05 17:42:28.000000000 -0400
+@@ -239,9 +239,7 @@
+ 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 ""
+@@ -297,7 +295,7 @@
+
+ #: ../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,11 +569,7 @@
+ 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"
+@@ -803,9 +797,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../mingw/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1005,9 +997,7 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:490
+ msgid "Configure library..."
+@@ -1026,9 +1016,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../mingw/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1431,9 +1419,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../mingw/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1447,9 +1433,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1600,9 +1584,7 @@
+ 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
+@@ -1785,9 +1767,7 @@
+ 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"
+@@ -2053,9 +2033,7 @@
+ "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"
+@@ -2086,9 +2064,7 @@
+ msgid "Insert..."
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:252
+ msgid "Internet"
+@@ -2391,7 +2367,7 @@
+ #: ../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,9 +2444,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2730,9 +2704,7 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2868,7 +2840,7 @@
+
+ #: ../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,9 +2947,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../mingw/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3009,7 +2979,7 @@
+
+ #: ../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,9 +2997,7 @@
+ msgid "Preferred audio format"
+ msgstr ""
+
+-#: ../mingw/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../mingw/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3422,17 +3390,7 @@
+ 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, ...)"
+@@ -3756,29 +3714,13 @@
+ 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"
+@@ -3789,7 +3731,7 @@
+ 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,17 +3817,7 @@
+ 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"
+@@ -4246,9 +4178,7 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+
+-#: ../mingw/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4265,7 +4195,7 @@
+
+ #: ../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,19 +4419,7 @@
+ 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"
+@@ -4562,7 +4480,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4651,8 +4569,7 @@
+ 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-05 19:14:54.000000000 -0400
+@@ -256,9 +256,7 @@
+ 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 ""
+@@ -318,7 +316,7 @@
+
+ #: ../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,13 +589,7 @@
+ 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"
+@@ -824,9 +816,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE desteği"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "İptal"
++ İptal"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1038,9 +1028,7 @@
+ 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..."
+@@ -1059,9 +1047,7 @@
+ 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"
+@@ -1478,9 +1464,7 @@
+ 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"
+@@ -1494,9 +1478,7 @@
+ 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"
+@@ -1652,9 +1634,7 @@
+ 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
+@@ -1837,9 +1817,7 @@
+ 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"
+@@ -2112,9 +2090,7 @@
+ "Dinamik modda yeni şarkılar seçilerek, her şarkı bittiğinde çalma listesine "
+ "eklenecektir."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Gelen Kutusu"
++ Gelen Kutusu"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2144,9 +2120,7 @@
+ msgid "Insert..."
+ msgstr "Ekle..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Kuruldu"
++ Kuruldu"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2454,7 +2428,7 @@
+ #: ../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,9 +2504,7 @@
+ 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"
++ Çalma listesini çevrim dışındayken kullanılabilir yap"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2792,9 +2764,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Yeterli komşu yok"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Kurulu değil"
++ Kurulu değil"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2930,7 +2900,7 @@
+
+ #: ../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,9 +3007,7 @@
+ msgid "Playlists"
+ msgstr "Çalma listeleri"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Eklenti durumu:"
++ Eklenti durumu:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3071,7 +3039,7 @@
+
+ #: ../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,9 +3056,7 @@
+ msgid "Preferred audio format"
+ msgstr "Tercih edilen ses biçimleri"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Tercih edilen bit oranı"
++ Tercih edilen bit oranı"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3482,17 +3448,7 @@
+ 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, ...)"
+@@ -3818,29 +3774,13 @@
+ 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"
+@@ -3851,7 +3791,7 @@
+ 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,17 +3877,7 @@
+ 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"
+@@ -4320,9 +4250,7 @@
+ 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"
++ Ses normalleştirme kullan"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4339,7 +4267,7 @@
+
+ #: ../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,21 +4502,7 @@
+ 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"
+@@ -4656,7 +4570,7 @@
+ 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 +4659,7 @@
+ 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-05 19:16:10.000000000 -0400
+@@ -254,9 +254,7 @@
+ 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 ""
+@@ -318,7 +316,7 @@
+
+ #: ../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,13 +589,7 @@
+ 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"
+@@ -824,9 +816,7 @@
+ msgid "CUE sheet support"
+ msgstr "Підтримка листів CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Скасувати"
++ Скасувати"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1039,9 +1029,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "Налаштування комбінацій клавіш"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Налаштування Spotify…"
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1060,9 +1048,7 @@
+ msgid "Connect device"
+ msgstr "З’єднати пристрій"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "З'єднання зі Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1479,9 +1465,7 @@
+ msgid "Download this album..."
+ msgstr "Завантажити цей альбом…"
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Звантажити…"
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1495,9 +1479,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Завантаження каталогу Magnatune"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Завантаження модуля Spotify"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1651,9 +1633,7 @@
+ 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
+@@ -1837,10 +1817,7 @@
+ 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"
+@@ -2113,9 +2090,7 @@
+ "У динамічному режимі нові доріжку буде обрано та додано до списку "
+ "відтворення кожного разу як завершується пісня."
+
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Вхідні"
++ Вхідні"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2145,9 +2120,7 @@
+ msgid "Insert..."
+ msgstr "Вставити…"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Встановлено"
++ Встановлено"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2451,7 +2424,7 @@
+ #: ../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,9 +2500,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Основний профіль (MAIN)"
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Зробити список відтворення доступним онлайн"
++ Зробити список відтворення доступним онлайн"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2789,9 +2760,7 @@
+ msgid "Not enough neighbors"
+ msgstr "Недостатньо сусідів"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Не встановлено"
++ Не встановлено"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2927,7 +2896,7 @@
+
+ #: ../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,9 +3003,7 @@
+ msgid "Playlists"
+ msgstr "Списки відтворення"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Статус модуля:"
++ Статус модуля:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3068,7 +3035,7 @@
+
+ #: ../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,9 +3052,7 @@
+ msgid "Preferred audio format"
+ msgstr "Бажаний аудіо формат"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Бажана бітова швидкість"
++ Бажана бітова швидкість"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3479,17 +3444,7 @@
+ 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, ...)"
+@@ -3816,29 +3771,13 @@
+ 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"
+@@ -3849,7 +3788,7 @@
+ 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,17 +3876,7 @@
+ 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"
+@@ -4323,9 +4252,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "Використовувати системні налаштування проксі"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Використати нормалізацію гучності"
++ Використати нормалізацію гучності"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4342,7 +4269,7 @@
+
+ #: ../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,20 +4506,7 @@
+ 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"
+@@ -4661,7 +4575,7 @@
+ msgstr "%1 відтворень у вас"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr "Вами вказано помилкове ім’я користувача або пароль."
+
+@@ -4750,8 +4664,7 @@
+ 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-05 19:18:28.000000000 -0400
+@@ -256,9 +256,7 @@
+ 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 ""
+@@ -320,7 +318,7 @@
+
+ #: ../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,13 +591,7 @@
+ 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"
+@@ -826,9 +818,7 @@
+ msgid "CUE sheet support"
+ msgstr "Hỗ trợ danh sách CUE"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Hủy bỏ"
++ Hủy bỏ"
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1040,9 +1030,7 @@
+ 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..."
+@@ -1061,9 +1049,7 @@
+ 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"
+@@ -1480,9 +1466,7 @@
+ 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"
+@@ -1496,9 +1480,7 @@
+ 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"
+@@ -1653,9 +1635,7 @@
+ 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
+@@ -1841,9 +1821,7 @@
+ 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"
+@@ -2116,9 +2094,7 @@
+ "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"
++ Hộp thư đến"
+
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+@@ -2148,9 +2124,7 @@
+ msgid "Insert..."
+ msgstr "Nhập..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Đã cài đặt"
++ Đã cài đặt"
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2454,7 +2428,7 @@
+ #: ../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,9 +2504,7 @@
+ 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"
++ Danh sách sẵn sàng ngoại tuyến"
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2792,9 +2764,7 @@
+ 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"
++ Chưa cài đặt"
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2930,7 +2900,7 @@
+
+ #: ../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,9 +3007,7 @@
+ msgid "Playlists"
+ msgstr "Danh sách"
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Trạng thái trình cắm:"
++ Trạng thái trình cắm:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3071,7 +3039,7 @@
+
+ #: ../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,9 +3057,7 @@
+ 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"
++ Bitrate ưu tiên"
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3483,17 +3449,7 @@
+ 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, ...)"
+@@ -3819,29 +3775,13 @@
+ 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"
+@@ -3852,7 +3792,7 @@
+ 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,17 +3878,7 @@
+ 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"
+@@ -4328,9 +4258,7 @@
+ 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"
++ Sử dụng cân bằng âm lượng"
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4347,7 +4275,7 @@
+
+ #: ../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,21 +4512,7 @@
+ 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"
+@@ -4666,7 +4580,7 @@
+ 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 +4669,7 @@
+ 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-05 19:19:44.000000000 -0400
+@@ -249,9 +249,7 @@
+ 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 ""
+@@ -308,7 +306,7 @@
+
+ #: ../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,11 +579,7 @@
+ 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"
+@@ -812,9 +806,7 @@
+ msgid "CUE sheet support"
+ msgstr "CUE 支持"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1016,9 +1008,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "配置快捷键"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "配置Spotify..."
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1037,9 +1027,7 @@
+ msgid "Connect device"
+ msgstr "连接设备"
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "连接Spotify"
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1450,9 +1438,7 @@
+ msgid "Download this album..."
+ msgstr "下载此专辑..."
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "下载..."
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1466,9 +1452,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "正在下载 Magnatune 分类"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "下载Spotify插件中"
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1619,9 +1603,7 @@
+ 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
+@@ -1804,9 +1786,7 @@
+ 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"
+@@ -2070,9 +2050,7 @@
+ "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"
+@@ -2102,9 +2080,7 @@
+ msgid "Insert..."
+ msgstr "插入..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2408,7 +2384,7 @@
+ #: ../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,9 +2460,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2744,9 +2718,7 @@
+ msgid "Not enough neighbors"
+ msgstr "邻居不足"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2882,7 +2854,7 @@
+
+ #: ../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,9 +2961,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "插件状态:"
++ 插件状态:"
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3023,7 +2993,7 @@
+
+ #: ../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,9 +3010,7 @@
+ msgid "Preferred audio format"
+ msgstr "首选音乐格式"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3434,17 +3402,7 @@
+ 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, ...)"
+@@ -3770,29 +3728,13 @@
+ 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"
+@@ -3803,7 +3745,7 @@
+ 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,17 +3831,11 @@
+ 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"
+@@ -4258,9 +4194,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "使用系统代理设置"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4277,7 +4211,7 @@
+
+ #: ../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,19 +4439,11 @@
+ 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"
+@@ -4579,7 +4505,7 @@
+ msgstr "提交的音轨:%1"
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4668,8 +4594,7 @@
+ 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-05 15:26:50.000000000 -0400
+@@ -253,9 +253,7 @@
+ 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 ""
+@@ -312,7 +310,7 @@
+
+ #: ../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,11 +583,7 @@
+ 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"
+@@ -816,9 +810,7 @@
+ msgid "CUE sheet support"
+ msgstr ""
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
++
+
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+@@ -1020,9 +1012,7 @@
+ msgid "Configure Shortcuts"
+ msgstr "設定快速鍵"
+
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+@@ -1041,9 +1031,7 @@
+ msgid "Connect device"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
++
+
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+@@ -1454,9 +1442,7 @@
+ msgid "Download this album..."
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
++
+
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+@@ -1470,9 +1456,7 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "下載 Magnatune目錄"
+
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
++
+
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+@@ -1623,9 +1607,7 @@
+ 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
+@@ -1808,9 +1790,7 @@
+ 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"
+@@ -2074,9 +2054,7 @@
+ "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"
+@@ -2106,9 +2084,7 @@
+ msgid "Insert..."
+ msgstr "插入..."
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
++
+
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+@@ -2412,7 +2388,7 @@
+ #: ../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,9 +2464,7 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
++
+
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+@@ -2748,9 +2722,7 @@
+ msgid "Not enough neighbors"
+ msgstr "沒有足夠的鄰居"
+
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
++
+
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+@@ -2886,7 +2858,7 @@
+
+ #: ../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,9 +2965,7 @@
+ msgid "Playlists"
+ msgstr ""
+
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
++
+
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+@@ -3027,7 +2997,7 @@
+
+ #: ../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,9 +3014,7 @@
+ msgid "Preferred audio format"
+ msgstr "首選的音頻格式"
+
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
++
+
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+@@ -3438,17 +3406,11 @@
+ 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, ...)"
+@@ -3774,29 +3736,19 @@
+ 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"
+@@ -3807,7 +3759,7 @@
+ 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,17 +3845,11 @@
+ 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"
+@@ -4262,9 +4208,7 @@
+ msgid "Use the system proxy settings"
+ msgstr "使用系統代理伺服器設置"
+
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
++
+
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+@@ -4281,7 +4225,7 @@
+
+ #: ../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,19 +4449,11 @@
+ 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"
+@@ -4578,7 +4514,7 @@
+ msgstr ""
+
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
++
+ msgid "Your username or password was incorrect."
+ msgstr ""
+
+@@ -4667,8 +4603,7 @@
+ 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/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
+@@ -79,12 +79,6 @@
+ ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>");
+ ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>");
+
+-#ifdef HAVE_SPOTIFY
+- ret += "<p>This product uses SPOTIFY(R) CORE but is not endorsed, certified "
+- "or otherwise approved in any way by Spotify. Spotify is the "
+- "registered trade mark of the Spotify Group.</p>";
+-#endif // HAVE_SPOTIFY
+-
+ 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
+@@ -55,10 +55,6 @@
+ # include "remote/remotesettingspage.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_SPOTIFY
+- AddPage(Page_Spotify, new SpotifySettingsPage(this), providers);
+-#endif
+-
+ 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 @@
+ Page_Library,
+ Page_Lastfm,
+ Page_Grooveshark,
+- Page_Spotify,
+ Page_Magnatune,
+ Page_DigitallyImported,
+ Page_BackgroundStreams,
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-21 20:49:05 +0000