Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into qt5

This commit is contained in:
Chocobozzz 2016-12-13 20:26:19 +01:00
parent 18a89f78a9 d3ea0c8482
commit 2096b1f268
12 changed files with 112 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/libclementine-tagreader/tagreader.cpp
View File

@ -709,9 +709,9 @@ bool TagReader::SaveFile(const QString& filename,
TagLib::MP4::Item(song.disc() <= 0 - 1 ? 0 : song.disc(), 0); TagLib::MP4::Item(song.disc() <= 0 - 1 ? 0 : song.disc(), 0);
tag->itemListMap()["tmpo"] = TagLib::StringList( tag->itemListMap()["tmpo"] = TagLib::StringList(
song.bpm() <= 0 - 1 ? "0" : TagLib::String::number(song.bpm())); song.bpm() <= 0 - 1 ? "0" : TagLib::String::number(song.bpm()));
tag->itemListMap()["\251wrt"] = TagLib::StringList(song.composer()); tag->itemListMap()["\251wrt"] = TagLib::StringList(song.composer().c_str());
tag->itemListMap()["\251grp"] = TagLib::StringList(song.grouping()); tag->itemListMap()["\251grp"] = TagLib::StringList(song.grouping().c_str());
tag->itemListMap()["aART"] = TagLib::StringList(song.albumartist()); tag->itemListMap()["aART"] = TagLib::StringList(song.albumartist().c_str());
tag->itemListMap()["cpil"] = tag->itemListMap()["cpil"] =
TagLib::StringList(song.compilation() ? "1" : "0"); TagLib::StringList(song.compilation() ? "1" : "0");
} }

11
src/core/mac_startup.mm
View File

@ -27,6 +27,7 @@
#import <Foundation/NSError.h> #import <Foundation/NSError.h>
#import <Foundation/NSFileManager.h> #import <Foundation/NSFileManager.h>
#import <Foundation/NSPathUtilities.h> #import <Foundation/NSPathUtilities.h>
#import <Foundation/NSProcessInfo.h>
#import <Foundation/NSThread.h> #import <Foundation/NSThread.h>
#import <Foundation/NSTimer.h> #import <Foundation/NSTimer.h>
#import <Foundation/NSURL.h> #import <Foundation/NSURL.h>
@ -160,10 +161,16 @@ static BreakpadRef InitBreakpad() {
- (void)applicationDidFinishLaunching:(NSNotification*)aNotification { - (void)applicationDidFinishLaunching:(NSNotification*)aNotification {
key_tap_ = [[SPMediaKeyTap alloc] initWithDelegate:self]; key_tap_ = [[SPMediaKeyTap alloc] initWithDelegate:self];
if ([SPMediaKeyTap usesGlobalMediaKeyTap]) if ([SPMediaKeyTap usesGlobalMediaKeyTap] &&
![[NSProcessInfo processInfo]
isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){
.majorVersion = 10,
.minorVersion = 12,
.patchVersion = 0}]) {
[key_tap_ startWatchingMediaKeys]; [key_tap_ startWatchingMediaKeys];
else } else {
qLog(Warning) << "Media key monitoring disabled"; qLog(Warning) << "Media key monitoring disabled";
}
} }
- (BOOL)application:(NSApplication*)app openFile:(NSString*)filename { - (BOOL)application:(NSApplication*)app openFile:(NSString*)filename {

2
src/covers/kittenloader.cpp
View File

@ -31,7 +31,7 @@ const char* KittenLoader::kFlickrKittenUrl =
"https://api.flickr.com/services/rest/" "https://api.flickr.com/services/rest/"
"?method=flickr.photos.search" "?method=flickr.photos.search"
"&api_key=808b52887b3cc7fe098abd62f6ed1745" "&api_key=808b52887b3cc7fe098abd62f6ed1745"
"&tags=kitten" "&group_id=99442622@N00"
"&sort=random" "&sort=random"
"&safe_search=1" "&safe_search=1"
"&content_type=1"; "&content_type=1";

25
src/internet/core/internetmodel.cpp
View File

@ -28,22 +28,22 @@
#include <QMimeData> #include <QMimeData>
#include <QtDebug> #include <QtDebug>
#include "internet/digitally/digitallyimportedservicebase.h"
#include "internet/icecast/icecastservice.h"
#include "internet/core/internetmimedata.h"
#include "internet/core/internetservice.h"
#include "internet/jamendo/jamendoservice.h"
#include "internet/magnatune/magnatuneservice.h"
#include "internet/internetradio/savedradio.h"
#include "internet/somafm/somafmservice.h"
#include "internet/intergalacticfm/intergalacticfmservice.h"
#include "internet/soundcloud/soundcloudservice.h"
#include "internet/spotify/spotifyservice.h"
#include "internet/subsonic/subsonicservice.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/mergedproxymodel.h" #include "core/mergedproxymodel.h"
#include "internet/core/internetmimedata.h"
#include "internet/core/internetservice.h"
#include "internet/digitally/digitallyimportedservicebase.h"
#include "internet/icecast/icecastservice.h"
#include "internet/intergalacticfm/intergalacticfmservice.h"
#include "internet/internetradio/savedradio.h"
#include "internet/jamendo/jamendoservice.h"
#include "internet/magnatune/magnatuneservice.h"
#include "internet/podcasts/podcastservice.h" #include "internet/podcasts/podcastservice.h"
#include "internet/somafm/somafmservice.h"
#include "internet/soundcloud/soundcloudservice.h"
#include "internet/spotify/spotifyservice.h"
#include "internet/subsonic/subsonicservice.h"
#include "smartplaylists/generatormimedata.h" #include "smartplaylists/generatormimedata.h"
#ifdef HAVE_GOOGLE_DRIVE #ifdef HAVE_GOOGLE_DRIVE
@ -84,6 +84,7 @@ InternetModel::InternetModel(Application* app, QObject* parent)
merged_model_->setSourceModel(this); merged_model_->setSourceModel(this);
AddService(new ClassicalRadioService(app, this));
AddService(new DigitallyImportedService(app, this)); AddService(new DigitallyImportedService(app, this));
AddService(new IcecastService(app, this)); AddService(new IcecastService(app, this));
AddService(new JamendoService(app, this)); AddService(new JamendoService(app, this));

15
src/internet/digitally/digitallyimportedservicebase.cpp
View File

@ -25,17 +25,17 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QSettings> #include <QSettings>
#include "digitallyimportedclient.h"
#include "digitallyimportedurlhandler.h"
#include "internet/core/internetmodel.h"
#include "core/application.h" #include "core/application.h"
#include "core/closure.h" #include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "core/network.h" #include "core/network.h"
#include "core/player.h" #include "core/player.h"
#include "core/taskmanager.h" #include "core/taskmanager.h"
#include "digitallyimportedclient.h"
#include "digitallyimportedurlhandler.h"
#include "globalsearch/digitallyimportedsearchprovider.h" #include "globalsearch/digitallyimportedsearchprovider.h"
#include "globalsearch/globalsearch.h" #include "globalsearch/globalsearch.h"
#include "internet/core/internetmodel.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"
const char* DigitallyImportedServiceBase::kSettingsGroup = "digitally_imported"; const char* DigitallyImportedServiceBase::kSettingsGroup = "digitally_imported";
@ -260,3 +260,12 @@ RockRadioService::RockRadioService(Application* app, InternetModel* model,
"RockRadio", "ROCKRADIO.com", QUrl("http://www.rockradio.com"), "RockRadio", "ROCKRADIO.com", QUrl("http://www.rockradio.com"),
IconLoader::Load("rockradio", IconLoader::Provider), "rockradio", app, IconLoader::Load("rockradio", IconLoader::Provider), "rockradio", app,
model, false, parent) {} model, false, parent) {}
ClassicalRadioService::ClassicalRadioService(Application* app,
InternetModel* model,
QObject* parent)
: DigitallyImportedServiceBase(
"ClassicalRadio", "ClassicalRadio.com",
QUrl("http://www.classicalradio.com"),
IconLoader::Load("digitallyimported", IconLoader::Provider),
"classicalradio", app, model, false, parent) {}

10
src/internet/digitally/digitallyimportedservicebase.h
View File

@ -22,9 +22,9 @@
#include <memory> #include <memory>
#include "core/cachedlist.h"
#include "digitallyimportedclient.h" #include "digitallyimportedclient.h"
#include "internet/core/internetservice.h" #include "internet/core/internetservice.h"
#include "core/cachedlist.h"
class DigitallyImportedClient; class DigitallyImportedClient;
class DigitallyImportedUrlHandler; class DigitallyImportedUrlHandler;
@ -67,7 +67,7 @@ class DigitallyImportedServiceBase : public InternetService {
public slots: public slots:
void ShowSettingsDialog(); void ShowSettingsDialog();
signals: signals:
void StreamsChanged(); void StreamsChanged();
private slots: private slots:
@ -133,4 +133,10 @@ class RockRadioService : public DigitallyImportedServiceBase {
QObject* parent = nullptr); QObject* parent = nullptr);
}; };
class ClassicalRadioService : public DigitallyImportedServiceBase {
public:
ClassicalRadioService(Application* app, InternetModel* model,
QObject* parent = nullptr);
};
#endif // INTERNET_DIGITALLY_DIGITALLYIMPORTEDSERVICEBASE_H_ #endif // INTERNET_DIGITALLY_DIGITALLYIMPORTEDSERVICEBASE_H_

2
src/internet/subsonic/subsonicdynamicplaylist.cpp
View File

@ -94,7 +94,7 @@ PlaylistItemList SubsonicDynamicPlaylist::GenerateMore(int count) {
} }
BOOST_SCOPE_EXIT_END BOOST_SCOPE_EXIT_END
QUrl url = service->BuildRequestUrl("GetAlbumList"); QUrl url = service->BuildRequestUrl("getAlbumList");
QNetworkAccessManager network; QNetworkAccessManager network;
if (count > kMaxCount) count = kMaxCount; if (count > kMaxCount) count = kMaxCount;

14
src/musicbrainz/chromaprinter.cpp
View File

@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
ChromaprintContext* chromaprint = ChromaprintContext* chromaprint =
chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT); chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels); chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()), chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
data.size() / 2); data.size() / 2);
chromaprint_finish(chromaprint); chromaprint_finish(chromaprint);
void* fprint = nullptr;
int size = 0; int size = 0;
#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
u_int32_t *fprint = nullptr;
char *encoded = nullptr;
#else
void *fprint = nullptr;
void *encoded = nullptr;
#endif
int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
QByteArray fingerprint; QByteArray fingerprint;
if (ret == 1) { if (ret == 1) {
void* encoded = nullptr;
int encoded_size = 0; int encoded_size = 0;
chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
&encoded, &encoded_size, 1); &encoded, &encoded_size, 1);

84
src/translations/hr.po
View File

@ -11,8 +11,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Clementine Music Player\n" "Project-Id-Version: Clementine Music Player\n"
"PO-Revision-Date: 2016-09-18 12:46+0000\n" "PO-Revision-Date: 2016-10-03 19:09+0000\n"
"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n" "Last-Translator: gogo <trebelnik2@gmail.com>\n"
"Language-Team: Croatian (http://www.transifex.com/davidsansome/clementine/language/hr/)\n" "Language-Team: Croatian (http://www.transifex.com/davidsansome/clementine/language/hr/)\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -194,7 +194,7 @@ msgstr "Dodaci"
#: ../bin/src/ui_edittagdialog.h:728 #: ../bin/src/ui_edittagdialog.h:728
msgid "&Grouping" msgid "&Grouping"
msgstr "" msgstr "&Grupiranje"
#: ../bin/src/ui_mainwindow.h:734 #: ../bin/src/ui_mainwindow.h:734
msgid "&Help" msgid "&Help"
@ -219,7 +219,7 @@ msgstr "&Zaključaj ocjenu"
#: ../bin/src/ui_edittagdialog.h:731 #: ../bin/src/ui_edittagdialog.h:731
msgid "&Lyrics" msgid "&Lyrics"
msgstr "" msgstr "&Tekst pjesame"
#: ../bin/src/ui_mainwindow.h:732 #: ../bin/src/ui_mainwindow.h:732
msgid "&Music" msgid "&Music"
@ -259,7 +259,7 @@ msgstr "Alati"
#: ../bin/src/ui_edittagdialog.h:724 #: ../bin/src/ui_edittagdialog.h:724
msgid "&Year" msgid "&Year"
msgstr "" msgstr "&Godina"
#: ui/edittagdialog.cpp:50 #: ui/edittagdialog.cpp:50
msgid "(different across multiple songs)" msgid "(different across multiple songs)"
@ -362,7 +362,7 @@ msgid ""
"href=\"%1\">%2</a>, which is released under the <a href=\"https" "href=\"%1\">%2</a>, which is released under the <a href=\"https"
"://clementine-player.org/licenses/by-sa/3.0/legalcode.txt\">Creative Commons" "://clementine-player.org/licenses/by-sa/3.0/legalcode.txt\">Creative Commons"
" Attribution-Share-Alike License 3.0</a>.</p>" " Attribution-Share-Alike License 3.0</a>.</p>"
msgstr "" msgstr "<p>Ovaj članak koristi materijal s Wikipedia članka <a href=\"%1\">%2</a>, koji je objavljen pod <a href=\"https://clementine-player.org/licenses/by-sa/3.0/legalcode.txt\">Creative Commons Attribution-Share-Alike Licencom 3.0</a>.</p>"
#: ../bin/src/ui_organisedialog.h:250 #: ../bin/src/ui_organisedialog.h:250
msgid "" msgid ""
@ -788,7 +788,7 @@ msgstr "Dopusti mid/side enkôdiranje"
#: ../bin/src/ui_transcodedialog.h:230 #: ../bin/src/ui_transcodedialog.h:230
msgid "Alongside the originals" msgid "Alongside the originals"
msgstr "Pokraj orginala" msgstr "Pokraj izvornika"
#: ../bin/src/ui_behavioursettingspage.h:324 #: ../bin/src/ui_behavioursettingspage.h:324
msgid "Always hide the main window" msgid "Always hide the main window"
@ -857,7 +857,7 @@ msgstr "Primjenite kompresiju da spriječite isječak"
#: ui/equalizer.cpp:222 #: ui/equalizer.cpp:222
#, qt-format #, qt-format
msgid "Are you sure you want to delete the \"%1\" preset?" msgid "Are you sure you want to delete the \"%1\" preset?"
msgstr "Sigurno želite izbrisati \"%1\" postavke?" msgstr "Sigurno želite obrisati \"%1\" postavke?"
#: ui/edittagdialog.cpp:803 #: ui/edittagdialog.cpp:803
msgid "Are you sure you want to reset this song's statistics?" msgid "Are you sure you want to reset this song's statistics?"
@ -927,7 +927,7 @@ msgstr "Automatske"
#: ../bin/src/ui_librarysettingspage.h:189 #: ../bin/src/ui_librarysettingspage.h:189
msgid "Automatic updating" msgid "Automatic updating"
msgstr "Automatsko ažuriranje" msgstr "Automatska nadopuna"
#: ../bin/src/ui_librarysettingspage.h:207 #: ../bin/src/ui_librarysettingspage.h:207
msgid "Automatically open single categories in the library tree" msgid "Automatically open single categories in the library tree"
@ -1004,7 +1004,7 @@ msgstr "Najbolje"
#: songinfo/artistbiography.cpp:90 songinfo/artistbiography.cpp:255 #: songinfo/artistbiography.cpp:90 songinfo/artistbiography.cpp:255
msgid "Biography" msgid "Biography"
msgstr "" msgstr "Životopis"
#: playlist/playlist.cpp:1355 ../bin/src/ui_edittagdialog.h:706 #: playlist/playlist.cpp:1355 ../bin/src/ui_edittagdialog.h:706
msgid "Bit rate" msgid "Bit rate"
@ -1154,7 +1154,7 @@ msgstr "Provjeri za nove nastavke"
#: internet/googledrive/googledriveservice.cpp:221 #: internet/googledrive/googledriveservice.cpp:221
msgid "Check for updates" msgid "Check for updates"
msgstr "Provjeri ažuriranja" msgstr "Provjeri nadopune"
#: ui/mainwindow.cpp:805 #: ui/mainwindow.cpp:805
msgid "Check for updates..." msgid "Check for updates..."
@ -1343,7 +1343,7 @@ msgstr "Klub"
#: ../bin/src/ui_edittagdialog.h:726 #: ../bin/src/ui_edittagdialog.h:726
msgid "Co&mposer" msgid "Co&mposer"
msgstr "" msgstr "Sk&ladatelj"
#: ../bin/src/ui_appearancesettingspage.h:271 #: ../bin/src/ui_appearancesettingspage.h:271
msgid "Colors" msgid "Colors"
@ -1570,7 +1570,7 @@ msgstr "Omoti s %1"
#: core/commandlineoptions.cpp:172 #: core/commandlineoptions.cpp:172
msgid "Create a new playlist with files/URLs" msgid "Create a new playlist with files/URLs"
msgstr "" msgstr "Stvori novi popis izvođenja s datotekama/URL-ovima"
#: ../bin/src/ui_playbacksettingspage.h:344 #: ../bin/src/ui_playbacksettingspage.h:344
msgid "Cross-fade when changing tracks automatically" msgid "Cross-fade when changing tracks automatically"
@ -1671,7 +1671,7 @@ msgstr "Pauza između vizualizacija"
#: playlist/playlistlistcontainer.cpp:70 #: playlist/playlistlistcontainer.cpp:70
#: ../bin/src/ui_playlistlistcontainer.h:130 #: ../bin/src/ui_playlistlistcontainer.h:130
msgid "Delete" msgid "Delete"
msgstr "Izbriši" msgstr "Obriši"
#: internet/podcasts/podcastservice.cpp:435 #: internet/podcasts/podcastservice.cpp:435
msgid "Delete downloaded data" msgid "Delete downloaded data"
@ -1680,16 +1680,16 @@ msgstr "Obriši preuzete podatke"
#: devices/deviceview.cpp:408 library/libraryview.cpp:645 #: devices/deviceview.cpp:408 library/libraryview.cpp:645
#: ui/mainwindow.cpp:2342 widgets/fileview.cpp:188 #: ui/mainwindow.cpp:2342 widgets/fileview.cpp:188
msgid "Delete files" msgid "Delete files"
msgstr "Izbrišite datoteku" msgstr "Obrišite datoteku"
#: devices/deviceview.cpp:232 #: devices/deviceview.cpp:232
msgid "Delete from device..." msgid "Delete from device..."
msgstr "Izbrišite s uređaja..." msgstr "Obrišite s uređaja..."
#: library/libraryview.cpp:411 ui/mainwindow.cpp:707 #: library/libraryview.cpp:411 ui/mainwindow.cpp:707
#: widgets/fileviewlist.cpp:47 #: widgets/fileviewlist.cpp:47
msgid "Delete from disk..." msgid "Delete from disk..."
msgstr "Izbrišite s diska..." msgstr "Obrišite s diska..."
#: ../bin/src/ui_podcastsettingspage.h:268 #: ../bin/src/ui_podcastsettingspage.h:268
msgid "Delete played episodes" msgid "Delete played episodes"
@ -1697,15 +1697,15 @@ msgstr "Obriši reproducirane nastavke"
#: ui/equalizer.cpp:221 ../bin/src/ui_equalizer.h:168 #: ui/equalizer.cpp:221 ../bin/src/ui_equalizer.h:168
msgid "Delete preset" msgid "Delete preset"
msgstr "Izbrišite predložak" msgstr "Obrišite predložak"
#: library/libraryview.cpp:401 #: library/libraryview.cpp:401
msgid "Delete smart playlist" msgid "Delete smart playlist"
msgstr "Izbrišite pametni popis izvođenja" msgstr "Obrišite pametni popis izvođenja"
#: ../bin/src/ui_organisedialog.h:245 #: ../bin/src/ui_organisedialog.h:245
msgid "Delete the original files" msgid "Delete the original files"
msgstr "Izbriši orginalne datoteke" msgstr "Obriši izvorne datoteke"
#: core/deletefiles.cpp:50 #: core/deletefiles.cpp:50
msgid "Deleting files" msgid "Deleting files"
@ -2494,7 +2494,7 @@ msgstr "Pun Treble"
#: ../bin/src/ui_edittagdialog.h:729 #: ../bin/src/ui_edittagdialog.h:729
msgid "Ge&nre" msgid "Ge&nre"
msgstr "" msgstr "Vrsta &glazbe"
#: ui/settingsdialog.cpp:137 #: ui/settingsdialog.cpp:137
msgid "General" msgid "General"
@ -2573,7 +2573,7 @@ msgstr "Grupiraj po Albumu"
#: library/libraryfilterwidget.cpp:150 #: library/libraryfilterwidget.cpp:150
msgid "Group by Album artist/Album" msgid "Group by Album artist/Album"
msgstr "" msgstr "Grupiraj po Izvođaču albuma/Albumu"
#: library/libraryfilterwidget.cpp:143 #: library/libraryfilterwidget.cpp:143
msgid "Group by Artist" msgid "Group by Artist"
@ -2884,7 +2884,7 @@ msgstr "Nastavi izvođenje u pozadini kada je prozor zatvoren"
#: ../bin/src/ui_organisedialog.h:244 #: ../bin/src/ui_organisedialog.h:244
msgid "Keep the original files" msgid "Keep the original files"
msgstr "Zadrži orginalne datoteke" msgstr "Zadrži izvorne datoteke"
#: ../bin/src/ui_mainwindow.h:697 #: ../bin/src/ui_mainwindow.h:697
msgctxt "Label for buton to enable/disable kittens in the now playing widget" msgctxt "Label for buton to enable/disable kittens in the now playing widget"
@ -3128,7 +3128,7 @@ msgstr "Tekstovi pjesama sa %1"
#: songinfo/taglyricsinfoprovider.cpp:29 #: songinfo/taglyricsinfoprovider.cpp:29
msgid "Lyrics from the tag" msgid "Lyrics from the tag"
msgstr "" msgstr "Tekst pjesme sa oznake"
#: transcoder/transcoder.cpp:235 #: transcoder/transcoder.cpp:235
msgid "M4A AAC" msgid "M4A AAC"
@ -3632,7 +3632,7 @@ msgstr "Se otvoriti u novom popisu izvođenja"
#: songinfo/artistbiography.cpp:94 songinfo/artistbiography.cpp:261 #: songinfo/artistbiography.cpp:94 songinfo/artistbiography.cpp:261
msgid "Open in your browser" msgid "Open in your browser"
msgstr "" msgstr "Otvori u svojem pregledniku"
#: ../bin/src/ui_globalshortcutssettingspage.h:168 #: ../bin/src/ui_globalshortcutssettingspage.h:168
#: ../bin/src/ui_globalshortcutssettingspage.h:170 #: ../bin/src/ui_globalshortcutssettingspage.h:170
@ -3675,7 +3675,7 @@ msgstr "Organiziranje datoteka"
#: ui/trackselectiondialog.cpp:163 #: ui/trackselectiondialog.cpp:163
msgid "Original tags" msgid "Original tags"
msgstr "Orginalne oznake" msgstr "Izvorne oznake"
#: library/savedgroupingmanager.cpp:101 playlist/playlist.cpp:1329 #: library/savedgroupingmanager.cpp:101 playlist/playlist.cpp:1329
#: ui/organisedialog.cpp:73 ../bin/src/ui_groupbydialog.h:135 #: ui/organisedialog.cpp:73 ../bin/src/ui_groupbydialog.h:135
@ -3730,7 +3730,7 @@ msgstr "Raščlanjivanje Jamendo kataloga"
#: devices/udisks2lister.cpp:79 #: devices/udisks2lister.cpp:79
msgid "Partition label" msgid "Partition label"
msgstr "" msgstr "Naziv particije"
#: ui/equalizer.cpp:139 #: ui/equalizer.cpp:139
msgid "Party" msgid "Party"
@ -4359,7 +4359,7 @@ msgstr "Scrobblaj pjesmu koju slušam"
#: ../bin/src/ui_behavioursettingspage.h:313 #: ../bin/src/ui_behavioursettingspage.h:313
msgid "Scroll over icon to change track" msgid "Scroll over icon to change track"
msgstr "" msgstr "Prijeđi preko ikone za promjenu pjesme"
#: ../bin/src/ui_seafilesettingspage.h:164 #: ../bin/src/ui_seafilesettingspage.h:164
msgid "Seafile" msgid "Seafile"
@ -4641,7 +4641,7 @@ msgstr "Prikaži samo neoznačene pjesme"
#: ../bin/src/ui_mainwindow.h:729 #: ../bin/src/ui_mainwindow.h:729
msgid "Show or hide the sidebar" msgid "Show or hide the sidebar"
msgstr "" msgstr "Prikaži ili sakrij bočnu traku"
#: ../bin/src/ui_vksettingspage.h:220 #: ../bin/src/ui_vksettingspage.h:220
msgid "Show playing song on your page" msgid "Show playing song on your page"
@ -4653,7 +4653,7 @@ msgstr "Prikaži prijedloge pretraživanja"
#: ../bin/src/ui_mainwindow.h:727 #: ../bin/src/ui_mainwindow.h:727
msgid "Show sidebar" msgid "Show sidebar"
msgstr "" msgstr "Prikaži bočnu traku"
#: ../bin/src/ui_lastfmsettingspage.h:136 #: ../bin/src/ui_lastfmsettingspage.h:136
msgid "Show the \"love\" button" msgid "Show the \"love\" button"
@ -5054,7 +5054,7 @@ msgstr "Probno razdoblje za Subsonic poslužitelj je završeno. Molim, donirajte
msgid "" msgid ""
"The version of Clementine you've just updated to requires a full library " "The version of Clementine you've just updated to requires a full library "
"rescan because of the new features listed below:" "rescan because of the new features listed below:"
msgstr "Inačica Clementinea koju ste upravo ažurirali zahtjeva ponovnu pretragu cijele fonoteke zbog novih mogućnosti navedenih ispod:" msgstr "Inačica Clementinea koju ste upravo nadopunili zahtijeva ponovnu pretragu cijele fonoteke zbog novih mogućnosti navedenih ispod:"
#: library/libraryview.cpp:562 #: library/libraryview.cpp:562
msgid "There are other songs in this album" msgid "There are other songs in this album"
@ -5237,7 +5237,7 @@ msgstr "Ukupno mrežnih zahtjeva"
#: ../bin/src/ui_edittagdialog.h:720 #: ../bin/src/ui_edittagdialog.h:720
msgid "Trac&k" msgid "Trac&k"
msgstr "" msgstr "Broj &pjesme"
#: playlist/playlist.cpp:1323 ui/organisedialog.cpp:69 #: playlist/playlist.cpp:1323 ui/organisedialog.cpp:69
#: ../bin/src/ui_trackselectiondialog.h:212 ../bin/src/ui_ripcddialog.h:304 #: ../bin/src/ui_trackselectiondialog.h:212 ../bin/src/ui_ripcddialog.h:304
@ -5291,7 +5291,7 @@ msgstr "URL(ovi)"
#: devices/udisks2lister.cpp:80 #: devices/udisks2lister.cpp:80
msgid "UUID" msgid "UUID"
msgstr "" msgstr "UUID"
#: ../bin/src/ui_transcoderoptionsspeex.h:227 #: ../bin/src/ui_transcoderoptionsspeex.h:227
msgid "Ultra wide band (UWB)" msgid "Ultra wide band (UWB)"
@ -5348,41 +5348,41 @@ msgstr "Nadolazeći koncerti"
#: internet/vk/vkservice.cpp:347 #: internet/vk/vkservice.cpp:347
msgid "Update" msgid "Update"
msgstr "Ažuriranje" msgstr "Nadopuna"
#: internet/podcasts/podcastservice.cpp:420 #: internet/podcasts/podcastservice.cpp:420
msgid "Update all podcasts" msgid "Update all podcasts"
msgstr "Ažuriraj sve podcaste" msgstr "Nadopuni sve podcaste"
#: ../bin/src/ui_mainwindow.h:711 #: ../bin/src/ui_mainwindow.h:711
msgid "Update changed library folders" msgid "Update changed library folders"
msgstr "Ažurirajte promjene u mapi fonoteke" msgstr "Nadopuni promjene u mapi fonoteke"
#: ../bin/src/ui_librarysettingspage.h:190 #: ../bin/src/ui_librarysettingspage.h:190
msgid "Update the library when Clementine starts" msgid "Update the library when Clementine starts"
msgstr "Ažuriraj fonoteku kada se Clementine pokrene" msgstr "Nadopuni fonoteku kada se Clementine pokrene"
#: internet/podcasts/podcastservice.cpp:429 #: internet/podcasts/podcastservice.cpp:429
msgid "Update this podcast" msgid "Update this podcast"
msgstr "Ažuriraj ovaj podcast" msgstr "Nadopuni ovaj podcast"
#: ../bin/src/ui_podcastsettingspage.h:251 #: ../bin/src/ui_podcastsettingspage.h:251
msgid "Updating" msgid "Updating"
msgstr "Ažuriranje" msgstr "Nadopuna"
#: library/librarywatcher.cpp:97 #: library/librarywatcher.cpp:97
#, qt-format #, qt-format
msgid "Updating %1" msgid "Updating %1"
msgstr "Ažuriranje %1" msgstr "Nadopuna %1"
#: devices/deviceview.cpp:105 #: devices/deviceview.cpp:105
#, qt-format #, qt-format
msgid "Updating %1%..." msgid "Updating %1%..."
msgstr "Ažuriranje %1..." msgstr "Nadopuna %1%..."
#: library/librarywatcher.cpp:95 #: library/librarywatcher.cpp:95
msgid "Updating library" msgid "Updating library"
msgstr "Ažuriranje fonoteke" msgstr "Nadopuna fonoteke"
#: core/commandlineoptions.cpp:152 #: core/commandlineoptions.cpp:152
msgid "Usage" msgid "Usage"

12
src/translations/id.po
View File

@ -28,8 +28,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Clementine Music Player\n" "Project-Id-Version: Clementine Music Player\n"
"PO-Revision-Date: 2016-09-18 12:46+0000\n" "PO-Revision-Date: 2016-10-08 16:48+0000\n"
"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n" "Last-Translator: zk\n"
"Language-Team: Indonesian (http://www.transifex.com/davidsansome/clementine/language/id/)\n" "Language-Team: Indonesian (http://www.transifex.com/davidsansome/clementine/language/id/)\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -2590,7 +2590,7 @@ msgstr "Grup berdasarkan Album"
#: library/libraryfilterwidget.cpp:150 #: library/libraryfilterwidget.cpp:150
msgid "Group by Album artist/Album" msgid "Group by Album artist/Album"
msgstr "" msgstr "Grup berdasarkan Artis album/Album"
#: library/libraryfilterwidget.cpp:143 #: library/libraryfilterwidget.cpp:143
msgid "Group by Artist" msgid "Group by Artist"
@ -3145,7 +3145,7 @@ msgstr "Lirik dari %1"
#: songinfo/taglyricsinfoprovider.cpp:29 #: songinfo/taglyricsinfoprovider.cpp:29
msgid "Lyrics from the tag" msgid "Lyrics from the tag"
msgstr "" msgstr "Lirik dari tag"
#: transcoder/transcoder.cpp:235 #: transcoder/transcoder.cpp:235
msgid "M4A AAC" msgid "M4A AAC"
@ -4658,7 +4658,7 @@ msgstr "Tampilkan hanya tidak bertag"
#: ../bin/src/ui_mainwindow.h:729 #: ../bin/src/ui_mainwindow.h:729
msgid "Show or hide the sidebar" msgid "Show or hide the sidebar"
msgstr "" msgstr "Tampil atau sembunyikan bilah sisi"
#: ../bin/src/ui_vksettingspage.h:220 #: ../bin/src/ui_vksettingspage.h:220
msgid "Show playing song on your page" msgid "Show playing song on your page"
@ -4670,7 +4670,7 @@ msgstr "Tampilkan saran pencarian"
#: ../bin/src/ui_mainwindow.h:727 #: ../bin/src/ui_mainwindow.h:727
msgid "Show sidebar" msgid "Show sidebar"
msgstr "" msgstr "Tampilkan bilah sisi"
#: ../bin/src/ui_lastfmsettingspage.h:136 #: ../bin/src/ui_lastfmsettingspage.h:136
msgid "Show the \"love\" button" msgid "Show the \"love\" button"

6
src/translations/ms.po
View File

@ -9,8 +9,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Clementine Music Player\n" "Project-Id-Version: Clementine Music Player\n"
"PO-Revision-Date: 2016-09-18 12:46+0000\n" "PO-Revision-Date: 2016-10-02 02:48+0000\n"
"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n" "Last-Translator: abuyop <abuyop@gmail.com>\n"
"Language-Team: Malay (http://www.transifex.com/davidsansome/clementine/language/ms/)\n" "Language-Team: Malay (http://www.transifex.com/davidsansome/clementine/language/ms/)\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -3126,7 +3126,7 @@ msgstr "Lirik dari %1"
#: songinfo/taglyricsinfoprovider.cpp:29 #: songinfo/taglyricsinfoprovider.cpp:29
msgid "Lyrics from the tag" msgid "Lyrics from the tag"
msgstr "" msgstr "Lirik dari tag"
#: transcoder/transcoder.cpp:235 #: transcoder/transcoder.cpp:235
msgid "M4A AAC" msgid "M4A AAC"

6
src/translations/sv.po
View File

@ -29,8 +29,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Clementine Music Player\n" "Project-Id-Version: Clementine Music Player\n"
"PO-Revision-Date: 2016-09-18 12:46+0000\n" "PO-Revision-Date: 2016-10-07 12:09+0000\n"
"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n" "Last-Translator: Staffan Vilcans\n"
"Language-Team: Swedish (http://www.transifex.com/davidsansome/clementine/language/sv/)\n" "Language-Team: Swedish (http://www.transifex.com/davidsansome/clementine/language/sv/)\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -3146,7 +3146,7 @@ msgstr "Låttext från %1"
#: songinfo/taglyricsinfoprovider.cpp:29 #: songinfo/taglyricsinfoprovider.cpp:29
msgid "Lyrics from the tag" msgid "Lyrics from the tag"
msgstr "" msgstr "Låttext från etiketten"
#: transcoder/transcoder.cpp:235 #: transcoder/transcoder.cpp:235
msgid "M4A AAC" msgid "M4A AAC"