diff options
Diffstat (limited to 'libre/clementine-libre/remove-nonfree-references-on-translations.patch')
| -rw-r--r-- | libre/clementine-libre/remove-nonfree-references-on-translations.patch | 20088 |
1 files changed, 0 insertions, 20088 deletions
diff --git a/libre/clementine-libre/remove-nonfree-references-on-translations.patch b/libre/clementine-libre/remove-nonfree-references-on-translations.patch deleted file mode 100644 index f80e7f5a7..000000000 --- a/libre/clementine-libre/remove-nonfree-references-on-translations.patch +++ /dev/null @@ -1,20088 +0,0 @@ -diff -rauN clementine-1.0.1/src/translations/ar.po clementine-libre-1.0.1/src/translations/ar.po ---- clementine-1.0.1/src/translations/ar.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ar.po 2012-05-28 22:09:35.427205715 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "ابدأ قئمة التشغيل اللتي تعمل حالياً" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/be.po clementine-libre-1.0.1/src/translations/be.po ---- clementine-1.0.1/src/translations/be.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/be.po 2012-05-29 13:46:37.876404109 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -311,7 +307,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -584,12 +579,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -815,10 +804,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1025,10 +1010,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Наладзіць калекцыю..." -@@ -1046,10 +1027,6 @@ - msgid "Connect device" - msgstr "Падлучэнне прылады" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1465,10 +1442,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1481,10 +1454,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Спампаваць каталог Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1634,10 +1603,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1819,10 +1784,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2085,10 +2046,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2117,10 +2074,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2423,7 +2376,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2499,10 +2451,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2759,10 +2707,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2897,7 +2841,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -3004,10 +2947,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3038,7 +2977,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3055,10 +2993,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3449,18 +3383,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3785,30 +3707,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3818,7 +3720,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3904,18 +3805,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4273,10 +4162,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4292,7 +4177,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4516,20 +4400,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4589,7 +4459,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4678,8 +4547,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/bg.po clementine-libre-1.0.1/src/translations/bg.po ---- clementine-1.0.1/src/translations/bg.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/bg.po 2012-05-29 13:48:35.013070898 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Необходим е Grooveshark Anywhere акаунт" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Нуждаете се от премиум регистрация в Spotify." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,14 +584,6 @@ - msgid "Always start playing" - msgstr "Винаги да се започва възпроизвеждането" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"За да използвате Spotify в Clementine е необходима допълнителна приставка. " --"Иската ли да я свалите и инсталирате сега?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Получи се грешка при копирането на iTunes базата данни от утройството" -@@ -822,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "Поддръжка на CUE листове" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Отказ" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Смени обложката" -@@ -1038,10 +1021,6 @@ - msgid "Configure Shortcuts" - msgstr "Настройване на бързите клавиши" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Настройване на Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Настройване на библиотека..." -@@ -1060,10 +1039,6 @@ - msgid "Connect device" - msgstr "Свързване на устройство" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Свързване към Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Постоянен битов поток" -@@ -1480,10 +1455,6 @@ - msgid "Download this album..." - msgstr "Сваляне на този албум..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Изтегляне..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Сваляне на icecast директорията" -@@ -1496,10 +1467,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Сваляне на каталог Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Изтегляне на приставка за Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Сваляне на метаданни" -@@ -1654,10 +1621,6 @@ - msgid "Error deleting songs" - msgstr "Грешка при изтриване на песни" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Грешка при изтеглянето на приставка за Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1839,12 +1802,6 @@ - msgid "Font size" - msgstr "Размер на шрифта" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Поради причини, свързани с лицензирането, поддръжката на Spotify е като " --"отделна приставка." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Принудително кодиране в моно" -@@ -2117,10 +2074,6 @@ - "В динамичен режим новите песни ще бъдат избирани и добавяни към списъка с " - "песни всеки път, когато свърши песента." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Входящи" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Включване на обложката в известяването" -@@ -2149,10 +2102,6 @@ - msgid "Insert..." - msgstr "Вмъкване..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Инсталирани" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Интернет" -@@ -2459,7 +2408,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2535,10 +2483,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Списъкът с песни да е наличен в режим извън мрежа" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Грешка при отговора" -@@ -2798,10 +2742,6 @@ - msgid "Not enough neighbors" - msgstr "Недостатъчно съседи" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Не е инсталиран" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Не сте вписан" -@@ -2936,7 +2876,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Парола" -@@ -3043,10 +2982,6 @@ - msgid "Playlists" - msgstr "Списъци с песни" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Състояние на приставката:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Поп" -@@ -3077,7 +3012,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Настройки" -@@ -3095,10 +3029,6 @@ - msgid "Preferred audio format" - msgstr "Предпочитан аудио формат" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Предпочитан битов поток" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Предпочитан формат" -@@ -3489,18 +3419,6 @@ - msgid "Search Magnatune" - msgstr "Търси в Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Търсене в Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Търсене в Spotify (отваря нов подпрозорец)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Търсене в Spotify (отваря нов подпрозорец)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Търсене във всички източници (библиотека, интернет услуги, ...)" -@@ -3826,30 +3744,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Грешка в вписване в Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Приставка за Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Приставката за Spotify не е инсталирана" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Стандартно" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Със звезда" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Стартиране на текущо възпроизвеждания списък с песни" -@@ -3859,7 +3757,6 @@ - msgstr "Начало на прекодирането" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Започнете да пишете в полето за търсее за да намерите музика на %1." -@@ -3945,18 +3842,6 @@ - msgid "Switch provider" - msgstr "Смяна на доставчика" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Синхронизиране на входящата кутия на Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Синхронизиране на списъка с песни от Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Синхронизиране на оценените песни от Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Табовете отгоре" -@@ -4342,10 +4227,6 @@ - msgid "Use the system proxy settings" - msgstr "Използване на системните настройки за сървър-посредник" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Използване на нормализация на звука" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Използван" -@@ -4361,7 +4242,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Потребителско име" -@@ -4599,20 +4479,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Нямате Grooveshark Anywhere акаунт." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Нямате Spotify Premium акаунт." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "Отписан сте от Spotify, моля въведете отново паролата си в Настройки." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Изписан сте от Spotify, моля въведете паролата си отново" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Харесвате тази песен" -@@ -4680,7 +4546,6 @@ - msgstr "Вашите слушания: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Вашето потребителско име или парола не съвпада." - -@@ -4769,8 +4634,6 @@ - msgstr "в последните" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "килобита/сек" - -diff -rauN clementine-1.0.1/src/translations/bn.po clementine-libre-1.0.1/src/translations/bn.po ---- clementine-1.0.1/src/translations/bn.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/bn.po 2012-05-29 13:50:28.419737684 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "এক্ টি স্পটীফাই অ্যাকাউন্ট প্রয়োজন" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -311,7 +307,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -584,14 +579,6 @@ - msgid "Always start playing" - msgstr "স্থায়ী ভাবে সঙ্গীত চালু রাখুন" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"এক্ টি প্লাগ ইন প্রয়োজন। আপনি কি প্লাগ ইন টি ডাউনলোড করে ইন্সটল করতে ইচ্ছুক " --"?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "iTune ডাটাবেস কপি করায় ত্রুটি র জন্য দুঃখিত ।" -@@ -817,10 +804,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1021,10 +1004,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1042,10 +1021,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1455,10 +1430,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1471,10 +1442,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1624,10 +1591,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1809,10 +1772,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2075,10 +2034,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2107,10 +2062,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2413,7 +2364,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2489,10 +2439,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2749,10 +2695,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2887,7 +2829,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2994,10 +2935,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3028,7 +2965,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3045,10 +2981,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3439,18 +3371,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3775,30 +3695,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3808,7 +3708,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3894,18 +3793,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4263,10 +4150,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4282,7 +4165,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4506,20 +4388,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4579,7 +4447,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4668,8 +4535,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/br.po clementine-libre-1.0.1/src/translations/br.po ---- clementine-1.0.1/src/translations/br.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/br.po 2012-05-29 13:51:23.959737744 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Ur c'hont Grooveshark a zo dleet" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Ret eo deoc'h kaout ur kont Spotify Premium." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -314,7 +310,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -588,14 +583,6 @@ - msgid "Always start playing" - msgstr "Atav kregin da lenn" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Un enlugellad a zo ezhomm a-benn implij Spotify e-barzh Clementine. C'hoant " --"ho peus pellgargañ ha staliañ anezhañ bremañ ?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -824,10 +811,6 @@ - msgid "CUE sheet support" - msgstr "Kemer e kont ar CUE sheet" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Nullañ" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Kemmañ golo an albom" -@@ -1040,10 +1023,6 @@ - msgid "Configure Shortcuts" - msgstr "Kefluniañ ar Berradennoù" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Kefluniañ Spotify" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Kefluniañ al levraoueg..." -@@ -1061,10 +1040,6 @@ - msgid "Connect device" - msgstr "An drobarzhell a zo o kennaskañ" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "O kennaskañ da Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "CBR" -@@ -1480,10 +1455,6 @@ - msgid "Download this album..." - msgstr "Pellgkargañ an albom..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Pellgargañ" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "O pellgargañ katalog Icecast" -@@ -1496,10 +1467,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "O pellgargañ katalog Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "O pellgargañ enlugellad Spotify..." -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "O pellgargañ metadaveennoù" -@@ -1653,10 +1620,6 @@ - msgid "Error deleting songs" - msgstr "Ur gudenn a zo savet e-kerzh dilamidigezh an tonioù" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Ur gudenn a zo savet o pellgargañ enlugellad Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1841,10 +1804,6 @@ - msgid "Font size" - msgstr "Ment an nodrezh" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Evit abegoù lañsav, meret eo Spotify gant un enlugellad distag." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forsiñ an enkodiñ mono" -@@ -2119,10 +2078,6 @@ - "E stumm dinamek, roudennoù nevez a vo choazet hag ouzhpennet e fin al roll " - "c'hoari bep taol ma vo echu gant un ton." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Boest degemer" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Diskouez an albom er gemenadenn" -@@ -2151,10 +2106,6 @@ - msgid "Insert..." - msgstr "Enlakaat..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Staliaet" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2458,7 +2409,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2534,10 +2484,6 @@ - msgid "Main profile (MAIN)" - msgstr "Profil pennañ (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Lakaat ar roll c'hoari da vezañ lennus ezlinenn" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Respont furmed fall" -@@ -2798,10 +2744,6 @@ - msgid "Not enough neighbors" - msgstr "N'eus ket trawalc'h a amezeizen" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "N'eo ket staliet" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "N'eo ket kannasket" -@@ -2936,7 +2878,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Tremenger" -@@ -3043,10 +2984,6 @@ - msgid "Playlists" - msgstr "Rollioù c'hoari" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Stad an enlugellad" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3077,7 +3014,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Gwellvezioù" -@@ -3094,10 +3030,6 @@ - msgid "Preferred audio format" - msgstr "Stumm audio gwellañ" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Bitrate gwellañ" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Stumm gwellañ" -@@ -3488,18 +3420,6 @@ - msgid "Search Magnatune" - msgstr "Klask Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Klask Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Klask Spotify (digeriñ un ivinel nevez)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Klask Spotify (digeriñ un ivinel nevez)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Klask e-touez holl o mammennoù (levraoueg, internet, servijoù...)" -@@ -3824,30 +3744,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Kudenn kennaskañ gant Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Enlugellad Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Enlugellad Spotify n'eo ket staliet" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Boaz" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Gwellañ" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Kregiñ ar roll c'hoari" -@@ -3857,7 +3757,6 @@ - msgstr "Kregin an transkodiñ" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Kregin da skrivañ er boest klask a-us evit kavout sonerezh war %1" -@@ -3943,18 +3842,6 @@ - msgid "Switch provider" - msgstr "Cheñch servij" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Sinkronizadur ar boest degemer Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Sinkronizadur ar roll c'hoari Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Sinkronizadur tonioù gwellañ Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Ivinelloù a-us" -@@ -4336,10 +4223,6 @@ - msgid "Use the system proxy settings" - msgstr "Implij dibarzhioù dre ziouer ar proksi" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Implij normalizadur an ampled" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Implijet" -@@ -4355,7 +4238,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Lezanv" -@@ -4592,22 +4474,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "N'ho peus ket a kont Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "N'ho peus ket a kont Spotify Premium." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen e-barzh prenestr ar " --"c'hefluniadoù." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen mar plij." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Karout a rit ar roadenn-mañ" -@@ -4675,7 +4541,6 @@ - msgstr "Ho scrobble: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Ho anv implijer pe ho tremenger a zo direizh." - -@@ -4764,8 +4629,6 @@ - msgstr "etrezek ar re ziwezhañ" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbde" - -diff -rauN clementine-1.0.1/src/translations/bs.po clementine-libre-1.0.1/src/translations/bs.po ---- clementine-1.0.1/src/translations/bs.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/bs.po 2012-05-29 13:52:24.389737809 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -311,7 +307,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -584,12 +579,6 @@ - msgid "Always start playing" - msgstr "Uvjek počni sa slušanjem" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Desila se greška prilikom kopiranja iTunes baze podataka sa uređaja" -@@ -815,10 +804,6 @@ - msgid "CUE sheet support" - msgstr "CUE lista podrška" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Promjeni omot" -@@ -1029,10 +1014,6 @@ - msgid "Configure Shortcuts" - msgstr "Podesi prečice" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Podesi biblioteku..." -@@ -1050,10 +1031,6 @@ - msgid "Connect device" - msgstr "Spoji uređaj" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1467,10 +1444,6 @@ - msgid "Download this album..." - msgstr "Preuzmi ovaj album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Preuzimam Icecast fasciklu" -@@ -1483,10 +1456,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Preuzimam Magnatune katalog" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1636,10 +1605,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1821,10 +1786,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2087,10 +2048,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2119,10 +2076,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2425,7 +2378,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2501,10 +2453,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2761,10 +2709,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2899,7 +2843,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -3006,10 +2949,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3040,7 +2979,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3057,10 +2995,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3451,18 +3385,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3787,30 +3709,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3820,7 +3722,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3906,18 +3807,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4275,10 +4164,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4294,7 +4179,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4518,20 +4402,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4591,7 +4461,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4680,8 +4549,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/ca.po clementine-libre-1.0.1/src/translations/ca.po ---- clementine-1.0.1/src/translations/ca.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ca.po 2012-05-29 14:27:32.546406760 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Us cal un compte Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Cal un compte Premium de Spotify" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -318,7 +314,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -591,14 +586,6 @@ - msgid "Always start playing" - msgstr "Començar sempre reproduint" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Cal un connector addicional per utilitzar Spotify a Clementine. Voleu " --"descarregar-lo i instaŀlar-lo ara?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -827,10 +814,6 @@ - msgid "CUE sheet support" - msgstr "Suport per a CUE sheet" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Canceŀla" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Canviar la imatge de la portada" -@@ -1043,10 +1026,6 @@ - msgid "Configure Shortcuts" - msgstr "Configura dreceres" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configura l'Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configura la llibreria..." -@@ -1064,10 +1043,6 @@ - msgid "Connect device" - msgstr "Connecta el dispositiu" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Connectant amb Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Taxa de bits constant" -@@ -1483,10 +1458,6 @@ - msgid "Download this album..." - msgstr "Descarrega aquest àlbum..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Descarrega..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Descarregant el directori d'Icecast" -@@ -1499,10 +1470,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Descarregant el catàleg de Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Descarregant el connector d'Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Descarregant metadades" -@@ -1654,10 +1621,6 @@ - msgid "Error deleting songs" - msgstr "Error esborrant cançons" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1839,10 +1802,6 @@ - msgid "Font size" - msgstr "Mida de la font" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Força la codificació mono" -@@ -2110,10 +2069,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Safata d'entrafa" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Incloure la caràtula a la notificació" -@@ -2142,10 +2097,6 @@ - msgid "Insert..." - msgstr "Insereix..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instaŀlat" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2450,7 +2401,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2526,10 +2476,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Resposta malformada" -@@ -2788,10 +2734,6 @@ - msgid "Not enough neighbors" - msgstr "No hi ha prous veïns" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "No heu iniciat la sessió" -@@ -2926,7 +2868,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Contrasenya" -@@ -3033,10 +2974,6 @@ - msgid "Playlists" - msgstr "Llistes de reproducció" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3067,7 +3004,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Preferències" -@@ -3084,10 +3020,6 @@ - msgid "Preferred audio format" - msgstr "Format d'àudio preferit" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Format preferit" -@@ -3478,18 +3410,6 @@ - msgid "Search Magnatune" - msgstr "Cercar a Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3814,30 +3734,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Error en iniciar sessió a Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Connector d'Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Connector d'Spotify no instaŀlat" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Estàndard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Destacat" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Inicia la llista de reproducció que s'està reproduint" -@@ -3847,7 +3747,6 @@ - msgstr "Inicia transcodificació" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3933,18 +3832,6 @@ - msgid "Switch provider" - msgstr "Canvia de proveïdor" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4314,10 +4201,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Usat" -@@ -4333,7 +4216,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nom d'usuari" -@@ -4560,20 +4442,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4636,7 +4504,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4725,8 +4592,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/cs.po clementine-libre-1.0.1/src/translations/cs.po ---- clementine-1.0.1/src/translations/cs.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/cs.po 2012-05-29 14:53:26.439741827 -0400 -@@ -257,10 +257,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Je požadován účet Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Je požadován účet Spotify Premium." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -321,7 +317,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -594,14 +589,6 @@ - msgid "Always start playing" - msgstr "Vždy začít přehrávat" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Pro používání Spotify v Clementine je vyžadován přídavný modul. Chcete jej " --"stáhnout a nainstalovat nyní?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Při kopírování databáze iTunes ze zařízení nastala chyba" -@@ -827,10 +814,6 @@ - msgid "CUE sheet support" - msgstr "Podpora pro list CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Zrušit" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Změnit obal" -@@ -1041,10 +1024,6 @@ - msgid "Configure Shortcuts" - msgstr "Nastavit klávesové zkratky" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Nastavit Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Nastavit sbírku..." -@@ -1062,10 +1041,6 @@ - msgid "Connect device" - msgstr "Připojit zařízení" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Připojuje se k Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Stálý datový tok" -@@ -1481,10 +1456,6 @@ - msgid "Download this album..." - msgstr "Stáhnout toto album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Stáhnout..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Stahuje se adresář Icecast" -@@ -1497,10 +1468,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Stahuje se katalog Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Stahuje se přídavný modul Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Stahují se metadata" -@@ -1653,10 +1620,6 @@ - msgid "Error deleting songs" - msgstr "Chyba při mazání písní" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Chyba při stahování přídavného modulu Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1838,11 +1801,6 @@ - msgid "Font size" - msgstr "Velikost písma" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Z licenčních důvodů je podpora pro Spotify v odděleném přídavném modulu" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Vynutit monokódování" -@@ -2115,10 +2073,6 @@ - "V dynamickém režimu budou nové skladby vybrány a přidány do seznamu skladeb " - "pokaždé, když píseň skončí." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Doručená pošta" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Zahrnout obal alba do oznámení" -@@ -2147,10 +2101,6 @@ - msgid "Insert..." - msgstr "Vložit..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Nainstalován" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2456,7 +2406,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2532,12 +2481,6 @@ - msgid "Main profile (MAIN)" - msgstr "Hlavní profil" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" --"Zajistit, že seznam skladeb bude dostupný, i když počítač nebude připojen k " --"internetu" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Poškozená odpověď" -@@ -2796,10 +2739,6 @@ - msgid "Not enough neighbors" - msgstr "Nedostatek sousedů" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nenainstalován" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Nepřihlášen" -@@ -2934,7 +2873,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Heslo" -@@ -3041,10 +2979,6 @@ - msgid "Playlists" - msgstr "Seznamy skladeb" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Stav přídavného modulu:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3075,7 +3009,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Nastavení" -@@ -3092,10 +3025,6 @@ - msgid "Preferred audio format" - msgstr "Upřednostňovaný zvukový formát" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Upřednostňovaný datový tok" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Upřednostňovaný formát" -@@ -3486,18 +3415,6 @@ - msgid "Search Magnatune" - msgstr "Hledat na Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Hledat v Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Hledat v Spotify (otevře novou kartu)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Hledat v Spotify (otevře novou kartu)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Hledat ve všech vašich zdrojích (sbírka, internetové služby, ...)" -@@ -3822,30 +3739,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Chyba přihlášení k Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Přídavný modul Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Přídavný modul Spotify není nainstalován" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Obvyklý" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "S hvězdičkou" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Přehrát současnou skladbu v seznamu skladeb" -@@ -3855,7 +3752,6 @@ - msgstr "Převést" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Začněte psát ve vyhledávacím poli pro nalezení hudby na %1." -@@ -3941,18 +3837,6 @@ - msgid "Switch provider" - msgstr "Přepnout poskytovatele" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synchronizuje se schránka Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synchronizuje se seznam skladeb Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synchronizují se skladby označené hvězdičkou na Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Karty nahoře" -@@ -4329,10 +4213,6 @@ - msgid "Use the system proxy settings" - msgstr "Použít systémové nastavení proxy" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Použít normalizaci hlasitosti" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Použito" -@@ -4348,7 +4228,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Uživatelské jméno" -@@ -4584,22 +4463,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Nemáte účet Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Nemáte účet Spotify Premium." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo v dialogu pro " --"nastavení znovu." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo znovu." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Tato skladba patří mezi vaše oblíbené" -@@ -4667,7 +4530,6 @@ - msgstr "Váš počet přehrání: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Uživatelské jméno nebo heslo bylo nesprávné." - -@@ -4756,8 +4618,6 @@ - msgstr "za posledních" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kb/s" - -diff -rauN clementine-1.0.1/src/translations/cy.po clementine-libre-1.0.1/src/translations/cy.po ---- clementine-1.0.1/src/translations/cy.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/cy.po 2012-05-29 14:57:59.696408611 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/da.po clementine-libre-1.0.1/src/translations/da.po ---- clementine-1.0.1/src/translations/da.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/da.po 2012-05-29 14:59:00.383075364 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "En Spotify Premium konto er påkrævet." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -315,7 +311,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -588,12 +583,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -819,10 +808,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1023,10 +1008,6 @@ - msgid "Configure Shortcuts" - msgstr "Konfigurér Genveje" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Indstil bibliotek..." -@@ -1044,10 +1025,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1457,10 +1434,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1473,10 +1446,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1628,10 +1597,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1813,10 +1778,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2079,10 +2040,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Inkludér albumkunst i bekendtgørelsen" -@@ -2111,10 +2068,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2417,7 +2370,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2493,10 +2445,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Misdannet svar" -@@ -2753,10 +2701,6 @@ - msgid "Not enough neighbors" - msgstr "Ikke nok naboer" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2891,7 +2835,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2998,10 +2941,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3032,7 +2971,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3049,10 +2987,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3443,18 +3377,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3781,30 +3703,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Start den spilleliste der afspiller nu" -@@ -3814,7 +3716,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3900,18 +3801,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4270,10 +4159,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4289,7 +4174,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4513,20 +4397,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4586,7 +4456,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4675,8 +4544,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/de.po clementine-libre-1.0.1/src/translations/de.po ---- clementine-1.0.1/src/translations/de.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/de.po 2012-05-29 15:03:39.899742271 -0400 -@@ -258,10 +258,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Ein Grooveshark Anywhere-Konto wird benötigt." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Ein Spotify Premium-Konto ist erforderlich." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -323,7 +319,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -597,14 +592,6 @@ - msgid "Always start playing" - msgstr "Immer mit der Wiedergabe beginnen" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Ein zusätzlich Plugin ist benötigt, um Spotify in Clementine zu benutzen. " --"Möchten Sie es jetzt herunterladen und installieren?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -832,10 +819,6 @@ - msgid "CUE sheet support" - msgstr "Unterstützung von Cuesheets" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Abbrechen" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Cover ändern" -@@ -1048,10 +1031,6 @@ - msgid "Configure Shortcuts" - msgstr "Tastenkürzel einrichten" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Spotify konfigurieren..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Musiksammlung einrichten..." -@@ -1069,10 +1048,6 @@ - msgid "Connect device" - msgstr "Gerät verbinden" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Verbindung mit Spotify wird aufgebaut" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Konstante Bitrate" -@@ -1488,10 +1463,6 @@ - msgid "Download this album..." - msgstr "Album herunterladen..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Herunterladen..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Lade Icecast-Verzeichnis herunter" -@@ -1504,10 +1475,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Magnatune-Katalog wird geladen" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Spotify-Plugin wird heruntergeladen" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Metadaten werden heruntergeladen" -@@ -1662,10 +1629,6 @@ - msgid "Error deleting songs" - msgstr "Fehler beim Löschen der Titel" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Fehler beim herunterladen von Spotify-Plugin" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1847,12 +1810,6 @@ - msgid "Font size" - msgstr "Schriftgröße" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Aus lizenzrechtlichen Gründen, ist die Spotify-Unterstützung in einem " --"Separaten Plugin enthalten." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Mono Encoding erzwingen" -@@ -2125,10 +2082,6 @@ - "Im dynamischen Modus werden neue Stücke automatisch ausgewählt und an die " - "Wiedergabeliste angehängt, sobald ein Titel zu Ende ist." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Posteingang" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Cover in der Benachrichtigung anzeigen" -@@ -2157,10 +2110,6 @@ - msgid "Insert..." - msgstr "Einfügen..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Installiert" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2465,7 +2414,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2541,10 +2489,6 @@ - msgid "Main profile (MAIN)" - msgstr "Standard - Profil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Wiedergabeliste für die Offlinebenutzung verfügbar machen" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Ungültige Antwort" -@@ -2803,10 +2747,6 @@ - msgid "Not enough neighbors" - msgstr "Nicht genug Nachbarn" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nicht installiert" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Nicht angemeldet" -@@ -2941,7 +2881,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Passwort" -@@ -3049,10 +2988,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Plugin-Status" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3083,7 +3018,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Einstellungen" -@@ -3100,10 +3034,6 @@ - msgid "Preferred audio format" - msgstr "Bevorzugtes Dateiformat" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Bevorzugte Bitrate" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Bevorzugtes Format" -@@ -3494,18 +3424,6 @@ - msgid "Search Magnatune" - msgstr "Magnatune durchsuchen" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Spotify-Suche" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Spotify-Suche (öffnet im neuen Tab)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Spotify-Suche (öffnet im neuen Tab)" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Alle Quellen durchsuchen (Sammlung, Internetdienste, …)" -@@ -3832,30 +3750,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Fehler beim anmelden bei Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify-Plugin" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify-Plugin nicht installiert" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Markiert" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Spiele das aktuelle Stück in der Wiedergabeliste ab" -@@ -3865,7 +3763,6 @@ - msgstr "Konvertieren" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Benutzen Sie die Suchleiste um Musik auf %1 zu finden." -@@ -3951,18 +3848,6 @@ - msgid "Switch provider" - msgstr "Anbieter wechseln" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synchronisiere Spotify Postfach" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synchronisiere Spotify Wiedergabeliste" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synchronisiere markierte Stücke von Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Tabs oben" -@@ -4345,10 +4230,6 @@ - msgid "Use the system proxy settings" - msgstr "Verwende Proxy-Einstellungen des Betriebssystems" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Belegt" -@@ -4364,7 +4245,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Benutzername" -@@ -4602,20 +4482,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Sie haben kein Grooveshark Anywhere-Konto." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Sie haben kein Spotify Premium-Konto." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Sie lieben dieses Stück" -@@ -4683,7 +4549,6 @@ - msgstr "Ihre Scrobbles: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Ihr Benutzername oder Kennwort sind ungültig." - -@@ -4772,8 +4637,6 @@ - msgstr "in den letzten" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "Kb/s" - -diff -rauN clementine-1.0.1/src/translations/el.po clementine-libre-1.0.1/src/translations/el.po ---- clementine-1.0.1/src/translations/el.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/el.po 2012-05-29 15:04:37.229742284 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Απαιτείτε ένας λογαρισμός Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Απαιτείται premium λογαριασμός Spotify." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -318,7 +314,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -591,14 +586,6 @@ - msgid "Always start playing" - msgstr "Έναρξη αναπαραγωγής πάντα" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Απαιτείται ένα πρόσθετο για να χρησιμοποιήσετε το Spotify. Θέλετε να το " --"κατεβάσετε και να το εγκαταστήσετε τώρα;" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -827,10 +814,6 @@ - msgid "CUE sheet support" - msgstr "Υποστήριξη φύλλων CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Άκυρο" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Αλλαγή εξώφυλλου καλλιτέχνη" -@@ -1046,10 +1029,6 @@ - msgid "Configure Shortcuts" - msgstr "Ρύθμιση συντομεύσεων" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Ρύθμιση του Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Παραμετροποίηση της βιβλιοθήκης" -@@ -1069,10 +1048,6 @@ - msgid "Connect device" - msgstr "Σύνδεση συσκευής" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Σύνδεση στο Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Σταθερός ρυθμός bit" -@@ -1488,10 +1463,6 @@ - msgid "Download this album..." - msgstr "Μεταφόρτωση αυτού του άλμπουμ..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Λήψη..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Μεταφόρτωση καταλόγου Icecast" -@@ -1504,10 +1475,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Μεταφόρτωση καταλόγου του Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Λήψη πρόσθετου για το Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Λήψη μεταδεδομένων" -@@ -1664,10 +1631,6 @@ - msgid "Error deleting songs" - msgstr "Σφάλμα κατά την διαγραφή τραγουδιών" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Σφάλμα στην λήψη του πρόσθετου του Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1850,11 +1813,6 @@ - msgid "Font size" - msgstr "Μέγεθος γραμματοσειράς" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Για λόγους αδειοδότησης η υποστήριξη για το Spotify γίνεται ξεχωριστά." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Επιβολή κωδικοποίησης mono" -@@ -2129,10 +2087,6 @@ - "Στην δυναμική λειτουργία νέα κομμάτια θα επιλέγονται και τοποθετούνται στην " - "λίστα κάθε φορά που ένα τραγούδι τελειώνει." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Εισερχόμενα" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Εμφάνιση του άλμπουμ (εικόνα) στην ειδοποίηση" -@@ -2163,10 +2117,6 @@ - msgid "Insert..." - msgstr "Εισαγωγή..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Εγκατεστημένο" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Διαδίκτυο" -@@ -2471,7 +2421,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2547,10 +2496,6 @@ - msgid "Main profile (MAIN)" - msgstr "Κύριο προφίλ (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Η λίστα να είναι διαθέσιμη και εκτός σύνδεσης" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Παραμορφωμένη απάντηση" -@@ -2812,10 +2757,6 @@ - msgid "Not enough neighbors" - msgstr "Δεν υπάρχουν αρκετοί γείτονες" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Μη εγκατεστημένο" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Δεν είστε συνδεδεμένος" -@@ -2950,7 +2891,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Συνθηματικό" -@@ -3057,10 +2997,6 @@ - msgid "Playlists" - msgstr "Λίστες" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Κατάσταση πρόσθετου:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3091,7 +3027,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Προτιμήσεις" -@@ -3110,10 +3045,6 @@ - msgid "Preferred audio format" - msgstr "Προτιμώμενη ηχητική διαμόρφωση" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Προτιμώμενος ρυθμός bit " -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Προτιμώμενη μορφή" -@@ -3504,18 +3435,6 @@ - msgid "Search Magnatune" - msgstr "Εύρεση στο Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Εύρεση Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Αναζήτηση σε όλες τις πηγές σας (βιβλιοθήκη, υπηρεσίες internet, ...)" -@@ -3843,30 +3762,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Σφάλμα εισόδου στο Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Πρόσθετο Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Το πρόσθετο του Spotify μη εγκατεστημένο" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Κανονικό" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Με αστέρι" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Εκκίνηση της λίστας αναπαραγωγής που παίζει τώρα" -@@ -3876,7 +3775,6 @@ - msgstr "Εκκίνηση επανακωδικοποίησης" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3964,18 +3862,6 @@ - msgid "Switch provider" - msgstr "Αλλαγή παροχέα" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Συγχρονισμός εισερχομένων του Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Συγχρονισμός λίστας του Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Συγχρονισμός κομματιών επισημασμένων με αστέρι του Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Καρτέλες στην κορυφή" -@@ -4361,10 +4247,6 @@ - msgid "Use the system proxy settings" - msgstr "Χρήση ρυθμίσεων του διαμεσολαβητή του συστήματος" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Χρήση κανονικοποίησης ήχου" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Σε χρήση" -@@ -4380,7 +4262,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Όνομα χρήστη" -@@ -4617,22 +4498,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Δεν έχετε λογαριασμό στο GrooveShark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Δεν έχετε Premium λογαριασμό στο Spotify." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας στις " --"ρυθμίσεις." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Λατρεύεις αυτό το κομμάτι" -@@ -4699,7 +4564,6 @@ - msgstr "Τα scrobbles σου: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Το όνομα χρήστη ή το συνθηματικό ήταν λανθασμένο." - -@@ -4788,8 +4652,6 @@ - msgstr "εντός των τελευταίων" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/en_CA.po clementine-libre-1.0.1/src/translations/en_CA.po ---- clementine-1.0.1/src/translations/en_CA.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/en_CA.po 2012-05-29 15:05:50.036409383 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "Configure Shortcuts" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configure library..." -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1452,10 +1429,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1468,10 +1441,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Downloading Magnatune catalogue" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1622,10 +1591,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1807,10 +1772,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2073,10 +2034,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Include album art in the notification" -@@ -2105,10 +2062,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2411,7 +2364,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2487,10 +2439,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Malformed response" -@@ -2748,10 +2696,6 @@ - msgid "Not enough neighbors" - msgstr "Not enough neighbours" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2886,7 +2830,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2993,10 +2936,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3027,7 +2966,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3044,10 +2982,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3438,18 +3372,6 @@ - msgid "Search Magnatune" - msgstr "Search Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3774,30 +3696,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Start the playlist currently playing" -@@ -3807,7 +3709,6 @@ - msgstr "Start transcoding" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3893,18 +3794,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4262,10 +4151,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4281,7 +4166,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4505,20 +4389,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4578,7 +4448,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4667,8 +4536,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/en_GB.po clementine-libre-1.0.1/src/translations/en_GB.po ---- clementine-1.0.1/src/translations/en_GB.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/en_GB.po 2012-05-29 15:06:41.279742544 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "A Spotify Premium account is required." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -315,7 +311,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -588,14 +583,6 @@ - msgid "Always start playing" - msgstr "Always start playing" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "An error occurred copying the iTunes database from the device" -@@ -821,10 +808,6 @@ - msgid "CUE sheet support" - msgstr "CUE sheet support" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Cancel" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Change cover art" -@@ -1026,10 +1009,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configure library..." -@@ -1047,10 +1026,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1460,10 +1435,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1476,10 +1447,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1630,10 +1597,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1815,10 +1778,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2081,10 +2040,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Include album art in the notification" -@@ -2113,10 +2068,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2419,7 +2370,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2495,10 +2445,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Malformed response" -@@ -2755,10 +2701,6 @@ - msgid "Not enough neighbors" - msgstr "Not enough neighbours" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2893,7 +2835,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -3000,10 +2941,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3034,7 +2971,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3051,10 +2987,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3445,18 +3377,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3781,30 +3701,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Start the playlist currently playing" -@@ -3814,7 +3714,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3900,18 +3799,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4269,10 +4156,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4288,7 +4171,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4512,20 +4394,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4585,7 +4453,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4674,8 +4541,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/en.po clementine-libre-1.0.1/src/translations/en.po ---- clementine-1.0.1/src/translations/en.po 2011-12-02 16:24:44.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/en.po 2012-05-29 15:04:56.353075508 -0400 -@@ -178,9 +178,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --msgid "A Spotify Premium account is required." --msgstr "" -- - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " - "There are different types of smart playlist that offer different ways of " -@@ -408,11 +405,6 @@ - msgid "Always start playing" - msgstr "" - --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - msgid "An error occurred copying the iTunes database from the device" - msgstr "" - -@@ -720,9 +712,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --msgid "Configure Spotify..." --msgstr "" -- - msgid "Configure library..." - msgstr "" - -@@ -735,9 +724,6 @@ - msgid "Connect device" - msgstr "" - --msgid "Connecting to Spotify" --msgstr "" -- - msgid "Constant bitrate" - msgstr "" - -@@ -1045,9 +1031,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --msgid "Downloading Spotify plugin" --msgstr "" -- - msgid "Downloading metadata" - msgstr "" - -@@ -1152,9 +1135,6 @@ - msgid "Error deleting songs" - msgstr "" - --msgid "Error downloading Spotify plugin" --msgstr "" -- - #, qt-format - msgid "Error loading %1" - msgstr "" -@@ -1280,9 +1260,6 @@ - msgid "Font size" - msgstr "" - --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - msgid "Force mono encoding" - msgstr "" - -@@ -2409,15 +2386,6 @@ - msgid "Search Magnatune" - msgstr "" - --msgid "Search Spotify" --msgstr "" -- --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - msgid "Search for album covers..." - msgstr "" - -@@ -2647,18 +2615,6 @@ - msgid "Speex" - msgstr "" - --msgid "Spotify" --msgstr "" -- --msgid "Spotify login error" --msgstr "" -- --msgid "Spotify plugin" --msgstr "" -- --msgid "Spotify plugin not installed" --msgstr "" -- - msgid "Standard" - msgstr "" - -@@ -2674,9 +2630,6 @@ - msgid "Start typing in the search box above to find music on Grooveshark." - msgstr "" - --msgid "Start typing in the search box above to find music on Spotify." --msgstr "" -- - #, qt-format - msgid "Starting %1" - msgstr "" -@@ -2731,15 +2684,6 @@ - msgid "Switch provider" - msgstr "" - --msgid "Syncing Spotify inbox" --msgstr "" -- --msgid "Syncing Spotify playlist" --msgstr "" -- --msgid "Syncing Spotify starred tracks" --msgstr "" -- - msgid "Tabs on top" - msgstr "" - -@@ -3180,9 +3124,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --msgid "You do not have a Spotify Premium account." --msgstr "" -- - msgid "" - "You have selected a Premium-only audio type but do not have any account " - "details entered" -diff -rauN clementine-1.0.1/src/translations/eo.po clementine-libre-1.0.1/src/translations/eo.po ---- clementine-1.0.1/src/translations/eo.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/eo.po 2012-05-29 15:18:59.993076631 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Eraro okazis dum kopiado de la iTunes-datumbazo el aparato" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/es.po clementine-libre-1.0.1/src/translations/es.po ---- clementine-1.0.1/src/translations/es.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/es.po 2012-05-29 15:22:56.383076862 -0400 -@@ -254,10 +254,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Se requiere una cuenta Grooveshrak Anywhere" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Se requiere una cuenta Premium de Spotify." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -319,7 +315,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -592,14 +587,6 @@ - msgid "Always start playing" - msgstr "Siempre empezar a reproducir" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Un plugin adicional es requerido para usar Spotify en Clementine. ¿Te " --"gustaría descargarlo e instalarlo ahora?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -829,10 +816,6 @@ - msgid "CUE sheet support" - msgstr "Soporte de hoja CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Cancelar" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Cambiar portada" -@@ -1046,10 +1029,6 @@ - msgid "Configure Shortcuts" - msgstr "Configurar accesos rápidos" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configurar Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configurar colección..." -@@ -1067,10 +1046,6 @@ - msgid "Connect device" - msgstr "Conectar dispositivo" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Connectando con Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Flujo de bits constante" -@@ -1486,10 +1461,6 @@ - msgid "Download this album..." - msgstr "Descargar este álbum..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Descargar..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Descargar el directorio de Icecast" -@@ -1502,10 +1473,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Descargando el catálogo de Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Descargando el plugin Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Descargando metadatos" -@@ -1657,10 +1624,6 @@ - msgid "Error deleting songs" - msgstr "Error al borrar canciones" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Error descargando el plugin Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1844,12 +1807,6 @@ - msgid "Font size" - msgstr "Tamaño de letra" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Por razones de licenciamiento, para usar Spotify se necesita un complemento " --"separado." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forzar la codificación en mono" -@@ -2123,10 +2080,6 @@ - "En el modo dinámico las canciones nuevas se elegirán y añadirán a la lista " - "de reproducción cada vez que termine una canción." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Bandeja de entrada" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Incluir carátula en la notificación" -@@ -2155,10 +2108,6 @@ - msgid "Insert..." - msgstr "Insertar..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instalado" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2463,7 +2412,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2539,10 +2487,6 @@ - msgid "Main profile (MAIN)" - msgstr "Perfil principal (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Hacer disponible la lista de reproducción fuera de línea" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Respuesta malformada" -@@ -2803,10 +2747,6 @@ - msgid "Not enough neighbors" - msgstr "No hay suficientes vecinos" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "No instalado" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "No ha iniciado sesión" -@@ -2941,7 +2881,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Contraseña" -@@ -3048,10 +2987,6 @@ - msgid "Playlists" - msgstr "Listas de reproducción" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Estado del complemento:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3082,7 +3017,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Preferencias" -@@ -3099,10 +3033,6 @@ - msgid "Preferred audio format" - msgstr "Formato de audio preferido" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Formato preferido" -@@ -3493,18 +3423,6 @@ - msgid "Search Magnatune" - msgstr "Buscar en Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Buscar en Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Buscar en Spotify (abre una nueva pestaña)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Buscar en Spotify (abre una pestaña nueva)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Buscar en todas tus fuentes(libreria, servicios de internet, ...) " -@@ -3830,30 +3748,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Error de inicio de sesión de Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Complemento de Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "El complemento de Spotify no está instalado" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Estándar" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Destacado" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Iniciar la lista de reproducción actualmente reproduciendose" -@@ -3863,7 +3761,6 @@ - msgstr "Comenzar conversión" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3951,18 +3848,6 @@ - msgid "Switch provider" - msgstr "Cambiar proveedor" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Sincronizando bandeja de entrada de Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Sincronizando lista de reproducción de Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Sincronizando canciones destacadas de Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Pestañas en la parte superior" -@@ -4341,10 +4226,6 @@ - msgid "Use the system proxy settings" - msgstr "Utilizar la configuración para proxy del sistema" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Usado" -@@ -4360,7 +4241,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nombre de Usuario" -@@ -4599,20 +4479,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "No tienes una cuenta Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "No tienes una cuenta Spotify Premium." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Amas esta canción" -@@ -4680,7 +4546,6 @@ - msgstr "Sus scrobbles: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Tu nombre de usuario o contraseña es incorrecta." - -@@ -4769,8 +4634,6 @@ - msgstr "en los últimos" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/et.po clementine-libre-1.0.1/src/translations/et.po ---- clementine-1.0.1/src/translations/et.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/et.po 2012-05-29 15:46:09.829745009 -0400 -@@ -251,10 +251,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -310,7 +306,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -583,12 +578,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -814,10 +803,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Loobu" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1018,10 +1003,6 @@ - msgid "Configure Shortcuts" - msgstr "Kiirklahvide seadistamine" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1039,10 +1020,6 @@ - msgid "Connect device" - msgstr "Ühenda seade" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1452,10 +1429,6 @@ - msgid "Download this album..." - msgstr "Lae see album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1468,10 +1441,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1622,10 +1591,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1807,10 +1772,6 @@ - msgid "Font size" - msgstr "Kirja suurus" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2073,10 +2034,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2105,10 +2062,6 @@ - msgid "Insert..." - msgstr "Lisa..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Paigaldatud" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2411,7 +2364,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2487,10 +2439,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Vigane vastus" -@@ -2748,10 +2696,6 @@ - msgid "Not enough neighbors" - msgstr "Pole piisavalt naabreid" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2886,7 +2830,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Parool" -@@ -2993,10 +2936,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3027,7 +2966,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Seadistused" -@@ -3044,10 +2982,6 @@ - msgid "Preferred audio format" - msgstr "Eelistatud heli vorming" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Eelistatud vorming" -@@ -3438,18 +3372,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3774,30 +3696,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3807,7 +3709,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3893,18 +3794,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4262,10 +4151,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Kasutuses" -@@ -4281,7 +4166,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Kasutajanimi" -@@ -4505,20 +4389,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4578,7 +4448,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4667,8 +4536,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/eu.po clementine-libre-1.0.1/src/translations/eu.po ---- clementine-1.0.1/src/translations/eu.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/eu.po 2012-05-29 15:47:59.699745177 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/fa.po clementine-libre-1.0.1/src/translations/fa.po ---- clementine-1.0.1/src/translations/fa.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/fa.po 2012-05-29 15:57:55.966412407 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "حساب کاربری «Spotify Premium» مورد نیاز است." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -315,7 +311,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -588,14 +583,6 @@ - msgid "Always start playing" - msgstr "همواره پخش را شروع کن" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"کلمنتاین به افزونهٔ دیگری برای استفادهٔ اسپاتیفای نیاز دارد. آیا میخواهید" --" این افزونه را بارگیری و نصب نمایید؟" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "مشکلی هنگام کپیکردن بانک اطلاعاتی آیتیون از دستگاه پیش آمد" -@@ -821,10 +808,6 @@ - msgid "CUE sheet support" - msgstr "برگهٔ پشتیبانی CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "لغو" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "تغییر جلد هنری" -@@ -1035,10 +1018,6 @@ - msgid "Configure Shortcuts" - msgstr "پیکربندی میانبرها" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "پیکربندی Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "پیکربندی کتابخانه..." -@@ -1056,10 +1035,6 @@ - msgid "Connect device" - msgstr "اتصال دستگاه" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "اتصال به Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "ضرباهنگ ثابت" -@@ -1475,10 +1450,6 @@ - msgid "Download this album..." - msgstr "بارگیری این آلبوم..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "بارگیری..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "بارگیری پوشهٔ Icecast" -@@ -1491,10 +1462,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "بارگیری کاتالوگ Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "بارگیری افزونهٔ Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "بارگیری ابرداده" -@@ -1645,10 +1612,6 @@ - msgid "Error deleting songs" - msgstr "خطا در پاک کردن آهنگها" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "خطا در بارگیری افزونهٔ Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1830,10 +1793,6 @@ - msgid "Font size" - msgstr "اندازهٔ قلم" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "به دلایل اجازهنامه، پشتیبانی اسپاتیفای در افزونهای جداگانه است." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "رمزینهٔ مونو پخش کن" -@@ -2104,10 +2063,6 @@ - "در حالت دینامیک پس از پایان هر آهنگ، قطعههای تازه انتخاب و به لیستپخش " - "افزوده میشوند." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "صندوق ورودی" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "آلبوم هنری را در آگاهساز قرار بده" -@@ -2136,10 +2091,6 @@ - msgid "Insert..." - msgstr "قرار دادن..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "نصب شد" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "اینترنت" -@@ -2442,7 +2393,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2518,10 +2468,6 @@ - msgid "Main profile (MAIN)" - msgstr "مشخصات اصلی (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "لیستپخش را بیرونخط در دسترس بگذار" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "پاسخ ناهنجار" -@@ -2780,10 +2726,6 @@ - msgid "Not enough neighbors" - msgstr "بدون همسایهٔ کافی" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "نصب نشده" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2918,7 +2860,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "کلمهٔ عبور" -@@ -3025,10 +2966,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "وضعیت افزونه" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "پاپ" -@@ -3059,7 +2996,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "تنظیمات" -@@ -3076,10 +3012,6 @@ - msgid "Preferred audio format" - msgstr "فرمت صوتی ترجیحی" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "فرمت ترجیحی" -@@ -3470,18 +3402,6 @@ - msgid "Search Magnatune" - msgstr "جستجوی Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "جستجوی Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3806,30 +3726,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "خطای ورود به سیستم Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "افزونهٔ Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "افزونهٔ Spotify نصب نیست" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "استاندارد" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "ستارهدار" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "شروع لیستپخش در حال پخش" -@@ -3839,7 +3739,6 @@ - msgstr "شروع ترانسکد" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3925,18 +3824,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "همگامسازی صندوق ورودی اسپاتیفای" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "همگامسازی لیستپخش اسپاتیفای" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "همگامسازی قطعههای ستارهدار اسپاتیفای" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "باریکهها در بالا" -@@ -4314,10 +4201,6 @@ - msgid "Use the system proxy settings" - msgstr "بکاربردن تنظیمات پراکسی سیستم" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "استفادهشده" -@@ -4333,7 +4216,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "شناسه" -@@ -4568,20 +4450,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "عاشق این آهنگ هستید" -@@ -4648,7 +4516,6 @@ - msgstr "برونکشیهای شما: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4737,8 +4604,6 @@ - msgstr "در آخرین" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/fi.po clementine-libre-1.0.1/src/translations/fi.po ---- clementine-1.0.1/src/translations/fi.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/fi.po 2012-05-29 16:22:14.749747287 -0400 -@@ -250,10 +250,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Grooveshark Anywhere tili vaaditaan käyttöön." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotifyn Premium-tili vaaditaan." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -311,7 +307,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -584,14 +579,6 @@ - msgid "Always start playing" - msgstr "Aloita aina toisto" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Spotifyn käyttö Clementinessä vaatii lisäosan. Haluatko ladata ja asentaa " --"sen nyt?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "iTunes-tietokantaa laitteesta ladatessa tapahtui virhe" -@@ -819,10 +806,6 @@ - msgid "CUE sheet support" - msgstr "CUE-tiedostojen tuki" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Peru" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Vaihda kansikuvaa" -@@ -1032,10 +1015,6 @@ - msgid "Configure Shortcuts" - msgstr "Pikanäppäinten asetukset..." - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Muokkaa Spotifya..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Kirjaston asetukset..." -@@ -1053,10 +1032,6 @@ - msgid "Connect device" - msgstr "Yhdistä laite" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Yhdistetään Spotifyyn" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Pysyvä bittinopeus" -@@ -1468,10 +1443,6 @@ - msgid "Download this album..." - msgstr "Lataa tämä levy..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Lataa..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Ladataan Icecast-hakemistoa" -@@ -1484,10 +1455,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Ladataan Magnatune-luetteloa" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Ladataan Spotify-liitännäistä" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Noudetaan metadataa" -@@ -1638,10 +1605,6 @@ - msgid "Error deleting songs" - msgstr "Virhe kappaleita poistaessa" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Virhe ladatessa Spotify-liitännäistä" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1825,10 +1788,6 @@ - msgid "Font size" - msgstr "Kirjasinkoko" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Lisenssisyistä Spotify-tuki on erillinen liitännäinen." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Pakota monokoodaus" -@@ -2097,10 +2056,6 @@ - "Dynaamisessa tilassa uusia kappaleita valitaan ja lisätään soittolistaan " - "joka kerta kun yksi kappale on soitettu." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Saapuneet" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Näytä kansikuva ilmoituksen yhteydessä" -@@ -2129,10 +2084,6 @@ - msgid "Insert..." - msgstr "Lisää..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Asennettu" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2435,7 +2386,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2511,10 +2461,6 @@ - msgid "Main profile (MAIN)" - msgstr "Oletusprofiili (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Virheellinen vastaus" -@@ -2775,10 +2721,6 @@ - msgid "Not enough neighbors" - msgstr "Ei tarpeeksi naapureita" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Ei asennettu" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Ei kirjautunut" -@@ -2913,7 +2855,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Salasana" -@@ -3020,10 +2961,6 @@ - msgid "Playlists" - msgstr "Soittolistat" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Liitännäisen tila:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3054,7 +2991,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Asetukset" -@@ -3071,10 +3007,6 @@ - msgid "Preferred audio format" - msgstr "Ensisijainen äänimuoto" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Ensisijainen muoto" -@@ -3465,18 +3397,6 @@ - msgid "Search Magnatune" - msgstr "Etsi Magnatunesta" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Etsi Spotifysta" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Etsi Spotifysta (avaa uuden välilehden)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Etsi Spotifysta (avaa uuden välilehden)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Etsi kaikista lähteistä (kirjasto, internet, ...)" -@@ -3801,30 +3721,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify-kirjautumisvirhe" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify-liitännäinen" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify-liitännäistä ei ole asennettu" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Normaali" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3834,7 +3734,6 @@ - msgstr "Aloita muunnos" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3920,18 +3819,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synkronoi Spotify saapuneet" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synkronoi Spotify soittolistan" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synkronoi Spotify arvostellut kappaleet" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Välilehdet ylhäällä" -@@ -4306,10 +4193,6 @@ - msgid "Use the system proxy settings" - msgstr "Käytä järjestelmän välityspalvelinasetuksia" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Käytetty" -@@ -4325,7 +4208,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Käyttäjätunnus" -@@ -4562,20 +4444,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Sinulla ei ole Grooveshark Anywhere tiliä." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Sinulla ei ole Spotify Premium tiliä." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Tykkäät tästä kappaleesta" -@@ -4635,7 +4503,6 @@ - msgstr "Lähetyksesi: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Käyttäjätunnus tai salasana oli virheellinen." - -@@ -4724,8 +4591,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kb/s" - -diff -rauN clementine-1.0.1/src/translations/fr.po clementine-libre-1.0.1/src/translations/fr.po ---- clementine-1.0.1/src/translations/fr.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/fr.po 2012-05-29 16:25:03.779747446 -0400 -@@ -258,10 +258,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Un compte Grooveshark Anywhere est nécessaire." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Un compte Spotify Premium est nécessaire." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -323,7 +319,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -597,14 +592,6 @@ - msgid "Always start playing" - msgstr "Toujours commencer à lire" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Un module externe est requis pour pouvoir utiliser Spotify. Voulez-vous le " --"télécharger et l'installer maintenant ?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -838,10 +825,6 @@ - msgid "CUE sheet support" - msgstr "Support des CUE sheet." - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Annuler" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Changer la couverture de l'album" -@@ -1056,10 +1039,6 @@ - msgid "Configure Shortcuts" - msgstr "Configurer les raccourcis clavier" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configurer Spotify…" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configurer votre bibliothèque..." -@@ -1077,10 +1056,6 @@ - msgid "Connect device" - msgstr "Connexion du périphérique" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Connexion à Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Débit constant" -@@ -1496,10 +1471,6 @@ - msgid "Download this album..." - msgstr "Télécharger cet album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Télécharger..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Téléchargement du catalogue d'Icecast" -@@ -1512,10 +1483,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Téléchargement du catalogue Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Téléchargement du module Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Téléchargement des métadonnées" -@@ -1671,10 +1638,6 @@ - msgid "Error deleting songs" - msgstr "Erreur lors de la suppression des morceaux" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Erreur lors du téléchargement du module Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1858,12 +1821,6 @@ - msgid "Font size" - msgstr "Taille de la police" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Pour des raisons de licence, le support de Spotify est dans un module " --"séparé." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forcer l’encodage en mono" -@@ -2138,10 +2095,6 @@ - "En mode dynamique, de nouvelles pistes seront choisies et ajoutées à la fin " - "de la liste de lecture chaque fois qu'un morceau se terminera." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Boîte de réception" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Inclure la pochette de l'abum dans la fenêtre de notification" -@@ -2170,10 +2123,6 @@ - msgid "Insert..." - msgstr "Insérer..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Installé(e)(s)" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2481,7 +2430,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2557,10 +2505,6 @@ - msgid "Main profile (MAIN)" - msgstr "Profil principal (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Rendre la liste de lecture accessible hors ligne" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Réponse mal formatée" -@@ -2822,10 +2766,6 @@ - msgid "Not enough neighbors" - msgstr "Voisins insuffisants" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Non installé" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Non connecté" -@@ -2960,7 +2900,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Mot de passe" -@@ -3067,10 +3006,6 @@ - msgid "Playlists" - msgstr "Listes de lecture" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "État du module externe :" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3101,7 +3036,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Préférences" -@@ -3118,10 +3052,6 @@ - msgid "Preferred audio format" - msgstr "Format audio préféré" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Débit préféré" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Format préféré" -@@ -3512,18 +3442,6 @@ - msgid "Search Magnatune" - msgstr "Recherche Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Recherche Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Recherche Spotify (ouvre un nouvel onglet)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Recherche Spotify (ouvre un nouvel onglet)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3851,30 +3769,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Erreur lors de la connexion à Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Module externe Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Le module externe de Spotify n'est pas installé" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Favoris" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Commencer la liste de lecture jouée actuellement" -@@ -3884,7 +3782,6 @@ - msgstr "Démarrer transcodage" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3972,18 +3869,6 @@ - msgid "Switch provider" - msgstr "Changer de service" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synchronisation de la boîte de réception Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synchronisation de la liste de lecture Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synchronisation des morceaux Spotify préférés" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Onglets au dessus" -@@ -4369,10 +4254,6 @@ - msgid "Use the system proxy settings" - msgstr "Utiliser les paramètres du système pour le serveur mandataire" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Utilisé" -@@ -4388,7 +4269,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nom d'utilisateur" -@@ -4629,23 +4509,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Vous n'avez pas de compte Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Vous n'avez pas de compte Spotify Premium." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe " --"dans la fenêtre des préférences." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" --"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Vous aimez cette piste" -@@ -4713,7 +4576,6 @@ - msgstr "Vos scrobbles : %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Votre nom d'utilisateur ou mot de passe est incorrect." - -@@ -4802,8 +4664,6 @@ - msgstr "parmi les derniers" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/gl.po clementine-libre-1.0.1/src/translations/gl.po ---- clementine-1.0.1/src/translations/gl.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/gl.po 2012-05-29 16:27:07.409747570 -0400 -@@ -251,10 +251,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -310,7 +306,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -583,12 +578,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Aconteceu un erro copiando a base de datos de iTunes do dispositivo" -@@ -814,10 +803,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1022,10 +1007,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configurar a biblioteca..." -@@ -1043,10 +1024,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1456,10 +1433,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1472,10 +1445,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1625,10 +1594,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1810,10 +1775,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2076,10 +2037,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2108,10 +2065,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2415,7 +2368,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2491,10 +2443,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Resposta mal formada" -@@ -2751,10 +2699,6 @@ - msgid "Not enough neighbors" - msgstr "Viciños insuficientes" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2889,7 +2833,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2996,10 +2939,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3030,7 +2969,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3047,10 +2985,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3441,18 +3375,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3777,30 +3699,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Reproducir a playlist actualmente reproducindo" -@@ -3810,7 +3712,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3896,18 +3797,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4265,10 +4154,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4284,7 +4169,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4508,20 +4392,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4581,7 +4451,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4670,8 +4539,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/he.po clementine-libre-1.0.1/src/translations/he.po ---- clementine-1.0.1/src/translations/he.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/he.po 2012-05-29 16:33:23.043081344 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -313,7 +309,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -586,12 +581,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "ארעה שגיאה בהעתקת מסד הנתונים של iTunes מההתקן" -@@ -817,10 +806,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "שינוי עטיפת האלבום" -@@ -1025,10 +1010,6 @@ - msgid "Configure Shortcuts" - msgstr "הגדר קיצורי מקשים" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "הגדר את הספרייה..." -@@ -1046,10 +1027,6 @@ - msgid "Connect device" - msgstr "חבר התקן" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1464,10 +1441,6 @@ - msgid "Download this album..." - msgstr "הורד את האלבום הזה..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "מוריד תיקיית Icecast" -@@ -1480,10 +1453,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "מוריד את הקטלוג של Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1633,10 +1602,6 @@ - msgid "Error deleting songs" - msgstr "שגיאה במחיקת שירים" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1818,10 +1783,6 @@ - msgid "Font size" - msgstr "גודל הגופן" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2086,10 +2047,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "אומנות אלבום בתוך ההתראה" -@@ -2118,10 +2075,6 @@ - msgid "Insert..." - msgstr "הוספה..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "אינטרנט" -@@ -2424,7 +2377,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2500,10 +2452,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "תגובה שגויה" -@@ -2761,10 +2709,6 @@ - msgid "Not enough neighbors" - msgstr "אין מספיק שכנים" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2899,7 +2843,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "סיסמא" -@@ -3006,10 +2949,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "פופ" -@@ -3040,7 +2979,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "מאפיינים" -@@ -3057,10 +2995,6 @@ - msgid "Preferred audio format" - msgstr "פורמט אודיו מועדף" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "פורמט מועדף" -@@ -3451,18 +3385,6 @@ - msgid "Search Magnatune" - msgstr "חיפוש ב־Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3787,30 +3709,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "התחל את רשימת־ההשמעה המתנגנת כעת" -@@ -3820,7 +3722,6 @@ - msgstr "התחלת הקידוד" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3906,18 +3807,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "לשוניות למעלה" -@@ -4280,10 +4169,6 @@ - msgid "Use the system proxy settings" - msgstr "שימוש בהגדרות הפרוקסי של המערכת" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "בשימוש" -@@ -4299,7 +4184,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "שם משתמש" -@@ -4532,20 +4416,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "אתה אוהב את הרצועה הזו" -@@ -4608,7 +4478,6 @@ - msgstr "ה-scrobbles שלך: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4697,8 +4566,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "קילו־סיביות לשניה" - -diff -rauN clementine-1.0.1/src/translations/hi.po clementine-libre-1.0.1/src/translations/hi.po ---- clementine-1.0.1/src/translations/hi.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/hi.po 2012-05-29 16:34:21.266414734 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/hr.po clementine-libre-1.0.1/src/translations/hr.po ---- clementine-1.0.1/src/translations/hr.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/hr.po 2012-05-29 16:50:07.443081990 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotify Premium račun je obvezan." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,14 +584,6 @@ - msgid "Always start playing" - msgstr "Uvijek započinji reprodukciju glazbe" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Dodatni dodatak je potreban za korištenje Spotify-a u Clementine-u. Želite " --"li preuzeti dodatak i instalirati sada?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Pogreška je nastala tijekom kopiranja iTunes baze podataka sa uređaja" -@@ -822,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "Podrška za CUE listu" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Otkaži" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Promijenite omot albuma" -@@ -1039,10 +1022,6 @@ - msgid "Configure Shortcuts" - msgstr "Podesi prečace" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Podesite Spotify ..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Podesi zbirku..." -@@ -1060,10 +1039,6 @@ - msgid "Connect device" - msgstr "Spoji uređaj" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Spajanje Spotify-a" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Konstantna brzina prijenosa" -@@ -1479,10 +1454,6 @@ - msgid "Download this album..." - msgstr "Preuzmi ovaj album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Preuzmi..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Preuzimanje Icecast direktorija" -@@ -1495,10 +1466,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Preuzimanje Magnatune kataloga" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Preuzimanje Spotify dodatka" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Preuzimanje metapodataka" -@@ -1649,10 +1616,6 @@ - msgid "Error deleting songs" - msgstr "Pogreška u brisanju pjesama" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "pogreška pri preuzimanju Spotify dodatka" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1834,10 +1797,6 @@ - msgid "Font size" - msgstr "Veličina slova" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Zbog razloga licenciranja Spotify-a podrška je u posebnom dodatak." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forsiraj mono enkodiranje" -@@ -2108,10 +2067,6 @@ - "U dinamičkom modu nove pjesme će biti izabrane i dodane u popis izvođenja " - "svaki puta kada je pjesma odsvirana." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Pristigle poruke" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Prikaži omot albuma u obavijesti" -@@ -2140,10 +2095,6 @@ - msgid "Insert..." - msgstr "Umetni..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instalirano" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2446,7 +2397,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2522,10 +2472,6 @@ - msgid "Main profile (MAIN)" - msgstr "Glavni profil (GLAVNI)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Učini popis izvođenja dostupnim kada je veza prekinuta" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Pogreška u odgovoru" -@@ -2784,10 +2730,6 @@ - msgid "Not enough neighbors" - msgstr "Nema dovoljno susjeda" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nije instalirano" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2922,7 +2864,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Lozinka" -@@ -3029,10 +2970,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Status dodatka:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3063,7 +3000,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Opcije" -@@ -3080,10 +3016,6 @@ - msgid "Preferred audio format" - msgstr "Željeni audio format" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Željeni format" -@@ -3474,18 +3406,6 @@ - msgid "Search Magnatune" - msgstr "Pretražite Magnatune stanice" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Pretražite Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Pretražite Spotify (otvori u novoj kartici)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Pretražite Spotify (otvori u novoj kartici)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3811,30 +3731,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify pogreška kod prijave" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify dodatak" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify dodatak nije instaliran" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standardno" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Sa zvjezdicom" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Pokrenite popis izvođenja koji se trenutno izvodi" -@@ -3844,7 +3744,6 @@ - msgstr "Započni enkodiranje" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3930,18 +3829,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Sinkronizacija Spotify ulaznog spremnika" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Sinkroniziranje Spotify popisa izvođenja" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Sinkronizacija Spotify pjesama označenim zvjezdicama" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Kartice pri vrhu" -@@ -4318,10 +4205,6 @@ - msgid "Use the system proxy settings" - msgstr "Koristite proxy postavke od sustava" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Iskorišteno" -@@ -4337,7 +4220,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Korisničko ime" -@@ -4572,20 +4454,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Sviđa vam se ova pjesma" -@@ -4653,7 +4521,6 @@ - msgstr "Vaši scrobbles: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4742,8 +4609,6 @@ - msgstr "u posljednjih" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/hu.po clementine-libre-1.0.1/src/translations/hu.po ---- clementine-1.0.1/src/translations/hu.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/hu.po 2012-05-29 16:50:46.463082538 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Grooveshark Anywhere fiók szükséges." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotify prémium fiók szükséges" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,14 +584,6 @@ - msgid "Always start playing" - msgstr "Mindig indítja a lejátszást" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"A Spotify használatához külön beépülő szükséges. Szeretnéd most letölteni és" --" telepíteni?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Hiba történt az iTunes adatbázis másolása közben az eszközről" -@@ -823,10 +810,6 @@ - msgid "CUE sheet support" - msgstr "CUE fájl támogatás" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Mégsem" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Albumborító módosítása" -@@ -1042,10 +1025,6 @@ - msgid "Configure Shortcuts" - msgstr "Billentyűkombinációk beállítása" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Spotify beállítása..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Zenetár beállítása..." -@@ -1065,10 +1044,6 @@ - msgid "Connect device" - msgstr "Eszköz csatlakoztatása" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Csatlakozás a Spotifyhoz" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Állandó bitráta" -@@ -1484,10 +1459,6 @@ - msgid "Download this album..." - msgstr "Album letöltése..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Letöltés…" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Icecast könyvtár letöltése" -@@ -1500,10 +1471,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Magnatune katalógus letöltése" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Spotify beépülő letöltése" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Metaadat letöltése" -@@ -1656,10 +1623,6 @@ - msgid "Error deleting songs" - msgstr "Hiba történt a számok törlése közben" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Hiba a Spotify beépülő letöltése közben" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1842,12 +1805,6 @@ - msgid "Font size" - msgstr "Betűméret" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Licencelési okok miatt a Spotify támogatást külön beépülőben kell " --"telepíteni." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Mono kódolás kényszerítése" -@@ -2117,10 +2074,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Beérkezett üzenetek" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Albumborító megjelenítése az értesítésben" -@@ -2149,10 +2102,6 @@ - msgid "Insert..." - msgstr "Beszúrás..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Telepítve" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2455,7 +2404,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2531,10 +2479,6 @@ - msgid "Main profile (MAIN)" - msgstr "Fő profil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Hibásan formázott válasz" -@@ -2793,10 +2737,6 @@ - msgid "Not enough neighbors" - msgstr "Nincs elég szomszédja" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nincs telepítve" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2931,7 +2871,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Jelszó" -@@ -3038,10 +2977,6 @@ - msgid "Playlists" - msgstr "Lejátszási lista" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Beépülő állapot:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3072,7 +3007,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Beállítások" -@@ -3089,10 +3023,6 @@ - msgid "Preferred audio format" - msgstr "Előnyben részesített audio formátum" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Előnyben részesített formátum" -@@ -3483,18 +3413,6 @@ - msgid "Search Magnatune" - msgstr "Keresés a Magnatuneon" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Keresés Spotifyon" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Keresés Spotifyon (új lapot nyit)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Keresés Spotifyon (új lapot nyit)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3822,30 +3740,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Hiba a Spotifyra való bejelentkezéskor" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify beépülő" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "A Spotify beépülő nincs telepítve" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Normál" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Kedvenc" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Az éppen lejátszott lista indítása" -@@ -3855,7 +3753,6 @@ - msgstr "Átkódolás indítása" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3941,18 +3838,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Spotify üzenetek szinkronizálása" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Spotify lejátszási lista szinkronizálása" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Spotify csillagozott számok szinronizálása" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Lapfülek felül" -@@ -4327,10 +4212,6 @@ - msgid "Use the system proxy settings" - msgstr "A rendszer proxy beállításainak használata" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Használt" -@@ -4346,7 +4227,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Felhasználónév" -@@ -4580,20 +4460,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Kedveled ezt a számot" -@@ -4660,7 +4526,6 @@ - msgstr "Scrobblejaid: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4749,8 +4614,6 @@ - msgstr "az utóbbi" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/hy.po clementine-libre-1.0.1/src/translations/hy.po ---- clementine-1.0.1/src/translations/hy.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/hy.po 2012-05-29 16:51:35.523082336 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/ia.po clementine-libre-1.0.1/src/translations/ia.po ---- clementine-1.0.1/src/translations/ia.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ia.po 2012-05-29 16:52:43.266415554 -0400 -@@ -250,10 +250,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -309,7 +305,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -582,12 +577,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -813,10 +802,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1017,10 +1002,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1038,10 +1019,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1451,10 +1428,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1467,10 +1440,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1620,10 +1589,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1805,10 +1770,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2071,10 +2032,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2103,10 +2060,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2409,7 +2362,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2485,10 +2437,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2745,10 +2693,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2883,7 +2827,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2990,10 +2933,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3024,7 +2963,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3041,10 +2979,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3435,18 +3369,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3771,30 +3693,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3804,7 +3706,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3890,18 +3791,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4259,10 +4148,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4278,7 +4163,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4502,20 +4386,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4575,7 +4445,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4664,8 +4533,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/id.po clementine-libre-1.0.1/src/translations/id.po ---- clementine-1.0.1/src/translations/id.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/id.po 2012-05-29 16:55:43.939749412 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Sebuah akun Premium Spotify diperlukan." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,12 +584,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -820,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1024,10 +1009,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1045,10 +1026,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1458,10 +1435,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1474,10 +1447,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1627,10 +1596,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1812,10 +1777,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2078,10 +2039,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2110,10 +2067,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2416,7 +2369,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2492,10 +2444,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2752,10 +2700,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2890,7 +2834,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2997,10 +2940,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3031,7 +2970,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3048,10 +2986,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3442,18 +3376,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3778,30 +3700,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3811,7 +3713,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3897,18 +3798,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4266,10 +4155,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4285,7 +4170,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4509,20 +4393,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4582,7 +4452,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4671,8 +4540,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/is.po clementine-libre-1.0.1/src/translations/is.po ---- clementine-1.0.1/src/translations/is.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/is.po 2012-05-29 16:56:42.033082876 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "Alltaf hefja spilun" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Villa kom upp við afritun iTunes gagnagrunns af tæki" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/it.po clementine-libre-1.0.1/src/translations/it.po ---- clementine-1.0.1/src/translations/it.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/it.po 2012-05-29 16:57:27.279749567 -0400 -@@ -256,10 +256,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "È richiesto un account Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "È richiesto un account Premium di Spotify" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -318,7 +314,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -591,14 +586,6 @@ - msgid "Always start playing" - msgstr "Inizia sempre la riproduzione" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Un plugin aggiuntivo è richiesto per utilizzare Spotify in Clementine. Vuoi " --"scaricarlo e installarlo subito?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -829,10 +816,6 @@ - msgid "CUE sheet support" - msgstr "Supporto CUE sheet" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Annulla" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Cambia copertina" -@@ -1044,10 +1027,6 @@ - msgid "Configure Shortcuts" - msgstr "Configura scorciatoie" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configura Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configura raccolta..." -@@ -1065,10 +1044,6 @@ - msgid "Connect device" - msgstr "Connetti dispositivo" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Connessione a Spotify in corso" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Bitrate costante" -@@ -1484,10 +1459,6 @@ - msgid "Download this album..." - msgstr "Scarica questo album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Scarica..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Scaricamento directory Icecast in corso" -@@ -1500,10 +1471,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Scaricamento catalogo Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Scarica il plugin di Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Scaricamento metadati in corso" -@@ -1658,10 +1625,6 @@ - msgid "Error deleting songs" - msgstr "Errore durante l'eliminazione dei brani" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Errore di scaricamento del plugin di Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1844,11 +1807,6 @@ - msgid "Font size" - msgstr "Dimensione del carattere" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Per motivi di licenza, il supporto di Spotify è in un plugin separato." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forza codifica mono" -@@ -2123,10 +2081,6 @@ - "Nella modalità dinamica le nuove tracce saranno scelte e aggiunte alla " - "scaletta al termine di ogni brano." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "In arrivo" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Includi copertina nella notifica" -@@ -2155,10 +2109,6 @@ - msgid "Insert..." - msgstr "Inserisci..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Installati" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2465,7 +2415,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2541,10 +2490,6 @@ - msgid "Main profile (MAIN)" - msgstr "Profilo principale (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Rendi la scaletta disponibile non in linea" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Risposta non corretta" -@@ -2804,10 +2749,6 @@ - msgid "Not enough neighbors" - msgstr "Vicini non sufficienti" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Non installati" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Accesso non effettuato" -@@ -2942,7 +2883,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Password" -@@ -3049,10 +2989,6 @@ - msgid "Playlists" - msgstr "Scalette" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Stato del plugin:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3083,7 +3019,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Preferenze" -@@ -3100,10 +3035,6 @@ - msgid "Preferred audio format" - msgstr "Formato audio preferito" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Bitrate preferito" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Formato preferito" -@@ -3494,18 +3425,6 @@ - msgid "Search Magnatune" - msgstr "Cerca in Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Cerca in Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Cerca in Spotify (apre una nuova scheda)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Cerca in Spotify (apre una nuova scheda)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Cerca in tutte le fonti (raccolta, servizi internet, ...)" -@@ -3831,30 +3750,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Errore di accesso a Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Plugin di Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Plugin di Spotify non installato" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Preferiti" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Avvia la scaletta attualmente in riproduzione" -@@ -3864,7 +3763,6 @@ - msgstr "Avvia transcodifica" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3952,18 +3850,6 @@ - msgid "Switch provider" - msgstr "Cambia fornitore" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Sincronizzazione inbox di Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Sincronizzazione scaletta di Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Sincronizzazione tracce preferite di Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Schede in alto" -@@ -4351,10 +4237,6 @@ - msgid "Use the system proxy settings" - msgstr "Utilizza le impostazioni di sistema del proxy" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Usa la normalizzazione del volume" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Utilizzato" -@@ -4370,7 +4252,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nome utente" -@@ -4607,22 +4488,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Non hai un account Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Non hai un account Premium Spotify." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Ti sei disconnesso da Spotify, reinserisci la password nella finestra " --"Impostazioni." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Ti sei disconnesso da Spotify, reinserisci la password." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Ti piace questa traccia" -@@ -4690,7 +4555,6 @@ - msgstr "I tuoi scrobble: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Nome utente o password non corretta." - -@@ -4779,8 +4643,6 @@ - msgstr "negli ultimi" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/ja.po clementine-libre-1.0.1/src/translations/ja.po ---- clementine-1.0.1/src/translations/ja.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ja.po 2012-05-29 16:58:23.063082909 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Grooveshark Anywhere のアカウントが必要です。" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotify のプレミアムアカウントが必要です。" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -313,7 +309,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -586,12 +581,6 @@ - msgid "Always start playing" - msgstr "常に再生を開始する" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "Clementine で Spotify を利用するには追加のプラグインが必要です。今すぐダウンロードしてインストールしますか？" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "デバイスからの iTunes データベースのコピー エラーです" -@@ -817,10 +806,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "キャンセル" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "カバー アートの変更" -@@ -1023,10 +1008,6 @@ - msgid "Configure Shortcuts" - msgstr "ショートカットの構成" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "ライブラリの構成..." -@@ -1044,10 +1025,6 @@ - msgid "Connect device" - msgstr "デバイスの接続" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1461,10 +1438,6 @@ - msgid "Download this album..." - msgstr "このアルバムをダウンロード..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Icecast ディレクトリのダウンロード" -@@ -1477,10 +1450,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Magnatune カタログのダウンロード" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Spotify のプラグインをダウンロード中" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "メタデータをダウンロード中" -@@ -1630,10 +1599,6 @@ - msgid "Error deleting songs" - msgstr "曲の削除エラー" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1815,10 +1780,6 @@ - msgid "Font size" - msgstr "フォント サイズ" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2081,10 +2042,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "通知にアルバム アートを含める" -@@ -2113,10 +2070,6 @@ - msgid "Insert..." - msgstr "挿入..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "インターネット" -@@ -2419,7 +2372,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2495,10 +2447,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "不正な応答です" -@@ -2755,10 +2703,6 @@ - msgid "Not enough neighbors" - msgstr "ご近所さんが足りません" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2893,7 +2837,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "パスワード" -@@ -3000,10 +2943,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3034,7 +2973,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "環境設定" -@@ -3051,10 +2989,6 @@ - msgid "Preferred audio format" - msgstr "優先するオーディオ形式" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "優先する形式" -@@ -3445,18 +3379,6 @@ - msgid "Search Magnatune" - msgstr "Magnatune の検索" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3781,30 +3703,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "現在再生中のプレイリストを開始する" -@@ -3814,7 +3716,6 @@ - msgstr "トランスコードの開始" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3900,18 +3801,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "タブを上に配置" -@@ -4271,10 +4160,6 @@ - msgid "Use the system proxy settings" - msgstr "システムのプロキシ設定を使用する" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "使用中" -@@ -4290,7 +4175,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "ユーザー名" -@@ -4520,20 +4404,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "このトラックは Love されています" -@@ -4595,7 +4465,6 @@ - msgstr "Scrobble 回数: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "ユーザネームまたはパスワードが間違っています。" - -@@ -4684,8 +4553,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/ka.po clementine-libre-1.0.1/src/translations/ka.po ---- clementine-1.0.1/src/translations/ka.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ka.po 2012-05-29 16:59:47.116416380 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotify-ის Premium ანგარიში აუცილებელია." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "ყოველთვის დაიწყე დაკვრა" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "შეცდომა მოწყობილობიდან iTunes-ის მონაცემთა ბაზის კოპირებისას" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "CUE sheet-ის მხარდაჭერა" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "გაუქმება" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "ალბომის ყდის შეცვლა" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/kk.po clementine-libre-1.0.1/src/translations/kk.po ---- clementine-1.0.1/src/translations/kk.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/kk.po 2012-05-29 17:17:47.953084141 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Поп" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/ko.po clementine-libre-1.0.1/src/translations/ko.po ---- clementine-1.0.1/src/translations/ko.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ko.po 2012-05-29 17:20:24.469750963 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotify 프리미엄 계정이 필요합니다." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/lt.po clementine-libre-1.0.1/src/translations/lt.po ---- clementine-1.0.1/src/translations/lt.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/lt.po 2012-05-29 17:21:09.749751142 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Reikalingas mokamas Spotify vartotojas" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -313,7 +309,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -586,14 +581,6 @@ - msgid "Always start playing" - msgstr "Visada pradėti grojant" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Kad naudotumėte Spotify Clementine grotuve, jums reikia papildomo išplėtimo." --" Ar parsiųsti ir įdiegti jį dabar?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Iškilo klaida kopijuojant iTunes duomenų bazę iš įrenginio" -@@ -819,10 +806,6 @@ - msgid "CUE sheet support" - msgstr "\"CUE sheet\" palaikymas" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Atšaukti" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Keisti viršelio paveikslėlį" -@@ -1032,10 +1015,6 @@ - msgid "Configure Shortcuts" - msgstr "Konfigūruoti sparčiuosius klavišus" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Konfigūruoti Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Konfigūruoti fonoteką..." -@@ -1053,10 +1032,6 @@ - msgid "Connect device" - msgstr "Prijungti įrenginį" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Jungiamasi prie Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Pastovus bitų dažnis" -@@ -1472,10 +1447,6 @@ - msgid "Download this album..." - msgstr "Atsisiunčiamas šis albumas" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Atsisiųsti..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Atsiunčiamas Icecast aplankas" -@@ -1488,10 +1459,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Atsiunčiamas Magnatune katalogas" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Siunčiamas Spotify plėtinys" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Atsiunčiami metaduomenys" -@@ -1643,10 +1610,6 @@ - msgid "Error deleting songs" - msgstr "Klaida trinant dainas" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Klaida siunčiant Spotify plėtinį" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1828,12 +1791,6 @@ - msgid "Font size" - msgstr "Šrifto dydis" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Dėl licencijavimo priežasčių Spotify palaikymas yra įjungiamas per atskirą " --"plėtinį." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Įjungti tik mono kodavimą" -@@ -2104,10 +2061,6 @@ - "Dinamiškame režime nauji kūriniais bus parinkti ir pridėti į grojaraštį " - "kaskart, kai dabar grojamas kūrinys baigsis." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Gautieji" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Rodyti albumo paveikslus pranešime" -@@ -2136,10 +2089,6 @@ - msgid "Insert..." - msgstr "Įterpti..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Įdiegta" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internetas" -@@ -2444,7 +2393,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2520,10 +2468,6 @@ - msgid "Main profile (MAIN)" - msgstr "Pagrindinis profilis" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Padaryti šį grojaraštį prieinamą atsijungus" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Netinkamas atsakymas" -@@ -2781,10 +2725,6 @@ - msgid "Not enough neighbors" - msgstr "Nepakanka kaimynų" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Neįdiegta" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2919,7 +2859,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Slaptažodis" -@@ -3026,10 +2965,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Plėtinio būklė:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3060,7 +2995,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Nustatymai" -@@ -3078,10 +3012,6 @@ - msgid "Preferred audio format" - msgstr "Pageidaujamas audio formatas" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Pageidaujamas formatas" -@@ -3472,18 +3402,6 @@ - msgid "Search Magnatune" - msgstr "Ieškoti Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Ieškoti Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Ieškoti Spotify (atveria naują kortelę)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Ieškoti Spotify (atveria naują kortelę)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3808,30 +3726,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify prisijungimo klaida" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify plėtinys" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify plėtinys neįdiegtas" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standartinis" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Su žvaigždute" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Pradėti grajaraštį nuo dabar grojančio" -@@ -3841,7 +3739,6 @@ - msgstr "Perkoduoti" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3927,18 +3824,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Atnaujinama Spotify dėžutė" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Atnaujinama Spotify grojaraštis" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Atnaujinama Spotify pažymėti kūriniai" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Kortelės viršuje" -@@ -4312,10 +4197,6 @@ - msgid "Use the system proxy settings" - msgstr "Naudoti sistemos tarpinio serverio nustatymus" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Panaudota" -@@ -4331,7 +4212,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Naudotojo vardas" -@@ -4565,20 +4445,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Jūs mylite šį takelį" -@@ -4645,7 +4511,6 @@ - msgstr "Jūsų pateikta informacija: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4734,8 +4599,6 @@ - msgstr "per paskutines" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/lv.po clementine-libre-1.0.1/src/translations/lv.po ---- clementine-1.0.1/src/translations/lv.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/lv.po 2012-05-29 17:21:57.143084399 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Nepieciešams Spotify Premium konts." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -315,7 +311,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -588,14 +583,6 @@ - msgid "Always start playing" - msgstr "Vienmēr sākt atskaņošanu" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Lai lietotu Spotify, nepieciešams papildus spraudnis. Vai jūs vēlaties to " --"lejupielādēt un instalēt?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Kļūda kopējot iTunes datubāzi no ierīces" -@@ -822,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Atcelt" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Mainīt vāka attēlu" -@@ -1035,10 +1018,6 @@ - msgid "Configure Shortcuts" - msgstr "Konfigurēt īsceļus" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Konfigurēt Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Konfigurēt bibliotēku..." -@@ -1056,10 +1035,6 @@ - msgid "Connect device" - msgstr "Pieslēgt ierīci" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Pieslēdzos Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Konstants bitreits" -@@ -1475,10 +1450,6 @@ - msgid "Download this album..." - msgstr "Lejupielādēt šo albumu..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Lejupielādēt..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Lejupielādē Icecast mapi" -@@ -1491,10 +1462,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Lejupielādē Magnatude katalogu" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Lejupielādē Spotify spraudni" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Lejupielādē metadatus" -@@ -1646,10 +1613,6 @@ - msgid "Error deleting songs" - msgstr "Kļūda dzēšot dziesmas" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Kļūda lejupielādējot Spotify spraudni" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1832,10 +1795,6 @@ - msgid "Font size" - msgstr "Fonta izmērs" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Licencēšanas nolūkā Spotify atbalsts pieejams kā atsevišķs spraudnis" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forsēt mono kodēšanu" -@@ -2102,10 +2061,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Ienākošie" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Iekļaut vāku attēlus paziņojumos" -@@ -2134,10 +2089,6 @@ - msgid "Insert..." - msgstr "Ievietot..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Uzstādīts" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internets" -@@ -2441,7 +2392,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2517,10 +2467,6 @@ - msgid "Main profile (MAIN)" - msgstr "Galvenais profils (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Izkropļota atbilde" -@@ -2778,10 +2724,6 @@ - msgid "Not enough neighbors" - msgstr "Nepietiek kaimiņu" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nav uzstādīta" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2916,7 +2858,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Parole" -@@ -3023,10 +2964,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Spraudņa statuss:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Popmūzika" -@@ -3057,7 +2994,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Uzstādījumi" -@@ -3074,10 +3010,6 @@ - msgid "Preferred audio format" - msgstr "Vēlamais audio formāts" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Vēlamais formāts" -@@ -3468,18 +3400,6 @@ - msgid "Search Magnatune" - msgstr "Meklēt Magnatude" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Meklēt Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Meklēt Spotify (tiks atvērta jauna cilne)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Meklēt Spotify (tiks atvērta jauna cilne)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3804,30 +3724,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify pieslēgšanās kļūda" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify spraudnis" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify spraudnis nav uzstādīts" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standarts" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Novērtēts ar zvaigzni" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Sākt pašreiz atskaņoto dziesmu listi" -@@ -3837,7 +3737,6 @@ - msgstr "Sākt kodēšanu" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3923,18 +3822,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Cilnes pa virsu" -@@ -4304,10 +4191,6 @@ - msgid "Use the system proxy settings" - msgstr "Lietot sistēmas starpniekservera uzstādījumus" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Izmantots" -@@ -4323,7 +4206,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Lietotājvārds" -@@ -4554,20 +4436,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Jūs mīlat šo dziesmu" -@@ -4630,7 +4498,6 @@ - msgstr "Jūsu skrobli: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4719,8 +4586,6 @@ - msgstr "pēdējās" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kb/s" - -diff -rauN clementine-1.0.1/src/translations/mr.po clementine-libre-1.0.1/src/translations/mr.po ---- clementine-1.0.1/src/translations/mr.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/mr.po 2012-05-29 17:22:45.193084728 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/ms.po clementine-libre-1.0.1/src/translations/ms.po ---- clementine-1.0.1/src/translations/ms.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ms.po 2012-05-29 17:23:27.779751138 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Akaun Spotify Premium diperlukan" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -313,7 +309,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -586,14 +581,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Satu plugin tambahan diperlukan untuk menggunakan Spotify dalam Clementine. " --"Inginkah anda memuat turun dan memasangnya sekarang?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Satu ralat berlaku semasa menyalin pangkalan data iTunes dari peranti" -@@ -819,10 +806,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Batal" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Ubahkan seni kulit muka" -@@ -1030,10 +1013,6 @@ - msgid "Configure Shortcuts" - msgstr "Tetapkan Pintasan" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1051,10 +1030,6 @@ - msgid "Connect device" - msgstr "Sambung peranti" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Menyambung ke Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Kadar bit malar" -@@ -1464,10 +1439,6 @@ - msgid "Download this album..." - msgstr "Muat turun album ini..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Muat Turun..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Memuat turun direktori Icecast" -@@ -1480,10 +1451,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Memuat turun katalog Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Memuat turun plugin Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Memuatturun metadata" -@@ -1633,10 +1600,6 @@ - msgid "Error deleting songs" - msgstr "Ralat memadam lagu-lagu" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Ralat memuat turun plugin Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1822,11 +1785,6 @@ - msgid "Font size" - msgstr "Saiz fon" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Atas sebab-sebab perlesenan sokongan Spotify berada dalam plugin berasingan." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2099,10 +2057,6 @@ - "Dalam mod dinamik trek-trek baru akan dipilih dan ditambah ke senarai main " - "setiap kali lagu selesai." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Peti Masuk" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Sertakan hasil seni album dalam pemberitahuan" -@@ -2131,10 +2085,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Terpasang" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2437,7 +2387,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2513,10 +2462,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Buatkan senarai main tersedia di luar talian" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2775,10 +2720,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Tidak dipasang" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2913,7 +2854,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Kata laluan" -@@ -3020,10 +2960,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Status plugin:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3054,7 +2990,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3071,10 +3006,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3465,18 +3396,6 @@ - msgid "Search Magnatune" - msgstr "Cari Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Cari Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Cari Spotify (buka tab baru)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Cari Spotify (buka tab baru)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3801,30 +3720,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Ralat log masuk Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Plugin Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Plugin Spotify tidak dipasang" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Piawai" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Disukai" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3834,7 +3733,6 @@ - msgstr "Mulakan transkod" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3920,18 +3818,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Tab-tab di atas" -@@ -4308,10 +4194,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4327,7 +4209,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nama pengguna" -@@ -4555,20 +4436,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Anda suka trek ini" -@@ -4628,7 +4495,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4717,8 +4583,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/nb.po clementine-libre-1.0.1/src/translations/nb.po ---- clementine-1.0.1/src/translations/nb.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/nb.po 2012-05-29 17:24:06.539751459 -0400 -@@ -254,10 +254,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Til dette trenger du en Grooveshark Anywhere-konto." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Til dette trenger du en Spotify Premium-konto." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,14 +584,6 @@ - msgid "Always start playing" - msgstr "Alltid start avspilling" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Det trengs et programtillegg for å bruke Spotify i Clementine. Ønsker du å " --"laste ned og installere den nå?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "En feil oppsto under kopiering av iTunes databasen fra enheten" -@@ -822,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "Støtte for CUE-filer" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Avbryt" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Endre omslagsbilde" -@@ -1038,10 +1021,6 @@ - msgid "Configure Shortcuts" - msgstr "Oppsett av hurtigtaster" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Konfigurere Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Sett opp bibliotek..." -@@ -1059,10 +1038,6 @@ - msgid "Connect device" - msgstr "Koble til enhet" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Kobler til Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Konstant bitrate" -@@ -1478,10 +1453,6 @@ - msgid "Download this album..." - msgstr "Last ned dette albumet..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Last ned..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Laster ned Icecast-katalogen" -@@ -1494,10 +1465,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Laster ned Magnatune-katalogen" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Laster ned Spotify-modul" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Laster ned metadata" -@@ -1648,10 +1615,6 @@ - msgid "Error deleting songs" - msgstr "Kunne ikke slette sanger" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Kunne ikke laste ned Spotify-modul" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1833,10 +1796,6 @@ - msgid "Font size" - msgstr "Skriftstørrelse" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Av lisenshensyn er Spotify-støtte en egen innstikksmodul." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Tving monolyd-koding" -@@ -2108,10 +2067,6 @@ - "I dynamisk modus vil nye spor bli valgt og lagt til spillelista hver gang en" - " sang tar slutt." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Innboks" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Inkludér cover i meldingen" -@@ -2140,10 +2095,6 @@ - msgid "Insert..." - msgstr "Sett inn..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Installert" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internett" -@@ -2446,7 +2397,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2522,10 +2472,6 @@ - msgid "Main profile (MAIN)" - msgstr "Hovedprofil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Gjør spillelista tilgjengelig online" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Ugyldig svar" -@@ -2782,10 +2728,6 @@ - msgid "Not enough neighbors" - msgstr "Ikke nok naboer" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Ikke installert" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Ikke pålogget" -@@ -2920,7 +2862,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Passord" -@@ -3027,10 +2968,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Modulens status:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3061,7 +2998,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Innstillinger" -@@ -3078,10 +3014,6 @@ - msgid "Preferred audio format" - msgstr "Foretrukket lydformat" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Foretrukket format" -@@ -3472,18 +3404,6 @@ - msgid "Search Magnatune" - msgstr "Søk i Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Søk i Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Søk i Spotify (åpner en ny flik)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Søk i Spotify (åpner en ny flik...)" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3808,30 +3728,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Kunne ikke logge på Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify-modul" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Har ikke installert Spotify-modul" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Har stjerner" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Begynn på spillelista nå" -@@ -3841,7 +3741,6 @@ - msgstr "Start koding" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3927,18 +3826,6 @@ - msgid "Switch provider" - msgstr "Switch-leverandør" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synkroniserer Spotify-innboksen" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synkroniserer Spotify-spillelista" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synkroniserer spor med sterner mot Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Fliker på toppen" -@@ -4310,10 +4197,6 @@ - msgid "Use the system proxy settings" - msgstr "Bruk standard proxy-innstillinger" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Brukt" -@@ -4329,7 +4212,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Brukernavn" -@@ -4565,20 +4447,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Du har ikke noen Grooveshark Anywhare-konto." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Du har ikke noen Spotify Premium-konto." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Du elsker dette sporet" -@@ -4644,7 +4512,6 @@ - msgstr "Dine delte lyttevaner (\"scrobbles\"): %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Feil med din brukerinformasjon" - -@@ -4733,8 +4600,6 @@ - msgstr "i de siste" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/nl.po clementine-libre-1.0.1/src/translations/nl.po ---- clementine-1.0.1/src/translations/nl.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/nl.po 2012-05-29 17:24:47.773084596 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Een Grooveshark Anywhere account is vereist." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Een Spotify Premium account is vereist." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -317,7 +313,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -592,14 +587,6 @@ - msgid "Always start playing" - msgstr "Altijd afspelen" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Een extra plug-in is vereist om Spotify in Clementine te gebruiken. Wilt u " --"deze nu downloaden en installeren?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -829,10 +816,6 @@ - msgid "CUE sheet support" - msgstr "CUE-sheet ondersteuning" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Annuleren" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Albumhoes wijzigen" -@@ -1047,10 +1030,6 @@ - msgid "Configure Shortcuts" - msgstr "Sneltoetsen instellen" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configureer Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Bibliotheek configureren…" -@@ -1068,10 +1047,6 @@ - msgid "Connect device" - msgstr "Apparaat verbinden" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Met Spotify verbinden" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Constante bitrate" -@@ -1487,10 +1462,6 @@ - msgid "Download this album..." - msgstr "Dit album downloaden…" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Downloaden…" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Icecast-map aan het downloaden" -@@ -1503,10 +1474,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Magnatune-catalogus downloaden" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "De Spotify plug-in aan het downloaden" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Metadata ophalen" -@@ -1660,10 +1627,6 @@ - msgid "Error deleting songs" - msgstr "Fout tijdens het verwijderen van de nummers" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Fout bij het downloaden van de Spotify plug-in" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1846,12 +1809,6 @@ - msgid "Font size" - msgstr "Tekengrootte" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Vanwege licenties is Spotify-ondersteuning alleen via een plug-in " --"beschikbaar." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Mono-encodering forceren" -@@ -2126,10 +2083,6 @@ - "In ‘dynamische modus’ worden nieuwe nummers gekozen en aan de afspeellijst " - "toegevoegd op het moment dat een nummer eindigt." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Inbox" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Albumhoes in de notificatie weergeven" -@@ -2158,10 +2111,6 @@ - msgid "Insert..." - msgstr "Invoegen…" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Geïnstalleerd" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2466,7 +2415,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2542,10 +2490,6 @@ - msgid "Main profile (MAIN)" - msgstr "Normaal profiel (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Afspeellijst offline beschikbaar maken" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Foutieve respons" -@@ -2806,10 +2750,6 @@ - msgid "Not enough neighbors" - msgstr "Onvoldoende buren" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Niet geïnstalleerd" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Niet ingelogd" -@@ -2944,7 +2884,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Wachtwoord" -@@ -3051,10 +2990,6 @@ - msgid "Playlists" - msgstr "Afspeellijsten" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Plug-in status:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3085,7 +3020,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Voorkeuren" -@@ -3103,10 +3037,6 @@ - msgid "Preferred audio format" - msgstr "Audioformaat-voorkeur" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Bitrate voorkeur" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Voorkeursformaat" -@@ -3497,18 +3427,6 @@ - msgid "Search Magnatune" - msgstr "Zoeken op Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Doorzoek Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Doorzoek Spotify (open nieuw tabblad)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Doorzoek Spotify (open nieuw tabblad)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Doorzoek al uw bronnen (bibliotheek, internet bronnen, ...)" -@@ -3833,30 +3751,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify inlogfout" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify plug-in" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify plug-in niet geïnstalleerd" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standaard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Met ster" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Momenteel spelende afspeellijst starten" -@@ -3866,7 +3764,6 @@ - msgstr "Converteren starten" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Typ in de zoekbalk hierboven om naar muziek te zoeken op %1." -@@ -3952,18 +3849,6 @@ - msgid "Switch provider" - msgstr "Switch provider" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Spotify inbox synchroniseren" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Spotify afspeellijst synchroniseren" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Favoriete Spotify-nummers synchroniseren" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Tabs bovenaan" -@@ -4350,10 +4235,6 @@ - msgid "Use the system proxy settings" - msgstr "Globale proxy-instellingen gebruiken" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Volume normalisatie gebruiken" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Gebruikt" -@@ -4369,7 +4250,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Gebruikersnaam" -@@ -4607,22 +4487,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "U heeft geen Grooveshark Anywhere account." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "U heeft geen Spotify Premium account." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"U bent uitgelogd bij Spotify, voer in het voorkeuren venster nogmaals uw " --"wachtwoord in." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "U bent uitgelogd bij Spotify, voer nogmaals uw wachtwoord in." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "U vindt dit nummer mooi" -@@ -4690,7 +4554,6 @@ - msgstr "Uw scrobbles: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Uw gebruikersnaam of wachtwoord is niet correct." - -@@ -4779,8 +4642,6 @@ - msgstr "in de laatste" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/oc.po clementine-libre-1.0.1/src/translations/oc.po ---- clementine-1.0.1/src/translations/oc.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/oc.po 2012-05-29 17:25:36.176417975 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "Configurar los acorchis de clavièr" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Sus Internet" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/pa.po clementine-libre-1.0.1/src/translations/pa.po ---- clementine-1.0.1/src/translations/pa.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/pa.po 2012-05-29 17:26:32.036418109 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/pl.po clementine-libre-1.0.1/src/translations/pl.po ---- clementine-1.0.1/src/translations/pl.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/pl.po 2012-05-29 17:27:25.839751300 -0400 -@@ -254,10 +254,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Potrzebne jest konto Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Musisz posiadać konto Spotify Premium." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -318,7 +314,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -591,14 +586,6 @@ - msgid "Always start playing" - msgstr "Odtwarzaj automatycznie" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Aby korzystać ze Spotify przy użyciu Clementine, wymagany jest dodatkowy " --"skrypt. Czy chcesz go teraz pobrać?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Wystąpił błąd podczas kopiowania bazy danych iTunes z urządzenia" -@@ -824,10 +811,6 @@ - msgid "CUE sheet support" - msgstr "obsługa arkuszy CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Anuluj" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Zmień okładkę" -@@ -1041,10 +1024,6 @@ - msgid "Configure Shortcuts" - msgstr "Konfiguracja skrótów klawiszowych" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Konfiguracja Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Konfiguruj bibliotekę..." -@@ -1062,10 +1041,6 @@ - msgid "Connect device" - msgstr "Podłącz urządzenie" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Połącz z Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Stały bitrate" -@@ -1481,10 +1456,6 @@ - msgid "Download this album..." - msgstr "Pobierz ten album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Pobierz..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Pobieranie katalogu Icecast" -@@ -1497,10 +1468,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Pobieranie katalogu Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Pobierz plugin Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Pobieranie metadanych" -@@ -1651,10 +1618,6 @@ - msgid "Error deleting songs" - msgstr "Błąd przy usuwaniu utworów" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Plugin Spotify - nieudane pobieranie" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1837,11 +1800,6 @@ - msgid "Font size" - msgstr "Rozmiar czcionki" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Ze względów licencyjnych Spotify obsługiwany jest przez oddzielny plugin" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Wymuś kodowanie mono" -@@ -2114,10 +2072,6 @@ - "W trybie dynamicznym nowe utwory będą wybierane i dodawane do playlisty za " - "każdym razem gdy skończy się odtwarzanie bieżącego utworu." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Skrzynka odbiorcza" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Dołącz okładkę albumu" -@@ -2146,10 +2100,6 @@ - msgid "Insert..." - msgstr "Wstaw..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Zainstalowano" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2454,7 +2404,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2530,10 +2479,6 @@ - msgid "Main profile (MAIN)" - msgstr "Profil główny (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Uczyń playlistę dostępną offline" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Nieprawidłowa odpowiedź" -@@ -2793,10 +2738,6 @@ - msgid "Not enough neighbors" - msgstr "Za mało sąsiadów" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nie zainstalowano" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2931,7 +2872,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Hasło" -@@ -3038,10 +2978,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Stan wtyczki:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3072,7 +3008,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Ustawienia" -@@ -3090,10 +3025,6 @@ - msgid "Preferred audio format" - msgstr "Preferowany format audio" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Preferowany format" -@@ -3484,18 +3415,6 @@ - msgid "Search Magnatune" - msgstr "Przeszukaj Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Szukaj w Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Szukaj w Spotify (nowa karta)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Szukaj w Spotify (nowa karta)" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3821,30 +3740,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Nieudane logowanie do Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Wtyczka Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Nie zainstalowano pluginu Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standardowy" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Oznaczone gwiazdką" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Rozpocznij aktualnie odtwarzaną listę" -@@ -3854,7 +3753,6 @@ - msgstr "Rozpocznij transkodowanie" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3940,18 +3838,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synchronizowanie skrzynki Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synchronizowanie playlisty Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synchronizowanie utworów oznaczonych gwiazdką na Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Zakładki na górze" -@@ -4326,10 +4212,6 @@ - msgid "Use the system proxy settings" - msgstr "Użyj systemowych ustawień proxy" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Użyto" -@@ -4345,7 +4227,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Użytkownik" -@@ -4579,20 +4460,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Kochasz tę ścieżkę" -@@ -4662,7 +4529,6 @@ - msgstr "Przesłane utwory: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4751,8 +4617,6 @@ - msgstr "w ostatnich" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/pt_BR.po clementine-libre-1.0.1/src/translations/pt_BR.po ---- clementine-1.0.1/src/translations/pt_BR.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/pt_BR.po 2012-05-29 17:30:29.606418269 -0400 -@@ -251,10 +251,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "É necessária uma conta Premium Spotify." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -313,7 +309,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -586,14 +581,6 @@ - msgid "Always start playing" - msgstr "Sempre começar tocando" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Um plugin adicional é necessário para usar Spotify no Clementine. Gostaria " --"de fazer o download e instalá-lo agora?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -821,10 +808,6 @@ - msgid "CUE sheet support" - msgstr "Suporte a lista CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Cancelar" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Alterar capa" -@@ -1036,10 +1019,6 @@ - msgid "Configure Shortcuts" - msgstr "Configurar atalhos" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configurar Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configurar biblioteca" -@@ -1057,10 +1036,6 @@ - msgid "Connect device" - msgstr "Conectar dispositivo" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Conectando ao Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Taxa de bits constante" -@@ -1476,10 +1451,6 @@ - msgid "Download this album..." - msgstr "Baixar este álbum..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Baixar..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Baixando diretório Icecast" -@@ -1492,10 +1463,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Baixando catálogo da Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Baixando plugin Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Baixando metadados" -@@ -1647,10 +1614,6 @@ - msgid "Error deleting songs" - msgstr "Erro ao apagar músicas" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Erro ao baixar o plugin Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1834,12 +1797,6 @@ - msgid "Font size" - msgstr "Tamanho da fonte" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Por motivos de licenciamento, o suporte ao Spotify está em um plugin " --"separado." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forçar codificação em mono" -@@ -2113,10 +2070,6 @@ - "No modo dinâmico, novas faixas serão escolhidas e adicionadas à lista de " - "reprodução toda a vez que uma musica terminar." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Caixa de entrada" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Incluir capa do álbum na notificação" -@@ -2145,10 +2098,6 @@ - msgid "Insert..." - msgstr "Inserir..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instalado" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2453,7 +2402,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2529,10 +2477,6 @@ - msgid "Main profile (MAIN)" - msgstr "Meu perfil (PRINCIPAL)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Tornar lista de reprodução disponível offline" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Resposta inválida" -@@ -2793,10 +2737,6 @@ - msgid "Not enough neighbors" - msgstr "Sem vizinhos o bastante" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Não instalado" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2931,7 +2871,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Senha" -@@ -3038,10 +2977,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Status do plugin:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3072,7 +3007,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Preferências" -@@ -3089,10 +3023,6 @@ - msgid "Preferred audio format" - msgstr "Formato de áudio preferido" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Formato preferido" -@@ -3483,18 +3413,6 @@ - msgid "Search Magnatune" - msgstr "Pesquisar Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Procurar Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Procurar Spotify (abre um novo aba)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Procurar Spotify (abre um novo aba)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3819,30 +3737,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Erro ao conectar no Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Plugin Spofity" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Plugin Spofity não instalado" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Padrão" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Favoritos" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Iniciar a lista que está em execução" -@@ -3852,7 +3750,6 @@ - msgstr "Começar transcodificação" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3938,18 +3835,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Sincronizando caixa de entrada do Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Sincronizando listas de reprodução do Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Sincronizando faixas favoritas do Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Mostrar abas no topo" -@@ -4329,10 +4214,6 @@ - msgid "Use the system proxy settings" - msgstr "Usar configurações de proxy do sistema" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Usado" -@@ -4348,7 +4229,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nome de usuário" -@@ -4582,20 +4462,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Você adora essa faixa" -@@ -4661,7 +4527,6 @@ - msgstr "Seus scrobbles: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4750,8 +4615,6 @@ - msgstr "nos últimos" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/pt.po clementine-libre-1.0.1/src/translations/pt.po ---- clementine-1.0.1/src/translations/pt.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/pt.po 2012-05-29 17:28:15.776418125 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Requer uma conta Grooveshark Anywhere" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Requer uma conta Spotify Premium" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,14 +584,6 @@ - msgid "Always start playing" - msgstr "Iniciar sempre a reprodução" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Necessita de um \"plug-in\" para utilizar o Spotify no Clementine. Pretende " --"transferir e instalar o \"plug-in\"?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -823,10 +810,6 @@ - msgid "CUE sheet support" - msgstr "Suporte a ficheiros CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Cancelar" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Alterar capa do álbum" -@@ -1040,10 +1023,6 @@ - msgid "Configure Shortcuts" - msgstr "Configurar atalhos" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configurar Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configurar coleção..." -@@ -1061,10 +1040,6 @@ - msgid "Connect device" - msgstr "Ligar dispositivo" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Ligar ao Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Taxa de dados constante" -@@ -1480,10 +1455,6 @@ - msgid "Download this album..." - msgstr "Transferir este álbum..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Transferir..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "A transferir o diretório Icecast" -@@ -1496,10 +1467,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "A transferir o catálogo Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "A transferir o \"plug-in\" Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "A transferir dados" -@@ -1652,10 +1619,6 @@ - msgid "Error deleting songs" - msgstr "Erro ao eliminar faixas" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Erro ao transferir o \"plug-in\"" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1837,12 +1800,6 @@ - msgid "Font size" - msgstr "Tamanho de letra" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Devido à sua licença, o \"plug-in\" do Spotify é disponibilizado " --"separadamente" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forçar codificação mono" -@@ -2114,10 +2071,6 @@ - "No modo dinâmico, as faixas são escolhidas e adicionadas à lista de " - "reprodução assim que uma música termine" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Caixa de entrada" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Incluir capa do álbum na notificação" -@@ -2146,10 +2099,6 @@ - msgid "Insert..." - msgstr "Inserir..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instalado" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2454,7 +2403,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2530,10 +2478,6 @@ - msgid "Main profile (MAIN)" - msgstr "Perfil principal (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Tornar lista de reprodução disponível localmente" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Resposta inválida" -@@ -2793,10 +2737,6 @@ - msgid "Not enough neighbors" - msgstr "Vizinhos insuficientes" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Não instalado" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Sessão não iniciada" -@@ -2931,7 +2871,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Senha" -@@ -3038,10 +2977,6 @@ - msgid "Playlists" - msgstr "Listas de reprodução" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Estado:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3072,7 +3007,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Preferências" -@@ -3089,10 +3023,6 @@ - msgid "Preferred audio format" - msgstr "Formato áudio preferido" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Taxa de dados preferencial" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Formato preferido" -@@ -3483,18 +3413,6 @@ - msgid "Search Magnatune" - msgstr "Pesquisar no Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Procurar no Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Procurar no Spotify (abre um novo separador)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Procurar no Spotify (abre um novo separador)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Procurar em todas as fontes (coleção, internet, ...)" -@@ -3820,30 +3738,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Erro de autenticação Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "\"Plug-in\" Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "\"Plug-in\" Spotify não instalado" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Padrão" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Com estrela" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Iniciar lista de reprodução atual" -@@ -3853,7 +3751,6 @@ - msgstr "Iniciar conversão" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Escreva algo na caixa de procura para descobrir músicas no %1" -@@ -3939,18 +3836,6 @@ - msgid "Switch provider" - msgstr "Trocar fornecedor" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "A sincronizar caixa de entrada Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "A sincronizar lista de reprodução Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "A sincronizar faixas Spotify assinaladas" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Separadores no topo" -@@ -4333,10 +4218,6 @@ - msgid "Use the system proxy settings" - msgstr "Utilizar definições do sistema" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Utilizar normalização de volume" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Utilizado" -@@ -4352,7 +4233,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Utilizador" -@@ -4589,22 +4469,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Você não tem uma conta Grooveshark Anywhere" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Você não tem uma conta Spotify Premium" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Terminou a sessão no Spotify. Reintroduza a sua senha na caixa de diálogo de" --" definições" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Terminou a sessão no Spotify. Reintroduza a sua senha" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Você gosta desta faixa" -@@ -4671,7 +4535,6 @@ - msgstr "Os seus envios: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Utilizador e/ou senha inválida" - -@@ -4760,8 +4623,6 @@ - msgstr "no(s) último(s)" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/ro.po clementine-libre-1.0.1/src/translations/ro.po ---- clementine-1.0.1/src/translations/ro.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ro.po 2012-05-29 17:31:07.169751658 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Este necesar un cont Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Este necesar un cont Spotify Premium." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -317,7 +313,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -590,14 +585,6 @@ - msgid "Always start playing" - msgstr "Începe redarea întotdeauna" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Este necesara activarea unui plugin pentru utlizarea Spotify in Clementine. " --"Doriți să fie descărcat si instalat acum?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "A apărut o eroare de copiere a bazei de date iTunes de pe dispozitiv" -@@ -823,10 +810,6 @@ - msgid "CUE sheet support" - msgstr "CUE placa suport" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Anulare" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Schimbă imaginea coperții" -@@ -1037,10 +1020,6 @@ - msgid "Configure Shortcuts" - msgstr "Configurează scurtături" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Configurare Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Configurează biblioteca..." -@@ -1058,10 +1037,6 @@ - msgid "Connect device" - msgstr "Conectează un dispozitiv" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Se conectează la Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Rată de biți constantă" -@@ -1477,10 +1452,6 @@ - msgid "Download this album..." - msgstr "Descarcă acest album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Descărcare..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Descărcare dosarul Icecast" -@@ -1493,10 +1464,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Descărcare catalog Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Se descarcă pluginul Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Descărcare metadata" -@@ -1651,10 +1618,6 @@ - msgid "Error deleting songs" - msgstr "Eroare ștergere melodii" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Eroare la descărcarea pluginului Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1838,11 +1801,6 @@ - msgid "Font size" - msgstr "Dimensiunea fontului" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"Din motive de licență, suportul pentru Spotify este într-un plugin separat." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Forțează codarea mono" -@@ -2114,10 +2072,6 @@ - "În modul dinamic, melodii noi vor fi alese și adăugate la lista de redare de" - " fiecare dată când se termină o melodie." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Includeți album de artă în notificare" -@@ -2146,10 +2100,6 @@ - msgid "Insert..." - msgstr "Introduce..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instalat" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2452,7 +2402,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2528,10 +2477,6 @@ - msgid "Main profile (MAIN)" - msgstr "Profil principal (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2788,10 +2733,6 @@ - msgid "Not enough neighbors" - msgstr "Nu sunt destui vecini" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Neinstalat" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2926,7 +2867,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Parolă" -@@ -3033,10 +2973,6 @@ - msgid "Playlists" - msgstr "Liste de redare" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Status plugin:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3067,7 +3003,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Preferinţe" -@@ -3084,10 +3019,6 @@ - msgid "Preferred audio format" - msgstr "Format audio preferat" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Rată de biți preferată" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Format preferat" -@@ -3478,18 +3409,6 @@ - msgid "Search Magnatune" - msgstr "Caută în Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Caută în Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Caută în Spotify (deschide o filă nouă)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Caută în Spotify (deschide o filă nouă)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3814,30 +3733,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Eroare la logarea în Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Plugin Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Pluginul Spotify nu este instalat" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Cu steluță" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3847,7 +3746,6 @@ - msgstr "Începe transcodare" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3933,18 +3831,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "File deasupra" -@@ -4304,10 +4190,6 @@ - msgid "Use the system proxy settings" - msgstr "Folosește setările de proxy ale sistemului" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4323,7 +4205,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Nume de utilizator" -@@ -4549,20 +4430,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Nu aveți un cont Spotify Premium." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4622,7 +4489,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Parola sau numele de utilizator au fost incorecte." - -@@ -4711,8 +4577,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/ru.po clementine-libre-1.0.1/src/translations/ru.po ---- clementine-1.0.1/src/translations/ru.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/ru.po 2012-05-29 17:31:44.913085063 -0400 -@@ -256,10 +256,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Требуется учётная запись Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Требуется Premium аккаунт Spotify" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -320,7 +316,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -593,14 +588,6 @@ - msgid "Always start playing" - msgstr "Всегда начинать воспроизведение" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Требуется дополнительный модуль для использования Spotify в Clementine. " --"Скачать и установить его?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Произошла ошибка при загрузке данных iTunes с устройства" -@@ -826,10 +813,6 @@ - msgid "CUE sheet support" - msgstr "Поддержка файлов разметки CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Отмена" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Выберите обложку" -@@ -1045,10 +1028,6 @@ - msgid "Configure Shortcuts" - msgstr "Комбинации клавиш" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Настройка Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Настроить коллекцию..." -@@ -1066,10 +1045,6 @@ - msgid "Connect device" - msgstr "Подсоединение устройства" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Подключение к Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Постоянный битрейт" -@@ -1485,10 +1460,6 @@ - msgid "Download this album..." - msgstr "Загрузить этот альбом" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Загрузить..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Загружаем директорию Icecast" -@@ -1501,10 +1472,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Скачать каталог Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Загрузка модуля Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Загрузка метаданных" -@@ -1658,10 +1625,6 @@ - msgid "Error deleting songs" - msgstr "Ошибка удаления композиций" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Ошибка загрузки модуля Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1845,12 +1808,6 @@ - msgid "Font size" - msgstr "Размер шрифта" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"По лицензионным соображениям поддержка Spotify реализована в виде отдельного" --" плагина" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Принудительное кодирование в моно" -@@ -2122,10 +2079,6 @@ - "В динамическом режиме новые треки выбираются и добавляются в список " - "воспроизведения каждый раз, когда заканчивается очередная песня." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Входящие" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Показывать обложку альбома в уведомлении" -@@ -2154,10 +2107,6 @@ - msgid "Insert..." - msgstr "Вставить..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Установлено" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Интернет" -@@ -2462,7 +2411,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2538,10 +2486,6 @@ - msgid "Main profile (MAIN)" - msgstr "Основной профиль (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Сделать плейлист доступным оффлайн" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Неправильный ответ" -@@ -2800,10 +2744,6 @@ - msgid "Not enough neighbors" - msgstr "Недостаточно соседей" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Не установлено" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Не был выполнен логин" -@@ -2938,7 +2878,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Пароль" -@@ -3045,10 +2984,6 @@ - msgid "Playlists" - msgstr "Списки воспроизведения" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Статус модуля:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3079,7 +3014,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Настройки" -@@ -3096,10 +3030,6 @@ - msgid "Preferred audio format" - msgstr "Предпочитаемый аудио формат" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Предпочитаемый битрейт" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Предпочитаемый формат" -@@ -3490,18 +3420,6 @@ - msgid "Search Magnatune" - msgstr "Искать на Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Поиск на Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Поиск на Spotify (открывается в новой вкладке)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Поиск на Spotify (в новой вкладке)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Искать во всех источниках (библиотеке, интернет сервисах, ...)" -@@ -3827,30 +3745,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Ошибка имени пользователя Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Модуль Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Модуль Spotify не установлен" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Стандартный" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Оцененные" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Запустить список воспроизведения проигрываемый в данный момент" -@@ -3860,7 +3758,6 @@ - msgstr "Начать перекодирование" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Наберите начальные буквы наименования песни чтобы начать поиск в %1" -@@ -3946,18 +3843,6 @@ - msgid "Switch provider" - msgstr "Выбрать другой источник" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Синхронизация входящих Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Синхронизация плейлистов Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Синхронизация рейтингованных треков Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Вкладки вверху" -@@ -4336,10 +4221,6 @@ - msgid "Use the system proxy settings" - msgstr "Использовать системные настройки прокси" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Использовать выравнивание громкости" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Использовано" -@@ -4355,7 +4236,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Имя пользователя" -@@ -4591,23 +4471,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "У вас нет учетной записи Grooveshark Anywhere" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "У вас нет учетной записи Spotify Premium" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Подключение к сервису Spotify было разорвано, введите ваш пароль ещё раз в" --" диалоге Настройки." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" --"Подключение к сервису Spotify было разорвано, введите ваш пароль ещё раз." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Вам нравится эта композиция" -@@ -4675,7 +4538,6 @@ - msgstr "Ваш скробблинг: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Имя пользователя или пароль неправильные." - -@@ -4764,8 +4626,6 @@ - msgstr "в последние" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "кбит/с" - -diff -rauN clementine-1.0.1/src/translations/sk.po clementine-libre-1.0.1/src/translations/sk.po ---- clementine-1.0.1/src/translations/sk.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/sk.po 2012-05-29 17:32:30.349751863 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Je vyžadovaný Grooveshark Anywhere účet." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Je vyžadovaný prémium účet na Spotify." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -314,7 +310,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -587,14 +582,6 @@ - msgid "Always start playing" - msgstr "Hneď začne hrať" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Aby sa dalo Spotify využiť v Clementine, je vyžadovaný ďalší plugin. Chcete " --"ho teraz stiahnuť a nainštalovať?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Nastala chyba pri kopírovaní iTunes databázy zo zariadenia" -@@ -820,10 +807,6 @@ - msgid "CUE sheet support" - msgstr "podpora CUE zoznamu" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Zrušiť" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Zmeniť obal albumu" -@@ -1034,10 +1017,6 @@ - msgid "Configure Shortcuts" - msgstr "Klávesové skratky" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Nastaviť Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Nastaviť zbierku..." -@@ -1055,10 +1034,6 @@ - msgid "Connect device" - msgstr "Pripojiť zariadenie" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Pripájanie k Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Konštantný dátový tok" -@@ -1474,10 +1449,6 @@ - msgid "Download this album..." - msgstr "Stiahnuť tento album..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Stiahnuť..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Sťahuje sa Icecast priečinok" -@@ -1490,10 +1461,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Sťahuje sa Magnatune katalóg" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Sťahuje sa Spotify plugin" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Sťahujú sa metadáta" -@@ -1648,10 +1615,6 @@ - msgid "Error deleting songs" - msgstr "Chyba pri vymazávaní piesní" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Chyba pri sťahovaní Spotify pluginu." -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1834,10 +1797,6 @@ - msgid "Font size" - msgstr "Veľkosť písma" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Kvôli licenčným dôvodom je podpora Spotify v oddelenom plugine." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Vynútiť mono enkódovanie" -@@ -2109,10 +2068,6 @@ - "V dynamickom režime budú nové skladby vybraté a pridané do playlistu " - "zakaždým keď skončí pieseň." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Doručené" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Zahrnúť obal do upozornenia" -@@ -2141,10 +2096,6 @@ - msgid "Insert..." - msgstr "Vložiť..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Nainštalované" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2447,7 +2398,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2523,10 +2473,6 @@ - msgid "Main profile (MAIN)" - msgstr "Hlavný profil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Urobiť playlist dostupný offline" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Poškodená odpoveď" -@@ -2785,10 +2731,6 @@ - msgid "Not enough neighbors" - msgstr "Nedostatok susedov" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Nenainštalované" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Nieprihlásený" -@@ -2923,7 +2865,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Heslo" -@@ -3030,10 +2971,6 @@ - msgid "Playlists" - msgstr "Playlisty" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Stav pluginu:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3064,7 +3001,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Nastavenia" -@@ -3081,10 +3017,6 @@ - msgid "Preferred audio format" - msgstr "Preferovaný formát zvuku" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Preferovaný dátový tok" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Preferovaný formát" -@@ -3475,18 +3407,6 @@ - msgid "Search Magnatune" - msgstr "Hľadať na Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Hľadať v Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Hľadať v Spotify (otvorí novú kartu)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Hľadať v Spotify (otvorí novú kartu)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3812,30 +3732,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Chyba pri prihlasovaní na Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify plugin" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify plugin nieje nainštalovaný" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Štandardný" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "S hviezdičkou" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Začať playlist práve prehrávanou" -@@ -3845,7 +3745,6 @@ - msgstr "Začať transkódovanie" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3932,18 +3831,6 @@ - msgid "Switch provider" - msgstr "Zmeniť poskytovateľa" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synchronizuje sa Spotify schránka" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synchronizuje sa Spotify playlist" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synchronizujú sa skladby ohviezdičkované na Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Karty na vrchu" -@@ -4325,10 +4212,6 @@ - msgid "Use the system proxy settings" - msgstr "Použiť systémové nastavenia proxy" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Použiť normalizáciu hlasitosti" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Použitých" -@@ -4344,7 +4227,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Meno používateľa" -@@ -4580,22 +4462,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Nemáte Grooveshark Anywhere účet." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Nemáte Spotify prémium účet." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Boli ste odhlásení zo Spotify, prosím, zadajte heslo znovu v dialógu " --"Nastavenia." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Boli ste odhlásený zo Spotify, prosím znovu zadajte heslo." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Milujete túto pieseň" -@@ -4663,7 +4529,6 @@ - msgstr "Skroblujete: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Vaše meno používateľa alebo heslo bolo nesprávne." - -@@ -4752,8 +4617,6 @@ - msgstr "za posledných" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/sl.po clementine-libre-1.0.1/src/translations/sl.po ---- clementine-1.0.1/src/translations/sl.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/sl.po 2012-05-29 17:41:04.549752271 -0400 -@@ -252,10 +252,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Zahtevan je račun Spotify Premium." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -314,7 +310,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -587,14 +582,6 @@ - msgid "Always start playing" - msgstr "Vedno začni s predvajanjem" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Da lahko uporabite Spotify v Clementine, potrebujete dodaten vstavek. Ga " --"želite prejeti in namestiti zdaj?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -822,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "Podpora predlogam CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Prekliči" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Spremeni ovitek albuma" -@@ -1039,10 +1022,6 @@ - msgid "Configure Shortcuts" - msgstr "Nastavi bližnjice" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Nastavi Spotify ..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Nastavi knjižnico ..." -@@ -1060,10 +1039,6 @@ - msgid "Connect device" - msgstr "Priklopi napravo" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Povezovanje na Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Stalna bitna hitrost" -@@ -1479,10 +1454,6 @@ - msgid "Download this album..." - msgstr "Prejmi ta album ..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Prejmi ..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Prejemanje imenika Icecast" -@@ -1495,10 +1466,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Prejemanje kataloga Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Prejemanje vstavka Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Prejemanje metapodatkov" -@@ -1651,10 +1618,6 @@ - msgid "Error deleting songs" - msgstr "Napaka pri brisanju skladb" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Napaka med prejemanjem vstavka Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1836,10 +1799,6 @@ - msgid "Font size" - msgstr "Velikost pisave" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Zaradi licence je podpora Spotify v ločenem vstavku." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Vsili mono kodiranje" -@@ -2111,10 +2070,6 @@ - "V dinamičnem načinu bodo nove skladbe izbrane in dodane na seznam " - "predvajanja vsakič, ko se prejšnja skladba konča." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Prejeto" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Vključi ovitek albuma v obvestilo" -@@ -2143,10 +2098,6 @@ - msgid "Insert..." - msgstr "Vstavi ..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Nameščeno" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Medmrežje" -@@ -2449,7 +2400,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2525,10 +2475,6 @@ - msgid "Main profile (MAIN)" - msgstr "Glavni profil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Seznam predvajanja naj bo na voljo tudi brez povezave" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Nepravilno oblikovan odziv" -@@ -2787,10 +2733,6 @@ - msgid "Not enough neighbors" - msgstr "Ni dovolj sosedov" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Ni nameščeno" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2925,7 +2867,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Geslo" -@@ -3032,10 +2973,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Stanje vstavka:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3066,7 +3003,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Možnosti" -@@ -3083,10 +3019,6 @@ - msgid "Preferred audio format" - msgstr "Prednostna vrsta zvoka" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Prednostna vrsta" -@@ -3477,18 +3409,6 @@ - msgid "Search Magnatune" - msgstr "Išči na Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Išči po Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Išči po Spotify (odpre nov zavihek)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Išči po Spotify (odpre nov zavihek) ..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3814,30 +3734,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Napaka med prijavo na Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Vstavek Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Vstavek Spotify ni nameščen" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Običajno" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Z zvezdico" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Predvajaj skladbo, ki je označena v predvajalnem seznamu" -@@ -3847,7 +3747,6 @@ - msgstr "Začni s prekodiranjem" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3933,18 +3832,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Usklajevanje mape Spotify - prejeto" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Usklajevanje seznama predvajanja Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Usklajevanje označenih skladb v Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Zavihki na vrhu" -@@ -4322,10 +4209,6 @@ - msgid "Use the system proxy settings" - msgstr "Uporabi nastavitve posredniškega strežnika sistema" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Uporabljeno" -@@ -4341,7 +4224,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Uporabniško ime" -@@ -4575,20 +4457,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "To je vaša priljubljena skladba" -@@ -4655,7 +4523,6 @@ - msgstr "Vaši seznami predvajanih skladb: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4744,8 +4611,6 @@ - msgstr "v zadnjih" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kb/s" - -diff -rauN clementine-1.0.1/src/translations/sr@latin.po clementine-libre-1.0.1/src/translations/sr@latin.po ---- clementine-1.0.1/src/translations/sr@latin.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/sr@latin.po 2012-05-29 17:42:43.256419021 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "" -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4501,20 +4385,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4574,7 +4444,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4663,8 +4532,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/sr.po clementine-libre-1.0.1/src/translations/sr.po ---- clementine-1.0.1/src/translations/sr.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/sr.po 2012-05-29 17:41:46.463085756 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Потребан је Spotify Premium налог" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -311,7 +307,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -584,14 +579,6 @@ - msgid "Always start playing" - msgstr "Увек почни да свираш" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Додатак је потребан да би се користио Spotify у Клементини. Да ли желиш да " --"га преузмеш и одмах уградиш?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Дошло је до грешке услед копирања базе података iTunes из уређаја" -@@ -817,10 +804,6 @@ - msgid "CUE sheet support" - msgstr "CUE подршка листа" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Otkaži" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Промени слику насловне" -@@ -1030,10 +1013,6 @@ - msgid "Configure Shortcuts" - msgstr "Подеси пречице" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Подеси Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Подеси библиотеку" -@@ -1051,10 +1030,6 @@ - msgid "Connect device" - msgstr "Повежи уређај" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Повежи се на Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Константан битни проток" -@@ -1470,10 +1445,6 @@ - msgid "Download this album..." - msgstr "Preuzmi ovaj albm" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Preuzmi..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Преузимање Icecast директоријума" -@@ -1486,10 +1457,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Преузми Магнатјунов каталог" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Преузимање Spotify додатка" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Преузимање метаподатака" -@@ -1641,10 +1608,6 @@ - msgid "Error deleting songs" - msgstr "Грешка при брисању песама" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Грешка преузимања Spotify додатка" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1828,10 +1791,6 @@ - msgid "Font size" - msgstr "Veličina fonta" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Због лиценцираниг разлога Spotify подршка је на посебном додатку." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Присили моно енкодирање" -@@ -2102,10 +2061,6 @@ - "У промењивом режиму нове нумере ће бити изабране и додате листи сваки пут " - "кад се песма заврши." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Сандуче" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Укључи омоте албума у обавештења" -@@ -2134,10 +2089,6 @@ - msgid "Insert..." - msgstr "Убаци..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Instalirano" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Интернет" -@@ -2441,7 +2392,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2517,10 +2467,6 @@ - msgid "Main profile (MAIN)" - msgstr "Главни налог (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Направи листу доступну ван мреже" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Лош одговор" -@@ -2778,10 +2724,6 @@ - msgid "Not enough neighbors" - msgstr "Нема довољно комшија" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Није уграђен" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2916,7 +2858,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Лозинка" -@@ -3023,10 +2964,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Статус додатка:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Поп" -@@ -3057,7 +2994,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Поставке" -@@ -3074,10 +3010,6 @@ - msgid "Preferred audio format" - msgstr "Пожељни формат звука" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Жељени формат" -@@ -3468,18 +3400,6 @@ - msgid "Search Magnatune" - msgstr "Претражи Магнатјун" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Потражи Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Потражи Spotify (отвара нову картицу)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Потражи Spotify (отвара нову картицу)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3804,30 +3724,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify грешка пријављивања" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify додатак" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify додатак није уграђен" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Стандард" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Звездицом" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Почни листу тренутно пуштаним" -@@ -3837,7 +3737,6 @@ - msgstr "Започни транскодирање" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3923,18 +3822,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Усаглашавање Spotify сандучета" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Усаглашавање Spotify листе" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Усаглашавање Spotify оцењених нумера" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Картице на врх" -@@ -4313,10 +4200,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "искоришћено" -@@ -4332,7 +4215,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Корисничко име" -@@ -4560,20 +4442,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4633,7 +4501,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4722,8 +4589,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kb/s" - -diff -rauN clementine-1.0.1/src/translations/sv.po clementine-libre-1.0.1/src/translations/sv.po ---- clementine-1.0.1/src/translations/sv.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/sv.po 2012-05-29 17:43:39.719752433 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Ett Grooveshark Anywhere konto krävs." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Kräver ett Spotify Premium-konto." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -316,7 +312,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -589,14 +584,6 @@ - msgid "Always start playing" - msgstr "Starta alltid att spela" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Ett ytterligare insticksprogram krävs för att använda Spotify i Clementine. " --"Vill du ladda ner och installera det nu?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Ett fel uppstod vid kopiering av iTunes-databasen från enheten" -@@ -822,10 +809,6 @@ - msgid "CUE sheet support" - msgstr "Stöd för CUE-filer" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Avbryt" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Ändra omslag" -@@ -1039,10 +1022,6 @@ - msgid "Configure Shortcuts" - msgstr "Konfigurera snabbtangenter" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Anpassa Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Konfigurera biblioteket..." -@@ -1060,10 +1039,6 @@ - msgid "Connect device" - msgstr "Anslut enhet" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Ansluter till Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Konstant bithastighet" -@@ -1479,10 +1454,6 @@ - msgid "Download this album..." - msgstr "Ladda ner det här albumet ..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Ladda ner..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Ladda ner Icecast-katalog" -@@ -1495,10 +1466,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Hämtar katalog från Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Laddar ner Spotify-insticket" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Hämtar metadata" -@@ -1650,10 +1617,6 @@ - msgid "Error deleting songs" - msgstr "Fel vid borttagning av låtar" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Fel vid hämtning av Spotify-insticket" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1835,10 +1798,6 @@ - msgid "Font size" - msgstr "Typsnittsstorlek" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Av licensskäl finns Spotify-stöd i ett separat insticksprogram." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Tvinga enkanalskodning" -@@ -2109,10 +2068,6 @@ - "I dynamiskt läge kommer nya spår väljas och läggas till i spellistan varje " - "gång en låt tar slut." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Inkorg" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Inkludera albumomslag i notifieringen" -@@ -2141,10 +2096,6 @@ - msgid "Insert..." - msgstr "Infoga..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Installerad" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2447,7 +2398,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2523,10 +2473,6 @@ - msgid "Main profile (MAIN)" - msgstr "Huvudprofil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Gör spellista tillgänglig offline" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Felformaterat svar" -@@ -2784,10 +2730,6 @@ - msgid "Not enough neighbors" - msgstr "Inte tillräckligt med grannar" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Inte installerad" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2922,7 +2864,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Lösenord" -@@ -3029,10 +2970,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Instickstatus:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3063,7 +3000,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Inställningar" -@@ -3080,10 +3016,6 @@ - msgid "Preferred audio format" - msgstr "Önskat ljudformat" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Önskat format" -@@ -3474,18 +3406,6 @@ - msgid "Search Magnatune" - msgstr "Sök i Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Sök på Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Sök på Spotify (öppnar en ny flik)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Sök på Spotify (öppnar en ny flik)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3810,30 +3730,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Fel vid inloggning på Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify-insticksprogram" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify-insticksprogrammet är inte installerat" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Stjärnmärkta" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Starta spellistan som spelas för närvarande" -@@ -3843,7 +3743,6 @@ - msgstr "Starta omkodning" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3929,18 +3828,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Synkroniserar Spotify-inkorg" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Synkroniserar Spotify-spellista" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Synkroniserar stjärnmärkta spår i Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Flikar längst upp" -@@ -4321,10 +4208,6 @@ - msgid "Use the system proxy settings" - msgstr "Använd systemets proxy inställningar" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Använd" -@@ -4340,7 +4223,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Användarnamn" -@@ -4574,20 +4456,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Du älskar detta spår" -@@ -4655,7 +4523,6 @@ - msgstr "Dina skrobblingar: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4744,8 +4611,6 @@ - msgstr "de senaste" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/translations.pot clementine-libre-1.0.1/src/translations/translations.pot ---- clementine-1.0.1/src/translations/translations.pot 2012-01-22 07:43:21.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/translations.pot 2012-05-29 17:45:10.709752528 -0400 -@@ -239,10 +239,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -297,7 +293,6 @@ - - #: ../mingw/src/ui_groovesharksettingspage.h:113 - #: ../mingw/src/ui_magnatunesettingspage.h:155 --#: ../mingw/src/ui_spotifysettingspage.h:209 - #: ../mingw/src/ui_remotesettingspage.h:203 - #: ../mingw/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -571,12 +566,6 @@ - msgid "Always start playing" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -803,10 +792,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../mingw/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1005,10 +990,6 @@ - msgid "Configure Shortcuts" - msgstr "" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:490 - msgid "Configure library..." - msgstr "" -@@ -1026,10 +1007,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../mingw/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1431,10 +1408,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../mingw/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1447,10 +1420,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "" -@@ -1600,10 +1569,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1785,10 +1750,6 @@ - msgid "Font size" - msgstr "" - --#: ../mingw/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../mingw/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2053,10 +2014,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../mingw/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "" -@@ -2086,10 +2043,6 @@ - msgid "Insert..." - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:252 - msgid "Internet" - msgstr "" -@@ -2391,7 +2344,6 @@ - #: ../mingw/src/ui_digitallyimportedsettingspage.h:163 - #: ../mingw/src/ui_groovesharksettingspage.h:116 - #: ../mingw/src/ui_magnatunesettingspage.h:164 --#: ../mingw/src/ui_spotifysettingspage.h:212 - #: ../mingw/src/ui_remotesettingspage.h:205 - #: ../mingw/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2468,10 +2420,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "" -@@ -2730,10 +2678,6 @@ - msgid "Not enough neighbors" - msgstr "" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2868,7 +2812,6 @@ - - #: ../mingw/src/ui_groovesharksettingspage.h:115 - #: ../mingw/src/ui_magnatunesettingspage.h:165 --#: ../mingw/src/ui_spotifysettingspage.h:211 - #: ../mingw/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "" -@@ -2975,10 +2918,6 @@ - msgid "Playlists" - msgstr "" - --#: ../mingw/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "" -@@ -3009,7 +2948,6 @@ - - #: ../mingw/src/ui_digitallyimportedsettingspage.h:166 - #: ../mingw/src/ui_magnatunesettingspage.h:166 --#: ../mingw/src/ui_spotifysettingspage.h:217 - #: ../mingw/src/ui_settingsdialog.h:115 - #: ../mingw/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" -@@ -3027,10 +2965,6 @@ - msgid "Preferred audio format" - msgstr "" - --#: ../mingw/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../mingw/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3422,18 +3356,6 @@ - msgid "Search Magnatune" - msgstr "" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../mingw/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3756,30 +3678,10 @@ - msgid "Speex" - msgstr "" - --#: ../mingw/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../mingw/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../mingw/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:145 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3789,7 +3691,6 @@ - msgstr "" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3875,18 +3776,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "" -@@ -4246,10 +4135,6 @@ - msgid "Use the system proxy settings" - msgstr "" - --#: ../mingw/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "" -@@ -4265,7 +4150,6 @@ - - #: ../mingw/src/ui_groovesharksettingspage.h:114 - #: ../mingw/src/ui_magnatunesettingspage.h:163 --#: ../mingw/src/ui_spotifysettingspage.h:210 - #: ../mingw/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "" -@@ -4489,20 +4373,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "" -@@ -4562,7 +4432,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4651,8 +4520,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "" - -diff -rauN clementine-1.0.1/src/translations/tr.po clementine-libre-1.0.1/src/translations/tr.po ---- clementine-1.0.1/src/translations/tr.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/tr.po 2012-05-29 17:44:19.953085826 -0400 -@@ -256,10 +256,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Grooveshark Anywhere hesabı gereklidir." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Spotify üyeliği gerekli." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -318,7 +314,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -591,14 +586,6 @@ - msgid "Always start playing" - msgstr "Her zaman çalarak başlat" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Spotify'ın Clementine'de kullanılması için harici bir eklenti gerekmektedir." --" Şimdi indirmek ve kurulumunu yapmak ister misiniz?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Aygıttan iTunes veritabanı kopyalanırken hata oluştu" -@@ -824,10 +811,6 @@ - msgid "CUE sheet support" - msgstr "CUE desteği" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "İptal" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Kapak resmini değiştir" -@@ -1038,10 +1021,6 @@ - msgid "Configure Shortcuts" - msgstr "Kısayolları Yapılandır" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Spotify Ayarları..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Kütüphaneyi düzenle..." -@@ -1059,10 +1038,6 @@ - msgid "Connect device" - msgstr "Aygıtı bağla" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Spotify'a bağlanılıyor." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Sabit bithızı" -@@ -1478,10 +1453,6 @@ - msgid "Download this album..." - msgstr "Bu albümü indirin..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "İndir..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Icecast dizini indiriliyor" -@@ -1494,10 +1465,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Magnatune kataloğu indiriliyor" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Spotify eklentisi indiriliyor" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Üstveri indiriliyor" -@@ -1652,10 +1619,6 @@ - msgid "Error deleting songs" - msgstr "Şarkılar silinirken hata" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Spotify eklentisini indirirken hata" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1837,10 +1800,6 @@ - msgid "Font size" - msgstr "Yazı tipi boyutu" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Lisans sebepleri dolayısıyla Spotify desteği ayrı bir eklentidir." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Mono çözümlemeye zorla" -@@ -2112,10 +2071,6 @@ - "Dinamik modda yeni şarkılar seçilerek, her şarkı bittiğinde çalma listesine " - "eklenecektir." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Gelen Kutusu" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Bildirimde albüm resimlendirmesini göster" -@@ -2144,10 +2099,6 @@ - msgid "Insert..." - msgstr "Ekle..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Kuruldu" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2454,7 +2405,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2530,10 +2480,6 @@ - msgid "Main profile (MAIN)" - msgstr "Ana profil (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Çalma listesini çevrim dışındayken kullanılabilir yap" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Bozuk yanıt" -@@ -2792,10 +2738,6 @@ - msgid "Not enough neighbors" - msgstr "Yeterli komşu yok" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Kurulu değil" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Giriş yapmadınız" -@@ -2930,7 +2872,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Parola" -@@ -3037,10 +2978,6 @@ - msgid "Playlists" - msgstr "Çalma listeleri" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Eklenti durumu:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3071,7 +3008,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Tercihler" -@@ -3088,10 +3024,6 @@ - msgid "Preferred audio format" - msgstr "Tercih edilen ses biçimleri" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Tercih edilen bit oranı" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Tercih edilen biçim" -@@ -3482,18 +3414,6 @@ - msgid "Search Magnatune" - msgstr "Magnatune'da Ara" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Spotify'i ara" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Spotify'i ara (yeni sekme açar)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Spotify'i ara (yeni sekme açar)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Tüm kaynaklarınızda arayın (kütüphane, internet servisleri, ...)" -@@ -3818,30 +3738,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Spotify giriş hatası" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Spotify eklentisi" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Spotify eklentisi kurulu değil" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Standard" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Yıldızlı" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Çalma listesini mevcut çalınanla başlat" -@@ -3851,7 +3751,6 @@ - msgstr "Dönüştürmeye başla" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Müzik bulmak için yukarıdaki arama kutusuna yazarak başlayın %1 " -@@ -3937,18 +3836,6 @@ - msgid "Switch provider" - msgstr "Anahtar sağlayıcı" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Spotify gelen kutusu eşleniyor" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Spotify çalma listesi eşleniyor" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Spotify yıldızlı şarkılar eşleniyor" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Üstteki sekmeler" -@@ -4320,10 +4207,6 @@ - msgid "Use the system proxy settings" - msgstr "Sistem vekil sunucu ayarlarını kullan" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Ses normalleştirme kullan" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Kullanılan" -@@ -4339,7 +4222,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Kullanıcı Adı" -@@ -4574,22 +4456,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Bir Grooveshark Anywhere hesabınız yok" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Spotify Premium hesabınız yok." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Spotify servisinden çıktınız, lütfen Ayarlar ekranında parolanızı yeniden " --"girin." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Spotify servisinden çıktınız, lütfen parolanızı yeniden girin." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Bu şarkıyı seviyorsunuz" -@@ -4656,7 +4522,6 @@ - msgstr "Skroplarınız: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Kullanıcı adı veya parolanız yanlış." - -@@ -4745,8 +4610,6 @@ - msgstr "Sonuncu" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/uk.po clementine-libre-1.0.1/src/translations/uk.po ---- clementine-1.0.1/src/translations/uk.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/uk.po 2012-05-29 17:45:51.199752577 -0400 -@@ -254,10 +254,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Потрібен обліковий запис Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Потрібен обліковий запис Spotify Premium." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -318,7 +314,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -591,14 +586,6 @@ - msgid "Always start playing" - msgstr "Завжди починати відтворення" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Для користування Spotify в Clementine, потрібний додатковий модуль. " --"Завантажити і встановити його зараз?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Виникла помилка копіювання бази даних iTunes з пристрою" -@@ -824,10 +811,6 @@ - msgid "CUE sheet support" - msgstr "Підтримка листів CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Скасувати" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Змінити обкладинку" -@@ -1039,10 +1022,6 @@ - msgid "Configure Shortcuts" - msgstr "Налаштування комбінацій клавіш" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Налаштування Spotify…" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Налаштувати фонотеку" -@@ -1060,10 +1039,6 @@ - msgid "Connect device" - msgstr "З’єднати пристрій" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "З'єднання зі Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Стала бітова швидкість" -@@ -1479,10 +1454,6 @@ - msgid "Download this album..." - msgstr "Завантажити цей альбом…" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Звантажити…" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Завантажую каталог Icecast" -@@ -1495,10 +1466,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Завантаження каталогу Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Завантаження модуля Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Завантажую метадані" -@@ -1651,10 +1618,6 @@ - msgid "Error deleting songs" - msgstr "Помилка вилучення композицій" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Помилка завантаження модуля Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1837,11 +1800,6 @@ - msgid "Font size" - msgstr "Розмір шрифту" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" --"З підстав ліцензування, для підтримки Spotify потрібен спеціальний модуль." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Примусове моно-кодування" -@@ -2113,10 +2071,6 @@ - "У динамічному режимі нові доріжку буде обрано та додано до списку " - "відтворення кожного разу як завершується пісня." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Вхідні" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Показувати обкладинку в повідомлені" -@@ -2145,10 +2099,6 @@ - msgid "Insert..." - msgstr "Вставити…" - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Встановлено" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Інтернет" -@@ -2451,7 +2401,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2527,10 +2476,6 @@ - msgid "Main profile (MAIN)" - msgstr "Основний профіль (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Зробити список відтворення доступним онлайн" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Спотворений відгук" -@@ -2789,10 +2734,6 @@ - msgid "Not enough neighbors" - msgstr "Недостатньо сусідів" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Не встановлено" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Вхід не здійснено" -@@ -2927,7 +2868,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Пароль" -@@ -3034,10 +2974,6 @@ - msgid "Playlists" - msgstr "Списки відтворення" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Статус модуля:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Поп" -@@ -3068,7 +3004,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Параметри" -@@ -3085,10 +3020,6 @@ - msgid "Preferred audio format" - msgstr "Бажаний аудіо формат" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Бажана бітова швидкість" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Бажаний формат" -@@ -3479,18 +3410,6 @@ - msgid "Search Magnatune" - msgstr "Пошук на Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Пошук в Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Пошук в Spotify (у новій вкладці)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Пошук в Spotify (у новій вкладці)…" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Шукати у всіх джерелах даних (бібліотеці, на службах інтернету тощо)" -@@ -3816,30 +3735,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Помилка входу до Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Модуль Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Модуль Spotify не встановлено" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Типово" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Оцінені" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Запустити список відтворення, що відтворюється на цей час" -@@ -3849,7 +3748,6 @@ - msgstr "Почати перекодування" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3937,18 +3835,6 @@ - msgid "Switch provider" - msgstr "Перемкнути джерело" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Синхронізація вхідних Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Синхронізація списку відтворення Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Синхронізація оцінених доріжок Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Вкладки зверху" -@@ -4323,10 +4209,6 @@ - msgid "Use the system proxy settings" - msgstr "Використовувати системні налаштування проксі" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Використати нормалізацію гучності" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Використано" -@@ -4342,7 +4224,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Користувач" -@@ -4579,21 +4460,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "У вас немає облікового запису Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "У вас немає облікового запису Spotify Premium." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Ви вийшли зі Spotify, введіть ваш пароль знов у налаштуваннях, будь ласка." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Ви вийшли зі Spotify, введіть ваш пароль знов, будь ласка." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Улюблена композиція" -@@ -4661,7 +4527,6 @@ - msgstr "%1 відтворень у вас" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Вами вказано помилкове ім’я користувача або пароль." - -@@ -4750,8 +4615,6 @@ - msgstr "за останні" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "кбіт/с" - -diff -rauN clementine-1.0.1/src/translations/vi.po clementine-libre-1.0.1/src/translations/vi.po ---- clementine-1.0.1/src/translations/vi.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/vi.po 2012-05-29 17:46:32.973085951 -0400 -@@ -256,10 +256,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "Cần có tài khoản Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "Yêu cầu một tài khoản Premium của Spotify." -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -320,7 +316,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -593,14 +588,6 @@ - msgid "Always start playing" - msgstr "Bắt đầu phát nhạc" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" --"Cần phải có một trình cắm thêm để sử dụng Spotify trong Clementine. Bạn có " --"muốn tải nó về và cài đặt ngay không?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "Một lỗi đã xảy ra khi sao chép cơ sở dữ liệu iTunes từ thiết bị" -@@ -826,10 +813,6 @@ - msgid "CUE sheet support" - msgstr "Hỗ trợ danh sách CUE" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "Hủy bỏ" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "Đổi ảnh bìa" -@@ -1040,10 +1023,6 @@ - msgid "Configure Shortcuts" - msgstr "Phím tắt" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "Cấu hình Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "Cấu hình thư viện..." -@@ -1061,10 +1040,6 @@ - msgid "Connect device" - msgstr "Kết nối thiết bị" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "Kết nối đến Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "Bitrate cố định" -@@ -1480,10 +1455,6 @@ - msgid "Download this album..." - msgstr "Tải album này..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "Tải về..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "Đang tải thư mục Icecast" -@@ -1496,10 +1467,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "Đang tải mục lục Magnatune" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "Tải trình cắm thêm Spotify" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "Đang tải thông tin dữ liệu" -@@ -1653,10 +1620,6 @@ - msgid "Error deleting songs" - msgstr "Lỗi xóa các bài hát" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "Lỗi khi tải trình cắm thêm Spotify" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1841,10 +1804,6 @@ - msgid "Font size" - msgstr "Kích cỡ phông chữ" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "Vì lí do giấy phép nên Spotify được hỗ trợ trong một trình cắm riêng." -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "Buộc mã hóa đơn kênh" -@@ -2116,10 +2075,6 @@ - "Trong chế độ năng động, các bài hát mới sẽ được chọn và thêm vào danh sách " - "mỗi khi một bài hát được phát xong." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "Hộp thư đến" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "Kèm theo ảnh bìa album trong thông báo" -@@ -2148,10 +2103,6 @@ - msgid "Insert..." - msgstr "Nhập..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "Đã cài đặt" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "Internet" -@@ -2454,7 +2405,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2530,10 +2480,6 @@ - msgid "Main profile (MAIN)" - msgstr "Hồ sơ chính (MAIN)" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "Danh sách sẵn sàng ngoại tuyến" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "Phản hồi có vẻ xấu" -@@ -2792,10 +2738,6 @@ - msgid "Not enough neighbors" - msgstr "Chưa đủ những người lân cận" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "Chưa cài đặt" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "Chưa đăng nh" -@@ -2930,7 +2872,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "Mật khẩu" -@@ -3037,10 +2978,6 @@ - msgid "Playlists" - msgstr "Danh sách" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "Trạng thái trình cắm:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "Pop" -@@ -3071,7 +3008,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "Thiết lập" -@@ -3089,10 +3025,6 @@ - msgid "Preferred audio format" - msgstr "Định dạng âm thanh được ưu tiên" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "Bitrate ưu tiên" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "Định dạng được ưu tiên" -@@ -3483,18 +3415,6 @@ - msgid "Search Magnatune" - msgstr "Tìm kiếm trên Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "Tìm kiếm trong Spotify" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "Tìm kiếm trong Spotify (mở trong tab mới)" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "Tìm kiếm trong Spotify (mở trong tab mới)..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "Tìm từ tất cả các nguồn (thư viện, các dịch vụ internet, ...)" -@@ -3819,30 +3739,10 @@ - msgid "Speex" - msgstr "Speex" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "Lỗi đăng nhập Spotify" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "Trình cắm Spotify" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "Trình cắm thêm Spotify chưa được cài đặt" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "Chuẩn" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "Đã bắt đầu" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "Bắt đầu danh sách hiện đang phát" -@@ -3852,7 +3752,6 @@ - msgstr "Bắt đầu chuyển mã" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "Nhập vào hộp tìm kiếm ở trên để tìm nhạc trên %1." -@@ -3938,18 +3837,6 @@ - msgid "Switch provider" - msgstr "Đổi nhà cung cấp" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "Đang đồng bộ hộp thư đến Spotify" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "Đang đồng bộ danh sách Spotify" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "Đang đồng bộ các bài hát được đánh dấu sao của Spotify" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "Các tab ở phía trên" -@@ -4328,10 +4215,6 @@ - msgid "Use the system proxy settings" - msgstr "Sử dụng thiết lập proxy của hệ thống" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "Sử dụng cân bằng âm lượng" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "Đã dùng" -@@ -4347,7 +4230,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "Tên người dùng" -@@ -4584,22 +4466,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "Bạn không có tài khoản Grooveshark Anywhere." - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "Bạn không có tài khoản cao cấp của Spotify." -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" --"Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu trong hộp thoại Thiết " --"lập." -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu." -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "Bạn thích bài hát này" -@@ -4666,7 +4532,6 @@ - msgstr "Thông tin bài hát của bạn: %1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "Tên người dùng hay mật khẩu không đúng." - -@@ -4755,8 +4620,6 @@ - msgstr "cuối" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/zh_CN.po clementine-libre-1.0.1/src/translations/zh_CN.po ---- clementine-1.0.1/src/translations/zh_CN.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/zh_CN.po 2012-05-29 17:47:24.893086011 -0400 -@@ -249,10 +249,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -308,7 +304,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -581,12 +576,6 @@ - msgid "Always start playing" - msgstr "总是开始播放" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "Clementine需要安装额外的插件才能使用Spotify.现在就下载并安装吗?" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "从 iTunes 复制数据库出错" -@@ -812,10 +801,6 @@ - msgid "CUE sheet support" - msgstr "CUE 支持" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "更改封面" -@@ -1016,10 +1001,6 @@ - msgid "Configure Shortcuts" - msgstr "配置快捷键" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "配置Spotify..." -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "配置音乐库..." -@@ -1037,10 +1018,6 @@ - msgid "Connect device" - msgstr "连接设备" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "连接Spotify" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "固定位速率" -@@ -1450,10 +1427,6 @@ - msgid "Download this album..." - msgstr "下载此专辑..." - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "下载..." -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "正在下载 Icecast 目录" -@@ -1466,10 +1439,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "正在下载 Magnatune 分类" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "下载Spotify插件中" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "下载元数据" -@@ -1619,10 +1588,6 @@ - msgid "Error deleting songs" - msgstr "删除曲目出错" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "下载Spotify插件出错" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1804,10 +1769,6 @@ - msgid "Font size" - msgstr "字号" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2070,10 +2031,6 @@ - "time a song finishes." - msgstr "在动态模式中, 每次歌曲播放完之后会被选择并添加新歌曲到播放列表.使用动态模式将忽略您的播放列表大小设定值." - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "收件夹" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "在提示中中加入专辑封面" -@@ -2102,10 +2059,6 @@ - msgid "Insert..." - msgstr "插入..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "互联网" -@@ -2408,7 +2361,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2484,10 +2436,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "无效的响应" -@@ -2744,10 +2692,6 @@ - msgid "Not enough neighbors" - msgstr "邻居不足" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2882,7 +2826,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "密码" -@@ -2989,10 +2932,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "插件状态:" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "流行" -@@ -3023,7 +2962,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "首选项" -@@ -3040,10 +2978,6 @@ - msgid "Preferred audio format" - msgstr "首选音乐格式" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "首选格式" -@@ -3434,18 +3368,6 @@ - msgid "Search Magnatune" - msgstr "搜索 Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "在新标签栏中查找Spotify..." -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3770,30 +3692,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "Spotify" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "potify 插件未安装" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "" -@@ -3803,7 +3705,6 @@ - msgstr "开始转换" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3889,18 +3790,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "标签在上" -@@ -4258,10 +4147,6 @@ - msgid "Use the system proxy settings" - msgstr "使用系统代理设置" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "已使用" -@@ -4277,7 +4162,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "用户名" -@@ -4505,20 +4389,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "您喜爱这个音轨" -@@ -4579,7 +4449,6 @@ - msgstr "提交的音轨:%1" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4668,8 +4537,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - -diff -rauN clementine-1.0.1/src/translations/zh_TW.po clementine-libre-1.0.1/src/translations/zh_TW.po ---- clementine-1.0.1/src/translations/zh_TW.po 2011-12-27 13:16:09.000000000 -0500 -+++ clementine-libre-1.0.1/src/translations/zh_TW.po 2012-05-29 17:48:16.866419419 -0400 -@@ -253,10 +253,6 @@ - msgid "A Grooveshark Anywhere account is required." - msgstr "" - --#: internet/spotifysettingspage.cpp:162 --msgid "A Spotify Premium account is required." --msgstr "" -- - #: smartplaylists/wizard.cpp:72 - msgid "" - "A smart playlist is a dynamic list of songs that come from your library. " -@@ -312,7 +308,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:113 - #: ../bin/src/ui_magnatunesettingspage.h:155 --#: ../bin/src/ui_spotifysettingspage.h:209 - #: ../bin/src/ui_remotesettingspage.h:203 - #: ../bin/src/ui_lastfmsettingspage.h:145 - msgid "Account details" -@@ -585,12 +580,6 @@ - msgid "Always start playing" - msgstr "總是開始播放" - --#: internet/spotifyblobdownloader.cpp:59 --msgid "" --"An additional plugin is required to use Spotify in Clementine. Would you " --"like to download and install it now?" --msgstr "" -- - #: devices/afcdevice.cpp:62 - msgid "An error occurred copying the iTunes database from the device" - msgstr "" -@@ -816,10 +805,6 @@ - msgid "CUE sheet support" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Cancel" --msgstr "" -- - #: ../bin/src/ui_edittagdialog.h:634 - msgid "Change cover art" - msgstr "" -@@ -1020,10 +1005,6 @@ - msgid "Configure Shortcuts" - msgstr "設定快速鍵" - --#: internet/spotifyservice.cpp:491 --msgid "Configure Spotify..." --msgstr "" -- - #: ui/mainwindow.cpp:491 - msgid "Configure library..." - msgstr "設定音樂庫" -@@ -1041,10 +1022,6 @@ - msgid "Connect device" - msgstr "" - --#: internet/spotifyservice.cpp:246 --msgid "Connecting to Spotify" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:196 - msgid "Constant bitrate" - msgstr "" -@@ -1454,10 +1431,6 @@ - msgid "Download this album..." - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:216 --msgid "Download..." --msgstr "" -- - #: internet/icecastservice.cpp:97 - msgid "Downloading Icecast directory" - msgstr "" -@@ -1470,10 +1443,6 @@ - msgid "Downloading Magnatune catalogue" - msgstr "下載 Magnatune目錄" - --#: internet/spotifyblobdownloader.cpp:43 --msgid "Downloading Spotify plugin" --msgstr "" -- - #: musicbrainz/tagfetcher.cpp:101 - msgid "Downloading metadata" - msgstr "正在下載元數據" -@@ -1623,10 +1592,6 @@ - msgid "Error deleting songs" - msgstr "" - --#: internet/spotifyblobdownloader.cpp:214 --msgid "Error downloading Spotify plugin" --msgstr "" -- - #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133 - #, qt-format - msgid "Error loading %1" -@@ -1808,10 +1773,6 @@ - msgid "Font size" - msgstr "字型大小" - --#: ../bin/src/ui_spotifysettingspage.h:214 --msgid "For licensing reasons Spotify support is in a separate plugin." --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:204 - msgid "Force mono encoding" - msgstr "" -@@ -2074,10 +2035,6 @@ - "time a song finishes." - msgstr "" - --#: internet/spotifyservice.cpp:347 --msgid "Inbox" --msgstr "" -- - #: ../bin/src/ui_notificationssettingspage.h:408 - msgid "Include album art in the notification" - msgstr "包括專輯封面的通知" -@@ -2106,10 +2063,6 @@ - msgid "Insert..." - msgstr "插入..." - --#: internet/spotifysettingspage.cpp:75 --msgid "Installed" --msgstr "" -- - #: ui/mainwindow.cpp:253 - msgid "Internet" - msgstr "網際網路" -@@ -2412,7 +2365,6 @@ - #: ../bin/src/ui_digitallyimportedsettingspage.h:163 - #: ../bin/src/ui_groovesharksettingspage.h:116 - #: ../bin/src/ui_magnatunesettingspage.h:164 --#: ../bin/src/ui_spotifysettingspage.h:212 - #: ../bin/src/ui_remotesettingspage.h:205 - #: ../bin/src/ui_lastfmsettingspage.h:147 - msgid "Login" -@@ -2488,10 +2440,6 @@ - msgid "Main profile (MAIN)" - msgstr "" - --#: internet/spotifyservice.cpp:496 --msgid "Make playlist available offline" --msgstr "" -- - #: internet/lastfmservice.cpp:449 - msgid "Malformed response" - msgstr "格式不正確的反應" -@@ -2748,10 +2696,6 @@ - msgid "Not enough neighbors" - msgstr "沒有足夠的鄰居" - --#: internet/spotifysettingspage.cpp:75 --msgid "Not installed" --msgstr "" -- - #: globalsearch/globalsearchsettingspage.cpp:123 - msgid "Not logged in" - msgstr "" -@@ -2886,7 +2830,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:115 - #: ../bin/src/ui_magnatunesettingspage.h:165 --#: ../bin/src/ui_spotifysettingspage.h:211 - #: ../bin/src/ui_networkproxysettingspage.h:169 - msgid "Password" - msgstr "密碼" -@@ -2993,10 +2936,6 @@ - msgid "Playlists" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:215 --msgid "Plugin status:" --msgstr "" -- - #: ui/equalizer.cpp:119 - msgid "Pop" - msgstr "流行音樂" -@@ -3027,7 +2966,6 @@ - - #: ../bin/src/ui_digitallyimportedsettingspage.h:166 - #: ../bin/src/ui_magnatunesettingspage.h:166 --#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115 - #: ../bin/src/ui_lastfmsettingspage.h:149 - msgid "Preferences" - msgstr "偏好設定" -@@ -3044,10 +2982,6 @@ - msgid "Preferred audio format" - msgstr "首選的音頻格式" - --#: ../bin/src/ui_spotifysettingspage.h:218 --msgid "Preferred bitrate" --msgstr "" -- - #: ../bin/src/ui_deviceproperties.h:380 - msgid "Preferred format" - msgstr "" -@@ -3438,18 +3372,6 @@ - msgid "Search Magnatune" - msgstr "搜尋 Magnatune" - --#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604 --msgid "Search Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:338 --msgid "Search Spotify (opens a new tab)" --msgstr "" -- --#: internet/spotifyservice.cpp:489 --msgid "Search Spotify (opens a new tab)..." --msgstr "" -- - #: ../bin/src/ui_globalsearchwidget.h:61 - msgid "Search around all your sources (library, internet services, ...)" - msgstr "" -@@ -3774,30 +3696,10 @@ - msgid "Speex" - msgstr "" - --#: ../bin/src/ui_spotifysettingspage.h:208 --msgid "Spotify" --msgstr "" -- --#: internet/spotifyservice.cpp:179 --msgid "Spotify login error" --msgstr "" -- --#: ../bin/src/ui_spotifysettingspage.h:213 --msgid "Spotify plugin" --msgstr "" -- --#: internet/spotifyblobdownloader.cpp:58 --msgid "Spotify plugin not installed" --msgstr "" -- - #: ../bin/src/ui_transcoderoptionsmp3.h:201 - msgid "Standard" - msgstr "" - --#: internet/spotifyservice.cpp:343 --msgid "Starred" --msgstr "" -- - #: core/commandlineoptions.cpp:148 - msgid "Start the playlist currently playing" - msgstr "開始播放目前播放清單" -@@ -3807,7 +3709,6 @@ - msgstr "開始轉碼" - - #: internet/groovesharksearchplaylisttype.cpp:36 --#: internet/spotifysearchplaylisttype.cpp:36 - #, qt-format - msgid "Start typing in the search box above to find music on %1." - msgstr "" -@@ -3893,18 +3794,6 @@ - msgid "Switch provider" - msgstr "" - --#: internet/spotifyservice.cpp:515 --msgid "Syncing Spotify inbox" --msgstr "" -- --#: internet/spotifyservice.cpp:510 --msgid "Syncing Spotify playlist" --msgstr "" -- --#: internet/spotifyservice.cpp:519 --msgid "Syncing Spotify starred tracks" --msgstr "" -- - #: widgets/fancytabwidget.cpp:650 - msgid "Tabs on top" - msgstr "標籤在上面" -@@ -4262,10 +4151,6 @@ - msgid "Use the system proxy settings" - msgstr "使用系統代理伺服器設置" - --#: ../bin/src/ui_spotifysettingspage.h:219 --msgid "Use volume normalisation" --msgstr "" -- - #: widgets/freespacebar.cpp:47 - msgid "Used" - msgstr "已用" -@@ -4281,7 +4166,6 @@ - - #: ../bin/src/ui_groovesharksettingspage.h:114 - #: ../bin/src/ui_magnatunesettingspage.h:163 --#: ../bin/src/ui_spotifysettingspage.h:210 - #: ../bin/src/ui_networkproxysettingspage.h:168 - msgid "Username" - msgstr "帳號" -@@ -4505,20 +4389,6 @@ - msgid "You do not have a Grooveshark Anywhere account." - msgstr "" - --#: internet/spotifysettingspage.cpp:149 --msgid "You do not have a Spotify Premium account." --msgstr "" -- --#: internet/spotifyservice.cpp:165 --msgid "" --"You have been logged out of Spotify, please re-enter your password in the " --"Settings dialog." --msgstr "" -- --#: internet/spotifysettingspage.cpp:158 --msgid "You have been logged out of Spotify, please re-enter your password." --msgstr "" -- - #: songinfo/lastfmtrackinfoprovider.cpp:95 - msgid "You love this track" - msgstr "您愛這首歌曲" -@@ -4578,7 +4448,6 @@ - msgstr "" - - #: internet/groovesharksettingspage.cpp:108 --#: internet/spotifysettingspage.cpp:154 - msgid "Your username or password was incorrect." - msgstr "" - -@@ -4667,8 +4536,6 @@ - msgstr "" - - #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422 --#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61 --#: internet/spotifysettingspage.cpp:62 - msgid "kbps" - msgstr "kbps" - |