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

author: Luke Shumaker <LukeShu@sbcglobal.net> 2012-06-06 09:22:43 -0400
committer: Luke Shumaker <LukeShu@sbcglobal.net> 2012-06-06 09:22:43 -0400
commit: 6237ecf456b95ac37864cf91df9cd02795a529d4 (patch)
tree: 6c26858ed69113ecc091964324d2b56292a78fe4 /libre
parent: 1c27f57b1a28074a50e05aaa73c47ef55127e318 (diff)
parent: 5cd5d2171660435cd34470577be150e2a01d1b5e (diff)
45 files changed, 24542 insertions, 242 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 1953c1764..f5962063a 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.2.2
-pkgrel=1.1
+pkgver=3.2.3
+pkgrel=1
 pkgdesc='Plugins for Audacious without unfree plugins'
 url='http://audacious-media-player.org/'
 arch=('i686' 'x86_64')
@@ -60,7 +60,7 @@ optdepends=('oss: Open Sound System v4 output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4518a6fdcba0c1b496e048b45ce5d87a46326c9b')
+sha1sums=('87a795c4ecf645ad36ffe7bb3a7b5691e0316f71')
 build() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
 	sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
new file mode 100644
index 000000000..defa4ae57
--- /dev/null
+++ b/libre/clementine-libre/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id$
+#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+#Contributor: BlackEagle <ike.devolder@gmail.com>
+#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
+#Maintainer (Parabola): Kete <kete@ninthfloor.org>
+#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+_pkgname=clementine
+pkgname=clementine-libre
+pkgver=1.0.1
+pkgrel=3.1
+pkgdesc="A music player and library organizer, without spotify support"
+url="http://www.clementine-player.org/"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
+         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
+         'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl')
+makedepends=('cmake' 'boost')
+optdepends=('gstreamer0.10-base-plugins: for more open formats'
+            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
+            'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
+            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
+replaces=('clementine')
+conflicts=('clementine')
+provides=("clementine=$pkgver")
+source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
+        clementine-fix-albumcoverfetch-crash.patch
+        clementine-fresh-start.patch
+        remove-and-disable-spotify.patch
+        remove-nonfree-references-on-translations.patch)
+sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd'
+          'fddd2e784181ce1dcc7809e7122cbade0af7b01f'
+          'd8abab4b8fb2d5284a2f43107505325e62d4af5f'
+          '2fef46eaffa7b5cd61afbf19b1dc909d11972a34'
+          '745bc4fd639d7ef3230592c6275fb43b8956f3d5')
+install=clementine.install
+
+build() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+
+   # https://bugs.gentoo.org/401713?id=401713
+   patch -Np1 -i ../clementine-fresh-start.patch
+
+   # http://code.google.com/p/clementine-player/issues/detail?id=2752
+   patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch
+
+   # https://labs.parabola.nu/issues/99
+   patch -Np1 -i ../remove-and-disable-spotify.patch
+   patch -Np1 -i ../remove-nonfree-references-on-translations.patch
+
+   # Remove nonfree spotifyblob folder
+   rm -Rf "./spotifyblob"
+
+   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON
+   make
+}
+
+package() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch b/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch
new file mode 100644
index 000000000..d7e64388c
--- /dev/null
+++ b/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch
@@ -0,0 +1,20 @@
+diff -rupN clementine-1.0.1.old/src/covers/albumcoverfetcher.cpp clementine-1.0.1/src/covers/albumcoverfetcher.cpp
+--- clementine-1.0.1.old/src/covers/albumcoverfetcher.cpp	2011-12-02 16:24:44.000000000 -0500
++++ clementine-1.0.1/src/covers/albumcoverfetcher.cpp	2012-02-26 11:37:56.351044572 -0500
+@@ -108,12 +108,16 @@ void AlbumCoverFetcher::StartRequests()
+
+ void AlbumCoverFetcher::SingleSearchFinished(quint64 request_id, CoverSearchResults results) {
+   AlbumCoverFetcherSearch* search = active_requests_.take(request_id);
++  if (!search)
++    return;
+   search->deleteLater();
+   emit SearchFinished(request_id, results, search->statistics());
+ }
+
+ void AlbumCoverFetcher::SingleCoverFetched(quint64 request_id, const QImage& image) {
+   AlbumCoverFetcherSearch* search = active_requests_.take(request_id);
++  if (!search)
++    return;
+   search->deleteLater();
+   emit AlbumCoverFetched(request_id, image, search->statistics());
+ }
diff --git a/libre/clementine-libre/clementine-fresh-start.patch b/libre/clementine-libre/clementine-fresh-start.patch
new file mode 100644
index 000000000..9bf12973d
--- /dev/null
+++ b/libre/clementine-libre/clementine-fresh-start.patch
@@ -0,0 +1,9 @@
+diff -rupN clementine-0.7.1.old/data/schema/schema.sql clementine-0.7.1/data/schema/schema.sql
+--- clementine-0.7.1.old/data/schema/schema.sql	2011-03-29 15:16:12.000000000 -0400
++++ clementine-0.7.1/data/schema/schema.sql	2012-01-12 19:15:39.889374607 -0500
+@@ -35,4 +35,5 @@ CREATE TABLE songs (
+ CREATE TABLE schema_version (
+   version INTEGER NOT NULL
+ );
++
+ INSERT INTO schema_version (version) VALUES (0);
diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install
new file mode 100644
index 000000000..2f0338d8a
--- /dev/null
+++ b/libre/clementine-libre/clementine.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+
+post_remove() {
+  post_install $1
+}
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..9cfc3092a
--- /dev/null
+++ b/libre/clementine-libre/remove-and-disable-spotify.patch
@@ -0,0 +1,3268 @@
+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-30 02:50:15.725755468 -0300
+@@ -552,7 +552,6 @@
+   internet/internetviewcontainer.ui
+   internet/magnatunedownloaddialog.ui
+   internet/magnatunesettingspage.ui
+-  internet/spotifysettingspage.ui
+ 
+   library/groupbydialog.ui
+   library/libraryfilterwidget.ui
+@@ -690,23 +689,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 +1019,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 +1092,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/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/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,
+--- clementine-1.0.1/src/core/logging.cpp	2011-12-02 19:24:43.000000000 -0200
++++ clementine-libre-1.0.1/src/core/logging.cpp	2012-05-30 03:09:25.554790760 -0300
+@@ -14,10 +14,6 @@
+    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>
+--- clementine-1.0.1/src/core/logging.h	2011-12-02 19:24:43.000000000 -0200
++++ clementine-libre-1.0.1/src/core/logging.h	2012-05-30 03:09:44.390404481 -0300
+@@ -14,10 +14,6 @@
+    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
+--- clementine-1.0.1/src/core/timeconstants.h	2011-12-02 19:24:44.000000000 -0200
++++ clementine-libre-1.0.1/src/core/timeconstants.h	2012-05-30 03:10:10.338953893 -0300
+@@ -14,10 +14,6 @@
+    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
+ 
diff --git a/libre/clementine-libre/remove-nonfree-references-on-translations.patch b/libre/clementine-libre/remove-nonfree-references-on-translations.patch
new file mode 100644
index 000000000..f80e7f5a7
--- /dev/null
+++ b/libre/clementine-libre/remove-nonfree-references-on-translations.patch
@@ -0,0 +1,20088 @@
+diff -rauN clementine-1.0.1/src/translations/ar.po clementine-libre-1.0.1/src/translations/ar.po
+--- clementine-1.0.1/src/translations/ar.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ar.po	2012-05-28 22:09:35.427205715 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "ابدأ قئمة التشغيل اللتي تعمل حالياً"
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/be.po clementine-libre-1.0.1/src/translations/be.po
+--- clementine-1.0.1/src/translations/be.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/be.po	2012-05-29 13:46:37.876404109 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -311,7 +307,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -584,12 +579,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -815,10 +804,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1025,10 +1010,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Наладзіць калекцыю..."
+@@ -1046,10 +1027,6 @@
+ msgid "Connect device"
+ msgstr "Падлучэнне прылады"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1465,10 +1442,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1481,10 +1454,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Спампаваць каталог Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1634,10 +1603,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1819,10 +1784,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2085,10 +2046,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2117,10 +2074,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2423,7 +2376,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2499,10 +2451,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2759,10 +2707,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2897,7 +2841,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -3004,10 +2947,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3038,7 +2977,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3055,10 +2993,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3449,18 +3383,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3785,30 +3707,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3818,7 +3720,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3904,18 +3805,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4273,10 +4162,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4292,7 +4177,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4516,20 +4400,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4589,7 +4459,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4678,8 +4547,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/bg.po clementine-libre-1.0.1/src/translations/bg.po
+--- clementine-1.0.1/src/translations/bg.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/bg.po	2012-05-29 13:48:35.013070898 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Необходим е Grooveshark Anywhere акаунт"
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Нуждаете се от премиум регистрация в Spotify."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,14 +584,6 @@
+ msgid "Always start playing"
+ msgstr "Винаги да се започва възпроизвеждането"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"За да използвате Spotify в Clementine е необходима допълнителна приставка. "
+-"Иската ли да я свалите и инсталирате сега?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Получи се грешка при копирането на iTunes базата данни от утройството"
+@@ -822,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr "Поддръжка на CUE листове"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Отказ"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Смени обложката"
+@@ -1038,10 +1021,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Настройване на бързите клавиши"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Настройване на Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Настройване на библиотека..."
+@@ -1060,10 +1039,6 @@
+ msgid "Connect device"
+ msgstr "Свързване на устройство"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Свързване към Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Постоянен битов поток"
+@@ -1480,10 +1455,6 @@
+ msgid "Download this album..."
+ msgstr "Сваляне на този албум..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Изтегляне..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Сваляне на icecast директорията"
+@@ -1496,10 +1467,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Сваляне на каталог Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Изтегляне на приставка за Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Сваляне на метаданни"
+@@ -1654,10 +1621,6 @@
+ msgid "Error deleting songs"
+ msgstr "Грешка при изтриване на песни"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Грешка при изтеглянето на приставка за Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1839,12 +1802,6 @@
+ msgid "Font size"
+ msgstr "Размер на шрифта"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Поради причини, свързани с лицензирането, поддръжката на Spotify е като "
+-"отделна приставка."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Принудително кодиране в моно"
+@@ -2117,10 +2074,6 @@
+ "В динамичен режим новите песни ще бъдат избирани и добавяни към списъка с "
+ "песни всеки път, когато свърши песента."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Входящи"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Включване на обложката в известяването"
+@@ -2149,10 +2102,6 @@
+ msgid "Insert..."
+ msgstr "Вмъкване..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Инсталирани"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Интернет"
+@@ -2459,7 +2408,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2535,10 +2483,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Списъкът с песни да е наличен в режим извън мрежа"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Грешка при отговора"
+@@ -2798,10 +2742,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Недостатъчно съседи"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Не е инсталиран"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Не сте вписан"
+@@ -2936,7 +2876,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Парола"
+@@ -3043,10 +2982,6 @@
+ msgid "Playlists"
+ msgstr "Списъци с песни"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Състояние на приставката:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Поп"
+@@ -3077,7 +3012,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Настройки"
+@@ -3095,10 +3029,6 @@
+ msgid "Preferred audio format"
+ msgstr "Предпочитан аудио формат"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Предпочитан битов поток"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Предпочитан формат"
+@@ -3489,18 +3419,6 @@
+ msgid "Search Magnatune"
+ msgstr "Търси в Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Търсене в Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Търсене в Spotify (отваря нов подпрозорец)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Търсене в Spotify (отваря нов подпрозорец)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Търсене във всички източници (библиотека, интернет услуги, ...)"
+@@ -3826,30 +3744,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Грешка в вписване в Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Приставка за Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Приставката за Spotify не е инсталирана"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Стандартно"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Със звезда"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Стартиране на текущо възпроизвеждания списък с песни"
+@@ -3859,7 +3757,6 @@
+ msgstr "Начало на прекодирането"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Започнете да пишете в полето за търсее за да намерите музика на %1."
+@@ -3945,18 +3842,6 @@
+ msgid "Switch provider"
+ msgstr "Смяна на доставчика"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Синхронизиране на входящата кутия на Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Синхронизиране на списъка с песни от Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Синхронизиране на оценените песни от Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Табовете отгоре"
+@@ -4342,10 +4227,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Използване на системните настройки за сървър-посредник"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Използване на нормализация на звука"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Използван"
+@@ -4361,7 +4242,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Потребителско име"
+@@ -4599,20 +4479,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Нямате Grooveshark Anywhere акаунт."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Нямате Spotify Premium акаунт."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr "Отписан сте от Spotify, моля въведете отново паролата си в Настройки."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Изписан сте от Spotify, моля въведете паролата си отново"
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Харесвате тази песен"
+@@ -4680,7 +4546,6 @@
+ msgstr "Вашите слушания: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Вашето потребителско име или парола не съвпада."
+ 
+@@ -4769,8 +4634,6 @@
+ msgstr "в последните"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "килобита/сек"
+ 
+diff -rauN clementine-1.0.1/src/translations/bn.po clementine-libre-1.0.1/src/translations/bn.po
+--- clementine-1.0.1/src/translations/bn.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/bn.po	2012-05-29 13:50:28.419737684 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "এক্ টি স্পটীফাই অ্যাকাউন্ট প্রয়োজন"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -311,7 +307,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -584,14 +579,6 @@
+ msgid "Always start playing"
+ msgstr "স্থায়ী ভাবে সঙ্গীত চালু রাখুন"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"এক্ টি প্লাগ ইন প্রয়োজন। আপনি কি প্লাগ ইন টি ডাউনলোড করে ইন্সটল করতে ইচ্ছুক "
+-"?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "iTune ডাটাবেস কপি করায় ত্রুটি র জন্য দুঃখিত ।"
+@@ -817,10 +804,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1021,10 +1004,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1042,10 +1021,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1455,10 +1430,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1471,10 +1442,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1624,10 +1591,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1809,10 +1772,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2075,10 +2034,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2107,10 +2062,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2413,7 +2364,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2489,10 +2439,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2749,10 +2695,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2887,7 +2829,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2994,10 +2935,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3028,7 +2965,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3045,10 +2981,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3439,18 +3371,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3775,30 +3695,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3808,7 +3708,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3894,18 +3793,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4263,10 +4150,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4282,7 +4165,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4506,20 +4388,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4579,7 +4447,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4668,8 +4535,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/br.po clementine-libre-1.0.1/src/translations/br.po
+--- clementine-1.0.1/src/translations/br.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/br.po	2012-05-29 13:51:23.959737744 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Ur c'hont Grooveshark a zo dleet"
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Ret eo deoc'h kaout ur kont Spotify Premium."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -314,7 +310,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -588,14 +583,6 @@
+ msgid "Always start playing"
+ msgstr "Atav kregin da lenn"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Un enlugellad a zo ezhomm a-benn implij Spotify e-barzh Clementine. C'hoant "
+-"ho peus pellgargañ ha staliañ anezhañ bremañ ?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -824,10 +811,6 @@
+ msgid "CUE sheet support"
+ msgstr "Kemer e kont ar CUE sheet"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Nullañ"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Kemmañ golo an albom"
+@@ -1040,10 +1023,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Kefluniañ ar Berradennoù"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Kefluniañ Spotify"
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Kefluniañ al levraoueg..."
+@@ -1061,10 +1040,6 @@
+ msgid "Connect device"
+ msgstr "An drobarzhell a zo o kennaskañ"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "O kennaskañ da Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "CBR"
+@@ -1480,10 +1455,6 @@
+ msgid "Download this album..."
+ msgstr "Pellgkargañ an albom..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Pellgargañ"
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "O pellgargañ katalog Icecast"
+@@ -1496,10 +1467,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "O pellgargañ katalog Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "O pellgargañ enlugellad Spotify..."
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "O pellgargañ metadaveennoù"
+@@ -1653,10 +1620,6 @@
+ msgid "Error deleting songs"
+ msgstr "Ur gudenn a zo savet e-kerzh dilamidigezh an tonioù"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Ur gudenn a zo savet o pellgargañ enlugellad Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1841,10 +1804,6 @@
+ msgid "Font size"
+ msgstr "Ment an nodrezh"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Evit abegoù lañsav, meret eo Spotify gant un enlugellad distag."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forsiñ an enkodiñ mono"
+@@ -2119,10 +2078,6 @@
+ "E stumm dinamek, roudennoù nevez a vo choazet hag ouzhpennet e fin al roll "
+ "c'hoari bep taol ma vo echu gant un ton."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Boest degemer"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Diskouez an albom er gemenadenn"
+@@ -2151,10 +2106,6 @@
+ msgid "Insert..."
+ msgstr "Enlakaat..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Staliaet"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2458,7 +2409,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2534,10 +2484,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Profil pennañ (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Lakaat ar roll c'hoari da vezañ lennus ezlinenn"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Respont furmed fall"
+@@ -2798,10 +2744,6 @@
+ msgid "Not enough neighbors"
+ msgstr "N'eus ket trawalc'h a amezeizen"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "N'eo ket staliet"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "N'eo ket kannasket"
+@@ -2936,7 +2878,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Tremenger"
+@@ -3043,10 +2984,6 @@
+ msgid "Playlists"
+ msgstr "Rollioù c'hoari"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stad an enlugellad"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3077,7 +3014,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Gwellvezioù"
+@@ -3094,10 +3030,6 @@
+ msgid "Preferred audio format"
+ msgstr "Stumm audio gwellañ"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate gwellañ"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Stumm gwellañ"
+@@ -3488,18 +3420,6 @@
+ msgid "Search Magnatune"
+ msgstr "Klask Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Klask Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Klask Spotify (digeriñ un ivinel nevez)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Klask Spotify (digeriñ un ivinel nevez)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Klask e-touez holl o mammennoù (levraoueg, internet, servijoù...)"
+@@ -3824,30 +3744,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Kudenn kennaskañ gant Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Enlugellad Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Enlugellad Spotify n'eo ket staliet"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Boaz"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Gwellañ"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Kregiñ ar roll c'hoari"
+@@ -3857,7 +3757,6 @@
+ msgstr "Kregin an transkodiñ"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Kregin da skrivañ er boest klask a-us evit kavout sonerezh war %1"
+@@ -3943,18 +3842,6 @@
+ msgid "Switch provider"
+ msgstr "Cheñch servij"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Sinkronizadur ar boest degemer Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Sinkronizadur ar roll c'hoari Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Sinkronizadur tonioù gwellañ Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Ivinelloù a-us"
+@@ -4336,10 +4223,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Implij dibarzhioù dre ziouer ar proksi"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Implij normalizadur an ampled"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Implijet"
+@@ -4355,7 +4238,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Lezanv"
+@@ -4592,22 +4474,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "N'ho peus ket a kont Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "N'ho peus ket a kont Spotify Premium."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen e-barzh prenestr ar "
+-"c'hefluniadoù."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen mar plij."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Karout a rit ar roadenn-mañ"
+@@ -4675,7 +4541,6 @@
+ msgstr "Ho scrobble: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Ho anv implijer pe ho tremenger a zo direizh."
+ 
+@@ -4764,8 +4629,6 @@
+ msgstr "etrezek ar re ziwezhañ"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbde"
+ 
+diff -rauN clementine-1.0.1/src/translations/bs.po clementine-libre-1.0.1/src/translations/bs.po
+--- clementine-1.0.1/src/translations/bs.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/bs.po	2012-05-29 13:52:24.389737809 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -311,7 +307,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -584,12 +579,6 @@
+ msgid "Always start playing"
+ msgstr "Uvjek počni sa slušanjem"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Desila se greška prilikom kopiranja iTunes baze podataka sa uređaja"
+@@ -815,10 +804,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE lista podrška"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Promjeni omot"
+@@ -1029,10 +1014,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Podesi prečice"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Podesi biblioteku..."
+@@ -1050,10 +1031,6 @@
+ msgid "Connect device"
+ msgstr "Spoji uređaj"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1467,10 +1444,6 @@
+ msgid "Download this album..."
+ msgstr "Preuzmi ovaj album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Preuzimam Icecast fasciklu"
+@@ -1483,10 +1456,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Preuzimam Magnatune katalog"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1636,10 +1605,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1821,10 +1786,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2087,10 +2048,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2119,10 +2076,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2425,7 +2378,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2501,10 +2453,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2761,10 +2709,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2899,7 +2843,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -3006,10 +2949,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3040,7 +2979,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3057,10 +2995,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3451,18 +3385,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3787,30 +3709,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3820,7 +3722,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3906,18 +3807,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4275,10 +4164,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4294,7 +4179,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4518,20 +4402,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4591,7 +4461,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4680,8 +4549,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/ca.po clementine-libre-1.0.1/src/translations/ca.po
+--- clementine-1.0.1/src/translations/ca.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ca.po	2012-05-29 14:27:32.546406760 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Us cal un compte Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Cal un compte Premium de Spotify"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -318,7 +314,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -591,14 +586,6 @@
+ msgid "Always start playing"
+ msgstr "Començar sempre reproduint"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Cal un connector addicional per utilitzar Spotify a Clementine. Voleu "
+-"descarregar-lo i instaŀlar-lo ara?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -827,10 +814,6 @@
+ msgid "CUE sheet support"
+ msgstr "Suport per a CUE sheet"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Canceŀla"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Canviar la imatge de la portada"
+@@ -1043,10 +1026,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configura dreceres"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configura l'Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configura la llibreria..."
+@@ -1064,10 +1043,6 @@
+ msgid "Connect device"
+ msgstr "Connecta el dispositiu"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Connectant amb Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Taxa de bits constant"
+@@ -1483,10 +1458,6 @@
+ msgid "Download this album..."
+ msgstr "Descarrega aquest àlbum..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Descarrega..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Descarregant el directori d'Icecast"
+@@ -1499,10 +1470,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Descarregant el catàleg de Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Descarregant el connector d'Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Descarregant metadades"
+@@ -1654,10 +1621,6 @@
+ msgid "Error deleting songs"
+ msgstr "Error esborrant cançons"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1839,10 +1802,6 @@
+ msgid "Font size"
+ msgstr "Mida de la font"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Força la codificació mono"
+@@ -2110,10 +2069,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Safata d'entrafa"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Incloure la caràtula a la notificació"
+@@ -2142,10 +2097,6 @@
+ msgid "Insert..."
+ msgstr "Insereix..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instaŀlat"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2450,7 +2401,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2526,10 +2476,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Resposta malformada"
+@@ -2788,10 +2734,6 @@
+ msgid "Not enough neighbors"
+ msgstr "No hi ha prous veïns"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "No heu iniciat la sessió"
+@@ -2926,7 +2868,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Contrasenya"
+@@ -3033,10 +2974,6 @@
+ msgid "Playlists"
+ msgstr "Llistes de reproducció"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3067,7 +3004,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Preferències"
+@@ -3084,10 +3020,6 @@
+ msgid "Preferred audio format"
+ msgstr "Format d'àudio preferit"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Format preferit"
+@@ -3478,18 +3410,6 @@
+ msgid "Search Magnatune"
+ msgstr "Cercar a Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3814,30 +3734,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Error en iniciar sessió a Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Connector d'Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Connector d'Spotify no instaŀlat"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Estàndard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Destacat"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Inicia la llista de reproducció que s'està reproduint"
+@@ -3847,7 +3747,6 @@
+ msgstr "Inicia transcodificació"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3933,18 +3832,6 @@
+ msgid "Switch provider"
+ msgstr "Canvia de proveïdor"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4314,10 +4201,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Usat"
+@@ -4333,7 +4216,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nom d'usuari"
+@@ -4560,20 +4442,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4636,7 +4504,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4725,8 +4592,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/cs.po clementine-libre-1.0.1/src/translations/cs.po
+--- clementine-1.0.1/src/translations/cs.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/cs.po	2012-05-29 14:53:26.439741827 -0400
+@@ -257,10 +257,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Je požadován účet Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Je požadován účet Spotify Premium."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -321,7 +317,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -594,14 +589,6 @@
+ msgid "Always start playing"
+ msgstr "Vždy začít přehrávat"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Pro používání Spotify v Clementine je vyžadován přídavný modul. Chcete jej "
+-"stáhnout a nainstalovat nyní?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Při kopírování databáze iTunes ze zařízení nastala chyba"
+@@ -827,10 +814,6 @@
+ msgid "CUE sheet support"
+ msgstr "Podpora pro list CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Zrušit"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Změnit obal"
+@@ -1041,10 +1024,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Nastavit klávesové zkratky"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Nastavit Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Nastavit sbírku..."
+@@ -1062,10 +1041,6 @@
+ msgid "Connect device"
+ msgstr "Připojit zařízení"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Připojuje se k Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Stálý datový tok"
+@@ -1481,10 +1456,6 @@
+ msgid "Download this album..."
+ msgstr "Stáhnout toto album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Stáhnout..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Stahuje se adresář Icecast"
+@@ -1497,10 +1468,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Stahuje se katalog Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Stahuje se přídavný modul Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Stahují se metadata"
+@@ -1653,10 +1620,6 @@
+ msgid "Error deleting songs"
+ msgstr "Chyba při mazání písní"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Chyba při stahování přídavného modulu Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1838,11 +1801,6 @@
+ msgid "Font size"
+ msgstr "Velikost písma"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Z licenčních důvodů je podpora pro Spotify v odděleném přídavném modulu"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Vynutit monokódování"
+@@ -2115,10 +2073,6 @@
+ "V dynamickém režimu budou nové skladby vybrány a přidány do seznamu skladeb "
+ "pokaždé, když píseň skončí."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Doručená pošta"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Zahrnout obal alba do oznámení"
+@@ -2147,10 +2101,6 @@
+ msgid "Insert..."
+ msgstr "Vložit..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Nainstalován"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2456,7 +2406,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2532,12 +2481,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Hlavní profil"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-"Zajistit, že seznam skladeb bude dostupný, i když počítač nebude připojen k "
+-"internetu"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Poškozená odpověď"
+@@ -2796,10 +2739,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nedostatek sousedů"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nenainstalován"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Nepřihlášen"
+@@ -2934,7 +2873,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Heslo"
+@@ -3041,10 +2979,6 @@
+ msgid "Playlists"
+ msgstr "Seznamy skladeb"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stav přídavného modulu:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3075,7 +3009,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Nastavení"
+@@ -3092,10 +3025,6 @@
+ msgid "Preferred audio format"
+ msgstr "Upřednostňovaný zvukový formát"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Upřednostňovaný datový tok"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Upřednostňovaný formát"
+@@ -3486,18 +3415,6 @@
+ msgid "Search Magnatune"
+ msgstr "Hledat na Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Hledat v Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Hledat v Spotify (otevře novou kartu)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Hledat v Spotify (otevře novou kartu)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Hledat ve všech vašich zdrojích (sbírka, internetové služby, ...)"
+@@ -3822,30 +3739,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Chyba přihlášení k Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Přídavný modul Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Přídavný modul Spotify není nainstalován"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Obvyklý"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "S hvězdičkou"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Přehrát současnou skladbu v seznamu skladeb"
+@@ -3855,7 +3752,6 @@
+ msgstr "Převést"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Začněte psát ve vyhledávacím poli pro nalezení hudby na %1."
+@@ -3941,18 +3837,6 @@
+ msgid "Switch provider"
+ msgstr "Přepnout poskytovatele"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synchronizuje se schránka Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synchronizuje se seznam skladeb Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synchronizují se skladby označené hvězdičkou na Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Karty nahoře"
+@@ -4329,10 +4213,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Použít systémové nastavení proxy"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Použít normalizaci hlasitosti"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Použito"
+@@ -4348,7 +4228,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Uživatelské jméno"
+@@ -4584,22 +4463,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Nemáte účet Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Nemáte účet Spotify Premium."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo v dialogu pro "
+-"nastavení znovu."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo znovu."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Tato skladba patří mezi vaše oblíbené"
+@@ -4667,7 +4530,6 @@
+ msgstr "Váš počet přehrání: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Uživatelské jméno nebo heslo bylo nesprávné."
+ 
+@@ -4756,8 +4618,6 @@
+ msgstr "za posledních"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kb/s"
+ 
+diff -rauN clementine-1.0.1/src/translations/cy.po clementine-libre-1.0.1/src/translations/cy.po
+--- clementine-1.0.1/src/translations/cy.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/cy.po	2012-05-29 14:57:59.696408611 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/da.po clementine-libre-1.0.1/src/translations/da.po
+--- clementine-1.0.1/src/translations/da.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/da.po	2012-05-29 14:59:00.383075364 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "En Spotify Premium konto er påkrævet."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -315,7 +311,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -588,12 +583,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -819,10 +808,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1023,10 +1008,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfigurér Genveje"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Indstil bibliotek..."
+@@ -1044,10 +1025,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1457,10 +1434,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1473,10 +1446,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1628,10 +1597,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1813,10 +1778,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2079,10 +2040,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Inkludér albumkunst i bekendtgørelsen"
+@@ -2111,10 +2068,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2417,7 +2370,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2493,10 +2445,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Misdannet svar"
+@@ -2753,10 +2701,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Ikke nok naboer"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2891,7 +2835,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2998,10 +2941,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3032,7 +2971,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3049,10 +2987,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3443,18 +3377,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3781,30 +3703,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Start den spilleliste der afspiller nu"
+@@ -3814,7 +3716,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3900,18 +3801,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4270,10 +4159,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4289,7 +4174,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4513,20 +4397,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4586,7 +4456,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4675,8 +4544,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/de.po clementine-libre-1.0.1/src/translations/de.po
+--- clementine-1.0.1/src/translations/de.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/de.po	2012-05-29 15:03:39.899742271 -0400
+@@ -258,10 +258,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Ein Grooveshark Anywhere-Konto wird benötigt."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Ein Spotify Premium-Konto ist erforderlich."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -323,7 +319,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -597,14 +592,6 @@
+ msgid "Always start playing"
+ msgstr "Immer mit der Wiedergabe beginnen"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Ein zusätzlich Plugin ist benötigt, um Spotify in Clementine zu benutzen. "
+-"Möchten Sie es jetzt herunterladen und installieren?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -832,10 +819,6 @@
+ msgid "CUE sheet support"
+ msgstr "Unterstützung von Cuesheets"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Abbrechen"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Cover ändern"
+@@ -1048,10 +1031,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Tastenkürzel einrichten"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Spotify konfigurieren..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Musiksammlung einrichten..."
+@@ -1069,10 +1048,6 @@
+ msgid "Connect device"
+ msgstr "Gerät verbinden"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Verbindung mit Spotify wird aufgebaut"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Konstante Bitrate"
+@@ -1488,10 +1463,6 @@
+ msgid "Download this album..."
+ msgstr "Album herunterladen..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Herunterladen..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Lade Icecast-Verzeichnis herunter"
+@@ -1504,10 +1475,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Magnatune-Katalog wird geladen"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Spotify-Plugin wird heruntergeladen"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Metadaten werden heruntergeladen"
+@@ -1662,10 +1629,6 @@
+ msgid "Error deleting songs"
+ msgstr "Fehler beim Löschen der Titel"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Fehler beim herunterladen von Spotify-Plugin"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1847,12 +1810,6 @@
+ msgid "Font size"
+ msgstr "Schriftgröße"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Aus lizenzrechtlichen Gründen, ist die Spotify-Unterstützung in einem "
+-"Separaten Plugin enthalten."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Mono Encoding erzwingen"
+@@ -2125,10 +2082,6 @@
+ "Im dynamischen Modus werden neue Stücke automatisch ausgewählt und an die "
+ "Wiedergabeliste angehängt, sobald ein Titel zu Ende ist."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Posteingang"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Cover in der Benachrichtigung anzeigen"
+@@ -2157,10 +2110,6 @@
+ msgid "Insert..."
+ msgstr "Einfügen..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installiert"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2465,7 +2414,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2541,10 +2489,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Standard - Profil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Wiedergabeliste für die Offlinebenutzung verfügbar machen"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Ungültige Antwort"
+@@ -2803,10 +2747,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nicht genug Nachbarn"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nicht installiert"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Nicht angemeldet"
+@@ -2941,7 +2881,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Passwort"
+@@ -3049,10 +2988,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Plugin-Status"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3083,7 +3018,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Einstellungen"
+@@ -3100,10 +3034,6 @@
+ msgid "Preferred audio format"
+ msgstr "Bevorzugtes Dateiformat"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bevorzugte Bitrate"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Bevorzugtes Format"
+@@ -3494,18 +3424,6 @@
+ msgid "Search Magnatune"
+ msgstr "Magnatune durchsuchen"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Spotify-Suche"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Spotify-Suche (öffnet im neuen Tab)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Spotify-Suche (öffnet im neuen Tab)"
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Alle Quellen durchsuchen (Sammlung, Internetdienste, …)"
+@@ -3832,30 +3750,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Fehler beim anmelden bei Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify-Plugin"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify-Plugin nicht installiert"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Markiert"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Spiele das aktuelle Stück in der Wiedergabeliste ab"
+@@ -3865,7 +3763,6 @@
+ msgstr "Konvertieren"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Benutzen Sie die Suchleiste um Musik auf %1 zu finden."
+@@ -3951,18 +3848,6 @@
+ msgid "Switch provider"
+ msgstr "Anbieter wechseln"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synchronisiere Spotify Postfach"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synchronisiere Spotify Wiedergabeliste"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synchronisiere markierte Stücke von Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Tabs oben"
+@@ -4345,10 +4230,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Verwende Proxy-Einstellungen des Betriebssystems"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Belegt"
+@@ -4364,7 +4245,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Benutzername"
+@@ -4602,20 +4482,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Sie haben kein Grooveshark Anywhere-Konto."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Sie haben kein Spotify Premium-Konto."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Sie lieben dieses Stück"
+@@ -4683,7 +4549,6 @@
+ msgstr "Ihre Scrobbles: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Ihr Benutzername oder Kennwort sind ungültig."
+ 
+@@ -4772,8 +4637,6 @@
+ msgstr "in den letzten"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "Kb/s"
+ 
+diff -rauN clementine-1.0.1/src/translations/el.po clementine-libre-1.0.1/src/translations/el.po
+--- clementine-1.0.1/src/translations/el.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/el.po	2012-05-29 15:04:37.229742284 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Απαιτείτε ένας λογαρισμός Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Απαιτείται premium λογαριασμός Spotify."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -318,7 +314,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -591,14 +586,6 @@
+ msgid "Always start playing"
+ msgstr "Έναρξη αναπαραγωγής πάντα"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Απαιτείται ένα πρόσθετο για να χρησιμοποιήσετε το Spotify. Θέλετε να το "
+-"κατεβάσετε και να το εγκαταστήσετε τώρα;"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -827,10 +814,6 @@
+ msgid "CUE sheet support"
+ msgstr "Υποστήριξη φύλλων CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Άκυρο"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Αλλαγή εξώφυλλου καλλιτέχνη"
+@@ -1046,10 +1029,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Ρύθμιση συντομεύσεων"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Ρύθμιση του Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Παραμετροποίηση της βιβλιοθήκης"
+@@ -1069,10 +1048,6 @@
+ msgid "Connect device"
+ msgstr "Σύνδεση συσκευής"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Σύνδεση στο Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Σταθερός ρυθμός bit"
+@@ -1488,10 +1463,6 @@
+ msgid "Download this album..."
+ msgstr "Μεταφόρτωση αυτού του άλμπουμ..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Λήψη..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Μεταφόρτωση καταλόγου Icecast"
+@@ -1504,10 +1475,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Μεταφόρτωση καταλόγου του Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Λήψη πρόσθετου για το Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Λήψη μεταδεδομένων"
+@@ -1664,10 +1631,6 @@
+ msgid "Error deleting songs"
+ msgstr "Σφάλμα κατά την διαγραφή τραγουδιών"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Σφάλμα στην λήψη του πρόσθετου του Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1850,11 +1813,6 @@
+ msgid "Font size"
+ msgstr "Μέγεθος γραμματοσειράς"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Για λόγους αδειοδότησης η υποστήριξη για το Spotify γίνεται ξεχωριστά."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Επιβολή κωδικοποίησης mono"
+@@ -2129,10 +2087,6 @@
+ "Στην δυναμική λειτουργία νέα κομμάτια θα επιλέγονται και τοποθετούνται στην "
+ "λίστα κάθε φορά που ένα τραγούδι τελειώνει."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Εισερχόμενα"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Εμφάνιση του άλμπουμ (εικόνα) στην ειδοποίηση"
+@@ -2163,10 +2117,6 @@
+ msgid "Insert..."
+ msgstr "Εισαγωγή..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Εγκατεστημένο"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Διαδίκτυο"
+@@ -2471,7 +2421,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2547,10 +2496,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Κύριο προφίλ (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Η λίστα να είναι διαθέσιμη και εκτός σύνδεσης"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Παραμορφωμένη απάντηση"
+@@ -2812,10 +2757,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Δεν υπάρχουν αρκετοί γείτονες"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Μη εγκατεστημένο"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Δεν είστε συνδεδεμένος"
+@@ -2950,7 +2891,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Συνθηματικό"
+@@ -3057,10 +2997,6 @@
+ msgid "Playlists"
+ msgstr "Λίστες"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Κατάσταση πρόσθετου:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3091,7 +3027,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Προτιμήσεις"
+@@ -3110,10 +3045,6 @@
+ msgid "Preferred audio format"
+ msgstr "Προτιμώμενη ηχητική διαμόρφωση"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Προτιμώμενος ρυθμός bit "
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Προτιμώμενη μορφή"
+@@ -3504,18 +3435,6 @@
+ msgid "Search Magnatune"
+ msgstr "Εύρεση στο Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Εύρεση Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Αναζήτηση σε όλες τις πηγές σας (βιβλιοθήκη, υπηρεσίες internet, ...)"
+@@ -3843,30 +3762,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Σφάλμα εισόδου στο Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Πρόσθετο Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Το πρόσθετο του Spotify μη εγκατεστημένο"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Κανονικό"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Με αστέρι"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Εκκίνηση της λίστας αναπαραγωγής που παίζει τώρα"
+@@ -3876,7 +3775,6 @@
+ msgstr "Εκκίνηση επανακωδικοποίησης"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3964,18 +3862,6 @@
+ msgid "Switch provider"
+ msgstr "Αλλαγή παροχέα"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Συγχρονισμός εισερχομένων του Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Συγχρονισμός λίστας του Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Συγχρονισμός κομματιών επισημασμένων με αστέρι του Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Καρτέλες στην κορυφή"
+@@ -4361,10 +4247,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Χρήση ρυθμίσεων του διαμεσολαβητή του συστήματος"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Χρήση κανονικοποίησης ήχου"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Σε χρήση"
+@@ -4380,7 +4262,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Όνομα χρήστη"
+@@ -4617,22 +4498,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Δεν έχετε λογαριασμό στο GrooveShark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Δεν έχετε Premium λογαριασμό στο Spotify."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας στις "
+-"ρυθμίσεις."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Λατρεύεις αυτό το κομμάτι"
+@@ -4699,7 +4564,6 @@
+ msgstr "Τα scrobbles σου: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Το όνομα χρήστη ή το συνθηματικό ήταν λανθασμένο."
+ 
+@@ -4788,8 +4652,6 @@
+ msgstr "εντός των τελευταίων"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/en_CA.po clementine-libre-1.0.1/src/translations/en_CA.po
+--- clementine-1.0.1/src/translations/en_CA.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/en_CA.po	2012-05-29 15:05:50.036409383 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configure Shortcuts"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configure library..."
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1452,10 +1429,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1468,10 +1441,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Downloading Magnatune catalogue"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1622,10 +1591,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1807,10 +1772,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2073,10 +2034,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Include album art in the notification"
+@@ -2105,10 +2062,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2411,7 +2364,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2487,10 +2439,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Malformed response"
+@@ -2748,10 +2696,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Not enough neighbours"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2886,7 +2830,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2993,10 +2936,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3027,7 +2966,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3044,10 +2982,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3438,18 +3372,6 @@
+ msgid "Search Magnatune"
+ msgstr "Search Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3774,30 +3696,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Start the playlist currently playing"
+@@ -3807,7 +3709,6 @@
+ msgstr "Start transcoding"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3893,18 +3794,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4262,10 +4151,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4281,7 +4166,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4505,20 +4389,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4578,7 +4448,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4667,8 +4536,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/en_GB.po clementine-libre-1.0.1/src/translations/en_GB.po
+--- clementine-1.0.1/src/translations/en_GB.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/en_GB.po	2012-05-29 15:06:41.279742544 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "A Spotify Premium account is required."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -315,7 +311,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -588,14 +583,6 @@
+ msgid "Always start playing"
+ msgstr "Always start playing"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"An additional plugin is required to use Spotify in Clementine. Would you "
+-"like to download and install it now?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "An error occurred copying the iTunes database from the device"
+@@ -821,10 +808,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE sheet support"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancel"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Change cover art"
+@@ -1026,10 +1009,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configure library..."
+@@ -1047,10 +1026,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1460,10 +1435,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1476,10 +1447,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1630,10 +1597,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1815,10 +1778,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2081,10 +2040,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Include album art in the notification"
+@@ -2113,10 +2068,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2419,7 +2370,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2495,10 +2445,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Malformed response"
+@@ -2755,10 +2701,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Not enough neighbours"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2893,7 +2835,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -3000,10 +2941,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3034,7 +2971,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3051,10 +2987,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3445,18 +3377,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3781,30 +3701,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Start the playlist currently playing"
+@@ -3814,7 +3714,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3900,18 +3799,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4269,10 +4156,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4288,7 +4171,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4512,20 +4394,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4585,7 +4453,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4674,8 +4541,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/en.po clementine-libre-1.0.1/src/translations/en.po
+--- clementine-1.0.1/src/translations/en.po	2011-12-02 16:24:44.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/en.po	2012-05-29 15:04:56.353075508 -0400
+@@ -178,9 +178,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+ "There are different types of smart playlist that offer different ways of "
+@@ -408,11 +405,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+ 
+@@ -720,9 +712,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ msgid "Configure library..."
+ msgstr ""
+ 
+@@ -735,9 +724,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ msgid "Constant bitrate"
+ msgstr ""
+ 
+@@ -1045,9 +1031,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ msgid "Downloading metadata"
+ msgstr ""
+ 
+@@ -1152,9 +1135,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #, qt-format
+ msgid "Error loading %1"
+ msgstr ""
+@@ -1280,9 +1260,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ msgid "Force mono encoding"
+ msgstr ""
+ 
+@@ -2409,15 +2386,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-msgid "Search Spotify"
+-msgstr ""
+-
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ msgid "Search for album covers..."
+ msgstr ""
+ 
+@@ -2647,18 +2615,6 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-msgid "Spotify"
+-msgstr ""
+-
+-msgid "Spotify login error"
+-msgstr ""
+-
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ msgid "Standard"
+ msgstr ""
+ 
+@@ -2674,9 +2630,6 @@
+ msgid "Start typing in the search box above to find music on Grooveshark."
+ msgstr ""
+ 
+-msgid "Start typing in the search box above to find music on Spotify."
+-msgstr ""
+-
+ #, qt-format
+ msgid "Starting %1"
+ msgstr ""
+@@ -2731,15 +2684,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ msgid "Tabs on top"
+ msgstr ""
+ 
+@@ -3180,9 +3124,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+ msgid ""
+ "You have selected a Premium-only audio type but do not have any account "
+ "details entered"
+diff -rauN clementine-1.0.1/src/translations/eo.po clementine-libre-1.0.1/src/translations/eo.po
+--- clementine-1.0.1/src/translations/eo.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/eo.po	2012-05-29 15:18:59.993076631 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Eraro okazis dum kopiado de la iTunes-datumbazo el aparato"
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/es.po clementine-libre-1.0.1/src/translations/es.po
+--- clementine-1.0.1/src/translations/es.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/es.po	2012-05-29 15:22:56.383076862 -0400
+@@ -254,10 +254,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Se requiere una cuenta Grooveshrak Anywhere"
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Se requiere una cuenta Premium de Spotify."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -319,7 +315,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -592,14 +587,6 @@
+ msgid "Always start playing"
+ msgstr "Siempre empezar a reproducir"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Un plugin adicional es requerido para usar Spotify en Clementine. ¿Te "
+-"gustaría descargarlo e instalarlo ahora?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -829,10 +816,6 @@
+ msgid "CUE sheet support"
+ msgstr "Soporte de hoja CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancelar"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Cambiar portada"
+@@ -1046,10 +1029,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurar accesos rápidos"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurar Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configurar colección..."
+@@ -1067,10 +1046,6 @@
+ msgid "Connect device"
+ msgstr "Conectar dispositivo"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Connectando con Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Flujo de bits constante"
+@@ -1486,10 +1461,6 @@
+ msgid "Download this album..."
+ msgstr "Descargar este álbum..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Descargar..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Descargar el directorio de Icecast"
+@@ -1502,10 +1473,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Descargando el catálogo de Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Descargando el plugin Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Descargando metadatos"
+@@ -1657,10 +1624,6 @@
+ msgid "Error deleting songs"
+ msgstr "Error al borrar canciones"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Error descargando el plugin Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1844,12 +1807,6 @@
+ msgid "Font size"
+ msgstr "Tamaño de letra"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Por razones de licenciamiento, para usar Spotify se necesita un complemento "
+-"separado."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forzar la codificación en mono"
+@@ -2123,10 +2080,6 @@
+ "En el modo dinámico las canciones nuevas se elegirán y añadirán a la lista "
+ "de reproducción cada vez que termine una canción."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Bandeja de entrada"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Incluir carátula en la notificación"
+@@ -2155,10 +2108,6 @@
+ msgid "Insert..."
+ msgstr "Insertar..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalado"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2463,7 +2412,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2539,10 +2487,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Perfil principal (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Hacer disponible la lista de reproducción fuera de línea"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Respuesta malformada"
+@@ -2803,10 +2747,6 @@
+ msgid "Not enough neighbors"
+ msgstr "No hay suficientes vecinos"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "No instalado"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "No ha iniciado sesión"
+@@ -2941,7 +2881,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Contraseña"
+@@ -3048,10 +2987,6 @@
+ msgid "Playlists"
+ msgstr "Listas de reproducción"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Estado del complemento:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3082,7 +3017,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Preferencias"
+@@ -3099,10 +3033,6 @@
+ msgid "Preferred audio format"
+ msgstr "Formato de audio preferido"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Formato preferido"
+@@ -3493,18 +3423,6 @@
+ msgid "Search Magnatune"
+ msgstr "Buscar en Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Buscar en Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Buscar en Spotify (abre una nueva pestaña)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Buscar en Spotify (abre una pestaña nueva)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Buscar en todas tus fuentes(libreria, servicios de internet, ...) "
+@@ -3830,30 +3748,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Error de inicio de sesión de Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Complemento de Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "El complemento de Spotify no está instalado"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Estándar"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Destacado"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Iniciar la lista de reproducción actualmente reproduciendose"
+@@ -3863,7 +3761,6 @@
+ msgstr "Comenzar conversión"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3951,18 +3848,6 @@
+ msgid "Switch provider"
+ msgstr "Cambiar proveedor"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Sincronizando bandeja de entrada de Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Sincronizando lista de reproducción de Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Sincronizando canciones destacadas de Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Pestañas en la parte superior"
+@@ -4341,10 +4226,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Utilizar la configuración para proxy del sistema"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Usado"
+@@ -4360,7 +4241,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nombre de Usuario"
+@@ -4599,20 +4479,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "No tienes una cuenta Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "No tienes una cuenta Spotify Premium."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Amas esta canción"
+@@ -4680,7 +4546,6 @@
+ msgstr "Sus scrobbles: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Tu nombre de usuario o contraseña es incorrecta."
+ 
+@@ -4769,8 +4634,6 @@
+ msgstr "en los últimos"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/et.po clementine-libre-1.0.1/src/translations/et.po
+--- clementine-1.0.1/src/translations/et.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/et.po	2012-05-29 15:46:09.829745009 -0400
+@@ -251,10 +251,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -310,7 +306,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -583,12 +578,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -814,10 +803,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Loobu"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1018,10 +1003,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Kiirklahvide seadistamine"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1039,10 +1020,6 @@
+ msgid "Connect device"
+ msgstr "Ühenda seade"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1452,10 +1429,6 @@
+ msgid "Download this album..."
+ msgstr "Lae see album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1468,10 +1441,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1622,10 +1591,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1807,10 +1772,6 @@
+ msgid "Font size"
+ msgstr "Kirja suurus"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2073,10 +2034,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2105,10 +2062,6 @@
+ msgid "Insert..."
+ msgstr "Lisa..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Paigaldatud"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2411,7 +2364,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2487,10 +2439,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Vigane vastus"
+@@ -2748,10 +2696,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Pole piisavalt naabreid"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2886,7 +2830,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Parool"
+@@ -2993,10 +2936,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3027,7 +2966,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Seadistused"
+@@ -3044,10 +2982,6 @@
+ msgid "Preferred audio format"
+ msgstr "Eelistatud heli vorming"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Eelistatud vorming"
+@@ -3438,18 +3372,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3774,30 +3696,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3807,7 +3709,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3893,18 +3794,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4262,10 +4151,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Kasutuses"
+@@ -4281,7 +4166,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Kasutajanimi"
+@@ -4505,20 +4389,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4578,7 +4448,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4667,8 +4536,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/eu.po clementine-libre-1.0.1/src/translations/eu.po
+--- clementine-1.0.1/src/translations/eu.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/eu.po	2012-05-29 15:47:59.699745177 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/fa.po clementine-libre-1.0.1/src/translations/fa.po
+--- clementine-1.0.1/src/translations/fa.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/fa.po	2012-05-29 15:57:55.966412407 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "حساب کاربری «Spotify Premium» مورد نیاز است."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -315,7 +311,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -588,14 +583,6 @@
+ msgid "Always start playing"
+ msgstr "همواره پخش را شروع کن"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"کلمنتاین به افزونهٔ  دیگری برای استفادهٔ اسپاتیفای نیاز دارد.  آیا می‌خواهید"
+-"  این افزونه را  بارگیری و نصب نمایید؟"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "مشکلی هنگام  کپی‌کردن بانک اطلاعاتی آی‌تیون از دستگاه پیش آمد"
+@@ -821,10 +808,6 @@
+ msgid "CUE sheet support"
+ msgstr "برگهٔ پشتیبانی CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "لغو"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "تغییر جلد هنری"
+@@ -1035,10 +1018,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "پیکربندی میان‌برها"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "پیکربندی Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "پیکربندی کتابخانه..."
+@@ -1056,10 +1035,6 @@
+ msgid "Connect device"
+ msgstr "اتصال دستگاه"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "اتصال به Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "ضرباهنگ ثابت"
+@@ -1475,10 +1450,6 @@
+ msgid "Download this album..."
+ msgstr "بارگیری این آلبوم..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "بارگیری..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "بارگیری پوشهٔ Icecast"
+@@ -1491,10 +1462,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "بارگیری کاتالوگ Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "بارگیری افزونهٔ Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "بارگیری ابرداده"
+@@ -1645,10 +1612,6 @@
+ msgid "Error deleting songs"
+ msgstr "خطا در پاک کردن آهنگ‌ها"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "خطا در بارگیری افزونهٔ Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1830,10 +1793,6 @@
+ msgid "Font size"
+ msgstr "اندازهٔ قلم"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "به دلایل اجازه‌نامه، پشتیبانی اسپاتیفای در افزونه‌ای جداگانه است."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "رمزینهٔ مونو پخش کن"
+@@ -2104,10 +2063,6 @@
+ "در حالت دینامیک پس از پایان هر آهنگ، قطعه‌های تازه انتخاب و به لیست‌پخش "
+ "افزوده می‌شوند."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "صندوق ورودی"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "آلبوم هنری را در آگاهساز قرار بده"
+@@ -2136,10 +2091,6 @@
+ msgid "Insert..."
+ msgstr "قرار دادن..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "نصب شد"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "اینترنت"
+@@ -2442,7 +2393,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2518,10 +2468,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "مشخصات اصلی (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "لیست‌پخش را بیرون‌خط در دسترس بگذار"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "پاسخ ناهنجار"
+@@ -2780,10 +2726,6 @@
+ msgid "Not enough neighbors"
+ msgstr "بدون همسایهٔ کافی"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "نصب نشده"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2918,7 +2860,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "کلمهٔ عبور"
+@@ -3025,10 +2966,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "وضعیت افزونه"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "پاپ"
+@@ -3059,7 +2996,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "تنظیمات‌"
+@@ -3076,10 +3012,6 @@
+ msgid "Preferred audio format"
+ msgstr "فرمت صوتی ترجیحی"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "فرمت ترجیحی"
+@@ -3470,18 +3402,6 @@
+ msgid "Search Magnatune"
+ msgstr "جستجوی Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "جستجوی Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3806,30 +3726,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "خطای ورود به سیستم Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "افزونهٔ Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "افزونهٔ Spotify نصب نیست"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "استاندارد"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "ستاره‌دار"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "شروع لیست‌پخش در حال پخش"
+@@ -3839,7 +3739,6 @@
+ msgstr "شروع ترانسکد"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3925,18 +3824,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "همگام‌سازی صندوق ورودی اسپاتیفای"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "همگام‌سازی لیست‌پخش اسپاتیفای"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "همگام‌سازی قطعه‌های ستاره‌دار اسپاتیفای"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "باریکه‌ها در بالا"
+@@ -4314,10 +4201,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "بکاربردن تنظیمات پراکسی سیستم"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "استفاده‌شده"
+@@ -4333,7 +4216,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "شناسه"
+@@ -4568,20 +4450,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "عاشق این آهنگ هستید"
+@@ -4648,7 +4516,6 @@
+ msgstr "برونکشی‌های شما: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4737,8 +4604,6 @@
+ msgstr "در آخرین"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/fi.po clementine-libre-1.0.1/src/translations/fi.po
+--- clementine-1.0.1/src/translations/fi.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/fi.po	2012-05-29 16:22:14.749747287 -0400
+@@ -250,10 +250,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Grooveshark Anywhere tili vaaditaan käyttöön."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotifyn Premium-tili vaaditaan."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -311,7 +307,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -584,14 +579,6 @@
+ msgid "Always start playing"
+ msgstr "Aloita aina toisto"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Spotifyn käyttö Clementinessä vaatii lisäosan. Haluatko ladata ja asentaa "
+-"sen nyt?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "iTunes-tietokantaa laitteesta ladatessa tapahtui virhe"
+@@ -819,10 +806,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE-tiedostojen tuki"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Peru"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Vaihda kansikuvaa"
+@@ -1032,10 +1015,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Pikanäppäinten asetukset..."
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Muokkaa Spotifya..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Kirjaston asetukset..."
+@@ -1053,10 +1032,6 @@
+ msgid "Connect device"
+ msgstr "Yhdistä laite"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Yhdistetään Spotifyyn"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Pysyvä bittinopeus"
+@@ -1468,10 +1443,6 @@
+ msgid "Download this album..."
+ msgstr "Lataa tämä levy..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Lataa..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Ladataan Icecast-hakemistoa"
+@@ -1484,10 +1455,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Ladataan Magnatune-luetteloa"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Ladataan Spotify-liitännäistä"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Noudetaan metadataa"
+@@ -1638,10 +1605,6 @@
+ msgid "Error deleting songs"
+ msgstr "Virhe kappaleita poistaessa"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Virhe ladatessa Spotify-liitännäistä"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1825,10 +1788,6 @@
+ msgid "Font size"
+ msgstr "Kirjasinkoko"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Lisenssisyistä Spotify-tuki on erillinen liitännäinen."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Pakota monokoodaus"
+@@ -2097,10 +2056,6 @@
+ "Dynaamisessa tilassa uusia kappaleita valitaan ja lisätään soittolistaan "
+ "joka kerta kun yksi kappale on soitettu."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Saapuneet"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Näytä kansikuva ilmoituksen yhteydessä"
+@@ -2129,10 +2084,6 @@
+ msgid "Insert..."
+ msgstr "Lisää..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Asennettu"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2435,7 +2386,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2511,10 +2461,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Oletusprofiili (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Virheellinen vastaus"
+@@ -2775,10 +2721,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Ei tarpeeksi naapureita"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Ei asennettu"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Ei kirjautunut"
+@@ -2913,7 +2855,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Salasana"
+@@ -3020,10 +2961,6 @@
+ msgid "Playlists"
+ msgstr "Soittolistat"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Liitännäisen tila:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3054,7 +2991,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Asetukset"
+@@ -3071,10 +3007,6 @@
+ msgid "Preferred audio format"
+ msgstr "Ensisijainen äänimuoto"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Ensisijainen muoto"
+@@ -3465,18 +3397,6 @@
+ msgid "Search Magnatune"
+ msgstr "Etsi Magnatunesta"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Etsi Spotifysta"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Etsi Spotifysta (avaa uuden välilehden)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Etsi Spotifysta (avaa uuden välilehden)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Etsi kaikista lähteistä (kirjasto, internet, ...)"
+@@ -3801,30 +3721,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify-kirjautumisvirhe"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify-liitännäinen"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify-liitännäistä ei ole asennettu"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Normaali"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3834,7 +3734,6 @@
+ msgstr "Aloita muunnos"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3920,18 +3819,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synkronoi Spotify saapuneet"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synkronoi Spotify soittolistan"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synkronoi Spotify arvostellut kappaleet"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Välilehdet ylhäällä"
+@@ -4306,10 +4193,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Käytä järjestelmän välityspalvelinasetuksia"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Käytetty"
+@@ -4325,7 +4208,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Käyttäjätunnus"
+@@ -4562,20 +4444,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Sinulla ei ole Grooveshark Anywhere tiliä."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Sinulla ei ole Spotify Premium tiliä."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Tykkäät tästä kappaleesta"
+@@ -4635,7 +4503,6 @@
+ msgstr "Lähetyksesi: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Käyttäjätunnus tai salasana oli virheellinen."
+ 
+@@ -4724,8 +4591,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kb/s"
+ 
+diff -rauN clementine-1.0.1/src/translations/fr.po clementine-libre-1.0.1/src/translations/fr.po
+--- clementine-1.0.1/src/translations/fr.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/fr.po	2012-05-29 16:25:03.779747446 -0400
+@@ -258,10 +258,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Un compte Grooveshark Anywhere est nécessaire."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Un compte Spotify Premium est nécessaire."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -323,7 +319,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -597,14 +592,6 @@
+ msgid "Always start playing"
+ msgstr "Toujours commencer à lire"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Un module externe est requis pour pouvoir utiliser Spotify. Voulez-vous le "
+-"télécharger et l'installer maintenant ?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -838,10 +825,6 @@
+ msgid "CUE sheet support"
+ msgstr "Support des CUE sheet."
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Annuler"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Changer la couverture de l'album"
+@@ -1056,10 +1039,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurer les raccourcis clavier"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurer Spotify…"
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configurer votre bibliothèque..."
+@@ -1077,10 +1056,6 @@
+ msgid "Connect device"
+ msgstr "Connexion du périphérique"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Connexion à Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Débit constant"
+@@ -1496,10 +1471,6 @@
+ msgid "Download this album..."
+ msgstr "Télécharger cet album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Télécharger..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Téléchargement du catalogue d'Icecast"
+@@ -1512,10 +1483,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Téléchargement du catalogue Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Téléchargement du module Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Téléchargement des métadonnées"
+@@ -1671,10 +1638,6 @@
+ msgid "Error deleting songs"
+ msgstr "Erreur lors de la suppression des morceaux"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Erreur lors du téléchargement du module Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1858,12 +1821,6 @@
+ msgid "Font size"
+ msgstr "Taille de la police"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Pour des raisons de licence, le support de Spotify est dans un module "
+-"séparé."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forcer l’encodage en mono"
+@@ -2138,10 +2095,6 @@
+ "En mode dynamique, de nouvelles pistes seront choisies et ajoutées à la fin "
+ "de la liste de lecture chaque fois qu'un morceau se terminera."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Boîte de réception"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Inclure la pochette de l'abum dans la fenêtre de notification"
+@@ -2170,10 +2123,6 @@
+ msgid "Insert..."
+ msgstr "Insérer..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installé(e)(s)"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2481,7 +2430,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2557,10 +2505,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Profil principal (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Rendre la liste de lecture accessible hors ligne"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Réponse mal formatée"
+@@ -2822,10 +2766,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Voisins insuffisants"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Non installé"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Non connecté"
+@@ -2960,7 +2900,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Mot de passe"
+@@ -3067,10 +3006,6 @@
+ msgid "Playlists"
+ msgstr "Listes de lecture"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "État du module externe :"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3101,7 +3036,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Préférences"
+@@ -3118,10 +3052,6 @@
+ msgid "Preferred audio format"
+ msgstr "Format audio préféré"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Débit préféré"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Format préféré"
+@@ -3512,18 +3442,6 @@
+ msgid "Search Magnatune"
+ msgstr "Recherche Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Recherche Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Recherche Spotify (ouvre un nouvel onglet)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Recherche Spotify (ouvre un nouvel onglet)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3851,30 +3769,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Erreur lors de la connexion à Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Module externe Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Le module externe de Spotify n'est pas installé"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Favoris"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Commencer la liste de lecture jouée actuellement"
+@@ -3884,7 +3782,6 @@
+ msgstr "Démarrer transcodage"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3972,18 +3869,6 @@
+ msgid "Switch provider"
+ msgstr "Changer de service"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synchronisation de la boîte de réception Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synchronisation de la liste de lecture Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synchronisation des morceaux Spotify préférés"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Onglets au dessus"
+@@ -4369,10 +4254,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Utiliser les paramètres du système pour le serveur mandataire"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Utilisé"
+@@ -4388,7 +4269,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nom d'utilisateur"
+@@ -4629,23 +4509,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Vous n'avez pas de compte Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Vous n'avez pas de compte Spotify Premium."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe "
+-"dans la fenêtre des préférences."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Vous aimez cette piste"
+@@ -4713,7 +4576,6 @@
+ msgstr "Vos scrobbles : %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Votre nom d'utilisateur ou mot de passe est incorrect."
+ 
+@@ -4802,8 +4664,6 @@
+ msgstr "parmi les derniers"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/gl.po clementine-libre-1.0.1/src/translations/gl.po
+--- clementine-1.0.1/src/translations/gl.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/gl.po	2012-05-29 16:27:07.409747570 -0400
+@@ -251,10 +251,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -310,7 +306,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -583,12 +578,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Aconteceu un erro copiando a base de datos de iTunes do dispositivo"
+@@ -814,10 +803,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1022,10 +1007,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configurar a biblioteca..."
+@@ -1043,10 +1024,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1456,10 +1433,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1472,10 +1445,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1625,10 +1594,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1810,10 +1775,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2076,10 +2037,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2108,10 +2065,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2415,7 +2368,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2491,10 +2443,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Resposta mal formada"
+@@ -2751,10 +2699,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Viciños insuficientes"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2889,7 +2833,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2996,10 +2939,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3030,7 +2969,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3047,10 +2985,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3441,18 +3375,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3777,30 +3699,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Reproducir a playlist actualmente reproducindo"
+@@ -3810,7 +3712,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3896,18 +3797,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4265,10 +4154,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4284,7 +4169,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4508,20 +4392,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4581,7 +4451,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4670,8 +4539,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/he.po clementine-libre-1.0.1/src/translations/he.po
+--- clementine-1.0.1/src/translations/he.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/he.po	2012-05-29 16:33:23.043081344 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -313,7 +309,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -586,12 +581,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "ארעה שגיאה בהעתקת מסד הנתונים של iTunes מההתקן"
+@@ -817,10 +806,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "שינוי עטיפת האלבום"
+@@ -1025,10 +1010,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "הגדר קיצורי מקשים"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "הגדר את הספרייה..."
+@@ -1046,10 +1027,6 @@
+ msgid "Connect device"
+ msgstr "חבר התקן"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1464,10 +1441,6 @@
+ msgid "Download this album..."
+ msgstr "הורד את האלבום הזה..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "מוריד תיקיית Icecast"
+@@ -1480,10 +1453,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "מוריד את הקטלוג של Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1633,10 +1602,6 @@
+ msgid "Error deleting songs"
+ msgstr "שגיאה במחיקת שירים"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1818,10 +1783,6 @@
+ msgid "Font size"
+ msgstr "גודל הגופן"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2086,10 +2047,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "אומנות אלבום בתוך ההתראה"
+@@ -2118,10 +2075,6 @@
+ msgid "Insert..."
+ msgstr "הוספה..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "אינטרנט"
+@@ -2424,7 +2377,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2500,10 +2452,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "תגובה שגויה"
+@@ -2761,10 +2709,6 @@
+ msgid "Not enough neighbors"
+ msgstr "אין מספיק שכנים"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2899,7 +2843,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "סיסמא"
+@@ -3006,10 +2949,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "פופ"
+@@ -3040,7 +2979,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "מאפיינים"
+@@ -3057,10 +2995,6 @@
+ msgid "Preferred audio format"
+ msgstr "פורמט אודיו מועדף"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "פורמט מועדף"
+@@ -3451,18 +3385,6 @@
+ msgid "Search Magnatune"
+ msgstr "חיפוש ב־Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3787,30 +3709,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "התחל את רשימת־ההשמעה המתנגנת כעת"
+@@ -3820,7 +3722,6 @@
+ msgstr "התחלת הקידוד"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3906,18 +3807,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "לשוניות למעלה"
+@@ -4280,10 +4169,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "שימוש בהגדרות הפרוקסי של המערכת"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "בשימוש"
+@@ -4299,7 +4184,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "שם משתמש"
+@@ -4532,20 +4416,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "אתה אוהב את הרצועה הזו"
+@@ -4608,7 +4478,6 @@
+ msgstr "ה-scrobbles שלך: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4697,8 +4566,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "קילו־סיביות לשניה"
+ 
+diff -rauN clementine-1.0.1/src/translations/hi.po clementine-libre-1.0.1/src/translations/hi.po
+--- clementine-1.0.1/src/translations/hi.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/hi.po	2012-05-29 16:34:21.266414734 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/hr.po clementine-libre-1.0.1/src/translations/hr.po
+--- clementine-1.0.1/src/translations/hr.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/hr.po	2012-05-29 16:50:07.443081990 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotify Premium račun je obvezan."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,14 +584,6 @@
+ msgid "Always start playing"
+ msgstr "Uvijek započinji reprodukciju glazbe"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Dodatni dodatak je potreban za korištenje Spotify-a u Clementine-u. Želite "
+-"li preuzeti dodatak i instalirati sada?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Pogreška je nastala tijekom kopiranja iTunes baze podataka sa uređaja"
+@@ -822,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr "Podrška za CUE listu"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Otkaži"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Promijenite omot albuma"
+@@ -1039,10 +1022,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Podesi prečace"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Podesite Spotify ..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Podesi zbirku..."
+@@ -1060,10 +1039,6 @@
+ msgid "Connect device"
+ msgstr "Spoji uređaj"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Spajanje Spotify-a"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Konstantna brzina prijenosa"
+@@ -1479,10 +1454,6 @@
+ msgid "Download this album..."
+ msgstr "Preuzmi ovaj album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Preuzmi..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Preuzimanje Icecast direktorija"
+@@ -1495,10 +1466,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Preuzimanje Magnatune kataloga"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Preuzimanje Spotify dodatka"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Preuzimanje metapodataka"
+@@ -1649,10 +1616,6 @@
+ msgid "Error deleting songs"
+ msgstr "Pogreška u brisanju pjesama"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "pogreška pri preuzimanju Spotify dodatka"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1834,10 +1797,6 @@
+ msgid "Font size"
+ msgstr "Veličina slova"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Zbog razloga licenciranja Spotify-a podrška je u posebnom dodatak."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forsiraj mono enkodiranje"
+@@ -2108,10 +2067,6 @@
+ "U dinamičkom modu nove pjesme će biti izabrane i dodane u popis izvođenja "
+ "svaki puta kada je pjesma odsvirana."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Pristigle poruke"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Prikaži omot albuma u obavijesti"
+@@ -2140,10 +2095,6 @@
+ msgid "Insert..."
+ msgstr "Umetni..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalirano"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2446,7 +2397,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2522,10 +2472,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Glavni profil (GLAVNI)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Učini popis izvođenja dostupnim kada je veza prekinuta"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Pogreška u odgovoru"
+@@ -2784,10 +2730,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nema dovoljno susjeda"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nije instalirano"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2922,7 +2864,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Lozinka"
+@@ -3029,10 +2970,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status dodatka:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3063,7 +3000,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Opcije"
+@@ -3080,10 +3016,6 @@
+ msgid "Preferred audio format"
+ msgstr "Željeni audio format"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Željeni format"
+@@ -3474,18 +3406,6 @@
+ msgid "Search Magnatune"
+ msgstr "Pretražite Magnatune stanice"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Pretražite Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Pretražite Spotify (otvori u novoj kartici)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Pretražite Spotify (otvori u novoj kartici)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3811,30 +3731,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify pogreška kod prijave"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify dodatak"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify dodatak nije instaliran"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standardno"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Sa zvjezdicom"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Pokrenite popis izvođenja koji se trenutno izvodi"
+@@ -3844,7 +3744,6 @@
+ msgstr "Započni enkodiranje"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3930,18 +3829,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Sinkronizacija Spotify ulaznog spremnika"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Sinkroniziranje Spotify popisa izvođenja"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Sinkronizacija Spotify pjesama označenim zvjezdicama"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Kartice pri vrhu"
+@@ -4318,10 +4205,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Koristite proxy postavke od sustava"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Iskorišteno"
+@@ -4337,7 +4220,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Korisničko ime"
+@@ -4572,20 +4454,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Sviđa vam se ova pjesma"
+@@ -4653,7 +4521,6 @@
+ msgstr "Vaši scrobbles: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4742,8 +4609,6 @@
+ msgstr "u posljednjih"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/hu.po clementine-libre-1.0.1/src/translations/hu.po
+--- clementine-1.0.1/src/translations/hu.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/hu.po	2012-05-29 16:50:46.463082538 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Grooveshark Anywhere fiók szükséges."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotify prémium fiók szükséges"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,14 +584,6 @@
+ msgid "Always start playing"
+ msgstr "Mindig indítja a lejátszást"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"A Spotify használatához külön beépülő szükséges. Szeretnéd most letölteni és"
+-" telepíteni?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Hiba történt az iTunes adatbázis másolása közben az eszközről"
+@@ -823,10 +810,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE fájl támogatás"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Mégsem"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Albumborító módosítása"
+@@ -1042,10 +1025,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Billentyűkombinációk beállítása"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Spotify beállítása..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Zenetár beállítása..."
+@@ -1065,10 +1044,6 @@
+ msgid "Connect device"
+ msgstr "Eszköz csatlakoztatása"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Csatlakozás a Spotifyhoz"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Állandó bitráta"
+@@ -1484,10 +1459,6 @@
+ msgid "Download this album..."
+ msgstr "Album letöltése..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Letöltés…"
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Icecast könyvtár letöltése"
+@@ -1500,10 +1471,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Magnatune katalógus letöltése"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Spotify beépülő letöltése"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Metaadat letöltése"
+@@ -1656,10 +1623,6 @@
+ msgid "Error deleting songs"
+ msgstr "Hiba történt a számok törlése közben"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Hiba a Spotify beépülő letöltése közben"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1842,12 +1805,6 @@
+ msgid "Font size"
+ msgstr "Betűméret"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Licencelési okok miatt a Spotify támogatást külön beépülőben kell "
+-"telepíteni."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Mono kódolás kényszerítése"
+@@ -2117,10 +2074,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Beérkezett üzenetek"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Albumborító megjelenítése az értesítésben"
+@@ -2149,10 +2102,6 @@
+ msgid "Insert..."
+ msgstr "Beszúrás..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Telepítve"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2455,7 +2404,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2531,10 +2479,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Fő profil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Hibásan formázott válasz"
+@@ -2793,10 +2737,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nincs elég szomszédja"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nincs telepítve"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2931,7 +2871,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Jelszó"
+@@ -3038,10 +2977,6 @@
+ msgid "Playlists"
+ msgstr "Lejátszási lista"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Beépülő állapot:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3072,7 +3007,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Beállítások"
+@@ -3089,10 +3023,6 @@
+ msgid "Preferred audio format"
+ msgstr "Előnyben részesített audio formátum"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Előnyben részesített formátum"
+@@ -3483,18 +3413,6 @@
+ msgid "Search Magnatune"
+ msgstr "Keresés a Magnatuneon"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Keresés Spotifyon"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Keresés Spotifyon (új lapot nyit)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Keresés Spotifyon (új lapot nyit)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3822,30 +3740,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Hiba a Spotifyra való bejelentkezéskor"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify beépülő"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "A Spotify beépülő nincs telepítve"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Normál"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Kedvenc"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Az éppen lejátszott lista indítása"
+@@ -3855,7 +3753,6 @@
+ msgstr "Átkódolás indítása"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3941,18 +3838,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Spotify üzenetek szinkronizálása"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Spotify lejátszási lista szinkronizálása"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Spotify csillagozott számok szinronizálása"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Lapfülek felül"
+@@ -4327,10 +4212,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "A rendszer proxy beállításainak használata"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Használt"
+@@ -4346,7 +4227,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Felhasználónév"
+@@ -4580,20 +4460,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Kedveled ezt a számot"
+@@ -4660,7 +4526,6 @@
+ msgstr "Scrobblejaid: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4749,8 +4614,6 @@
+ msgstr "az utóbbi"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/hy.po clementine-libre-1.0.1/src/translations/hy.po
+--- clementine-1.0.1/src/translations/hy.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/hy.po	2012-05-29 16:51:35.523082336 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/ia.po clementine-libre-1.0.1/src/translations/ia.po
+--- clementine-1.0.1/src/translations/ia.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ia.po	2012-05-29 16:52:43.266415554 -0400
+@@ -250,10 +250,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -309,7 +305,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -582,12 +577,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -813,10 +802,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1017,10 +1002,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1038,10 +1019,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1451,10 +1428,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1467,10 +1440,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1620,10 +1589,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1805,10 +1770,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2071,10 +2032,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2103,10 +2060,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2409,7 +2362,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2485,10 +2437,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2745,10 +2693,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2883,7 +2827,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2990,10 +2933,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3024,7 +2963,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3041,10 +2979,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3435,18 +3369,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3771,30 +3693,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3804,7 +3706,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3890,18 +3791,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4259,10 +4148,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4278,7 +4163,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4502,20 +4386,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4575,7 +4445,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4664,8 +4533,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/id.po clementine-libre-1.0.1/src/translations/id.po
+--- clementine-1.0.1/src/translations/id.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/id.po	2012-05-29 16:55:43.939749412 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Sebuah akun Premium Spotify diperlukan."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,12 +584,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -820,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1024,10 +1009,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1045,10 +1026,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1458,10 +1435,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1474,10 +1447,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1627,10 +1596,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1812,10 +1777,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2078,10 +2039,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2110,10 +2067,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2416,7 +2369,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2492,10 +2444,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2752,10 +2700,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2890,7 +2834,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2997,10 +2940,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3031,7 +2970,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3048,10 +2986,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3442,18 +3376,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3778,30 +3700,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3811,7 +3713,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3897,18 +3798,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4266,10 +4155,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4285,7 +4170,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4509,20 +4393,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4582,7 +4452,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4671,8 +4540,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/is.po clementine-libre-1.0.1/src/translations/is.po
+--- clementine-1.0.1/src/translations/is.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/is.po	2012-05-29 16:56:42.033082876 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr "Alltaf hefja spilun"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Villa kom upp við afritun iTunes gagnagrunns af tæki"
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/it.po clementine-libre-1.0.1/src/translations/it.po
+--- clementine-1.0.1/src/translations/it.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/it.po	2012-05-29 16:57:27.279749567 -0400
+@@ -256,10 +256,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "È richiesto un account Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "È richiesto un account Premium di Spotify"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -318,7 +314,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -591,14 +586,6 @@
+ msgid "Always start playing"
+ msgstr "Inizia sempre la riproduzione"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Un plugin aggiuntivo è richiesto per utilizzare Spotify in Clementine. Vuoi "
+-"scaricarlo e installarlo subito?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -829,10 +816,6 @@
+ msgid "CUE sheet support"
+ msgstr "Supporto CUE sheet"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Annulla"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Cambia copertina"
+@@ -1044,10 +1027,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configura scorciatoie"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configura Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configura raccolta..."
+@@ -1065,10 +1044,6 @@
+ msgid "Connect device"
+ msgstr "Connetti dispositivo"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Connessione a Spotify in corso"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Bitrate costante"
+@@ -1484,10 +1459,6 @@
+ msgid "Download this album..."
+ msgstr "Scarica questo album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Scarica..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Scaricamento directory Icecast in corso"
+@@ -1500,10 +1471,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Scaricamento catalogo Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Scarica il plugin di Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Scaricamento metadati in corso"
+@@ -1658,10 +1625,6 @@
+ msgid "Error deleting songs"
+ msgstr "Errore durante l'eliminazione dei brani"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Errore di scaricamento del plugin di Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1844,11 +1807,6 @@
+ msgid "Font size"
+ msgstr "Dimensione del carattere"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Per motivi di licenza, il supporto di Spotify è in un plugin separato."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forza codifica mono"
+@@ -2123,10 +2081,6 @@
+ "Nella modalità dinamica le nuove tracce saranno scelte e aggiunte alla "
+ "scaletta al termine di ogni brano."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "In arrivo"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Includi copertina nella notifica"
+@@ -2155,10 +2109,6 @@
+ msgid "Insert..."
+ msgstr "Inserisci..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installati"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2465,7 +2415,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2541,10 +2490,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Profilo principale (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Rendi la scaletta disponibile non in linea"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Risposta non corretta"
+@@ -2804,10 +2749,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Vicini non sufficienti"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Non installati"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Accesso non effettuato"
+@@ -2942,7 +2883,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Password"
+@@ -3049,10 +2989,6 @@
+ msgid "Playlists"
+ msgstr "Scalette"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stato del plugin:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3083,7 +3019,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Preferenze"
+@@ -3100,10 +3035,6 @@
+ msgid "Preferred audio format"
+ msgstr "Formato audio preferito"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate preferito"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Formato preferito"
+@@ -3494,18 +3425,6 @@
+ msgid "Search Magnatune"
+ msgstr "Cerca in Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Cerca in Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Cerca in Spotify (apre una nuova scheda)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Cerca in Spotify (apre una nuova scheda)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Cerca in tutte le fonti (raccolta, servizi internet, ...)"
+@@ -3831,30 +3750,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Errore di accesso a Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Plugin di Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Plugin di Spotify non installato"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Preferiti"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Avvia la scaletta attualmente in riproduzione"
+@@ -3864,7 +3763,6 @@
+ msgstr "Avvia transcodifica"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3952,18 +3850,6 @@
+ msgid "Switch provider"
+ msgstr "Cambia fornitore"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Sincronizzazione inbox di Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Sincronizzazione scaletta di Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Sincronizzazione tracce preferite di Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Schede in alto"
+@@ -4351,10 +4237,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Utilizza le impostazioni di sistema del proxy"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Usa la normalizzazione del volume"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Utilizzato"
+@@ -4370,7 +4252,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nome utente"
+@@ -4607,22 +4488,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Non hai un account Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Non hai un account Premium Spotify."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Ti sei disconnesso da Spotify, reinserisci la password nella finestra "
+-"Impostazioni."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Ti sei disconnesso da Spotify, reinserisci la password."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Ti piace questa traccia"
+@@ -4690,7 +4555,6 @@
+ msgstr "I tuoi scrobble: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Nome utente o password non corretta."
+ 
+@@ -4779,8 +4643,6 @@
+ msgstr "negli ultimi"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/ja.po clementine-libre-1.0.1/src/translations/ja.po
+--- clementine-1.0.1/src/translations/ja.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ja.po	2012-05-29 16:58:23.063082909 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Grooveshark Anywhere のアカウントが必要です。"
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotify のプレミアムアカウントが必要です。"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -313,7 +309,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -586,12 +581,6 @@
+ msgid "Always start playing"
+ msgstr "常に再生を開始する"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr "Clementine で Spotify を利用するには追加のプラグインが必要です。今すぐダウンロードしてインストールしますか？"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "デバイスからの iTunes データベースのコピー エラーです"
+@@ -817,10 +806,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "キャンセル"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "カバー アートの変更"
+@@ -1023,10 +1008,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "ショートカットの構成"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "ライブラリの構成..."
+@@ -1044,10 +1025,6 @@
+ msgid "Connect device"
+ msgstr "デバイスの接続"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1461,10 +1438,6 @@
+ msgid "Download this album..."
+ msgstr "このアルバムをダウンロード..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Icecast ディレクトリのダウンロード"
+@@ -1477,10 +1450,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Magnatune カタログのダウンロード"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Spotify のプラグインをダウンロード中"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "メタデータをダウンロード中"
+@@ -1630,10 +1599,6 @@
+ msgid "Error deleting songs"
+ msgstr "曲の削除エラー"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1815,10 +1780,6 @@
+ msgid "Font size"
+ msgstr "フォント サイズ"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2081,10 +2042,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "通知にアルバム アートを含める"
+@@ -2113,10 +2070,6 @@
+ msgid "Insert..."
+ msgstr "挿入..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "インターネット"
+@@ -2419,7 +2372,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2495,10 +2447,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "不正な応答です"
+@@ -2755,10 +2703,6 @@
+ msgid "Not enough neighbors"
+ msgstr "ご近所さんが足りません"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2893,7 +2837,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "パスワード"
+@@ -3000,10 +2943,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3034,7 +2973,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "環境設定"
+@@ -3051,10 +2989,6 @@
+ msgid "Preferred audio format"
+ msgstr "優先するオーディオ形式"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "優先する形式"
+@@ -3445,18 +3379,6 @@
+ msgid "Search Magnatune"
+ msgstr "Magnatune の検索"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3781,30 +3703,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "現在再生中のプレイリストを開始する"
+@@ -3814,7 +3716,6 @@
+ msgstr "トランスコードの開始"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3900,18 +3801,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "タブを上に配置"
+@@ -4271,10 +4160,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "システムのプロキシ設定を使用する"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "使用中"
+@@ -4290,7 +4175,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "ユーザー名"
+@@ -4520,20 +4404,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "このトラックは Love されています"
+@@ -4595,7 +4465,6 @@
+ msgstr "Scrobble 回数: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "ユーザネームまたはパスワードが間違っています。"
+ 
+@@ -4684,8 +4553,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/ka.po clementine-libre-1.0.1/src/translations/ka.po
+--- clementine-1.0.1/src/translations/ka.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ka.po	2012-05-29 16:59:47.116416380 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotify-ის Premium ანგარიში აუცილებელია."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr "ყოველთვის დაიწყე დაკვრა"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "შეცდომა მოწყობილობიდან iTunes-ის მონაცემთა ბაზის კოპირებისას"
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE sheet-ის მხარდაჭერა"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "გაუქმება"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "ალბომის ყდის შეცვლა"
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/kk.po clementine-libre-1.0.1/src/translations/kk.po
+--- clementine-1.0.1/src/translations/kk.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/kk.po	2012-05-29 17:17:47.953084141 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Поп"
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/ko.po clementine-libre-1.0.1/src/translations/ko.po
+--- clementine-1.0.1/src/translations/ko.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ko.po	2012-05-29 17:20:24.469750963 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotify 프리미엄 계정이 필요합니다."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/lt.po clementine-libre-1.0.1/src/translations/lt.po
+--- clementine-1.0.1/src/translations/lt.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/lt.po	2012-05-29 17:21:09.749751142 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Reikalingas mokamas Spotify vartotojas"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -313,7 +309,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -586,14 +581,6 @@
+ msgid "Always start playing"
+ msgstr "Visada pradėti grojant"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Kad naudotumėte Spotify Clementine grotuve, jums reikia papildomo išplėtimo."
+-" Ar parsiųsti ir įdiegti jį dabar?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Iškilo klaida kopijuojant iTunes duomenų bazę iš įrenginio"
+@@ -819,10 +806,6 @@
+ msgid "CUE sheet support"
+ msgstr "\"CUE sheet\" palaikymas"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Atšaukti"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Keisti viršelio paveikslėlį"
+@@ -1032,10 +1015,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfigūruoti sparčiuosius klavišus"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Konfigūruoti Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Konfigūruoti fonoteką..."
+@@ -1053,10 +1032,6 @@
+ msgid "Connect device"
+ msgstr "Prijungti įrenginį"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Jungiamasi prie Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Pastovus bitų dažnis"
+@@ -1472,10 +1447,6 @@
+ msgid "Download this album..."
+ msgstr "Atsisiunčiamas šis albumas"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Atsisiųsti..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Atsiunčiamas Icecast aplankas"
+@@ -1488,10 +1459,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Atsiunčiamas  Magnatune katalogas"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Siunčiamas Spotify plėtinys"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Atsiunčiami metaduomenys"
+@@ -1643,10 +1610,6 @@
+ msgid "Error deleting songs"
+ msgstr "Klaida trinant dainas"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Klaida siunčiant Spotify plėtinį"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1828,12 +1791,6 @@
+ msgid "Font size"
+ msgstr "Šrifto dydis"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Dėl licencijavimo priežasčių Spotify palaikymas yra įjungiamas per atskirą "
+-"plėtinį."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Įjungti tik mono kodavimą"
+@@ -2104,10 +2061,6 @@
+ "Dinamiškame režime nauji kūriniais bus parinkti ir pridėti į grojaraštį "
+ "kaskart, kai dabar grojamas kūrinys baigsis."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Gautieji"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Rodyti albumo paveikslus pranešime"
+@@ -2136,10 +2089,6 @@
+ msgid "Insert..."
+ msgstr "Įterpti..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Įdiegta"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internetas"
+@@ -2444,7 +2393,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2520,10 +2468,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Pagrindinis profilis"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Padaryti šį grojaraštį prieinamą atsijungus"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Netinkamas atsakymas"
+@@ -2781,10 +2725,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nepakanka kaimynų"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Neįdiegta"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2919,7 +2859,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Slaptažodis"
+@@ -3026,10 +2965,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Plėtinio būklė:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3060,7 +2995,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Nustatymai"
+@@ -3078,10 +3012,6 @@
+ msgid "Preferred audio format"
+ msgstr "Pageidaujamas audio formatas"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Pageidaujamas formatas"
+@@ -3472,18 +3402,6 @@
+ msgid "Search Magnatune"
+ msgstr "Ieškoti Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Ieškoti Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Ieškoti Spotify (atveria naują kortelę)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Ieškoti Spotify (atveria naują kortelę)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3808,30 +3726,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify prisijungimo klaida"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify plėtinys"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify plėtinys neįdiegtas"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standartinis"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Su žvaigždute"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Pradėti grajaraštį nuo dabar grojančio"
+@@ -3841,7 +3739,6 @@
+ msgstr "Perkoduoti"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3927,18 +3824,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Atnaujinama Spotify dėžutė"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Atnaujinama Spotify grojaraštis"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Atnaujinama Spotify pažymėti kūriniai"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Kortelės viršuje"
+@@ -4312,10 +4197,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Naudoti sistemos tarpinio serverio nustatymus"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Panaudota"
+@@ -4331,7 +4212,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Naudotojo vardas"
+@@ -4565,20 +4445,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Jūs mylite šį takelį"
+@@ -4645,7 +4511,6 @@
+ msgstr "Jūsų pateikta informacija: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4734,8 +4599,6 @@
+ msgstr "per paskutines"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/lv.po clementine-libre-1.0.1/src/translations/lv.po
+--- clementine-1.0.1/src/translations/lv.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/lv.po	2012-05-29 17:21:57.143084399 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Nepieciešams Spotify Premium konts."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -315,7 +311,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -588,14 +583,6 @@
+ msgid "Always start playing"
+ msgstr "Vienmēr sākt atskaņošanu"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Lai lietotu Spotify, nepieciešams papildus spraudnis. Vai jūs vēlaties to "
+-"lejupielādēt un instalēt?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Kļūda kopējot iTunes datubāzi no ierīces"
+@@ -822,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Atcelt"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Mainīt vāka attēlu"
+@@ -1035,10 +1018,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfigurēt īsceļus"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Konfigurēt Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Konfigurēt bibliotēku..."
+@@ -1056,10 +1035,6 @@
+ msgid "Connect device"
+ msgstr "Pieslēgt ierīci"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Pieslēdzos Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Konstants bitreits"
+@@ -1475,10 +1450,6 @@
+ msgid "Download this album..."
+ msgstr "Lejupielādēt šo albumu..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Lejupielādēt..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Lejupielādē Icecast mapi"
+@@ -1491,10 +1462,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Lejupielādē Magnatude katalogu"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Lejupielādē Spotify spraudni"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Lejupielādē metadatus"
+@@ -1646,10 +1613,6 @@
+ msgid "Error deleting songs"
+ msgstr "Kļūda dzēšot dziesmas"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Kļūda lejupielādējot Spotify spraudni"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1832,10 +1795,6 @@
+ msgid "Font size"
+ msgstr "Fonta izmērs"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Licencēšanas nolūkā Spotify atbalsts pieejams kā atsevišķs spraudnis"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forsēt mono kodēšanu"
+@@ -2102,10 +2061,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Ienākošie"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Iekļaut vāku attēlus paziņojumos"
+@@ -2134,10 +2089,6 @@
+ msgid "Insert..."
+ msgstr "Ievietot..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Uzstādīts"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internets"
+@@ -2441,7 +2392,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2517,10 +2467,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Galvenais profils (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Izkropļota atbilde"
+@@ -2778,10 +2724,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nepietiek kaimiņu"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nav uzstādīta"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2916,7 +2858,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Parole"
+@@ -3023,10 +2964,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Spraudņa statuss:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Popmūzika"
+@@ -3057,7 +2994,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Uzstādījumi"
+@@ -3074,10 +3010,6 @@
+ msgid "Preferred audio format"
+ msgstr "Vēlamais audio formāts"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Vēlamais formāts"
+@@ -3468,18 +3400,6 @@
+ msgid "Search Magnatune"
+ msgstr "Meklēt Magnatude"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Meklēt Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Meklēt Spotify (tiks atvērta jauna cilne)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Meklēt Spotify (tiks atvērta jauna cilne)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3804,30 +3724,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify pieslēgšanās kļūda"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify spraudnis"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify spraudnis nav uzstādīts"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standarts"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Novērtēts ar zvaigzni"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Sākt pašreiz atskaņoto dziesmu listi"
+@@ -3837,7 +3737,6 @@
+ msgstr "Sākt kodēšanu"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3923,18 +3822,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Cilnes pa virsu"
+@@ -4304,10 +4191,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Lietot sistēmas starpniekservera uzstādījumus"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Izmantots"
+@@ -4323,7 +4206,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Lietotājvārds"
+@@ -4554,20 +4436,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Jūs mīlat šo dziesmu"
+@@ -4630,7 +4498,6 @@
+ msgstr "Jūsu skrobli: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4719,8 +4586,6 @@
+ msgstr "pēdējās"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kb/s"
+ 
+diff -rauN clementine-1.0.1/src/translations/mr.po clementine-libre-1.0.1/src/translations/mr.po
+--- clementine-1.0.1/src/translations/mr.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/mr.po	2012-05-29 17:22:45.193084728 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/ms.po clementine-libre-1.0.1/src/translations/ms.po
+--- clementine-1.0.1/src/translations/ms.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ms.po	2012-05-29 17:23:27.779751138 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Akaun Spotify Premium diperlukan"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -313,7 +309,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -586,14 +581,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Satu plugin tambahan diperlukan untuk menggunakan Spotify dalam Clementine. "
+-"Inginkah anda memuat turun dan memasangnya sekarang?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Satu ralat berlaku semasa menyalin pangkalan data iTunes dari peranti"
+@@ -819,10 +806,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Batal"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Ubahkan seni kulit muka"
+@@ -1030,10 +1013,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Tetapkan Pintasan"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1051,10 +1030,6 @@
+ msgid "Connect device"
+ msgstr "Sambung peranti"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Menyambung ke Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Kadar bit malar"
+@@ -1464,10 +1439,6 @@
+ msgid "Download this album..."
+ msgstr "Muat turun album ini..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Muat Turun..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Memuat turun direktori Icecast"
+@@ -1480,10 +1451,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Memuat turun katalog Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Memuat turun plugin Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Memuatturun metadata"
+@@ -1633,10 +1600,6 @@
+ msgid "Error deleting songs"
+ msgstr "Ralat memadam lagu-lagu"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Ralat memuat turun plugin Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1822,11 +1785,6 @@
+ msgid "Font size"
+ msgstr "Saiz fon"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Atas sebab-sebab perlesenan sokongan Spotify berada dalam plugin berasingan."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2099,10 +2057,6 @@
+ "Dalam mod dinamik trek-trek baru akan dipilih dan ditambah ke senarai main "
+ "setiap kali lagu selesai."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Peti Masuk"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Sertakan hasil seni album dalam pemberitahuan"
+@@ -2131,10 +2085,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Terpasang"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2437,7 +2387,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2513,10 +2462,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Buatkan senarai main tersedia di luar talian"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2775,10 +2720,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Tidak dipasang"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2913,7 +2854,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Kata laluan"
+@@ -3020,10 +2960,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status plugin:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3054,7 +2990,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3071,10 +3006,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3465,18 +3396,6 @@
+ msgid "Search Magnatune"
+ msgstr "Cari Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Cari Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Cari Spotify (buka tab baru)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Cari Spotify (buka tab baru)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3801,30 +3720,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Ralat log masuk Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Plugin Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Plugin Spotify tidak dipasang"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Piawai"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Disukai"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3834,7 +3733,6 @@
+ msgstr "Mulakan transkod"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3920,18 +3818,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Tab-tab di atas"
+@@ -4308,10 +4194,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4327,7 +4209,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nama pengguna"
+@@ -4555,20 +4436,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Anda suka trek ini"
+@@ -4628,7 +4495,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4717,8 +4583,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/nb.po clementine-libre-1.0.1/src/translations/nb.po
+--- clementine-1.0.1/src/translations/nb.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/nb.po	2012-05-29 17:24:06.539751459 -0400
+@@ -254,10 +254,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Til dette trenger du en Grooveshark Anywhere-konto."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Til dette trenger du en Spotify Premium-konto."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,14 +584,6 @@
+ msgid "Always start playing"
+ msgstr "Alltid start avspilling"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Det trengs et programtillegg for å bruke Spotify i Clementine. Ønsker du å "
+-"laste ned og installere den nå?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "En feil oppsto under kopiering av iTunes databasen fra enheten"
+@@ -822,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr "Støtte for CUE-filer"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Avbryt"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Endre omslagsbilde"
+@@ -1038,10 +1021,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Oppsett av hurtigtaster"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Konfigurere Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Sett opp bibliotek..."
+@@ -1059,10 +1038,6 @@
+ msgid "Connect device"
+ msgstr "Koble til enhet"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Kobler til Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Konstant bitrate"
+@@ -1478,10 +1453,6 @@
+ msgid "Download this album..."
+ msgstr "Last ned dette albumet..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Last ned..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Laster ned Icecast-katalogen"
+@@ -1494,10 +1465,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Laster ned Magnatune-katalogen"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Laster ned Spotify-modul"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Laster ned metadata"
+@@ -1648,10 +1615,6 @@
+ msgid "Error deleting songs"
+ msgstr "Kunne ikke slette sanger"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Kunne ikke laste ned Spotify-modul"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1833,10 +1796,6 @@
+ msgid "Font size"
+ msgstr "Skriftstørrelse"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Av lisenshensyn er Spotify-støtte en egen innstikksmodul."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Tving monolyd-koding"
+@@ -2108,10 +2067,6 @@
+ "I dynamisk modus vil nye spor bli valgt og lagt til spillelista hver gang en"
+ " sang tar slutt."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Innboks"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Inkludér cover i meldingen"
+@@ -2140,10 +2095,6 @@
+ msgid "Insert..."
+ msgstr "Sett inn..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installert"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internett"
+@@ -2446,7 +2397,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2522,10 +2472,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Hovedprofil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Gjør spillelista tilgjengelig online"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Ugyldig svar"
+@@ -2782,10 +2728,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Ikke nok naboer"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Ikke installert"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Ikke pålogget"
+@@ -2920,7 +2862,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Passord"
+@@ -3027,10 +2968,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Modulens status:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3061,7 +2998,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Innstillinger"
+@@ -3078,10 +3014,6 @@
+ msgid "Preferred audio format"
+ msgstr "Foretrukket lydformat"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Foretrukket format"
+@@ -3472,18 +3404,6 @@
+ msgid "Search Magnatune"
+ msgstr "Søk i Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Søk i Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Søk i Spotify (åpner en ny flik)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Søk i Spotify (åpner en ny flik...)"
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3808,30 +3728,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Kunne ikke logge på Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify-modul"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Har ikke installert Spotify-modul"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Har stjerner"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Begynn på spillelista nå"
+@@ -3841,7 +3741,6 @@
+ msgstr "Start koding"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3927,18 +3826,6 @@
+ msgid "Switch provider"
+ msgstr "Switch-leverandør"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synkroniserer Spotify-innboksen"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synkroniserer Spotify-spillelista"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synkroniserer spor med sterner mot Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Fliker på toppen"
+@@ -4310,10 +4197,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Bruk standard proxy-innstillinger"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Brukt"
+@@ -4329,7 +4212,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Brukernavn"
+@@ -4565,20 +4447,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Du har ikke noen Grooveshark Anywhare-konto."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Du har ikke noen Spotify Premium-konto."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Du elsker dette sporet"
+@@ -4644,7 +4512,6 @@
+ msgstr "Dine delte lyttevaner (\"scrobbles\"): %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Feil med din brukerinformasjon"
+ 
+@@ -4733,8 +4600,6 @@
+ msgstr "i de siste"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/nl.po clementine-libre-1.0.1/src/translations/nl.po
+--- clementine-1.0.1/src/translations/nl.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/nl.po	2012-05-29 17:24:47.773084596 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Een Grooveshark Anywhere account is vereist."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Een Spotify Premium account is vereist."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -317,7 +313,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -592,14 +587,6 @@
+ msgid "Always start playing"
+ msgstr "Altijd afspelen"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Een extra plug-in is vereist om Spotify in Clementine te gebruiken. Wilt u "
+-"deze nu downloaden en installeren?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -829,10 +816,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE-sheet ondersteuning"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Annuleren"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Albumhoes wijzigen"
+@@ -1047,10 +1030,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Sneltoetsen instellen"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configureer Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Bibliotheek configureren…"
+@@ -1068,10 +1047,6 @@
+ msgid "Connect device"
+ msgstr "Apparaat verbinden"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Met Spotify verbinden"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Constante bitrate"
+@@ -1487,10 +1462,6 @@
+ msgid "Download this album..."
+ msgstr "Dit album downloaden…"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Downloaden…"
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Icecast-map aan het downloaden"
+@@ -1503,10 +1474,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Magnatune-catalogus downloaden"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "De Spotify plug-in aan het downloaden"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Metadata ophalen"
+@@ -1660,10 +1627,6 @@
+ msgid "Error deleting songs"
+ msgstr "Fout tijdens het verwijderen van de nummers"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Fout bij het downloaden van de Spotify plug-in"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1846,12 +1809,6 @@
+ msgid "Font size"
+ msgstr "Tekengrootte"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Vanwege licenties is Spotify-ondersteuning alleen via een plug-in "
+-"beschikbaar."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Mono-encodering forceren"
+@@ -2126,10 +2083,6 @@
+ "In ‘dynamische modus’ worden nieuwe nummers gekozen en aan de afspeellijst "
+ "toegevoegd op het moment dat een nummer eindigt."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Inbox"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Albumhoes in de notificatie weergeven"
+@@ -2158,10 +2111,6 @@
+ msgid "Insert..."
+ msgstr "Invoegen…"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Geïnstalleerd"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2466,7 +2415,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2542,10 +2490,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Normaal profiel (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Afspeellijst offline beschikbaar maken"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Foutieve respons"
+@@ -2806,10 +2750,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Onvoldoende buren"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Niet geïnstalleerd"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Niet ingelogd"
+@@ -2944,7 +2884,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Wachtwoord"
+@@ -3051,10 +2990,6 @@
+ msgid "Playlists"
+ msgstr "Afspeellijsten"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Plug-in status:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3085,7 +3020,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Voorkeuren"
+@@ -3103,10 +3037,6 @@
+ msgid "Preferred audio format"
+ msgstr "Audioformaat-voorkeur"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate voorkeur"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Voorkeursformaat"
+@@ -3497,18 +3427,6 @@
+ msgid "Search Magnatune"
+ msgstr "Zoeken op Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Doorzoek Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Doorzoek Spotify (open nieuw tabblad)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Doorzoek Spotify (open nieuw tabblad)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Doorzoek al uw bronnen (bibliotheek, internet bronnen, ...)"
+@@ -3833,30 +3751,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify inlogfout"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify plug-in"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify plug-in niet geïnstalleerd"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standaard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Met ster"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Momenteel spelende afspeellijst starten"
+@@ -3866,7 +3764,6 @@
+ msgstr "Converteren starten"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Typ in de zoekbalk hierboven om naar muziek te zoeken op %1."
+@@ -3952,18 +3849,6 @@
+ msgid "Switch provider"
+ msgstr "Switch provider"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Spotify inbox synchroniseren"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Spotify afspeellijst synchroniseren"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Favoriete Spotify-nummers synchroniseren"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Tabs bovenaan"
+@@ -4350,10 +4235,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Globale proxy-instellingen gebruiken"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Volume normalisatie gebruiken"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Gebruikt"
+@@ -4369,7 +4250,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Gebruikersnaam"
+@@ -4607,22 +4487,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "U heeft geen Grooveshark Anywhere account."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "U heeft geen Spotify Premium account."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"U bent uitgelogd bij Spotify, voer in het voorkeuren venster nogmaals uw "
+-"wachtwoord in."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "U bent uitgelogd bij Spotify, voer nogmaals uw wachtwoord in."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "U vindt dit nummer mooi"
+@@ -4690,7 +4554,6 @@
+ msgstr "Uw scrobbles: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Uw gebruikersnaam of wachtwoord is niet correct."
+ 
+@@ -4779,8 +4642,6 @@
+ msgstr "in de laatste"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/oc.po clementine-libre-1.0.1/src/translations/oc.po
+--- clementine-1.0.1/src/translations/oc.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/oc.po	2012-05-29 17:25:36.176417975 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurar los acorchis de clavièr"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Sus Internet"
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/pa.po clementine-libre-1.0.1/src/translations/pa.po
+--- clementine-1.0.1/src/translations/pa.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/pa.po	2012-05-29 17:26:32.036418109 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/pl.po clementine-libre-1.0.1/src/translations/pl.po
+--- clementine-1.0.1/src/translations/pl.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/pl.po	2012-05-29 17:27:25.839751300 -0400
+@@ -254,10 +254,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Potrzebne jest konto Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Musisz posiadać konto Spotify Premium."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -318,7 +314,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -591,14 +586,6 @@
+ msgid "Always start playing"
+ msgstr "Odtwarzaj automatycznie"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Aby korzystać ze Spotify przy użyciu Clementine, wymagany jest dodatkowy "
+-"skrypt. Czy chcesz go teraz pobrać?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Wystąpił błąd podczas kopiowania bazy danych iTunes z urządzenia"
+@@ -824,10 +811,6 @@
+ msgid "CUE sheet support"
+ msgstr "obsługa arkuszy CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Anuluj"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Zmień okładkę"
+@@ -1041,10 +1024,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfiguracja skrótów klawiszowych"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Konfiguracja Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Konfiguruj bibliotekę..."
+@@ -1062,10 +1041,6 @@
+ msgid "Connect device"
+ msgstr "Podłącz urządzenie"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Połącz z Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Stały bitrate"
+@@ -1481,10 +1456,6 @@
+ msgid "Download this album..."
+ msgstr "Pobierz ten album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Pobierz..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Pobieranie katalogu Icecast"
+@@ -1497,10 +1468,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Pobieranie katalogu Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Pobierz plugin Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Pobieranie metadanych"
+@@ -1651,10 +1618,6 @@
+ msgid "Error deleting songs"
+ msgstr "Błąd przy usuwaniu utworów"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Plugin Spotify - nieudane pobieranie"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1837,11 +1800,6 @@
+ msgid "Font size"
+ msgstr "Rozmiar czcionki"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Ze względów licencyjnych Spotify obsługiwany jest przez oddzielny plugin"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Wymuś kodowanie mono"
+@@ -2114,10 +2072,6 @@
+ "W trybie dynamicznym nowe utwory będą wybierane i dodawane do playlisty za "
+ "każdym razem gdy skończy się odtwarzanie bieżącego utworu."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Skrzynka odbiorcza"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Dołącz okładkę albumu"
+@@ -2146,10 +2100,6 @@
+ msgid "Insert..."
+ msgstr "Wstaw..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Zainstalowano"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2454,7 +2404,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2530,10 +2479,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Profil główny (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Uczyń playlistę dostępną offline"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Nieprawidłowa odpowiedź"
+@@ -2793,10 +2738,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Za mało sąsiadów"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nie zainstalowano"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2931,7 +2872,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Hasło"
+@@ -3038,10 +2978,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stan wtyczki:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3072,7 +3008,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Ustawienia"
+@@ -3090,10 +3025,6 @@
+ msgid "Preferred audio format"
+ msgstr "Preferowany format audio"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Preferowany format"
+@@ -3484,18 +3415,6 @@
+ msgid "Search Magnatune"
+ msgstr "Przeszukaj Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Szukaj w Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Szukaj w Spotify (nowa karta)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Szukaj w Spotify (nowa karta)"
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3821,30 +3740,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Nieudane logowanie do Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Wtyczka Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Nie zainstalowano pluginu Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standardowy"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Oznaczone gwiazdką"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Rozpocznij aktualnie odtwarzaną listę"
+@@ -3854,7 +3753,6 @@
+ msgstr "Rozpocznij transkodowanie"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3940,18 +3838,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synchronizowanie skrzynki Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synchronizowanie playlisty Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synchronizowanie utworów oznaczonych gwiazdką na Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Zakładki na górze"
+@@ -4326,10 +4212,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Użyj systemowych ustawień proxy"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Użyto"
+@@ -4345,7 +4227,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Użytkownik"
+@@ -4579,20 +4460,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Kochasz tę ścieżkę"
+@@ -4662,7 +4529,6 @@
+ msgstr "Przesłane utwory: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4751,8 +4617,6 @@
+ msgstr "w ostatnich"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/pt_BR.po clementine-libre-1.0.1/src/translations/pt_BR.po
+--- clementine-1.0.1/src/translations/pt_BR.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/pt_BR.po	2012-05-29 17:30:29.606418269 -0400
+@@ -251,10 +251,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "É necessária uma conta Premium Spotify."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -313,7 +309,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -586,14 +581,6 @@
+ msgid "Always start playing"
+ msgstr "Sempre começar tocando"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Um plugin adicional é necessário para usar Spotify no Clementine. Gostaria "
+-"de fazer o download e instalá-lo agora?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -821,10 +808,6 @@
+ msgid "CUE sheet support"
+ msgstr "Suporte a lista CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancelar"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Alterar capa"
+@@ -1036,10 +1019,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurar atalhos"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurar Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configurar biblioteca"
+@@ -1057,10 +1036,6 @@
+ msgid "Connect device"
+ msgstr "Conectar dispositivo"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Conectando ao Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Taxa de bits constante"
+@@ -1476,10 +1451,6 @@
+ msgid "Download this album..."
+ msgstr "Baixar este álbum..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Baixar..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Baixando diretório Icecast"
+@@ -1492,10 +1463,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Baixando catálogo da Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Baixando plugin Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Baixando metadados"
+@@ -1647,10 +1614,6 @@
+ msgid "Error deleting songs"
+ msgstr "Erro ao apagar músicas"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Erro ao baixar o plugin Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1834,12 +1797,6 @@
+ msgid "Font size"
+ msgstr "Tamanho da fonte"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Por motivos de licenciamento, o suporte ao Spotify está em um plugin "
+-"separado."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forçar codificação em mono"
+@@ -2113,10 +2070,6 @@
+ "No modo dinâmico, novas faixas serão escolhidas e adicionadas à lista de "
+ "reprodução toda a vez que uma musica terminar."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Caixa de entrada"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Incluir capa do álbum na notificação"
+@@ -2145,10 +2098,6 @@
+ msgid "Insert..."
+ msgstr "Inserir..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalado"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2453,7 +2402,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2529,10 +2477,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Meu perfil (PRINCIPAL)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Tornar lista de reprodução disponível offline"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Resposta inválida"
+@@ -2793,10 +2737,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Sem vizinhos o bastante"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Não instalado"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2931,7 +2871,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Senha"
+@@ -3038,10 +2977,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status do plugin:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3072,7 +3007,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Preferências"
+@@ -3089,10 +3023,6 @@
+ msgid "Preferred audio format"
+ msgstr "Formato de áudio preferido"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Formato preferido"
+@@ -3483,18 +3413,6 @@
+ msgid "Search Magnatune"
+ msgstr "Pesquisar Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Procurar Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Procurar Spotify (abre um novo aba)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Procurar Spotify (abre um novo aba)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3819,30 +3737,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Erro ao conectar no Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Plugin Spofity"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Plugin Spofity não instalado"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Padrão"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Favoritos"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Iniciar a lista que está em execução"
+@@ -3852,7 +3750,6 @@
+ msgstr "Começar transcodificação"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3938,18 +3835,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Sincronizando caixa de entrada do Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Sincronizando listas de reprodução do Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Sincronizando faixas favoritas do Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Mostrar abas no topo"
+@@ -4329,10 +4214,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Usar configurações de proxy do sistema"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Usado"
+@@ -4348,7 +4229,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nome de usuário"
+@@ -4582,20 +4462,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Você adora essa faixa"
+@@ -4661,7 +4527,6 @@
+ msgstr "Seus scrobbles: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4750,8 +4615,6 @@
+ msgstr "nos últimos"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/pt.po clementine-libre-1.0.1/src/translations/pt.po
+--- clementine-1.0.1/src/translations/pt.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/pt.po	2012-05-29 17:28:15.776418125 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Requer uma conta Grooveshark Anywhere"
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Requer uma conta Spotify Premium"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,14 +584,6 @@
+ msgid "Always start playing"
+ msgstr "Iniciar sempre a reprodução"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Necessita de um \"plug-in\" para utilizar o Spotify no Clementine. Pretende "
+-"transferir e instalar o \"plug-in\"?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -823,10 +810,6 @@
+ msgid "CUE sheet support"
+ msgstr "Suporte a ficheiros CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Cancelar"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Alterar capa do álbum"
+@@ -1040,10 +1023,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurar atalhos"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurar Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configurar coleção..."
+@@ -1061,10 +1040,6 @@
+ msgid "Connect device"
+ msgstr "Ligar dispositivo"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Ligar ao Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Taxa de dados constante"
+@@ -1480,10 +1455,6 @@
+ msgid "Download this album..."
+ msgstr "Transferir este álbum..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Transferir..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "A transferir o diretório Icecast"
+@@ -1496,10 +1467,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "A transferir o catálogo Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "A transferir o \"plug-in\" Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "A transferir dados"
+@@ -1652,10 +1619,6 @@
+ msgid "Error deleting songs"
+ msgstr "Erro ao eliminar faixas"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Erro ao transferir o \"plug-in\""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1837,12 +1800,6 @@
+ msgid "Font size"
+ msgstr "Tamanho de letra"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Devido à sua licença, o \"plug-in\" do Spotify é disponibilizado "
+-"separadamente"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forçar codificação mono"
+@@ -2114,10 +2071,6 @@
+ "No modo dinâmico, as faixas são escolhidas e adicionadas à lista de "
+ "reprodução assim que uma música termine"
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Caixa de entrada"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Incluir capa do álbum na notificação"
+@@ -2146,10 +2099,6 @@
+ msgid "Insert..."
+ msgstr "Inserir..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalado"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2454,7 +2403,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2530,10 +2478,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Perfil principal (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Tornar lista de reprodução disponível localmente"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Resposta inválida"
+@@ -2793,10 +2737,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Vizinhos insuficientes"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Não instalado"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Sessão não iniciada"
+@@ -2931,7 +2871,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Senha"
+@@ -3038,10 +2977,6 @@
+ msgid "Playlists"
+ msgstr "Listas de reprodução"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Estado:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3072,7 +3007,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Preferências"
+@@ -3089,10 +3023,6 @@
+ msgid "Preferred audio format"
+ msgstr "Formato áudio preferido"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Taxa de dados preferencial"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Formato preferido"
+@@ -3483,18 +3413,6 @@
+ msgid "Search Magnatune"
+ msgstr "Pesquisar no Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Procurar no Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Procurar no Spotify (abre um novo separador)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Procurar no Spotify (abre um novo separador)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Procurar em todas as fontes (coleção, internet, ...)"
+@@ -3820,30 +3738,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Erro de autenticação Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "\"Plug-in\" Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "\"Plug-in\" Spotify não instalado"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Padrão"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Com estrela"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Iniciar lista de reprodução atual"
+@@ -3853,7 +3751,6 @@
+ msgstr "Iniciar conversão"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Escreva algo na caixa de procura para descobrir músicas no %1"
+@@ -3939,18 +3836,6 @@
+ msgid "Switch provider"
+ msgstr "Trocar fornecedor"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "A sincronizar caixa de entrada Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "A sincronizar lista de reprodução Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "A sincronizar faixas Spotify assinaladas"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Separadores no topo"
+@@ -4333,10 +4218,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Utilizar definições do sistema"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Utilizar normalização de volume"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Utilizado"
+@@ -4352,7 +4233,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Utilizador"
+@@ -4589,22 +4469,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Você não tem uma conta Grooveshark Anywhere"
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Você não tem uma conta Spotify Premium"
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Terminou a sessão no Spotify. Reintroduza a sua senha na caixa de diálogo de"
+-" definições"
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Terminou a sessão no Spotify. Reintroduza a sua senha"
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Você gosta desta faixa"
+@@ -4671,7 +4535,6 @@
+ msgstr "Os seus envios: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Utilizador e/ou senha inválida"
+ 
+@@ -4760,8 +4623,6 @@
+ msgstr "no(s) último(s)"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/ro.po clementine-libre-1.0.1/src/translations/ro.po
+--- clementine-1.0.1/src/translations/ro.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ro.po	2012-05-29 17:31:07.169751658 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Este necesar un cont Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Este necesar un cont Spotify Premium."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -317,7 +313,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -590,14 +585,6 @@
+ msgid "Always start playing"
+ msgstr "Începe redarea întotdeauna"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Este necesara activarea unui plugin pentru utlizarea Spotify in Clementine. "
+-"Doriți să fie descărcat si instalat acum?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "A apărut o eroare de copiere a bazei de date iTunes de pe dispozitiv"
+@@ -823,10 +810,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE placa suport"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Anulare"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Schimbă imaginea coperții"
+@@ -1037,10 +1020,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Configurează scurtături"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Configurare Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Configurează biblioteca..."
+@@ -1058,10 +1037,6 @@
+ msgid "Connect device"
+ msgstr "Conectează un dispozitiv"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Se conectează la Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Rată de biți constantă"
+@@ -1477,10 +1452,6 @@
+ msgid "Download this album..."
+ msgstr "Descarcă acest album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Descărcare..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Descărcare dosarul Icecast"
+@@ -1493,10 +1464,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Descărcare catalog Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Se descarcă pluginul Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Descărcare metadata"
+@@ -1651,10 +1618,6 @@
+ msgid "Error deleting songs"
+ msgstr "Eroare ștergere melodii"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Eroare la descărcarea pluginului Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1838,11 +1801,6 @@
+ msgid "Font size"
+ msgstr "Dimensiunea fontului"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"Din motive de licență, suportul pentru Spotify este într-un plugin separat."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Forțează codarea mono"
+@@ -2114,10 +2072,6 @@
+ "În modul dinamic, melodii noi vor fi alese și adăugate la lista de redare de"
+ " fiecare dată când se termină o melodie."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Includeți album de artă în notificare"
+@@ -2146,10 +2100,6 @@
+ msgid "Insert..."
+ msgstr "Introduce..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalat"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2452,7 +2402,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2528,10 +2477,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Profil principal (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2788,10 +2733,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nu sunt destui vecini"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Neinstalat"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2926,7 +2867,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Parolă"
+@@ -3033,10 +2973,6 @@
+ msgid "Playlists"
+ msgstr "Liste de redare"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Status plugin:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3067,7 +3003,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Preferinţe"
+@@ -3084,10 +3019,6 @@
+ msgid "Preferred audio format"
+ msgstr "Format audio preferat"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Rată de biți preferată"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Format preferat"
+@@ -3478,18 +3409,6 @@
+ msgid "Search Magnatune"
+ msgstr "Caută în Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Caută în Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Caută în Spotify (deschide o filă nouă)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Caută în Spotify (deschide o filă nouă)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3814,30 +3733,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Eroare la logarea în Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Plugin Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Pluginul Spotify nu este instalat"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Cu steluță"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3847,7 +3746,6 @@
+ msgstr "Începe transcodare"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3933,18 +3831,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "File deasupra"
+@@ -4304,10 +4190,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Folosește setările de proxy ale sistemului"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4323,7 +4205,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Nume de utilizator"
+@@ -4549,20 +4430,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Nu aveți un cont Spotify Premium."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4622,7 +4489,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Parola sau numele de utilizator au fost incorecte."
+ 
+@@ -4711,8 +4577,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/ru.po clementine-libre-1.0.1/src/translations/ru.po
+--- clementine-1.0.1/src/translations/ru.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/ru.po	2012-05-29 17:31:44.913085063 -0400
+@@ -256,10 +256,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Требуется учётная запись Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Требуется Premium аккаунт Spotify"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -320,7 +316,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -593,14 +588,6 @@
+ msgid "Always start playing"
+ msgstr "Всегда начинать воспроизведение"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Требуется дополнительный модуль для использования Spotify в Clementine. "
+-"Скачать и установить его?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Произошла ошибка при загрузке данных iTunes с устройства"
+@@ -826,10 +813,6 @@
+ msgid "CUE sheet support"
+ msgstr "Поддержка файлов разметки CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Отмена"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Выберите обложку"
+@@ -1045,10 +1028,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Комбинации клавиш"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Настройка Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Настроить коллекцию..."
+@@ -1066,10 +1045,6 @@
+ msgid "Connect device"
+ msgstr "Подсоединение устройства"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Подключение к Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Постоянный битрейт"
+@@ -1485,10 +1460,6 @@
+ msgid "Download this album..."
+ msgstr "Загрузить этот альбом"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Загрузить..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Загружаем директорию Icecast"
+@@ -1501,10 +1472,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Скачать каталог Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Загрузка модуля Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Загрузка метаданных"
+@@ -1658,10 +1625,6 @@
+ msgid "Error deleting songs"
+ msgstr "Ошибка удаления композиций"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Ошибка загрузки модуля Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1845,12 +1808,6 @@
+ msgid "Font size"
+ msgstr "Размер шрифта"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"По лицензионным соображениям поддержка Spotify реализована в виде отдельного"
+-" плагина"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Принудительное кодирование в моно"
+@@ -2122,10 +2079,6 @@
+ "В динамическом режиме новые треки выбираются и добавляются в список "
+ "воспроизведения каждый раз, когда заканчивается очередная песня."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Входящие"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Показывать обложку альбома в уведомлении"
+@@ -2154,10 +2107,6 @@
+ msgid "Insert..."
+ msgstr "Вставить..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Установлено"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Интернет"
+@@ -2462,7 +2411,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2538,10 +2486,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Основной профиль (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Сделать плейлист доступным оффлайн"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Неправильный ответ"
+@@ -2800,10 +2744,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Недостаточно соседей"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Не установлено"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Не был выполнен логин"
+@@ -2938,7 +2878,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Пароль"
+@@ -3045,10 +2984,6 @@
+ msgid "Playlists"
+ msgstr "Списки воспроизведения"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Статус модуля:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3079,7 +3014,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Настройки"
+@@ -3096,10 +3030,6 @@
+ msgid "Preferred audio format"
+ msgstr "Предпочитаемый аудио формат"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Предпочитаемый битрейт"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Предпочитаемый формат"
+@@ -3490,18 +3420,6 @@
+ msgid "Search Magnatune"
+ msgstr "Искать на Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Поиск на Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Поиск на Spotify (открывается в новой вкладке)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Поиск на Spotify (в новой вкладке)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Искать во всех источниках (библиотеке, интернет сервисах, ...)"
+@@ -3827,30 +3745,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Ошибка имени пользователя Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Модуль Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Модуль Spotify не установлен"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Стандартный"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Оцененные"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Запустить список воспроизведения проигрываемый в данный момент"
+@@ -3860,7 +3758,6 @@
+ msgstr "Начать перекодирование"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Наберите начальные буквы наименования песни чтобы начать поиск в %1"
+@@ -3946,18 +3843,6 @@
+ msgid "Switch provider"
+ msgstr "Выбрать другой источник"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Синхронизация входящих Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Синхронизация плейлистов Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Синхронизация рейтингованных треков Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Вкладки вверху"
+@@ -4336,10 +4221,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Использовать системные настройки прокси"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Использовать выравнивание громкости"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Использовано"
+@@ -4355,7 +4236,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Имя пользователя"
+@@ -4591,23 +4471,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "У вас нет учетной записи Grooveshark Anywhere"
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "У вас нет учетной записи Spotify Premium"
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Подключение к сервису  Spotify было разорвано,  введите ваш пароль ещё раз в"
+-" диалоге Настройки."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-"Подключение к сервису  Spotify было разорвано,  введите ваш пароль ещё раз."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Вам нравится эта композиция"
+@@ -4675,7 +4538,6 @@
+ msgstr "Ваш скробблинг: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Имя пользователя или пароль неправильные."
+ 
+@@ -4764,8 +4626,6 @@
+ msgstr "в последние"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "кбит/с"
+ 
+diff -rauN clementine-1.0.1/src/translations/sk.po clementine-libre-1.0.1/src/translations/sk.po
+--- clementine-1.0.1/src/translations/sk.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/sk.po	2012-05-29 17:32:30.349751863 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Je vyžadovaný Grooveshark Anywhere účet."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Je vyžadovaný prémium účet na Spotify."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -314,7 +310,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -587,14 +582,6 @@
+ msgid "Always start playing"
+ msgstr "Hneď začne hrať"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Aby sa dalo Spotify využiť v Clementine, je vyžadovaný ďalší plugin. Chcete "
+-"ho teraz stiahnuť a nainštalovať?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Nastala chyba pri kopírovaní iTunes databázy zo zariadenia"
+@@ -820,10 +807,6 @@
+ msgid "CUE sheet support"
+ msgstr "podpora CUE zoznamu"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Zrušiť"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Zmeniť obal albumu"
+@@ -1034,10 +1017,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Klávesové skratky"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Nastaviť Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Nastaviť zbierku..."
+@@ -1055,10 +1034,6 @@
+ msgid "Connect device"
+ msgstr "Pripojiť zariadenie"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Pripájanie k Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Konštantný dátový tok"
+@@ -1474,10 +1449,6 @@
+ msgid "Download this album..."
+ msgstr "Stiahnuť tento album..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Stiahnuť..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Sťahuje sa Icecast priečinok"
+@@ -1490,10 +1461,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Sťahuje sa Magnatune katalóg"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Sťahuje sa Spotify plugin"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Sťahujú sa metadáta"
+@@ -1648,10 +1615,6 @@
+ msgid "Error deleting songs"
+ msgstr "Chyba pri vymazávaní piesní"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Chyba pri sťahovaní Spotify pluginu."
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1834,10 +1797,6 @@
+ msgid "Font size"
+ msgstr "Veľkosť písma"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Kvôli licenčným dôvodom je podpora Spotify v oddelenom plugine."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Vynútiť mono enkódovanie"
+@@ -2109,10 +2068,6 @@
+ "V dynamickom režime budú nové skladby vybraté a pridané do playlistu "
+ "zakaždým keď skončí pieseň."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Doručené"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Zahrnúť obal do upozornenia"
+@@ -2141,10 +2096,6 @@
+ msgid "Insert..."
+ msgstr "Vložiť..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Nainštalované"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2447,7 +2398,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2523,10 +2473,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Hlavný profil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Urobiť playlist dostupný offline"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Poškodená odpoveď"
+@@ -2785,10 +2731,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Nedostatok susedov"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Nenainštalované"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Nieprihlásený"
+@@ -2923,7 +2865,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Heslo"
+@@ -3030,10 +2971,6 @@
+ msgid "Playlists"
+ msgstr "Playlisty"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stav pluginu:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3064,7 +3001,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Nastavenia"
+@@ -3081,10 +3017,6 @@
+ msgid "Preferred audio format"
+ msgstr "Preferovaný formát zvuku"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Preferovaný dátový tok"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Preferovaný formát"
+@@ -3475,18 +3407,6 @@
+ msgid "Search Magnatune"
+ msgstr "Hľadať na Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Hľadať v Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Hľadať v Spotify (otvorí novú kartu)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Hľadať v Spotify (otvorí novú kartu)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3812,30 +3732,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Chyba pri prihlasovaní na Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify plugin"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify plugin nieje nainštalovaný"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Štandardný"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "S hviezdičkou"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Začať playlist práve prehrávanou"
+@@ -3845,7 +3745,6 @@
+ msgstr "Začať transkódovanie"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3932,18 +3831,6 @@
+ msgid "Switch provider"
+ msgstr "Zmeniť poskytovateľa"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synchronizuje sa Spotify schránka"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synchronizuje sa Spotify playlist"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synchronizujú sa skladby ohviezdičkované na Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Karty na vrchu"
+@@ -4325,10 +4212,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Použiť systémové nastavenia proxy"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Použiť normalizáciu hlasitosti"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Použitých"
+@@ -4344,7 +4227,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Meno používateľa"
+@@ -4580,22 +4462,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Nemáte Grooveshark Anywhere účet."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Nemáte Spotify prémium účet."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Boli ste odhlásení zo Spotify, prosím, zadajte heslo znovu v dialógu "
+-"Nastavenia."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Boli ste odhlásený zo Spotify, prosím znovu zadajte heslo."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Milujete túto pieseň"
+@@ -4663,7 +4529,6 @@
+ msgstr "Skroblujete: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Vaše meno používateľa alebo heslo bolo nesprávne."
+ 
+@@ -4752,8 +4617,6 @@
+ msgstr "za posledných"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/sl.po clementine-libre-1.0.1/src/translations/sl.po
+--- clementine-1.0.1/src/translations/sl.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/sl.po	2012-05-29 17:41:04.549752271 -0400
+@@ -252,10 +252,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Zahtevan je račun Spotify Premium."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -314,7 +310,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -587,14 +582,6 @@
+ msgid "Always start playing"
+ msgstr "Vedno začni s predvajanjem"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Da lahko uporabite Spotify v Clementine, potrebujete dodaten vstavek. Ga "
+-"želite prejeti in namestiti zdaj?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -822,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr "Podpora predlogam CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Prekliči"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Spremeni ovitek albuma"
+@@ -1039,10 +1022,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Nastavi bližnjice"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Nastavi Spotify ..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Nastavi knjižnico ..."
+@@ -1060,10 +1039,6 @@
+ msgid "Connect device"
+ msgstr "Priklopi napravo"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Povezovanje na Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Stalna bitna hitrost"
+@@ -1479,10 +1454,6 @@
+ msgid "Download this album..."
+ msgstr "Prejmi ta album ..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Prejmi ..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Prejemanje imenika Icecast"
+@@ -1495,10 +1466,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Prejemanje kataloga Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Prejemanje vstavka Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Prejemanje metapodatkov"
+@@ -1651,10 +1618,6 @@
+ msgid "Error deleting songs"
+ msgstr "Napaka pri brisanju skladb"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Napaka med prejemanjem vstavka Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1836,10 +1799,6 @@
+ msgid "Font size"
+ msgstr "Velikost pisave"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Zaradi licence je podpora Spotify v ločenem vstavku."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Vsili mono kodiranje"
+@@ -2111,10 +2070,6 @@
+ "V dinamičnem načinu bodo nove skladbe izbrane in dodane na seznam "
+ "predvajanja vsakič, ko se prejšnja skladba konča."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Prejeto"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Vključi ovitek albuma v obvestilo"
+@@ -2143,10 +2098,6 @@
+ msgid "Insert..."
+ msgstr "Vstavi ..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Nameščeno"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Medmrežje"
+@@ -2449,7 +2400,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2525,10 +2475,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Glavni profil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Seznam predvajanja naj bo na voljo tudi brez povezave"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Nepravilno oblikovan odziv"
+@@ -2787,10 +2733,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Ni dovolj sosedov"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Ni nameščeno"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2925,7 +2867,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Geslo"
+@@ -3032,10 +2973,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Stanje vstavka:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3066,7 +3003,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Možnosti"
+@@ -3083,10 +3019,6 @@
+ msgid "Preferred audio format"
+ msgstr "Prednostna vrsta zvoka"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Prednostna vrsta"
+@@ -3477,18 +3409,6 @@
+ msgid "Search Magnatune"
+ msgstr "Išči na Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Išči po Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Išči po Spotify (odpre nov zavihek)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Išči po Spotify (odpre nov zavihek) ..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3814,30 +3734,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Napaka med prijavo na Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Vstavek Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Vstavek Spotify ni nameščen"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Običajno"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Z zvezdico"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Predvajaj skladbo, ki je označena v predvajalnem seznamu"
+@@ -3847,7 +3747,6 @@
+ msgstr "Začni s prekodiranjem"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3933,18 +3832,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Usklajevanje mape Spotify - prejeto"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Usklajevanje seznama predvajanja Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Usklajevanje označenih skladb v Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Zavihki na vrhu"
+@@ -4322,10 +4209,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Uporabi nastavitve posredniškega strežnika sistema"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Uporabljeno"
+@@ -4341,7 +4224,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Uporabniško ime"
+@@ -4575,20 +4457,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "To je vaša priljubljena skladba"
+@@ -4655,7 +4523,6 @@
+ msgstr "Vaši seznami predvajanih skladb: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4744,8 +4611,6 @@
+ msgstr "v zadnjih"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kb/s"
+ 
+diff -rauN clementine-1.0.1/src/translations/sr@latin.po clementine-libre-1.0.1/src/translations/sr@latin.po
+--- clementine-1.0.1/src/translations/sr@latin.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/sr@latin.po	2012-05-29 17:42:43.256419021 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr ""
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr ""
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr ""
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4501,20 +4385,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4574,7 +4444,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4663,8 +4532,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/sr.po clementine-libre-1.0.1/src/translations/sr.po
+--- clementine-1.0.1/src/translations/sr.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/sr.po	2012-05-29 17:41:46.463085756 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Потребан је Spotify Premium налог"
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -311,7 +307,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -584,14 +579,6 @@
+ msgid "Always start playing"
+ msgstr "Увек почни да свираш"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Додатак је потребан да би се користио Spotify у Клементини. Да ли желиш да "
+-"га преузмеш и одмах уградиш?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Дошло је до грешке услед копирања базе података iTunes из уређаја"
+@@ -817,10 +804,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE подршка листа"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Otkaži"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Промени слику насловне"
+@@ -1030,10 +1013,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Подеси пречице"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Подеси Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Подеси библиотеку"
+@@ -1051,10 +1030,6 @@
+ msgid "Connect device"
+ msgstr "Повежи уређај"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Повежи се на Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Константан битни проток"
+@@ -1470,10 +1445,6 @@
+ msgid "Download this album..."
+ msgstr "Preuzmi ovaj albm"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Preuzmi..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Преузимање Icecast директоријума"
+@@ -1486,10 +1457,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Преузми Магнатјунов каталог"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Преузимање Spotify додатка"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Преузимање метаподатака"
+@@ -1641,10 +1608,6 @@
+ msgid "Error deleting songs"
+ msgstr "Грешка при брисању песама"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Грешка преузимања Spotify додатка"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1828,10 +1791,6 @@
+ msgid "Font size"
+ msgstr "Veličina fonta"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Због лиценцираниг разлога Spotify подршка је на посебном додатку."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Присили моно енкодирање"
+@@ -2102,10 +2061,6 @@
+ "У промењивом режиму нове нумере ће бити изабране и додате листи сваки пут "
+ "кад се песма заврши."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Сандуче"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Укључи омоте албума у обавештења"
+@@ -2134,10 +2089,6 @@
+ msgid "Insert..."
+ msgstr "Убаци..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Instalirano"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Интернет"
+@@ -2441,7 +2392,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2517,10 +2467,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Главни налог (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Направи листу доступну ван мреже"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Лош одговор"
+@@ -2778,10 +2724,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Нема довољно комшија"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Није уграђен"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2916,7 +2858,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Лозинка"
+@@ -3023,10 +2964,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Статус додатка:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Поп"
+@@ -3057,7 +2994,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Поставке"
+@@ -3074,10 +3010,6 @@
+ msgid "Preferred audio format"
+ msgstr "Пожељни формат звука"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Жељени формат"
+@@ -3468,18 +3400,6 @@
+ msgid "Search Magnatune"
+ msgstr "Претражи Магнатјун"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Потражи Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Потражи Spotify (отвара нову картицу)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Потражи Spotify (отвара нову картицу)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3804,30 +3724,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify грешка пријављивања"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify додатак"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify додатак није уграђен"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Стандард"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Звездицом"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Почни листу тренутно пуштаним"
+@@ -3837,7 +3737,6 @@
+ msgstr "Започни транскодирање"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3923,18 +3822,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Усаглашавање Spotify сандучета"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Усаглашавање Spotify листе"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Усаглашавање Spotify оцењених нумера"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Картице на врх"
+@@ -4313,10 +4200,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "искоришћено"
+@@ -4332,7 +4215,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Корисничко име"
+@@ -4560,20 +4442,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4633,7 +4501,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4722,8 +4589,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kb/s"
+ 
+diff -rauN clementine-1.0.1/src/translations/sv.po clementine-libre-1.0.1/src/translations/sv.po
+--- clementine-1.0.1/src/translations/sv.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/sv.po	2012-05-29 17:43:39.719752433 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Ett Grooveshark Anywhere konto krävs."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Kräver ett Spotify Premium-konto."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -316,7 +312,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -589,14 +584,6 @@
+ msgid "Always start playing"
+ msgstr "Starta alltid att spela"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Ett ytterligare insticksprogram krävs för att använda Spotify i Clementine. "
+-"Vill du ladda ner och installera det nu?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Ett fel uppstod vid kopiering av iTunes-databasen från enheten"
+@@ -822,10 +809,6 @@
+ msgid "CUE sheet support"
+ msgstr "Stöd för CUE-filer"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Avbryt"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Ändra omslag"
+@@ -1039,10 +1022,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Konfigurera snabbtangenter"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Anpassa Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Konfigurera biblioteket..."
+@@ -1060,10 +1039,6 @@
+ msgid "Connect device"
+ msgstr "Anslut enhet"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Ansluter till Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Konstant bithastighet"
+@@ -1479,10 +1454,6 @@
+ msgid "Download this album..."
+ msgstr "Ladda ner det här albumet ..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Ladda ner..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Ladda ner Icecast-katalog"
+@@ -1495,10 +1466,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Hämtar katalog från Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Laddar ner Spotify-insticket"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Hämtar metadata"
+@@ -1650,10 +1617,6 @@
+ msgid "Error deleting songs"
+ msgstr "Fel vid borttagning av låtar"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Fel vid hämtning av Spotify-insticket"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1835,10 +1798,6 @@
+ msgid "Font size"
+ msgstr "Typsnittsstorlek"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Av licensskäl finns Spotify-stöd i ett separat insticksprogram."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Tvinga enkanalskodning"
+@@ -2109,10 +2068,6 @@
+ "I dynamiskt läge kommer nya spår väljas och läggas till i spellistan varje "
+ "gång en låt tar slut."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Inkorg"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Inkludera albumomslag i notifieringen"
+@@ -2141,10 +2096,6 @@
+ msgid "Insert..."
+ msgstr "Infoga..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Installerad"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2447,7 +2398,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2523,10 +2473,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Huvudprofil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Gör spellista tillgänglig offline"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Felformaterat svar"
+@@ -2784,10 +2730,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Inte tillräckligt med grannar"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Inte installerad"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2922,7 +2864,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Lösenord"
+@@ -3029,10 +2970,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Instickstatus:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3063,7 +3000,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Inställningar"
+@@ -3080,10 +3016,6 @@
+ msgid "Preferred audio format"
+ msgstr "Önskat ljudformat"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Önskat format"
+@@ -3474,18 +3406,6 @@
+ msgid "Search Magnatune"
+ msgstr "Sök i Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Sök på Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Sök på Spotify (öppnar en ny flik)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Sök på Spotify (öppnar en ny flik)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3810,30 +3730,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Fel vid inloggning på Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify-insticksprogram"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify-insticksprogrammet är inte installerat"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Stjärnmärkta"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Starta spellistan som spelas för närvarande"
+@@ -3843,7 +3743,6 @@
+ msgstr "Starta omkodning"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3929,18 +3828,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Synkroniserar Spotify-inkorg"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Synkroniserar Spotify-spellista"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Synkroniserar stjärnmärkta spår i Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Flikar längst upp"
+@@ -4321,10 +4208,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Använd systemets proxy inställningar"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Använd"
+@@ -4340,7 +4223,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Användarnamn"
+@@ -4574,20 +4456,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Du älskar detta spår"
+@@ -4655,7 +4523,6 @@
+ msgstr "Dina skrobblingar: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4744,8 +4611,6 @@
+ msgstr "de senaste"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/translations.pot clementine-libre-1.0.1/src/translations/translations.pot
+--- clementine-1.0.1/src/translations/translations.pot	2012-01-22 07:43:21.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/translations.pot	2012-05-29 17:45:10.709752528 -0400
+@@ -239,10 +239,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -297,7 +293,6 @@
+ 
+ #: ../mingw/src/ui_groovesharksettingspage.h:113
+ #: ../mingw/src/ui_magnatunesettingspage.h:155
+-#: ../mingw/src/ui_spotifysettingspage.h:209
+ #: ../mingw/src/ui_remotesettingspage.h:203
+ #: ../mingw/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -571,12 +566,6 @@
+ msgid "Always start playing"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -803,10 +792,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../mingw/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1005,10 +990,6 @@
+ msgid "Configure Shortcuts"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:490
+ msgid "Configure library..."
+ msgstr ""
+@@ -1026,10 +1007,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../mingw/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1431,10 +1408,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../mingw/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1447,10 +1420,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr ""
+@@ -1600,10 +1569,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1785,10 +1750,6 @@
+ msgid "Font size"
+ msgstr ""
+ 
+-#: ../mingw/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../mingw/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2053,10 +2014,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../mingw/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr ""
+@@ -2086,10 +2043,6 @@
+ msgid "Insert..."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:252
+ msgid "Internet"
+ msgstr ""
+@@ -2391,7 +2344,6 @@
+ #: ../mingw/src/ui_digitallyimportedsettingspage.h:163
+ #: ../mingw/src/ui_groovesharksettingspage.h:116
+ #: ../mingw/src/ui_magnatunesettingspage.h:164
+-#: ../mingw/src/ui_spotifysettingspage.h:212
+ #: ../mingw/src/ui_remotesettingspage.h:205
+ #: ../mingw/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2468,10 +2420,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr ""
+@@ -2730,10 +2678,6 @@
+ msgid "Not enough neighbors"
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2868,7 +2812,6 @@
+ 
+ #: ../mingw/src/ui_groovesharksettingspage.h:115
+ #: ../mingw/src/ui_magnatunesettingspage.h:165
+-#: ../mingw/src/ui_spotifysettingspage.h:211
+ #: ../mingw/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr ""
+@@ -2975,10 +2918,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../mingw/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr ""
+@@ -3009,7 +2948,6 @@
+ 
+ #: ../mingw/src/ui_digitallyimportedsettingspage.h:166
+ #: ../mingw/src/ui_magnatunesettingspage.h:166
+-#: ../mingw/src/ui_spotifysettingspage.h:217
+ #: ../mingw/src/ui_settingsdialog.h:115
+ #: ../mingw/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+@@ -3027,10 +2965,6 @@
+ msgid "Preferred audio format"
+ msgstr ""
+ 
+-#: ../mingw/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../mingw/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3422,18 +3356,6 @@
+ msgid "Search Magnatune"
+ msgstr ""
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../mingw/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3756,30 +3678,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../mingw/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../mingw/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../mingw/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:145
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3789,7 +3691,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3875,18 +3776,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr ""
+@@ -4246,10 +4135,6 @@
+ msgid "Use the system proxy settings"
+ msgstr ""
+ 
+-#: ../mingw/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr ""
+@@ -4265,7 +4150,6 @@
+ 
+ #: ../mingw/src/ui_groovesharksettingspage.h:114
+ #: ../mingw/src/ui_magnatunesettingspage.h:163
+-#: ../mingw/src/ui_spotifysettingspage.h:210
+ #: ../mingw/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr ""
+@@ -4489,20 +4373,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr ""
+@@ -4562,7 +4432,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4651,8 +4520,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr ""
+ 
+diff -rauN clementine-1.0.1/src/translations/tr.po clementine-libre-1.0.1/src/translations/tr.po
+--- clementine-1.0.1/src/translations/tr.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/tr.po	2012-05-29 17:44:19.953085826 -0400
+@@ -256,10 +256,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Grooveshark Anywhere hesabı gereklidir."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Spotify üyeliği gerekli."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -318,7 +314,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -591,14 +586,6 @@
+ msgid "Always start playing"
+ msgstr "Her zaman çalarak başlat"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Spotify'ın Clementine'de kullanılması için harici bir eklenti gerekmektedir."
+-"  Şimdi indirmek ve kurulumunu yapmak ister misiniz?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Aygıttan iTunes veritabanı kopyalanırken hata oluştu"
+@@ -824,10 +811,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE desteği"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "İptal"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Kapak resmini değiştir"
+@@ -1038,10 +1021,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Kısayolları Yapılandır"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Spotify Ayarları..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Kütüphaneyi düzenle..."
+@@ -1059,10 +1038,6 @@
+ msgid "Connect device"
+ msgstr "Aygıtı bağla"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Spotify'a bağlanılıyor."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Sabit bithızı"
+@@ -1478,10 +1453,6 @@
+ msgid "Download this album..."
+ msgstr "Bu albümü indirin..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "İndir..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Icecast dizini indiriliyor"
+@@ -1494,10 +1465,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Magnatune kataloğu indiriliyor"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Spotify eklentisi indiriliyor"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Üstveri indiriliyor"
+@@ -1652,10 +1619,6 @@
+ msgid "Error deleting songs"
+ msgstr "Şarkılar silinirken hata"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Spotify eklentisini indirirken hata"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1837,10 +1800,6 @@
+ msgid "Font size"
+ msgstr "Yazı tipi boyutu"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Lisans sebepleri dolayısıyla Spotify desteği ayrı bir eklentidir."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Mono çözümlemeye zorla"
+@@ -2112,10 +2071,6 @@
+ "Dinamik modda yeni şarkılar seçilerek, her şarkı bittiğinde çalma listesine "
+ "eklenecektir."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Gelen Kutusu"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Bildirimde albüm resimlendirmesini göster"
+@@ -2144,10 +2099,6 @@
+ msgid "Insert..."
+ msgstr "Ekle..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Kuruldu"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2454,7 +2405,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2530,10 +2480,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Ana profil (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Çalma listesini çevrim dışındayken kullanılabilir yap"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Bozuk yanıt"
+@@ -2792,10 +2738,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Yeterli komşu yok"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Kurulu değil"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Giriş yapmadınız"
+@@ -2930,7 +2872,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Parola"
+@@ -3037,10 +2978,6 @@
+ msgid "Playlists"
+ msgstr "Çalma listeleri"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Eklenti durumu:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3071,7 +3008,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Tercihler"
+@@ -3088,10 +3024,6 @@
+ msgid "Preferred audio format"
+ msgstr "Tercih edilen ses biçimleri"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Tercih edilen bit oranı"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Tercih edilen biçim"
+@@ -3482,18 +3414,6 @@
+ msgid "Search Magnatune"
+ msgstr "Magnatune'da Ara"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Spotify'i ara"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Spotify'i ara (yeni sekme açar)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Spotify'i ara (yeni sekme açar)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Tüm kaynaklarınızda arayın (kütüphane, internet servisleri, ...)"
+@@ -3818,30 +3738,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Spotify giriş hatası"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Spotify eklentisi"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Spotify eklentisi kurulu değil"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Standard"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Yıldızlı"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Çalma listesini mevcut çalınanla başlat"
+@@ -3851,7 +3751,6 @@
+ msgstr "Dönüştürmeye başla"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Müzik bulmak için yukarıdaki arama kutusuna yazarak başlayın %1 "
+@@ -3937,18 +3836,6 @@
+ msgid "Switch provider"
+ msgstr "Anahtar sağlayıcı"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Spotify gelen kutusu eşleniyor"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Spotify çalma listesi eşleniyor"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Spotify yıldızlı şarkılar eşleniyor"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Üstteki sekmeler"
+@@ -4320,10 +4207,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Sistem vekil sunucu ayarlarını kullan"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Ses normalleştirme kullan"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Kullanılan"
+@@ -4339,7 +4222,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Kullanıcı Adı"
+@@ -4574,22 +4456,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Bir Grooveshark Anywhere hesabınız yok"
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Spotify Premium hesabınız yok."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Spotify servisinden çıktınız, lütfen Ayarlar ekranında parolanızı yeniden "
+-"girin."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Spotify servisinden çıktınız, lütfen parolanızı yeniden girin."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Bu şarkıyı seviyorsunuz"
+@@ -4656,7 +4522,6 @@
+ msgstr "Skroplarınız: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Kullanıcı adı veya parolanız yanlış."
+ 
+@@ -4745,8 +4610,6 @@
+ msgstr "Sonuncu"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/uk.po clementine-libre-1.0.1/src/translations/uk.po
+--- clementine-1.0.1/src/translations/uk.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/uk.po	2012-05-29 17:45:51.199752577 -0400
+@@ -254,10 +254,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Потрібен обліковий запис Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Потрібен обліковий запис Spotify Premium."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -318,7 +314,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -591,14 +586,6 @@
+ msgid "Always start playing"
+ msgstr "Завжди починати відтворення"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Для користування Spotify в Clementine, потрібний додатковий модуль. "
+-"Завантажити і встановити його зараз?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Виникла помилка копіювання бази даних iTunes з пристрою"
+@@ -824,10 +811,6 @@
+ msgid "CUE sheet support"
+ msgstr "Підтримка листів CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Скасувати"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Змінити обкладинку"
+@@ -1039,10 +1022,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Налаштування комбінацій клавіш"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Налаштування Spotify…"
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Налаштувати фонотеку"
+@@ -1060,10 +1039,6 @@
+ msgid "Connect device"
+ msgstr "З’єднати пристрій"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "З'єднання зі Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Стала бітова швидкість"
+@@ -1479,10 +1454,6 @@
+ msgid "Download this album..."
+ msgstr "Завантажити цей альбом…"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Звантажити…"
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Завантажую каталог Icecast"
+@@ -1495,10 +1466,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Завантаження каталогу Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Завантаження модуля Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Завантажую метадані"
+@@ -1651,10 +1618,6 @@
+ msgid "Error deleting songs"
+ msgstr "Помилка вилучення композицій"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Помилка завантаження модуля Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1837,11 +1800,6 @@
+ msgid "Font size"
+ msgstr "Розмір шрифту"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-"З підстав ліцензування, для підтримки Spotify потрібен спеціальний модуль."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Примусове моно-кодування"
+@@ -2113,10 +2071,6 @@
+ "У динамічному режимі нові доріжку буде обрано та додано до списку "
+ "відтворення кожного разу як завершується пісня."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Вхідні"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Показувати обкладинку в повідомлені"
+@@ -2145,10 +2099,6 @@
+ msgid "Insert..."
+ msgstr "Вставити…"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Встановлено"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Інтернет"
+@@ -2451,7 +2401,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2527,10 +2476,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Основний профіль (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Зробити список відтворення доступним онлайн"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Спотворений відгук"
+@@ -2789,10 +2734,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Недостатньо сусідів"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Не встановлено"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Вхід не здійснено"
+@@ -2927,7 +2868,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Пароль"
+@@ -3034,10 +2974,6 @@
+ msgid "Playlists"
+ msgstr "Списки відтворення"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Статус модуля:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Поп"
+@@ -3068,7 +3004,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Параметри"
+@@ -3085,10 +3020,6 @@
+ msgid "Preferred audio format"
+ msgstr "Бажаний аудіо формат"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Бажана бітова швидкість"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Бажаний формат"
+@@ -3479,18 +3410,6 @@
+ msgid "Search Magnatune"
+ msgstr "Пошук на Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Пошук в Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Пошук в Spotify (у новій вкладці)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Пошук в Spotify (у новій вкладці)…"
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Шукати у всіх джерелах даних (бібліотеці, на службах інтернету тощо)"
+@@ -3816,30 +3735,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Помилка входу до Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Модуль Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Модуль Spotify не встановлено"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Типово"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Оцінені"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Запустити список відтворення, що відтворюється на цей час"
+@@ -3849,7 +3748,6 @@
+ msgstr "Почати перекодування"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3937,18 +3835,6 @@
+ msgid "Switch provider"
+ msgstr "Перемкнути джерело"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Синхронізація вхідних Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Синхронізація списку відтворення Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Синхронізація оцінених доріжок Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Вкладки зверху"
+@@ -4323,10 +4209,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Використовувати системні налаштування проксі"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Використати нормалізацію гучності"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Використано"
+@@ -4342,7 +4224,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Користувач"
+@@ -4579,21 +4460,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "У вас немає облікового запису Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "У вас немає облікового запису Spotify Premium."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Ви вийшли зі Spotify, введіть ваш пароль знов у налаштуваннях, будь ласка."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Ви вийшли зі Spotify, введіть ваш пароль знов, будь ласка."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Улюблена композиція"
+@@ -4661,7 +4527,6 @@
+ msgstr "%1 відтворень у вас"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Вами вказано помилкове ім’я користувача або пароль."
+ 
+@@ -4750,8 +4615,6 @@
+ msgstr "за останні"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "кбіт/с"
+ 
+diff -rauN clementine-1.0.1/src/translations/vi.po clementine-libre-1.0.1/src/translations/vi.po
+--- clementine-1.0.1/src/translations/vi.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/vi.po	2012-05-29 17:46:32.973085951 -0400
+@@ -256,10 +256,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr "Cần có tài khoản Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr "Yêu cầu một tài khoản Premium của Spotify."
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -320,7 +316,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -593,14 +588,6 @@
+ msgid "Always start playing"
+ msgstr "Bắt đầu phát nhạc"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-"Cần phải có một trình cắm thêm để sử dụng Spotify trong Clementine. Bạn có "
+-"muốn tải nó về và cài đặt ngay không?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "Một lỗi đã xảy ra khi sao chép cơ sở dữ liệu iTunes từ thiết bị"
+@@ -826,10 +813,6 @@
+ msgid "CUE sheet support"
+ msgstr "Hỗ trợ danh sách CUE"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr "Hủy bỏ"
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "Đổi ảnh bìa"
+@@ -1040,10 +1023,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "Phím tắt"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "Cấu hình Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "Cấu hình thư viện..."
+@@ -1061,10 +1040,6 @@
+ msgid "Connect device"
+ msgstr "Kết nối thiết bị"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "Kết nối đến Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "Bitrate cố định"
+@@ -1480,10 +1455,6 @@
+ msgid "Download this album..."
+ msgstr "Tải album này..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "Tải về..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "Đang tải thư mục Icecast"
+@@ -1496,10 +1467,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "Đang tải mục lục Magnatune"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "Tải trình cắm thêm Spotify"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "Đang tải thông tin dữ liệu"
+@@ -1653,10 +1620,6 @@
+ msgid "Error deleting songs"
+ msgstr "Lỗi xóa các bài hát"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "Lỗi khi tải trình cắm thêm Spotify"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1841,10 +1804,6 @@
+ msgid "Font size"
+ msgstr "Kích cỡ phông chữ"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr "Vì lí do giấy phép nên Spotify được hỗ trợ trong một trình cắm riêng."
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr "Buộc mã hóa đơn kênh"
+@@ -2116,10 +2075,6 @@
+ "Trong chế độ năng động, các bài hát mới sẽ được chọn và thêm vào danh sách "
+ "mỗi khi một bài hát được phát xong."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "Hộp thư đến"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "Kèm theo ảnh bìa album trong thông báo"
+@@ -2148,10 +2103,6 @@
+ msgid "Insert..."
+ msgstr "Nhập..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr "Đã cài đặt"
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "Internet"
+@@ -2454,7 +2405,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2530,10 +2480,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr "Hồ sơ chính (MAIN)"
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr "Danh sách sẵn sàng ngoại tuyến"
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "Phản hồi có vẻ xấu"
+@@ -2792,10 +2738,6 @@
+ msgid "Not enough neighbors"
+ msgstr "Chưa đủ những người lân cận"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr "Chưa cài đặt"
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr "Chưa đăng nh"
+@@ -2930,7 +2872,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "Mật khẩu"
+@@ -3037,10 +2978,6 @@
+ msgid "Playlists"
+ msgstr "Danh sách"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "Trạng thái trình cắm:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "Pop"
+@@ -3071,7 +3008,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "Thiết lập"
+@@ -3089,10 +3025,6 @@
+ msgid "Preferred audio format"
+ msgstr "Định dạng âm thanh được ưu tiên"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr "Bitrate ưu tiên"
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "Định dạng được ưu tiên"
+@@ -3483,18 +3415,6 @@
+ msgid "Search Magnatune"
+ msgstr "Tìm kiếm trên Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr "Tìm kiếm trong Spotify"
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr "Tìm kiếm trong Spotify (mở trong tab mới)"
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "Tìm kiếm trong Spotify (mở trong tab mới)..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr "Tìm từ tất cả các nguồn (thư viện, các dịch vụ internet, ...)"
+@@ -3819,30 +3739,10 @@
+ msgid "Speex"
+ msgstr "Speex"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr "Lỗi đăng nhập Spotify"
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr "Trình cắm Spotify"
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "Trình cắm thêm Spotify chưa được cài đặt"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr "Chuẩn"
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr "Đã bắt đầu"
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "Bắt đầu danh sách hiện đang phát"
+@@ -3852,7 +3752,6 @@
+ msgstr "Bắt đầu chuyển mã"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr "Nhập vào hộp tìm kiếm ở trên để tìm nhạc trên %1."
+@@ -3938,18 +3837,6 @@
+ msgid "Switch provider"
+ msgstr "Đổi nhà cung cấp"
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr "Đang đồng bộ hộp thư đến Spotify"
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr "Đang đồng bộ danh sách Spotify"
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr "Đang đồng bộ các bài hát được đánh dấu sao của Spotify"
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "Các tab ở phía trên"
+@@ -4328,10 +4215,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "Sử dụng thiết lập proxy của hệ thống"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr "Sử dụng cân bằng âm lượng"
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "Đã dùng"
+@@ -4347,7 +4230,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "Tên người dùng"
+@@ -4584,22 +4466,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr "Bạn không có tài khoản Grooveshark Anywhere."
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr "Bạn không có tài khoản cao cấp của Spotify."
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-"Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu trong hộp thoại Thiết "
+-"lập."
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr "Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu."
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "Bạn thích bài hát này"
+@@ -4666,7 +4532,6 @@
+ msgstr "Thông tin bài hát của bạn: %1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr "Tên người dùng hay mật khẩu không đúng."
+ 
+@@ -4755,8 +4620,6 @@
+ msgstr "cuối"
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/zh_CN.po clementine-libre-1.0.1/src/translations/zh_CN.po
+--- clementine-1.0.1/src/translations/zh_CN.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/zh_CN.po	2012-05-29 17:47:24.893086011 -0400
+@@ -249,10 +249,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -308,7 +304,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -581,12 +576,6 @@
+ msgid "Always start playing"
+ msgstr "总是开始播放"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr "Clementine需要安装额外的插件才能使用Spotify.现在就下载并安装吗?"
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr "从 iTunes 复制数据库出错"
+@@ -812,10 +801,6 @@
+ msgid "CUE sheet support"
+ msgstr "CUE 支持"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr "更改封面"
+@@ -1016,10 +1001,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "配置快捷键"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr "配置Spotify..."
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "配置音乐库..."
+@@ -1037,10 +1018,6 @@
+ msgid "Connect device"
+ msgstr "连接设备"
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr "连接Spotify"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr "固定位速率"
+@@ -1450,10 +1427,6 @@
+ msgid "Download this album..."
+ msgstr "下载此专辑..."
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr "下载..."
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr "正在下载 Icecast 目录"
+@@ -1466,10 +1439,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "正在下载 Magnatune 分类"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr "下载Spotify插件中"
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "下载元数据"
+@@ -1619,10 +1588,6 @@
+ msgid "Error deleting songs"
+ msgstr "删除曲目出错"
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr "下载Spotify插件出错"
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1804,10 +1769,6 @@
+ msgid "Font size"
+ msgstr "字号"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2070,10 +2031,6 @@
+ "time a song finishes."
+ msgstr "在动态模式中, 每次歌曲播放完之后会被选择并添加新歌曲到播放列表.使用动态模式将忽略您的播放列表大小设定值."
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr "收件夹"
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "在提示中中加入专辑封面"
+@@ -2102,10 +2059,6 @@
+ msgid "Insert..."
+ msgstr "插入..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "互联网"
+@@ -2408,7 +2361,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2484,10 +2436,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "无效的响应"
+@@ -2744,10 +2692,6 @@
+ msgid "Not enough neighbors"
+ msgstr "邻居不足"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2882,7 +2826,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "密码"
+@@ -2989,10 +2932,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr "插件状态:"
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "流行"
+@@ -3023,7 +2962,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "首选项"
+@@ -3040,10 +2978,6 @@
+ msgid "Preferred audio format"
+ msgstr "首选音乐格式"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr "首选格式"
+@@ -3434,18 +3368,6 @@
+ msgid "Search Magnatune"
+ msgstr "搜索 Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr "在新标签栏中查找Spotify..."
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3770,30 +3692,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr "Spotify"
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr "potify 插件未安装"
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr ""
+@@ -3803,7 +3705,6 @@
+ msgstr "开始转换"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3889,18 +3790,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "标签在上"
+@@ -4258,10 +4147,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "使用系统代理设置"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "已使用"
+@@ -4277,7 +4162,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "用户名"
+@@ -4505,20 +4389,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "您喜爱这个音轨"
+@@ -4579,7 +4449,6 @@
+ msgstr "提交的音轨:%1"
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4668,8 +4537,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
+diff -rauN clementine-1.0.1/src/translations/zh_TW.po clementine-libre-1.0.1/src/translations/zh_TW.po
+--- clementine-1.0.1/src/translations/zh_TW.po	2011-12-27 13:16:09.000000000 -0500
++++ clementine-libre-1.0.1/src/translations/zh_TW.po	2012-05-29 17:48:16.866419419 -0400
+@@ -253,10 +253,6 @@
+ msgid "A Grooveshark Anywhere account is required."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:162
+-msgid "A Spotify Premium account is required."
+-msgstr ""
+-
+ #: smartplaylists/wizard.cpp:72
+ msgid ""
+ "A smart playlist is a dynamic list of songs that come from your library.  "
+@@ -312,7 +308,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:113
+ #: ../bin/src/ui_magnatunesettingspage.h:155
+-#: ../bin/src/ui_spotifysettingspage.h:209
+ #: ../bin/src/ui_remotesettingspage.h:203
+ #: ../bin/src/ui_lastfmsettingspage.h:145
+ msgid "Account details"
+@@ -585,12 +580,6 @@
+ msgid "Always start playing"
+ msgstr "總是開始播放"
+ 
+-#: internet/spotifyblobdownloader.cpp:59
+-msgid ""
+-"An additional plugin is required to use Spotify in Clementine.  Would you "
+-"like to download and install it now?"
+-msgstr ""
+-
+ #: devices/afcdevice.cpp:62
+ msgid "An error occurred copying the iTunes database from the device"
+ msgstr ""
+@@ -816,10 +805,6 @@
+ msgid "CUE sheet support"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Cancel"
+-msgstr ""
+-
+ #: ../bin/src/ui_edittagdialog.h:634
+ msgid "Change cover art"
+ msgstr ""
+@@ -1020,10 +1005,6 @@
+ msgid "Configure Shortcuts"
+ msgstr "設定快速鍵"
+ 
+-#: internet/spotifyservice.cpp:491
+-msgid "Configure Spotify..."
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:491
+ msgid "Configure library..."
+ msgstr "設定音樂庫"
+@@ -1041,10 +1022,6 @@
+ msgid "Connect device"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:246
+-msgid "Connecting to Spotify"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:196
+ msgid "Constant bitrate"
+ msgstr ""
+@@ -1454,10 +1431,6 @@
+ msgid "Download this album..."
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:216
+-msgid "Download..."
+-msgstr ""
+-
+ #: internet/icecastservice.cpp:97
+ msgid "Downloading Icecast directory"
+ msgstr ""
+@@ -1470,10 +1443,6 @@
+ msgid "Downloading Magnatune catalogue"
+ msgstr "下載 Magnatune目錄"
+ 
+-#: internet/spotifyblobdownloader.cpp:43
+-msgid "Downloading Spotify plugin"
+-msgstr ""
+-
+ #: musicbrainz/tagfetcher.cpp:101
+ msgid "Downloading metadata"
+ msgstr "正在下載元數據"
+@@ -1623,10 +1592,6 @@
+ msgid "Error deleting songs"
+ msgstr ""
+ 
+-#: internet/spotifyblobdownloader.cpp:214
+-msgid "Error downloading Spotify plugin"
+-msgstr ""
+-
+ #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
+ #, qt-format
+ msgid "Error loading %1"
+@@ -1808,10 +1773,6 @@
+ msgid "Font size"
+ msgstr "字型大小"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:214
+-msgid "For licensing reasons Spotify support is in a separate plugin."
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:204
+ msgid "Force mono encoding"
+ msgstr ""
+@@ -2074,10 +2035,6 @@
+ "time a song finishes."
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:347
+-msgid "Inbox"
+-msgstr ""
+-
+ #: ../bin/src/ui_notificationssettingspage.h:408
+ msgid "Include album art in the notification"
+ msgstr "包括專輯封面的通知"
+@@ -2106,10 +2063,6 @@
+ msgid "Insert..."
+ msgstr "插入..."
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Installed"
+-msgstr ""
+-
+ #: ui/mainwindow.cpp:253
+ msgid "Internet"
+ msgstr "網際網路"
+@@ -2412,7 +2365,6 @@
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:163
+ #: ../bin/src/ui_groovesharksettingspage.h:116
+ #: ../bin/src/ui_magnatunesettingspage.h:164
+-#: ../bin/src/ui_spotifysettingspage.h:212
+ #: ../bin/src/ui_remotesettingspage.h:205
+ #: ../bin/src/ui_lastfmsettingspage.h:147
+ msgid "Login"
+@@ -2488,10 +2440,6 @@
+ msgid "Main profile (MAIN)"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:496
+-msgid "Make playlist available offline"
+-msgstr ""
+-
+ #: internet/lastfmservice.cpp:449
+ msgid "Malformed response"
+ msgstr "格式不正確的反應"
+@@ -2748,10 +2696,6 @@
+ msgid "Not enough neighbors"
+ msgstr "沒有足夠的鄰居"
+ 
+-#: internet/spotifysettingspage.cpp:75
+-msgid "Not installed"
+-msgstr ""
+-
+ #: globalsearch/globalsearchsettingspage.cpp:123
+ msgid "Not logged in"
+ msgstr ""
+@@ -2886,7 +2830,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:115
+ #: ../bin/src/ui_magnatunesettingspage.h:165
+-#: ../bin/src/ui_spotifysettingspage.h:211
+ #: ../bin/src/ui_networkproxysettingspage.h:169
+ msgid "Password"
+ msgstr "密碼"
+@@ -2993,10 +2936,6 @@
+ msgid "Playlists"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:215
+-msgid "Plugin status:"
+-msgstr ""
+-
+ #: ui/equalizer.cpp:119
+ msgid "Pop"
+ msgstr "流行音樂"
+@@ -3027,7 +2966,6 @@
+ 
+ #: ../bin/src/ui_digitallyimportedsettingspage.h:166
+ #: ../bin/src/ui_magnatunesettingspage.h:166
+-#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
+ #: ../bin/src/ui_lastfmsettingspage.h:149
+ msgid "Preferences"
+ msgstr "偏好設定"
+@@ -3044,10 +2982,6 @@
+ msgid "Preferred audio format"
+ msgstr "首選的音頻格式"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:218
+-msgid "Preferred bitrate"
+-msgstr ""
+-
+ #: ../bin/src/ui_deviceproperties.h:380
+ msgid "Preferred format"
+ msgstr ""
+@@ -3438,18 +3372,6 @@
+ msgid "Search Magnatune"
+ msgstr "搜尋 Magnatune"
+ 
+-#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
+-msgid "Search Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:338
+-msgid "Search Spotify (opens a new tab)"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:489
+-msgid "Search Spotify (opens a new tab)..."
+-msgstr ""
+-
+ #: ../bin/src/ui_globalsearchwidget.h:61
+ msgid "Search around all your sources (library, internet services, ...)"
+ msgstr ""
+@@ -3774,30 +3696,10 @@
+ msgid "Speex"
+ msgstr ""
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:208
+-msgid "Spotify"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:179
+-msgid "Spotify login error"
+-msgstr ""
+-
+-#: ../bin/src/ui_spotifysettingspage.h:213
+-msgid "Spotify plugin"
+-msgstr ""
+-
+-#: internet/spotifyblobdownloader.cpp:58
+-msgid "Spotify plugin not installed"
+-msgstr ""
+-
+ #: ../bin/src/ui_transcoderoptionsmp3.h:201
+ msgid "Standard"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:343
+-msgid "Starred"
+-msgstr ""
+-
+ #: core/commandlineoptions.cpp:148
+ msgid "Start the playlist currently playing"
+ msgstr "開始播放目前播放清單"
+@@ -3807,7 +3709,6 @@
+ msgstr "開始轉碼"
+ 
+ #: internet/groovesharksearchplaylisttype.cpp:36
+-#: internet/spotifysearchplaylisttype.cpp:36
+ #, qt-format
+ msgid "Start typing in the search box above to find music on %1."
+ msgstr ""
+@@ -3893,18 +3794,6 @@
+ msgid "Switch provider"
+ msgstr ""
+ 
+-#: internet/spotifyservice.cpp:515
+-msgid "Syncing Spotify inbox"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:510
+-msgid "Syncing Spotify playlist"
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:519
+-msgid "Syncing Spotify starred tracks"
+-msgstr ""
+-
+ #: widgets/fancytabwidget.cpp:650
+ msgid "Tabs on top"
+ msgstr "標籤在上面"
+@@ -4262,10 +4151,6 @@
+ msgid "Use the system proxy settings"
+ msgstr "使用系統代理伺服器設置"
+ 
+-#: ../bin/src/ui_spotifysettingspage.h:219
+-msgid "Use volume normalisation"
+-msgstr ""
+-
+ #: widgets/freespacebar.cpp:47
+ msgid "Used"
+ msgstr "已用"
+@@ -4281,7 +4166,6 @@
+ 
+ #: ../bin/src/ui_groovesharksettingspage.h:114
+ #: ../bin/src/ui_magnatunesettingspage.h:163
+-#: ../bin/src/ui_spotifysettingspage.h:210
+ #: ../bin/src/ui_networkproxysettingspage.h:168
+ msgid "Username"
+ msgstr "帳號"
+@@ -4505,20 +4389,6 @@
+ msgid "You do not have a Grooveshark Anywhere account."
+ msgstr ""
+ 
+-#: internet/spotifysettingspage.cpp:149
+-msgid "You do not have a Spotify Premium account."
+-msgstr ""
+-
+-#: internet/spotifyservice.cpp:165
+-msgid ""
+-"You have been logged out of Spotify, please re-enter your password in the "
+-"Settings dialog."
+-msgstr ""
+-
+-#: internet/spotifysettingspage.cpp:158
+-msgid "You have been logged out of Spotify, please re-enter your password."
+-msgstr ""
+-
+ #: songinfo/lastfmtrackinfoprovider.cpp:95
+ msgid "You love this track"
+ msgstr "您愛這首歌曲"
+@@ -4578,7 +4448,6 @@
+ msgstr ""
+ 
+ #: internet/groovesharksettingspage.cpp:108
+-#: internet/spotifysettingspage.cpp:154
+ msgid "Your username or password was incorrect."
+ msgstr ""
+ 
+@@ -4667,8 +4536,6 @@
+ msgstr ""
+ 
+ #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
+-#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
+-#: internet/spotifysettingspage.cpp:62
+ msgid "kbps"
+ msgstr "kbps"
+ 
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index bfb9c430b..2aa38fca6 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -2,13 +2,13 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=crosstool-ng
-pkgver=1.14.1
+pkgver=1.15.2
 pkgrel=1
 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
 arch=('i686' 'x86_64')
 url="http://crosstool-ng.org/"
 license=(GPL2)
-depends=('cvs' 'curl')
+depends=('cvs' 'curl' 'gperf')
 makedepends=('libtool')
 optdepends=('subversion: for retrieving eglibc sources')
 source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
@@ -26,4 +26,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
-md5sums=('1e8e723df67c643ebdd529990607d5bf')
+md5sums=('0d03314debb73de37a72014632bf1ab3')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 94d5390ab..d77f392b6 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $
+# $Id: PKGBUILD 160716 2012-06-04 15:02:22Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=filesystem
-pkgver=2012.2
-pkgrel=5
+pkgver=2012.6
+pkgrel=1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -17,8 +17,8 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
-        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
-        'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
+        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+        'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
 md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          '6be47d893fd49b2e4a8c0e811b350861'
          '13753e4e0964f3652b0cc60a28528bdf'
@@ -31,6 +31,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '22518e922891f9359f971f4f5b4e793c'
          'd2dc4e39dbdea75b107f91789e3274ab'
@@ -43,10 +44,11 @@ package() {
 	#
 	# setup root filesystem
 	#
-	for d in bin boot dev etc home media mnt sbin usr var opt srv/http sys run; do
+	for d in boot dev etc home media mnt usr var opt srv/http run; do
 		install -d -m755 ${d}
 	done
 	install -d -m555 proc
+	install -d -m555 sys
 	install -d -m0750 root
 	install -d -m1777 tmp
 	# vsftpd won't run with write perms on /srv/ftp
@@ -54,7 +56,7 @@ package() {
 
 	# setup /etc
 	install -d etc/{ld.so.conf.d,skel,profile.d}
-	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
 		install -m644 ${srcdir}/${f} etc/
 	done
 	ln -s /proc/self/mounts etc/mtab
@@ -65,17 +67,15 @@ package() {
 	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 
 	# setup /var
-	for d in cache/man local opt log/old lib/misc empty run; do
+	for d in cache/man local opt log/old lib/misc empty; do
 		install -d -m755 var/${d}
 	done
-	install -d -m1777 var/{tmp,spool/mail,lock}
+	install -d -m1777 var/{tmp,spool/mail}
 	# allow setgid games to write scores
 	install -d -m775 -g games var/games
 	ln -s spool/mail var/mail
-	# not ready yet, needs possible change in pacman or other magic
-	# is fixed by initscripts on next boot
-#	ln -s ../run var/run
-#	ln -s ../run/lock var/lock
+	ln -s ../run var/run
+	ln -s ../run/lock var/lock
 
 	#
 	# setup /usr hierarchy
diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release
new file mode 100644
index 000000000..fe5f20b4f
--- /dev/null
+++ b/libre/filesystem/os-release
@@ -0,0 +1,8 @@
+NAME="Parabola"
+ID=parabola
+ID_LIKE=arch
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ANSI_COLOR="1;35"
+HOME_URL="https://parabolagnulinux.org/"
+BUG_REPORT_URL="https://labs.parabola.nu/"
+
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index c27cf61f9..b74958e3c 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 153262 2012-03-12 17:29:57Z jgc $
+# $Id: PKGBUILD 160766 2012-06-05 08:51:20Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=gstreamer0.10-bad-libre
 pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
 pkgver=0.10.23
-pkgrel=1.2
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool !emptydirs)
 source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
@@ -26,10 +26,15 @@ build() {
   sed -e 's/gst sys ext/gst/' -i Makefile
 }
 
+# Disable for now: 2 tests fail, one of them is because of not having a camera during build.
+#check() {
+#  cd "${srcdir}/gst-plugins-bad-${pkgver}"
+#  make check
+#}
+
 package_gstreamer0.10-bad-libre() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
   depends=('gstreamer0.10-base>=0.10.34')
-  groups=('gstreamer0.10-plugins')
   provides=("gstreamer0.10-bad=$pkgver")
   conflicts=('gstreamer0.10-bad')
   replaces=('gstreamer0.10-bad')
@@ -40,7 +45,7 @@ package_gstreamer0.10-bad-libre() {
 
 package_gstreamer0.10-bad-libre-plugins() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
-  depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg')
+  depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi')
   groups=('gstreamer0.10-plugins')
   install=gstreamer0.10-bad-plugins.install
   provides=("gstreamer0.10-bad-plugins=$pkgver")
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 81b24e100..c2cec2e13 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,5 @@
 # $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 # Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
@@ -6,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.12.4
-pkgrel=1
+pkgrel=4
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -28,24 +29,39 @@ provides=("${_pkgname}=${pkgver}")
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a063f76aa47edab55a3f31ff2558df07'
+         '2fe18f4091afb3dec200271dc7836128')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
  export PYTHON=python2
+
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
  sed -i 's|python ./print.py|python2 ./print.py|' scan.py
  sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+        local i
+        for i in ppd/hpijs/*.ppd.gz ; do
+                rm -f ${i}.temp
+                gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+                        gzip > ${i}.temp || return 1
+                mv ${i}.temp ${i}
+        done
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 
  ./configure --prefix=/usr \
              --enable-qt4 \
-             --enable-foomatic-rip-hplip-install \
+             --disable-foomatic-rip-hplip-install \
              --enable-foomatic-ppd-install \
              --enable-hpcups-install \
              --enable-new-hpcups \
@@ -70,5 +86,3 @@ package() {
  mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
  rm "$pkgdir"/lib -r
 }
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
-         '2fe18f4091afb3dec200271dc7836128')
diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
index cb0eaf8e8..74532cde3 100644
--- a/libre/hplip-libre/hplip.install
+++ b/libre/hplip-libre/hplip.install
@@ -8,3 +8,11 @@ NOTE
 
 EOF
 }
+
+post_upgrade() {
+  if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+    # important upgrade notice
+    echo "> Please remove your printer in cups, then add it"
+    echo "> back and reconfigure it to make it work again!"
+  fi
+}
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index b03b8196b..8e03cb882 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,12 +9,12 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=13.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
-_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
@@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('5ff63ad5c05d6d1b6602ad5741a0ebbe'
-         'ba39d79b5d311942e638668e2e4ed2c9'
-         '7f090255a9fe67dd690659ee174ee7a8'
-         '4c6bd176a604e52c72d9d879aa16ef92'
-         '2a5589be415e0fe395c16d59cdc7c91a'
-         '9e7908cee8a30ca2514bfb30ad8a73a1'
-         '19d7de55b66a939400384d5ff463b6e8'
-         'd9270f14e3119d6395345a1e211ae6be'
-         '3becb7d177c66b261a21af21b7ec9cb5'
-         '68758f2d56daa04c456b53852b811ae6'
-         'c128c138f022a1d81313fcbfa332dfe3'
-         'af0f6166f137fcd886e39e6f09c6bdf1'
-         'fea6cbd83d51a6c07b36ff33ffc0dd64'
-         'cf2c157ee82b06ca7d10fed9f0c3e71a'
-         '85816cd36489cbee7e3ac8ebde0f6217'
-         'a34727f3cb2e32133a280978dc354b01'
-         'e31213480521b80600207fd67adda16a'
-         '53b15a8b5ef4659bf67dc66ba946e2d2'
-         '4fa7defd9b33e26231e3d236b0fd9d8c'
-         '6788e9cdd0cc01b82d9a49800ce809ed'
-         '26cbb5f5afe5fbaa26716a297b6b2a46'
-         'df5c334e257805af2ebdf685a643e706'
-         '898a92607281f0263d670b4eb28ca224'
-         '8aa4093d5f55587dcf951201301c5246'
-         '1f4531c0c5f41a5095d811c107d276ac'
-         '907f8599e1e4a342b3b19072661cc72e'
-         '4db5b7af448becc5dd56e0a0cb9f908d'
-         '0fb24139ee7ea7b7c340d31e9e58ae04'
-         '7ff7ae7d1cd9a713dad7070c38dd4f42'
-         'f8f6385a9f6c1ecaa8d299ac72aa046e'
-         '49c99a2a04144e6b33cafed7e33b47ea'
-         'bc9a4b47fd087ceefce8745a2cedd615'
-         'd7a4703936bfde284cc46d68dede421f'
-         '615df26846bf62714466a7e1dd2a7e5e'
-         '3c666f8153645a9d958753eb5e910ef2'
-         '5217d26e9f4465db7433e77b7bbc5233'
-         'd3ffdf2ece6ca4d84fc0061371690b28'
-         'ccf85e0bc3be22824e1aa5ad99873248'
-         'e3bf49a5c040bf88583d5aa1b886eeea'
-         'a3c545319134c7febf801bb45722ab6f'
-         '48c9d21d50e2b5ccb3c0d1a5f8b46bb5'
-         'df6a5bedd8f5684f8b8b3f6fc11e7ceb'
-         'f82373a67a80e8ab9c39678e3eb92353'
-         '72084f9a0960ca6d3ac4a3b16b27e6e5'
-         '66763631a58e597fbd0e69f73bf08c94'
-         'af8c4e38439d6ad799eb071a9e59742f'
-         'fba1d988df08fbd991b961a35ccfd56e'
-         'b1792658b67d09c6cb1b28c73253668a'
-         'd0398797d63b6ba71478cb6ea00bae35'
-         '8cb0fa6026c0303b603969563b2ef911'
-         'f1d6d2f4a6a937f802040dc295e4e112'
-         '0f57699e98cc355de7c3bdaccbbfb832'
-         '7b86f62efab9124feda8793fda381a3a'
-         '84f27e886c65c91a2aeb3cfc9bfddff4'
-         'b55de8bc0f7c5a24de8b53a2fea82478'
-         '954f672c975029c170e7a77156e23557'
-         'f4758ff2db7be02c7498f635c17505a3'
-         'f24a6033051be1d638790dc5b1fa9198'
-         '573df4582c8fd6941b044f40900d4c99'
-         'a413353b6d7b50659b681d76cdd8f776'
-         '3a9147ba480b4aececbc70aa33fc9917'
-         '37319736f6e25d70add33217eff30818'
-         '2a4bc9f1c0b55f37e7fc92ef3ab8cf5d'
-         '1fff9acffe3326545beb09c740d44b6b'
-         '62d690efe261982864d3fa32e0239a96'
-         '082d3648630d6598a39f677da29cff36'
-         '228708e4516f88e68f829f1a9db61c57'
-         '9cc41239414fdc754c3b793f1d7e3687'
-         '760e3e973ba13d237eeec5242d2ac844'
-         '631e269b9b67af6a5051c66fe83817c0'
-         '0a87ae60bf970f9fa37b00d9682e2213'
-         'dc02816eb0a9abe9ebd92aa80b7d494a'
-         '11d5de175fc96065d89d06474f6aaeeb'
-         '5e0d0cfe252ad6209ca1fb5dba69e0f7'
-         'ddb128f54193c45b88640cf157420f3b'
-         '53d1ecb05a575de362868efcfdd6043f'
-         'b7440790e099bc475f5e5fe18440dbe4'
-         '6affd9862729c6c6697f96464c7475bc'
-         'd6ddadc8f0d32c2c3e601ae825881fac'
-         '4dfb121fdaab263e650fe741f6d353c3'
-         '45b4d8707e1bfd30e0b5393bb2e09533'
-         '51d955380bd47c8c6709a6a47b54f600'
-         '9f6818419d059157cb995a86892ad1f7'
-         'b7a7679359068b22efc4ba5902a7db39')
+md5sums=('e35b6b08fb314569174a12fb5d289f21'
+         'f7b4e4e93fc8a34b38af201d3dc5665d'
+         '16b41103c5ae2325884d266a4fa6ef2e'
+         '86829f63977541a6f8b241b352891fc8'
+         '442b5518d9e91a577de05e5e7bd4c1a3'
+         '771de4f956802cd2199e9a153ad7e93b'
+         '55612034c6b9aed03268f9387f6af846'
+         '00a47e3c42377a060d3b73a015a53615'
+         '10b1bd554a5390b15e441ee631663052'
+         '54780d957f68d12c1a22a014b099f504'
+         'dcdbb703a40aec783f62a994765a6298'
+         'eddaa79e00457f6a8ecab407fac979b1'
+         '49b6f4928bc1d0411368809ba47580b3'
+         'd0570b0084e5ec860626887e08ccdd90'
+         'a19c12048002e057afc3d1ca5bae4ad9'
+         '0a492ec08fa304b4bf6d83a65b549ff9'
+         '76f67c9ee46feca9d18d2bb30014816f'
+         'c3d9f562c28598307c740e4d4dd7348e'
+         '7567922156989828cd5c0e28a315e195'
+         'df91ab90a3e1fef34f5848a9f6444468'
+         '7d8e45e6e3da8b7d4a1cf94548583262'
+         'a661b6a102c5d98de9649d86cab880e0'
+         '51695205bfdddf982bb746cf4468ea1b'
+         '19de09fc98cde75bfa88c5274eff7cae'
+         'a59ef12c791749a6eca60ee001617751'
+         '53cbe9dfb8b124d579fcabaf8dcfafce'
+         '44de34e679070df84e74dee75c70c544'
+         'ee98508a21f6ff480f65924c1069965d'
+         '9827926ba6f4bba2858410b998fcb05b'
+         '0833c07b595ce249a384b1dda8f34963'
+         '0f3f0c3cf0813e91f570141b7e0212a4'
+         'f6fd9346dc9a0c16058ad765a808809b'
+         '8284e350944633e38c86d3ce6b30a23e'
+         'f67a900d496426c87478ad9bbc6ebbb0'
+         '3d67d29fcf015a4726a3b63c3e56efa6'
+         'a4dd7eecd30aa8e5675239ecb2aac643'
+         '17e14278b65190304b174fe2cb7f0ba7'
+         '7919d3e268fbe9a9385ae61da767972a'
+         '8ca4ea94c9433fa93270d6942f7bbdca'
+         '163c71e0d58891e4e4812c6f410b34e3'
+         '3e343f4039ba87817cbe4209f0828da2'
+         'c0993d2d4409635d5a5cc55a5dc22afa'
+         '9e9ebb4b90e64dc3bda9912ec68f5919'
+         'bf8f1b84ea8dbea3b35bef433cf0f513'
+         'f3c00bf1812f3f2ed940372100ef6baa'
+         'b8789e2547a5c507297fd75d10c61e47'
+         '8cafb2f5804a985f521d0fd8c4ac38e6'
+         'e74a59d6927b4f56804a412a70354be2'
+         '4d680519a811201ebf57944201c92522'
+         'fe24a7f2620b8743604784bc56600b0f'
+         'dfdb2c6b135ab98e2652c19136496c12'
+         '504fdcaf8730829d5c6d48b5fa8c89a8'
+         '459400531f8414c5b527a98cf5c854cd'
+         'b24b7067ba0a293f12e23a80998de2b8'
+         '2ffebdb22377309bacfa4f35e78e53ee'
+         '7f32199165b0aeca6dffb43ddd4e7934'
+         '9cddba25c3042a29d43e7d986ae9a2fe'
+         'b10c6b5ba44de100402a451fb0f87a0b'
+         '7ff013fd4b1eb6343d4d94c80697b0b8'
+         '24987ec9124fe40503d6218943f7f2c1'
+         '88ccdd6115de5e0e121aba11d8881f9d'
+         'f53d6573ab123cc740edff0a0f051214'
+         'bb8ebd84fbb6e85716633730986f8afb'
+         '308ab080c1a1978916d50277d7b1e170'
+         '6954762d9100f3f59f83a04833c6fc8b'
+         '11cbdb81af5cb5691b362a6fbb54522e'
+         '06df7af5c296be68853fbcaf6c11d354'
+         '321f8f412ad21213ee4bc9e5831e6061'
+         '4f7177bab3fb5e3f31f954e73403803f'
+         '6edd087d6c667739687426922961cdcf'
+         'b3d74b6ceab4befa4c42d245cbdfdbe4'
+         '3f6df88d121bd305740014e1677328f8'
+         'df58cc660670b906925aa22a5136aeaf'
+         '590727cebf9bdb599358b4b2d3ed40f9'
+         'f4d0f0184e77f3ea9585296b820de2cd'
+         'd074f5f4167585fc62ae802b7929669e'
+         'd5810f44cc19b5629183da39b234f92c'
+         '777d7caca99c317c3e71f464f53983d6'
+         'f9cfe429a139e450c3bb859d2224441c'
+         '468a90cc6648bd4ed7b39afc3e3dc253'
+         'de53d77cc1cd0126de3f00ddc24afe08'
+         'dddedd2b83b3083ce01ae25824a2eaf5'
+         '1e3122decb28bf37b630f84b05e02be8'
+         '9666c6e23b39f07d3b0b286e7514e3fd')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
new file mode 100644
index 000000000..4da03a569
--- /dev/null
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,271 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
+---
+ browser/components/migration/content/migration.js       |   15 ++++++++++-----
+ browser/components/migration/content/migration.xul      |    2 +-
+ .../migration/src/BrowserProfileMigrators.manifest      |    2 +-
+ .../components/migration/src/FirefoxProfileMigrator.js  |    2 +-
+ browser/components/migration/src/ProfileMigrator.js     |    4 ++++
+ .../en-US/chrome/browser/migration/migration.dtd        |    2 --
+ .../en-US/chrome/browser/migration/migration.properties |   11 +++++------
+ toolkit/content/aboutSupport.js                         |    8 ++++----
+ toolkit/content/jar.mn                                  |    2 +-
+ toolkit/content/resetProfile.js                         |    6 ++----
+ toolkit/profile/nsIProfileMigrator.idl                  |   10 +++++++++-
+ toolkit/xre/nsAppRunner.cpp                             |    2 +-
+ 83 files changed, 394 insertions(+), 382 deletions(-)
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index ffb0c34..442a5ff 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -314,7 +314,7 @@ var MigrationWizard = {
+     }
+ 
+     var bundle = document.getElementById("brandBundle");
+-    // These strings don't exist when not using official branding. If that's
++    // These strings may not exist when not using official branding. If that's
+     // the case, just skip this page.
+     try {
+       var pageTitle = bundle.getString("homePageMigrationPageTitle");
+@@ -346,8 +346,8 @@ var MigrationWizard = {
+       case "chrome":
+         source = "sourceNameChrome";
+         break;
+-      case "firefox":
+-        source = "sourceNameFirefox";
++      case "self":
++        source = "brand";
+         break;
+     }
+ 
+@@ -357,8 +357,13 @@ var MigrationWizard = {
+     var oldHomePageURL = this._migrator.sourceHomePageURL;
+ 
+     if (oldHomePageURL && source) {
+-      var bundle2 = document.getElementById("bundle");
+-      var appName = bundle2.getString(source);
++      var appName;
++      if (source == "brand") {
++        appName = bundle.GetStringFromName("brandFullName");
++      } else {
++        var bundle2 = document.getElementById("bundle");
++        appName = bundle2.getString(source);
++      }
+       var oldHomePageLabel = bundle.getFormattedString("homePageImport",
+                                                        [appName]);
+       var oldHomePage = document.getElementById("oldHomePage");
+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
+index f8653b1..f3ac62a 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -76,7 +76,7 @@
+ #endif
+ #endif
+       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>
+-      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>
++      <radio id="self"      hidden="true"/>
+       <radio id="fromfile"  label="&importFromHTMLFile.label;"  accesskey="&importFromHTMLFile.accesskey;" hidden="true"/>
+       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>
+     </radiogroup>
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index f49e481..e490ddf 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,4 +3,4 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index 7b4a6e4..add5bc4 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {
+   ]),
+ 
+   classDescription: "Firefox Profile Migrator",
+-  contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",
++  contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",
+   classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")
+ };
+ 
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index ea66675..fe4df10 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {
+                            params);
+   },
+ 
++  canMigrate: function PM__canMigrate(aMigratorKey) {
++    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++  },
++
+   _toCString: function PM__toCString(aStr) {
+     let cstr = Cc["@mozilla.org/supports-cstring;1"].
+                createInstance(Ci.nsISupportsCString);
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 86e9d0b..8df7864 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -13,8 +13,6 @@
+ <!ENTITY importFromSafari.accesskey     "S">
+ <!ENTITY importFromChrome.label         "Chrome">
+ <!ENTITY importFromChrome.accesskey     "C">
+-<!ENTITY importFromFirefox.label        "Firefox">
+-<!ENTITY importFromFirefox.accesskey    "X">
+ <!ENTITY importFromHTMLFile.label       "From an HTML File">
+ <!ENTITY importFromHTMLFile.accesskey   "F">
+ 
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 495ed78..0272654 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -4,7 +4,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+ 
+ importedBookmarksFolder=From %S
+ importedSearchURLsFolder=Keyword Searches (From %S)
+@@ -21,27 +20,27 @@ importedSafariBookmarks=From Safari
+ 2_ie=Cookies
+ 2_safari=Cookies
+ 2_chrome=Cookies
+-2_firefox=Cookies
++2_self=Cookies
+ 
+ 4_ie=Browsing History
+ 4_safari=Browsing History
+ 4_chrome=Browsing History
+-4_firefox=Browsing History
++4_self=Browsing History
+ 
+ 8_ie=Saved Form History
+ 8_safari=Saved Form History
+ 8_chrome=Saved Form History
+-8_firefox=Saved Form History
++8_self=Saved Form History
+ 
+ 16_ie=Saved Passwords
+ 16_safari=Saved Passwords
+ 16_chrome=Saved Passwords
+-16_firefox=Saved Passwords
++16_self=Saved Passwords
+ 
+ 32_ie=Favorites
+ 32_safari=Bookmarks
+ 32_chrome=Bookmarks
+-32_firefox=Bookmarks
++32_self=Bookmarks
+ 
+ 64_ie=Other Data
+ 64_safari=Other Data
+diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
+index c86d80c..ff1ccfe 100644
+--- a/toolkit/content/aboutSupport.js
++++ b/toolkit/content/aboutSupport.js
+@@ -608,13 +608,13 @@ function populateResetBox() {
+                          .getService(Ci.nsIToolkitProfileService);
+   let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+ 
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+   // Only show the reset box for the default profile if the self-migrator used for reset exists.
+   try {
+     if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||
+-        !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))
++        !("@mozilla.org/toolkit/profile-migrator;1" in Cc))
++      return;
++    let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++    if (!("canMigrate" in pm) || !pm.canMigrate("self"))
+       return;
+     document.getElementById("reset-box").style.visibility = "visible";
+   } catch (e) {
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 6f0d2d6..da7342b 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -38,7 +38,7 @@ toolkit.jar:
+ +  content/global/mozilla.xhtml               (mozilla.xhtml)
+ *+ content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
+    content/global/resetProfile.css            (resetProfile.css)
+-*  content/global/resetProfile.js             (resetProfile.js)
++   content/global/resetProfile.js             (resetProfile.js)
+ *  content/global/resetProfile.xul            (resetProfile.xul)
+ *  content/global/treeUtils.js                (treeUtils.js)
+ *+ content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index 975a9ed..d8e46b1 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+ 
+ // based on onImportItemsPageShow from migration.js
+ function onResetProfileLoad() {
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+   const MAX_MIGRATED_TYPES = 16;
+ 
+   var migratedItems = document.getElementById("migratedItems");
+-  var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
++  var bundle = Services.strings.createBundle("chrome://browser" +
+                                              "/locale/migration/migration.properties");
+ 
+   // Loop over possible data to migrate to give the user a list of what will be preserved. This
+@@ -21,7 +19,7 @@ function onResetProfileLoad() {
+     var itemID = Math.pow(2, i);
+     try {
+       var checkbox = document.createElement("label");
+-      checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));
++      checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));
+       migratedItems.appendChild(checkbox);
+     } catch (x) {
+       // Catch exceptions when the string for a data type doesn't exist because it's not migrated
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index e941336..5b264af 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports
+  * @client   Toolkit (Startup code)
+  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
+  */
+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
+ interface nsIProfileMigrator : nsISupports 
+ {
+   /**
+@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports
+    * @note The startup code ignores COM exceptions thrown from this method.
+    */
+   void migrate(in nsIProfileStartup aStartup, in ACString aKey);
++
++  /**
++   * Returns whether a given migration type is supported.
++   *
++   * @param  aKey   Migrator key
++   * @returns whether the migrator key is supported.
++   */
++  bool canMigrate(in ACString aKey);
+ };
+ 
+ %{C++
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 32eef5c..dbe1580 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
+             if (gDoProfileReset) {
+               // Automatically migrate from the current application if we just
+               // reset the profile.
+-              aKey = MOZ_APP_NAME;
++              aKey = "self";
+               pm->Migrate(&dirProvider, aKey);
+               // Set the new profile as the default after migration.
+               rv = SetCurrentProfileAsDefault(profileSvc, profD);
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 85ede7409..3875bbc3d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -3,6 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -12,8 +13,8 @@ _pgo=false
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=13.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -49,17 +50,19 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         libre.patch
         iceweasel-install-dir.patch
         region.properties
-        vendor.js)
-md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
-         '08aa0a949d9cbb26116490f7878a62fe'
-         'd7ad1c025d2442427a06cc702906ef0d'
+        vendor.js
+        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
+md5sums=('e440446bb92dc1c0311346c68024590b'
+         'cb8bfb543002a5d78db7e8661f9f87ec'
+         'a9848e41461776bc4bf8d2de824b1204'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '64be2fab525189c285ee04495d628035'
+         '1c23b150a9c2eeb378f167a1dfa09d89'
          'e529742c0a425648087bc3ce537fe4c5'
          'f1c76e7e244257856a386ca2de69bdf0'
-         '0d053487907de4376d67d8f499c5502b')
+         '0d053487907de4376d67d8f499c5502b'
+         '41ce105f0c1877fe22e0c0ec45e09565')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -78,6 +81,9 @@ dpkg-source() {
 # Doesn't apply and seems unimportant
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
+# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
+  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
+
   quilt push -a
   find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
   cd ..
@@ -98,6 +104,10 @@ if [ $NOEXTRACT -eq 0 ]; then
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
   patch -Np1 -i "$srcdir/libre.patch"
+
+# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
+
 fi
 
   cd "$srcdir/mozilla-build"
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index ecebbb3ce..7b4e6a395 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,13 +1,13 @@
-diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- mozilla-build/browser/app/profile/firefox.js.orig	2012-03-20 01:04:55.890545738 -0300
-+++ mozilla-build/browser/app/profile/firefox.js	2012-03-20 01:05:03.330545430 -0300
+diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js
+--- mozilla-build.orig/browser/app/profile/firefox.js	2012-06-01 09:03:47.000000000 -0300
++++ mozilla-build/browser/app/profile/firefox.js	2012-06-05 19:53:08.847012282 -0300
 @@ -64,11 +64,11 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
 -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 +pref("extensions.getAddons.get.url", "");
@@ -18,7 +18,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
+@@ -92,7 +92,7 @@
  pref("extensions.autoDisableScopes", 15);
  
  // Dictionary download preference
@@ -27,7 +27,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // The minimum delay in seconds for the timer to fire.
  // default=2 minutes
-@@ -200,7 +200,7 @@
+@@ -218,7 +218,7 @@
  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
                                              // Themes every day
  // Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -36,7 +36,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                  // restart.
-@@ -234,7 +234,7 @@
+@@ -252,7 +252,7 @@
  // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
  // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
  pref("browser.startup.page",                1);
@@ -45,7 +45,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
  // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
+@@ -345,7 +345,7 @@
  pref("browser.download.manager.resumeOnWakeDelay", 10000);
  
  // search engines URL
@@ -54,7 +54,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // pointer to the default engine name
  pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
+@@ -593,7 +593,7 @@
  pref("accessibility.typeaheadfind.flashBar", 1);
  
  // plugin finder service url
@@ -63,21 +63,9 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
  pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js
---- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js	2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0.1/browser/base/content/syncSetup.js	2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
- 
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-21 09:55:31.032062468 +0000
+diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-01 09:03:48.000000000 -0300
++++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-05 20:07:51.593611484 -0300
 @@ -1,8 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -98,9 +86,9 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
---- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html	2011-12-21 10:04:42.988062659 +0000
+diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
+--- mozilla-build.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
++++ mozilla-build/build/pgo/blueprint/elements.html	2012-06-05 20:37:22.059133787 -0300
 @@ -143,7 +143,7 @@
        </p>
        <p>
@@ -110,10 +98,10 @@ diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1
        </p>
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
---- iceweasel-9.0.1.orig/dom/ipc/test.xul	2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0.1/dom/ipc/test.xul	2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- mozilla-build.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
++++ mozilla-build/dom/ipc/test.xul	2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
  
@@ -121,9 +109,9 @@ diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
 +  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
-diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul	2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul	2011-12-21 10:03:06.408062626 +0000
+diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
+--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
++++ mozilla-build/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
 @@ -69,6 +69,6 @@
         label="setViewportScale"/>
    </toolbar>
@@ -132,16 +120,16 @@ diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/la
 +  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
             remote="true"/>
  </window>
-diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js
---- mozilla-build/mobile/xul/app/mobile.js.orig	2012-03-20 01:02:30.300551777 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js	2012-03-20 01:02:40.820551342 -0300
-@@ -220,13 +220,12 @@
+diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js
+--- mozilla-build.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/xul/app/mobile.js	2012-06-05 20:48:20.193241600 -0300
+@@ -221,13 +221,12 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
 -pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
 -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
@@ -155,8 +143,8 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
  
  /* preference for the locale picker */
  pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
+@@ -247,7 +246,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
@@ -164,9 +152,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties	2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties	2011-12-21 09:54:17.560062443 +0000
+diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
+--- mozilla-build.orig/mobile/locales/en-US/chrome/region.properties	2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/locales/en-US/chrome/region.properties	2012-06-05 20:53:03.264432170 -0300
 @@ -1,8 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -187,9 +175,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties ice
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js
---- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0.1/modules/libpref/src/init/all.js	2011-12-21 10:09:17.136062754 +0000
+diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js
+--- mozilla-build.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
++++ mozilla-build/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
 @@ -47,7 +47,7 @@
  // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
  //  The first character after a period must be alphabetic.
@@ -199,9 +187,9 @@ diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/m
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-21 12:51:31.188066096 +0000
+diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
+--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-01 09:04:20.000000000 -0300
++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-05 20:58:59.068158482 -0300
 @@ -4,10 +4,10 @@
  pluginStartupMessage=Starting Plugin for type
  
@@ -219,15 +207,15 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region
 +plugindoc_label=gnuzilla.gnu.org
 +plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
  
---- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in	2012-02-07 15:40:34.279657460 -0300
-+++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in	2012-02-07 15:40:19.226324812 -0300
-@@ -11,13 +11,13 @@
+diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-build.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
++++ mozilla-build/browser/locales/generic/profile/bookmarks.html.in	2012-06-05 21:03:38.239300038 -0300
+@@ -11,13 +11,12 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
      <DL><p>
 -        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+        <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A>
-+        <DT><A HREF="https://parabolagnulinux.org/">Parabola</A>
++        <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</A>
      </DL><p>
      <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
      <DL><p>
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 933527aa9..9799d2b5e 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158132 2012-05-03 13:20:07Z andrea $
+# $Id: PKGBUILD 160657 2012-06-03 10:02:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.8.3
-pkgrel=1
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -14,7 +14,8 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
+        'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+        'media-player-info')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 provides=("kdelibs=$pkgver")
 replaces=('kdelibs-experimental' 'kdelibs')
@@ -52,7 +53,8 @@ build() {
                -DSYSCONF_INSTALL_DIR=/etc \
                -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
                -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
+               -DWITH_FAM=OFF \
+               -DWITH_HUpnp=OFF
        make
 }
 
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3593442f9..6ca3d1e8b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=32
+_sublevel=33
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.32 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '1fc88c19baf04fbb37385712ad9c4d57'
-         'df7e69a7b238c6492b589cc2beb894d2'
-         '2ef390e115d6ae1c074c30fec9258442'
+         '3076be33631914b638eb9f313dc17d08'
+         '9cfcf3807201ce44aa720571232a10ce'
+         '8bb5c5aa217202c3ac3798ba7798e07d'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         'bacdceaf5ce186cfe69dffc89cd246a0')
+         '9c4fed22ad8ea99a54d20c22a63ad3d7')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 7094b2731..83bab0f8c 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -4998,7 +4998,8 @@ CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
 CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index f7cd1263b..fa7be5e5b 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -4739,7 +4739,8 @@ CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
 CONFIG_SIGMA=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 6cd9761a7..b6a6f731c 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.32-1-LIBRE-LTS
+KERNEL_VERSION=3.0.33-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index ae3f19ae1..219659c25 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,18 +12,17 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE
 _basekernel=3.4
-#_sublevel=6
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
-_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
-pkgrel=1.2
+_sublevel=1
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -35,16 +34,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'i915-fix-ghost-tv-output.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
-         #'6d9d139e4b53802615833372728cc0e4'
-         '631bee7d8e6e125f859fc51200699685'
-         '54f6db6c3b747fbee10cb02460ba66f0'
+         '9b5bcbc2f77807f66a50d5e34d4ce42e'
+         '669c3f9d5c6a2109bad8e511287826c3'
+         '454231e14419e56a5281eb7bc6fde83e'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         'de092ff42e61e88a67f50c351c2ad7c0')
+         'f70a4bf0ee00d8be680cfbd65459836d')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 0bea26739..a6e1a6310 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -411,6 +411,7 @@ CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
 # CONFIG_MICROCODE_INTEL is not set
 # CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
@@ -5177,7 +5178,8 @@ CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 8a4734dac..9f3698ac2 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.0-1 Kernel Configuration
+# Linux/x86_64 3.4.1-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -389,6 +389,7 @@ CONFIG_I8K=m
 CONFIG_MICROCODE=m
 # CONFIG_MICROCODE_INTEL is not set
 # CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -4949,7 +4950,8 @@ CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6a2a2795a..74143e1cd 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.4.0-1.2-LIBRE
+KERNEL_VERSION=3.4.1-1-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index b5b67689a..3ef5c65ee 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -8,13 +8,13 @@
 _pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
 pkgver=34578
-pkgrel=5
+pkgrel=5.1
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl-libre'
-         'lame-libre' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
+         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
          'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2'
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 914c939d2..9117277a7 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=pacman-mirrorlist-libre
 pkgver=$(date +%Y%m%d)
 pkgrel=1
-pkgdesc="Parabola GNU/Linux mirror list for use by pacman"
+pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman"
 arch=('any')
-url="http://repo.parabolagnulinux.org/mirrorlist.txt"
+url="https://repo.parabolagnulinux.org/mirrorlist.txt"
 license=('GPL')
 groups=('base')
 backup=(etc/pacman.d/mirrorlist)
@@ -15,7 +15,7 @@ source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
-md5sums=('3c7958c93c36a41ad18f8d09fd1803ff')
+md5sums=('83cc258f57e6e9501246270bf776849e')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
diff --git a/libre/systemd b/libre/systemd
deleted file mode 160000
-Subproject dd743ddf0d2297079591f90dc75938de160ac55
diff --git a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
new file mode 100644
index 000000000..06fc30944
--- /dev/null
+++ b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
@@ -0,0 +1,27 @@
+From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 2 Apr 2012 08:20:34 -0400
+Subject: [PATCH] check for proper return from dirent_ensure_type
+
+Fixes 'systemctl list-unit-files', which previously returned only:
+
+  Failed to issue method call: No such file or directory
+---
+ src/install.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/install.c b/src/install.c
+index 174d79b..9256116 100644
+--- a/src/install.c
++++ b/src/install.c
+@@ -1853,7 +1853,7 @@ int unit_file_get_list(
+
+                         r = dirent_ensure_type(d, de);
+                         if (r < 0) {
+-                                if (errno == ENOENT)
++                                if (r == -ENOENT)
+                                         continue;
+
+                                 goto finish;
+--
+1.7.9.5
diff --git a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
new file mode 100644
index 000000000..692d93356
--- /dev/null
+++ b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
@@ -0,0 +1,155 @@
+From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 22 Mar 2012 02:06:40 +0100
+Subject: [PATCH] logind: close FIFO before ending sessions cleanly
+
+For clean session endings ask logind explicitly to get rid of the FIFO
+before closing it so that the FIFO logic doesn't result in su/sudo to be
+terminated immediately.
+---
+ src/login/logind-dbus.c |   30 ++++++++++++++++++++
+ src/login/pam-module.c  |   71 +++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 98 insertions(+), 3 deletions(-)
+
+diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
+index d8f4d89..ea6b89f 100644
+--- a/src/login/logind-dbus.c
++++ b/src/login/logind-dbus.c
+@@ -80,6 +80,9 @@
+         "   <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n"        \
+         "   <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n"        \
+         "  </method>\n"                                                 \
++        "  <method name=\"ReleaseSession\">\n"                          \
++        "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
++        "  </method>\n"                                                 \
+         "  <method name=\"ActivateSession\">\n"                         \
+         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
+         "  </method>\n"                                                 \
+@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler(
+                 if (r < 0)
+                         return bus_send_error_reply(connection, message, &error, r);
+
++        } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) {
++                const char *name;
++                Session *session;
++
++                if (!dbus_message_get_args(
++                                    message,
++                                    &error,
++                                    DBUS_TYPE_STRING, &name,
++                                    DBUS_TYPE_INVALID))
++                        return bus_send_error_reply(connection, message, &error, -EINVAL);
++
++                session = hashmap_get(m->sessions, name);
++                if (!session)
++                        return bus_send_error_reply(connection, message, &error, -ENOENT);
++
++                /* We use the FIFO to detect stray sessions where the
++                process invoking PAM dies abnormally. We need to make
++                sure that that process is not killed if at the clean
++                end of the session it closes the FIFO. Hence, with
++                this call explicitly turn off the FIFO logic, so that
++                the PAM code can finish clean up on its own */
++                session_remove_fifo(session);
++
++                reply = dbus_message_new_method_return(message);
++                if (!reply)
++                        goto oom;
++
+         } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) {
+                 const char *name;
+                 Session *session;
+diff --git a/src/login/pam-module.c b/src/login/pam-module.c
+index 8544413..4106d2b 100644
+--- a/src/login/pam-module.c
++++ b/src/login/pam-module.c
+@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
+                         "/org/freedesktop/login1",
+                         "org.freedesktop.login1.Manager",
+                         "CreateSession");
+-
+         if (!m) {
+                 pam_syslog(handle, LOG_ERR, "Could not allocate create session message.");
+                 r = PAM_BUF_ERR;
+@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session(
+                 int argc, const char **argv) {
+
+         const void *p = NULL;
++        const char *id;
++        DBusConnection *bus = NULL;
++        DBusMessage *m = NULL, *reply = NULL;
++        DBusError error;
++        int r;
+
+-        pam_get_data(handle, "systemd.session-fd", &p);
++        assert(handle);
++
++        dbus_error_init(&error);
++
++        id = pam_getenv(handle, "XDG_SESSION_ID");
++        if (id) {
++
++                /* Before we go and close the FIFO we need to tell
++                 * logind that this is a clean session shutdown, so
++                 * that it doesn't just go and slaughter us
++                 * immediately after closing the fd */
++
++                bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
++                if (!bus) {
++                        pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
++                        r = PAM_SESSION_ERR;
++                        goto finish;
++                }
++
++                m = dbus_message_new_method_call(
++                                "org.freedesktop.login1",
++                                "/org/freedesktop/login1",
++                                "org.freedesktop.login1.Manager",
++                                "ReleaseSession");
++                if (!m) {
++                        pam_syslog(handle, LOG_ERR, "Could not allocate release session message.");
++                        r = PAM_BUF_ERR;
++                        goto finish;
++                }
++
++                if (!dbus_message_append_args(m,
++                                              DBUS_TYPE_STRING, &id,
++                                              DBUS_TYPE_INVALID)) {
++                        pam_syslog(handle, LOG_ERR, "Could not attach parameters to message.");
++                        r = PAM_BUF_ERR;
++                        goto finish;
++                }
+
++                reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
++                if (!reply) {
++                        pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error));
++                        r = PAM_SESSION_ERR;
++                        goto finish;
++                }
++        }
++
++        r = PAM_SUCCESS;
++
++finish:
++        pam_get_data(handle, "systemd.session-fd", &p);
+         if (p)
+                 close_nointr(PTR_TO_INT(p) - 1);
+
+-        return PAM_SUCCESS;
++        dbus_error_free(&error);
++
++        if (bus) {
++                dbus_connection_close(bus);
++                dbus_connection_unref(bus);
++        }
++
++        if (m)
++                dbus_message_unref(m);
++
++        if (reply)
++                dbus_message_unref(reply);
++
++        return r;
+ }
+--
+1.7.9.5
diff --git a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
new file mode 100644
index 000000000..9bf84dda6
--- /dev/null
+++ b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
@@ -0,0 +1,31 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
+                 if (is_dir) {
+                         int subdir_fd;
+
+-                        if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++                        subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++                        if (subdir_fd < 0) {
+                                 if (ret == 0 && errno != ENOENT)
+                                         ret = -errno;
+                                 continue;
+--
+1.7.9.4
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
new file mode 100644
index 000000000..d4f08f7d5
--- /dev/null
+++ b/libre/systemd/PKGBUILD
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> 
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgbase=systemd
+pkgname=('systemd')
+pkgver=44
+pkgrel=7
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2' 'LGPL2.1' 'MIT')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        "os-release"
+        0001-util-never-follow-symlinks-in-rm_rf_children.patch
+        0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
+        0001-check-for-proper-return-from-dirent_ensure_type.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
+         'd0210754762d923d36c9452a1648d550'
+         'b5863d6d4b47e2b5bda8eb57bde0d327'
+         'd37833358ef6c23fad622ea4a0941d1f'
+         '11f930fd0a3966abc794bf9127a7dde0')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375)
+  patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+
+  # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd)
+  patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch"
+
+  # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49)
+  patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch"
+
+  ./configure --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --with-pamlibdir=/usr/lib/security \
+              --localstatedir=/var \
+              --with-distro=arch \
+              --enable-split-usr \
+              --disable-ima
+
+  make
+}
+
+package_systemd() {
+  pkgdesc="system and service manager"
+  depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+  optdepends=('cryptsetup: required for encrypted block devices'
+              'dbus-python: systemd-analyze'
+              'initscripts: legacy support for hostname and vconsole setup'
+              'initscripts-systemd: native boot and initialization scripts'
+              'python2-cairo: systemd-analyze'
+              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+          etc/dbus-1/system.d/org.freedesktop.login1.conf
+          etc/dbus-1/system.d/org.freedesktop.locale1.conf
+          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/systemd/system.conf
+          etc/systemd/user.conf
+          etc/systemd/systemd-logind.conf
+          etc/systemd/systemd-journald.conf)
+  install="$pkgname.install"
+
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+
+  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
+  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  # symlink to /bin/systemd for compat and sanity
+  install -dm755 "$pkgdir/bin"
+  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+
+  # use python2 for systemd-analyze
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # didn't build this...
+  rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
+
+  # fix .so links in manpage stubs
+  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+      -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
+
+  # rename man pages to avoid conflicts with sysvinit and initscripts
+  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+            man5/{hostname,{vconsole,locale}.conf}.5)
+  cd "$pkgdir/usr/share/man"
+  for manpage in "${manpages[@]}"; do
+    IFS='/' read section page <<< "$manpage"
+    mv "$manpage" "$section/systemd.$page"
+  done
+  sed -i '1s|/\([^/]\+\)|/systemd.\1|' "$pkgdir"/usr/share/man/man8/systemd.{poweroff,reboot}.8
+
+  # move bash-completion and symlink for loginctl
+  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
+    "$pkgdir/usr/share/bash-completion/completions/systemctl"
+  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
+  rm -rf "$pkgdir/etc/bash_completion.d"
+
+  # fix systemctl where
+  find "$pkgdir" -type f -name '*.service' -exec \
+      sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} +
+
+  ### split off libsystemd (libs, includes, pkgconfig, man3)
+  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
+
+  cd "$srcdir"/libsystemd
+  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+  mv "$pkgdir/usr/include/systemd" usr/include
+  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+}
+
+# vim: ft=sh syn=sh et
diff --git a/libre/systemd/os-release b/libre/systemd/os-release
new file mode 100644
index 000000000..65253e9c3
--- /dev/null
+++ b/libre/systemd/os-release
@@ -0,0 +1,7 @@
+NAME=Parabola
+ID=parabola
+ID_LIKE=arch
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ANSI_COLOR="1;35"
+HOME_URL="https://parabolagnulinux.org/"
+BUG_REPORT_URL="https://labs.parabola.nu/"
diff --git a/libre/systemd/rePKGBUILD b/libre/systemd/rePKGBUILD
new file mode 100644
index 000000000..f825ee579
--- /dev/null
+++ b/libre/systemd/rePKGBUILD
@@ -0,0 +1,52 @@
+# This is an example rePKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+source PKGBUILD
+unset build package md5sums source check
+_repo=extra
+pkgname='systemd'
+options=(!strip)
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	# files for pkg modifications
+	os-release)
+
+build() {
+  cd "${srcdir}/"
+  rm -v .{INSTALL,PKGINFO} $pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT || true
+  # put actions for package modifications below this line
+
+  rm -v etc/os-release
+}
+
+package_systemd() {
+  pkgdesc="system and service manager (Parabola rebranded)"
+  depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+  optdepends=('cryptsetup: required for encrypted block devices'
+              'dbus-python: systemd-analyze'
+              'initscripts: legacy support for hostname and vconsole setup'
+              'initscripts-systemd: native boot and initialization scripts'
+              'python2-cairo: systemd-analyze'
+              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+          etc/dbus-1/system.d/org.freedesktop.login1.conf
+          etc/dbus-1/system.d/org.freedesktop.locale1.conf
+          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/systemd/system.conf
+          etc/systemd/user.conf
+          etc/systemd/systemd-logind.conf
+          etc/systemd/systemd-journald.conf)
+  install="$pkgname.install"
+
+  # Install Parabola os-release
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+
+  find ${srcdir} -maxdepth 1 -type l -delete
+  cp -a ${srcdir}/* ${pkgdir}
+}
diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install
new file mode 100644
index 000000000..0c3e9abee
--- /dev/null
+++ b/libre/systemd/systemd.install
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+checkgroups() {
+  if ! getent group lock >/dev/null; then
+    groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroup/systemd ]
+}
+
+post_install() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  echo "systemd has been installed to /bin/systemd. Please ensure you append"
+  echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    # we moved the binary in 44-2 to /usr, so a reexec leads to a
+    # coredump. refuse this reexec and warn the user that they should
+    # reboot instead.
+    if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
+      echo "warning: refusing to reexec systemd. the system should be rebooted."
+    else
+      systemctl daemon-reload
+      systemctl daemon-reexec
+    fi
+  fi
+}
+
+post_remove() {
+  if getent group lock >/dev/null; then
+    groupdel lock
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index be42680ad..eb120c0ad 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=texlive-core-libre
 _pkgname=texlive-core
 pkgver=2011.24722
 _revnr=${pkgver#2011.}
-pkgrel=1
+pkgrel=1.1
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=(any)
@@ -21,7 +21,7 @@ optdepends=(
 )
 groups=('texlive-most')
 conflicts=('tetex' 'texlive-latex3' 'texlive-core')
-provides=('tetex' 'texlive-latex3' 'texlive-core')
+provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
 source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index f04ec2f47..223eaff72 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,10 +1,12 @@
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# $Id: PKGBUILD 159467 2012-05-24 17:52:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
+# Maintainet (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
-pkgbasename=xchat
+_pkgname=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=7
+pkgrel=10
 pkgdesc="A GTK+ based IRC client without non-free browser reference"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
@@ -12,39 +14,50 @@ provides=("xchat=$pkgver")
 replaces=('xchat')
 conflicts=('xchat')
 license=('GPL')
-depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify')
-makedepends=('tcl' 'perl' 'python2')
+depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
+makedepends=('tcl' 'perl' 'python2' 'librsvg')
 optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
             'python2: for python plugin')
 options=('!libtool')
-changelog=ChangeLog
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz
+install=xchat.install
+source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz
+        http://xchat.org/files/icons/xchat-svg.tar.bz2
         xchat-2.8.8-libnotify07.patch
         xchat-2.8.8-link-against-libnotify.patch
+        xchat-2.8.8-glib-2.31.patch
         remove-non-free-suggestion.patch
         no-firefox.patch)
+sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
+          '0d366346cc11e0efb57fc2648fe423c94a3469bd'
+          'a053fba4e1911d1ee6a8248fe19e344797920fe3'
+          '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
+          'aecaf6176a7cfd62555207b02f2793b360aa39da'
+          'ead8947ae0033735803a0353e3b9d23f40fff990'
+          'aae58e189481e336825f8b56bf6939d55b2e42f3')
 
 build() {
-  cd "${srcdir}/${pkgbasename}-${pkgver}"
-  patch -Np1 -i ${srcdir}/remove-non-free-suggestion.patch
-  patch -Np1 -i ${srcdir}/no-firefox.patch
-  patch -Np1 -i ${srcdir}/xchat-2.8.8-libnotify07.patch
-  patch -Np1 -i ${srcdir}/xchat-2.8.8-link-against-libnotify.patch
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
+  patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
+  patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
+  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
+  patch -p1 -i "${srcdir}/no-firefox.patch"
   autoconf
   autoheader
 
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \
-    --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
+  LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \
+    --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgbasename}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-}
 
-md5sums=('9a11f13121ff0af787bba3b014378e58'
-         '8f0ba48dc3d151cd9b4fbef3255e8c95'
-         '805893e0d8f7c9713d703f34b6bb4b89'
-         'd0968310982fa9e30d43dd43536b7387'
-         'ba11c3e889509d1b46307d6ebf74509c')
+  for i in 24 32 48 64 128 256 ; do
+    install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps"
+    rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg
+  done
+  install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg"
+  install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg"
+}
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch
index 7fb5190de..f1ecd6631 100644
--- a/libre/xchat-libre/no-firefox.patch
+++ b/libre/xchat-libre/no-firefox.patch
@@ -5,7 +5,7 @@
  
  	/* everything failed, what now? just try firefox */
 -	if (try_browser ("firefox", NULL, url))
-+	if (try_browser ("icecat", NULL, url))
++	if (try_browser ("iceweasel", NULL, url))
  		return;
  
  	/* fresh out of ideas... */
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
index 943daff60..9383db521 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -6,7 +6,7 @@ diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
  
  static char defaultconf_urlhandlers[] =
 -		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		"NAME Open Link in Web Browser\n"		"CMD !icecat '%s'\n\n";
++		"NAME Open Link in Web Browser\n"		"CMD !iceweasel '%s'\n\n";
  
  #ifdef USE_SIGACTION
  /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch
new file mode 100644
index 000000000..63f562ff8
--- /dev/null
+++ b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch
@@ -0,0 +1,62 @@
+Author: Dominique Leuenberger <dimstar@opensuse.org>
+
+http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239
+
+glib got stricter in checking includes. Only glib.h (and a few exceptions)
+are to be included directly.
+
+Index: xchat-2.8.8/src/common/servlist.c
+===================================================================
+--- xchat-2.8.8.orig/src/common/servlist.c
++++ xchat-2.8.8/src/common/servlist.c
+@@ -24,7 +24,7 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
+Index: xchat-2.8.8/src/common/text.c
+===================================================================
+--- xchat-2.8.8.orig/src/common/text.c
++++ xchat-2.8.8/src/common/text.c
+@@ -28,7 +28,7 @@
+ #include <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
+Index: xchat-2.8.8/src/common/util.c
+===================================================================
+--- xchat-2.8.8.orig/src/common/util.c
++++ xchat-2.8.8/src/common/util.c
+@@ -39,7 +39,7 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+Index: xchat-2.8.8/src/common/xchat.h
+===================================================================
+--- xchat-2.8.8.orig/src/common/xchat.h
++++ xchat-2.8.8/src/common/xchat.h
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H
diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
index 95d429542..2a6dce9a2 100644
--- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
+++ b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
@@ -22,4 +22,3 @@ diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk
  		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
  			goto bad;
  		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
-
diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
index 6dad938ea..31e6c0854 100644
--- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
+++ b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
@@ -341,4 +341,3 @@ diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe
  #endif
  	return 1;
  }
-
diff --git a/libre/xchat-libre/xchat.install b/libre/xchat-libre/xchat.install
new file mode 100644
index 000000000..eab82d16f
--- /dev/null
+++ b/libre/xchat-libre/xchat.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor	
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 9c60622fb..cbf5b9c60 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -23,4 +23,4 @@ package() {
         sort -u
         ))
 }
-md5sums=('1a964c90247c9c9db5b0e44bd33143d6')
+md5sums=('c4ecf01611d55df03b5e4412dca4e70d')
author	Luke Shumaker <LukeShu@sbcglobal.net>	2012-06-06 09:22:43 -0400
committer	Luke Shumaker <LukeShu@sbcglobal.net>	2012-06-06 09:22:43 -0400
commit	6237ecf456b95ac37864cf91df9cd02795a529d4 (patch)
tree	6c26858ed69113ecc091964324d2b56292a78fe4 /libre
parent	1c27f57b1a28074a50e05aaa73c47ef55127e318 (diff)
parent	5cd5d2171660435cd34470577be150e2a01d1b5e (diff)