From 9b22f2ce408c59e877ba0749e5c0f5ad9064dc67 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sat, 25 Dec 2010 17:25:29 +0000 Subject: [PATCH] Proxy support. Fixes issue #38 --- src/CMakeLists.txt | 1 + src/core/networkproxyfactory.cpp | 101 ++++++++++++++++++ src/core/networkproxyfactory.h | 44 ++++++++ src/main.cpp | 6 ++ src/translations/ar.po | 24 +++++ src/translations/be.po | 24 +++++ src/translations/bg.po | 24 +++++ src/translations/br.po | 24 +++++ src/translations/ca.po | 24 +++++ src/translations/cs.po | 24 +++++ src/translations/cy.po | 24 +++++ src/translations/da.po | 24 +++++ src/translations/de.po | 24 +++++ src/translations/el.po | 24 +++++ src/translations/en.po | 24 +++++ src/translations/en_CA.po | 24 +++++ src/translations/en_GB.po | 24 +++++ src/translations/eo.po | 24 +++++ src/translations/es.po | 24 +++++ src/translations/et.po | 24 +++++ src/translations/eu.po | 24 +++++ src/translations/fi.po | 24 +++++ src/translations/fr.po | 24 +++++ src/translations/gl.po | 24 +++++ src/translations/he.po | 24 +++++ src/translations/hi.po | 24 +++++ src/translations/hr.po | 24 +++++ src/translations/hu.po | 24 +++++ src/translations/it.po | 24 +++++ src/translations/ja.po | 24 +++++ src/translations/kk.po | 24 +++++ src/translations/lt.po | 24 +++++ src/translations/nb.po | 24 +++++ src/translations/nl.po | 24 +++++ src/translations/oc.po | 24 +++++ src/translations/pl.po | 24 +++++ src/translations/pt.po | 24 +++++ src/translations/pt_BR.po | 24 +++++ src/translations/ro.po | 24 +++++ src/translations/ru.po | 24 +++++ src/translations/sk.po | 24 +++++ src/translations/sl.po | 24 +++++ src/translations/sr.po | 24 +++++ src/translations/sv.po | 24 +++++ src/translations/tr.po | 24 +++++ src/translations/translations.pot | 24 +++++ src/translations/uk.po | 24 +++++ src/translations/zh_CN.po | 24 +++++ src/translations/zh_TW.po | 24 +++++ src/ui/settingsdialog.cpp | 57 +++++++++- src/ui/settingsdialog.h | 1 + src/ui/settingsdialog.ui | 172 ++++++++++++++++++++++++++++-- 52 files changed, 1449 insertions(+), 13 deletions(-) create mode 100644 src/core/networkproxyfactory.cpp create mode 100644 src/core/networkproxyfactory.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c48093264..a9854758e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,6 +59,7 @@ set(SOURCES core/mpris_common.cpp core/musicstorage.cpp core/network.cpp + core/networkproxyfactory.cpp core/organise.cpp core/organiseformat.cpp core/player.cpp diff --git a/src/core/networkproxyfactory.cpp b/src/core/networkproxyfactory.cpp new file mode 100644 index 000000000..8a22ea30f --- /dev/null +++ b/src/core/networkproxyfactory.cpp @@ -0,0 +1,101 @@ +#include "networkproxyfactory.h" + +#include +#include +#include + +NetworkProxyFactory* NetworkProxyFactory::sInstance = NULL; +const char* NetworkProxyFactory::kSettingsGroup = "Proxy"; + +NetworkProxyFactory::NetworkProxyFactory() + : mode_(Mode_System), + type_(QNetworkProxy::HttpProxy), + port_(8080), + use_authentication_(false) +{ +#ifdef Q_OS_LINUX + // Linux uses environment variables to pass proxy configuration information, + // which systemProxyForQuery doesn't support for some reason. + + QStringList urls; + urls << QString::fromLocal8Bit(getenv("HTTP_PROXY")); + urls << QString::fromLocal8Bit(getenv("http_proxy")); + urls << QString::fromLocal8Bit(getenv("ALL_PROXY")); + urls << QString::fromLocal8Bit(getenv("all_proxy")); + + foreach (const QString& url_str, urls) { + if (url_str.isEmpty()) + continue; + + env_url_ = QUrl(url_str); + break; + } +#endif + + ReloadSettings(); +} + +NetworkProxyFactory* NetworkProxyFactory::Instance() { + if (!sInstance) { + sInstance = new NetworkProxyFactory; + } + + return sInstance; +} + +void NetworkProxyFactory::ReloadSettings() { + QMutexLocker l(&mutex_); + + QSettings s; + s.beginGroup(kSettingsGroup); + + mode_ = Mode(s.value("mode", Mode_System).toInt()); + type_ = QNetworkProxy::ProxyType(s.value("type", QNetworkProxy::HttpProxy).toInt()); + hostname_ = s.value("hostname").toString(); + port_ = s.value("port", 8080).toInt(); + use_authentication_ = s.value("use_authentication", false).toBool(); + username_ = s.value("username").toString(); + password_ = s.value("password").toString(); +} + +QList NetworkProxyFactory::queryProxy( + const QNetworkProxyQuery& query) { + QMutexLocker l(&mutex_); + + QNetworkProxy ret; + + switch (mode_) { + case Mode_System: +#ifdef Q_OS_LINUX + Q_UNUSED(query); + + ret.setHostName(env_url_.host()); + ret.setPort(env_url_.port()); + ret.setUser(env_url_.userName()); + ret.setPassword(env_url_.password()); + if (env_url_.scheme().startsWith("http")) + ret.setType(QNetworkProxy::HttpProxy); + else + ret.setType(QNetworkProxy::Socks5Proxy); + break; +#else + return systemProxyForQuery(query); +#endif + + case Mode_Direct: + ret.setType(QNetworkProxy::NoProxy); + break; + + case Mode_Manual: + ret.setType(type_); + ret.setHostName(hostname_); + ret.setPort(port_); + if (use_authentication_) { + ret.setUser(username_); + ret.setPassword(password_); + } + break; + } + + return QList() << ret; +} diff --git a/src/core/networkproxyfactory.h b/src/core/networkproxyfactory.h new file mode 100644 index 000000000..78030e772 --- /dev/null +++ b/src/core/networkproxyfactory.h @@ -0,0 +1,44 @@ +#ifndef NETWORKPROXYFACTORY_H +#define NETWORKPROXYFACTORY_H + +#include +#include +#include + +class NetworkProxyFactory : public QNetworkProxyFactory { +public: + // These values are persisted + enum Mode { + Mode_System = 0, + Mode_Direct = 1, + Mode_Manual = 2, + }; + + static NetworkProxyFactory* Instance(); + static const char* kSettingsGroup; + + // These methods are thread-safe + void ReloadSettings(); + QList queryProxy(const QNetworkProxyQuery& query); + +private: + NetworkProxyFactory(); + + static NetworkProxyFactory* sInstance; + + QMutex mutex_; + + Mode mode_; + QNetworkProxy::ProxyType type_; + QString hostname_; + int port_; + bool use_authentication_; + QString username_; + QString password_; + +#ifdef Q_OS_LINUX + QUrl env_url_; +#endif +}; + +#endif // NETWORKPROXYFACTORY_H diff --git a/src/main.cpp b/src/main.cpp index 2da9ddb65..73a68c743 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,6 +27,7 @@ #include "core/encoding.h" #include "core/mac_startup.h" #include "core/network.h" +#include "core/networkproxyfactory.h" #include "core/player.h" #include "core/potranslator.h" #include "core/song.h" @@ -44,6 +45,7 @@ #include #include +#include #include #include #include @@ -249,6 +251,10 @@ int main(int argc, char *argv[]) { Echonest::Config::instance()->setAPIKey("DFLFLJBUF4EGTXHIG"); Echonest::Config::instance()->setNetworkAccessManager(new NetworkAccessManager); + // Network proxy + QNetworkProxyFactory::setApplicationProxyFactory( + NetworkProxyFactory::Instance()); + // Seed the random number generator srand(time(NULL)); diff --git a/src/translations/ar.po b/src/translations/ar.po index b54f2c008..fef476349 100644 --- a/src/translations/ar.po +++ b/src/translations/ar.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "الجيران" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/be.po b/src/translations/be.po index fea64d77a..7c3750275 100644 --- a/src/translations/be.po +++ b/src/translations/be.po @@ -757,6 +757,9 @@ msgstr "Уласцівасці прылады..." msgid "Devices" msgstr "Прылады" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Каталёг" @@ -1073,6 +1076,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1363,6 +1369,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1444,6 +1453,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1664,6 +1676,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1845,6 +1860,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2315,6 +2333,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2324,6 +2345,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/bg.po b/src/translations/bg.po index f89e43313..60c75e711 100644 --- a/src/translations/bg.po +++ b/src/translations/bg.po @@ -743,6 +743,9 @@ msgstr "Настройване на устройство..." msgid "Devices" msgstr "Устройства" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Папка" @@ -1061,6 +1064,9 @@ msgstr "Групиране по Жанр/Албум" msgid "Group by Genre/Artist/Album" msgstr "Групиране по Жанр/Изпълнител/Албум" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Хардуерна информация" @@ -1353,6 +1359,9 @@ msgstr "" msgid "Malformed response" msgstr "Грешка при отговора" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Производител" @@ -1434,6 +1443,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1654,6 +1666,9 @@ msgstr "Поп" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1835,6 +1850,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2305,6 +2323,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2314,6 +2335,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/br.po b/src/translations/br.po index 6f26ac773..400f4c958 100644 --- a/src/translations/br.po +++ b/src/translations/br.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/ca.po b/src/translations/ca.po index 20e3f14c4..98c2b7d55 100644 --- a/src/translations/ca.po +++ b/src/translations/ca.po @@ -770,6 +770,9 @@ msgstr "Propietats del dispositiu..." msgid "Devices" msgstr "Dispositius" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Directori" @@ -1090,6 +1093,9 @@ msgstr "Agrupar per Gènere/Àlbum" msgid "Group by Genre/Artist/Album" msgstr "Agrupar per Gènere/Artista/Àlbum" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informació del maquinari" @@ -1385,6 +1391,9 @@ msgstr "Desarrega de Magnatune finalitzada" msgid "Malformed response" msgstr "Resposta malformada" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Fabricant" @@ -1466,6 +1475,9 @@ msgstr "Veïns" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1688,6 +1700,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Duració de la finestra emergent" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Preamplificador" @@ -1869,6 +1884,9 @@ msgstr "Limitar als caràcters ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Treure el dispositiu amb seguretat" @@ -2349,6 +2367,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "Utilitza el comandament remot Wii" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2358,6 +2379,9 @@ msgstr "" msgid "Use the system default" msgstr "Utilitza el sistema per defecte" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Usat" diff --git a/src/translations/cs.po b/src/translations/cs.po index c86e24ed4..b1d7bcbf5 100644 --- a/src/translations/cs.po +++ b/src/translations/cs.po @@ -765,6 +765,9 @@ msgstr "Vlastnosti zařízení..." msgid "Devices" msgstr "Zařízení" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Adresář" @@ -1086,6 +1089,9 @@ msgstr "Roztřídit podle žánru /alba" msgid "Group by Genre/Artist/Album" msgstr "Roztřídit podle žánru /umělce/alba" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informace o technickém vybavení" @@ -1386,6 +1392,9 @@ msgstr "Stahování z Magnatune bylo dokončeno" msgid "Malformed response" msgstr "Znetvořená odpověď" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Výrobce" @@ -1467,6 +1476,9 @@ msgstr "Sousedé" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nikdy" @@ -1689,6 +1701,9 @@ msgstr "Populární hudba" msgid "Popup duration" msgstr "Doba setrvání oznámení" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Předzesílení" @@ -1870,6 +1885,9 @@ msgstr "Omezit na znaky &ASCII" msgid "Rock" msgstr "Rocková hudba" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Odstranit zařízení bezpečně" @@ -2353,6 +2371,9 @@ msgstr "Používat metadata pro zesílení přehrávaných skladeb, jsou-li dost msgid "Use Wii Remote" msgstr "Použít dálkové ovládání Wii" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Použít dynamický režim" @@ -2362,6 +2383,9 @@ msgstr "Použít oznamování pro hlášení stavu dálkového ovládání Wii" msgid "Use the system default" msgstr "Použít výchozí nastavení systému" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Použito" diff --git a/src/translations/cy.po b/src/translations/cy.po index 8afeb9396..0999a76b7 100644 --- a/src/translations/cy.po +++ b/src/translations/cy.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/da.po b/src/translations/da.po index c3dfe4687..9e18e1828 100644 --- a/src/translations/da.po +++ b/src/translations/da.po @@ -744,6 +744,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1062,6 +1065,9 @@ msgstr "Gruppér efter genre/album" msgid "Group by Genre/Artist/Album" msgstr "Gruppér efter genre/kunstner/album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1354,6 +1360,9 @@ msgstr "" msgid "Malformed response" msgstr "Misdannet svar" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1435,6 +1444,9 @@ msgstr "Naboer" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1655,6 +1667,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Popup varighed" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "For-forstærker" @@ -1836,6 +1851,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2308,6 +2326,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2317,6 +2338,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/de.po b/src/translations/de.po index 597129cc1..d0a1ef3c7 100644 --- a/src/translations/de.po +++ b/src/translations/de.po @@ -769,6 +769,9 @@ msgstr "Geräteeinstellungen..." msgid "Devices" msgstr "Geräte" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Ordner" @@ -1089,6 +1092,9 @@ msgstr "Genre/Album" msgid "Group by Genre/Artist/Album" msgstr "Genre/Künstler/Album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Hardwareinformationen" @@ -1389,6 +1395,9 @@ msgstr "Magnatune-Download beendet" msgid "Malformed response" msgstr "Ungültige Antwort" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Hersteller" @@ -1470,6 +1479,9 @@ msgstr "Nachbarn" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Niemals" @@ -1692,6 +1704,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Anzeigedauer" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Vorverstärkung" @@ -1873,6 +1888,9 @@ msgstr "Nur ASCII-Zeichen benutzen" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Gerät sicher entfernen" @@ -2358,6 +2376,9 @@ msgstr "Benutze Replay Gain Metadaten wenn verfügbar" msgid "Use Wii Remote" msgstr "Wii-Fernbedienung benutzen" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Benutze dynamischen Modus" @@ -2368,6 +2389,9 @@ msgstr "" msgid "Use the system default" msgstr "Standardeinstellungen des Systems benutzen" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Belegt" diff --git a/src/translations/el.po b/src/translations/el.po index 5938a1c21..1b485ec7d 100644 --- a/src/translations/el.po +++ b/src/translations/el.po @@ -774,6 +774,9 @@ msgstr "Ιδιότητες συσκευής..." msgid "Devices" msgstr "Συσκευές" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Κατάλογος" @@ -1096,6 +1099,9 @@ msgstr "Ομαδοποίηση κατά Είδος/Άλμπουμ" msgid "Group by Genre/Artist/Album" msgstr "Ομαδοποίηση κατά Είδος/Καλλιντέχνη/Άλμπουμ" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Πληροφορίες υλικού" @@ -1394,6 +1400,9 @@ msgstr "Η λήψη Magnatune ολοκληρώθηκε" msgid "Malformed response" msgstr "Παραμορφωμένη απάντηση" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Κατασκευαστής" @@ -1475,6 +1484,9 @@ msgstr "Γείτονες" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Ποτέ" @@ -1699,6 +1711,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Διάρκεια αναδυόμενου μηνύματος" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Προ-ενισχυμένο" @@ -1880,6 +1895,9 @@ msgstr "Περιορισμός σε χαρακτήρες ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Ασφαλής αφαίρεση συσκευής" @@ -2367,6 +2385,9 @@ msgstr "Χρήση των μετα δεδομένων Replay Gain αν είνα msgid "Use Wii Remote" msgstr "Χρήση χειριστηρίου Wii" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Χρήση Δυναμικής λίστας" @@ -2377,6 +2398,9 @@ msgstr "" msgid "Use the system default" msgstr "Χρήση προκαθορισμένου του συστήματος" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Σε χρήση" diff --git a/src/translations/en.po b/src/translations/en.po index 12a0715ea..fe84460e9 100644 --- a/src/translations/en.po +++ b/src/translations/en.po @@ -732,6 +732,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1048,6 +1051,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1338,6 +1344,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1419,6 +1428,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1639,6 +1651,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1820,6 +1835,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2290,6 +2308,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2299,6 +2320,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po index 71f9cf119..1a36ea3fb 100644 --- a/src/translations/en_CA.po +++ b/src/translations/en_CA.po @@ -745,6 +745,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Directory" @@ -1062,6 +1065,9 @@ msgstr "Group by Genre/Album" msgid "Group by Genre/Artist/Album" msgstr "Group by Genre/Artist/Album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1353,6 +1359,9 @@ msgstr "" msgid "Malformed response" msgstr "Malformed response" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1434,6 +1443,9 @@ msgstr "Neighbours" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1655,6 +1667,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Popup duration" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Pre-amp" @@ -1836,6 +1851,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2306,6 +2324,9 @@ msgstr "Use Replay Gain metadata if it is available" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2315,6 +2336,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po index 9403796b5..1866b7d46 100644 --- a/src/translations/en_GB.po +++ b/src/translations/en_GB.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1060,6 +1063,9 @@ msgstr "Group by Genre/Album" msgid "Group by Genre/Artist/Album" msgstr "Group by Genre/Artist/Album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1351,6 +1357,9 @@ msgstr "" msgid "Malformed response" msgstr "Malformed response" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1432,6 +1441,9 @@ msgstr "Neighbours" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1652,6 +1664,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Popup duration" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Pre-amp" @@ -1833,6 +1848,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2303,6 +2321,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2312,6 +2333,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/eo.po b/src/translations/eo.po index 34b652b9b..7f1c3ac9d 100644 --- a/src/translations/eo.po +++ b/src/translations/eo.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/es.po b/src/translations/es.po index f12131de7..20c3c1447 100644 --- a/src/translations/es.po +++ b/src/translations/es.po @@ -771,6 +771,9 @@ msgstr "Propiedades del dispositivo..." msgid "Devices" msgstr "Dispositivos" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Directorio" @@ -1094,6 +1097,9 @@ msgstr "Agrupar por Género/Álbum" msgid "Group by Genre/Artist/Album" msgstr "Agrupar por Género/Artista/Álbum" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Información del Hardware" @@ -1395,6 +1401,9 @@ msgstr "Descarga de Magnatune finalizada" msgid "Malformed response" msgstr "Respuesta malformada" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Fabricante" @@ -1476,6 +1485,9 @@ msgstr "Vecinos" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nunca" @@ -1700,6 +1712,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Duracion de la notificación" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Preamplificación" @@ -1881,6 +1896,9 @@ msgstr "Restringir a caracteres ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Quitar dispositivo con seguridad" @@ -2363,6 +2381,9 @@ msgstr "Usar metadatos de ganancia de repetición si están disponibles" msgid "Use Wii Remote" msgstr "Usar Wiimote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Usar modo dinámico" @@ -2372,6 +2393,9 @@ msgstr "Usar notificaciones para informar del estado del Wiimote" msgid "Use the system default" msgstr "Usar los ajustes por defecto del sistema" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Usado" diff --git a/src/translations/et.po b/src/translations/et.po index bea825ec5..28753c398 100644 --- a/src/translations/et.po +++ b/src/translations/et.po @@ -743,6 +743,9 @@ msgstr "Seadme omadused..." msgid "Devices" msgstr "Seadmed" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Kataloog" @@ -1060,6 +1063,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Riistvara info" @@ -1351,6 +1357,9 @@ msgstr "" msgid "Malformed response" msgstr "Vigane vastus" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Tootja" @@ -1432,6 +1441,9 @@ msgstr "Naabrid" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Mitte kunagi" @@ -1652,6 +1664,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Eelmoonutus" @@ -1833,6 +1848,9 @@ msgstr "" msgid "Rock" msgstr "Rokk" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2303,6 +2321,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2312,6 +2333,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Kasutuses" diff --git a/src/translations/eu.po b/src/translations/eu.po index fdd5c2a91..a81bafc90 100644 --- a/src/translations/eu.po +++ b/src/translations/eu.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/fi.po b/src/translations/fi.po index e910db43f..c46140531 100644 --- a/src/translations/fi.po +++ b/src/translations/fi.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Kansio" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1350,6 +1356,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1432,6 +1441,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1652,6 +1664,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Esivahvistus" @@ -1833,6 +1848,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2303,6 +2321,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2312,6 +2333,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/fr.po b/src/translations/fr.po index 17b74bf38..d54b82cb5 100644 --- a/src/translations/fr.po +++ b/src/translations/fr.po @@ -773,6 +773,9 @@ msgstr "Propriétés du périphérique..." msgid "Devices" msgstr "Périphériques" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Dossier" @@ -1098,6 +1101,9 @@ msgstr "Grouper par Genre/Album" msgid "Group by Genre/Artist/Album" msgstr "Grouper par Genre/Artiste/Album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informations sur le matériel" @@ -1400,6 +1406,9 @@ msgstr "Téléchargement Magnatune terminé" msgid "Malformed response" msgstr "Réponse mal formatée" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Fabricant" @@ -1481,6 +1490,9 @@ msgstr "Voisins" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Jamais" @@ -1705,6 +1717,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Durée d'affichage de la fenêtre" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Pré-ampli" @@ -1886,6 +1901,9 @@ msgstr "Limiter aux caractères ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Enlever le périphérique en toute sécurité" @@ -2374,6 +2392,9 @@ msgstr "Utiliser la métadonnée Replay Gain si disponible" msgid "Use Wii Remote" msgstr "Utiliser Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Utiliser le mode dynamique" @@ -2383,6 +2404,9 @@ msgstr "Utiliser des notifications pour signaler l'état de la Wiimote" msgid "Use the system default" msgstr "Utiliser la langue par défaut du système" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Utilisé" diff --git a/src/translations/gl.po b/src/translations/gl.po index 6e2d9413d..aae1834a0 100644 --- a/src/translations/gl.po +++ b/src/translations/gl.po @@ -747,6 +747,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1063,6 +1066,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1355,6 +1361,9 @@ msgstr "" msgid "Malformed response" msgstr "Resposta mal formada" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1436,6 +1445,9 @@ msgstr "Viciños" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1656,6 +1668,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Preeamplificazón" @@ -1837,6 +1852,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2307,6 +2325,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2316,6 +2337,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/he.po b/src/translations/he.po index 4e3d8c82e..7d68a18b7 100644 --- a/src/translations/he.po +++ b/src/translations/he.po @@ -745,6 +745,9 @@ msgstr "מאפייני ההתקן..." msgid "Devices" msgstr "התקנים" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "תיקייה" @@ -1063,6 +1066,9 @@ msgstr "קבץ על־פי סגנון/אלבום" msgid "Group by Genre/Artist/Album" msgstr "קבץ על־פי סגנון/אמן/אלבום" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "מידע על החומרה" @@ -1356,6 +1362,9 @@ msgstr "" msgid "Malformed response" msgstr "תגובה שגויה" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "יצרן" @@ -1437,6 +1446,9 @@ msgstr "שכנים" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "לעולם לא" @@ -1658,6 +1670,9 @@ msgstr "פופ" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "קדם־הגבר" @@ -1839,6 +1854,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2309,6 +2327,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2318,6 +2339,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/hi.po b/src/translations/hi.po index e15511da2..96d51eeef 100644 --- a/src/translations/hi.po +++ b/src/translations/hi.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/hr.po b/src/translations/hr.po index 4941a1879..1bb967907 100644 --- a/src/translations/hr.po +++ b/src/translations/hr.po @@ -749,6 +749,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1065,6 +1068,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1355,6 +1361,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1436,6 +1445,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1656,6 +1668,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1837,6 +1852,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2307,6 +2325,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2316,6 +2337,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/hu.po b/src/translations/hu.po index 82024df8f..3f50ff2d2 100644 --- a/src/translations/hu.po +++ b/src/translations/hu.po @@ -765,6 +765,9 @@ msgstr "Eszköztulajdonságok..." msgid "Devices" msgstr "Eszközök" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Mappa" @@ -1087,6 +1090,9 @@ msgstr "Műfaj/Album szerint" msgid "Group by Genre/Artist/Album" msgstr "Műfaj/Előadó/Album szerint" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Hardverjellemzők" @@ -1385,6 +1391,9 @@ msgstr "Letöltés a Magnatuneról befejezve" msgid "Malformed response" msgstr "Hibásan formázott válasz" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Gyártó" @@ -1466,6 +1475,9 @@ msgstr "Szomszédok" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Soha" @@ -1688,6 +1700,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Értesítés időtartama" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Előerősítő" @@ -1869,6 +1884,9 @@ msgstr "Korlátozás ASCII karakterekre" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Eszköz biztonságos eltávolítása" @@ -2353,6 +2371,9 @@ msgstr "Replay Gain adatok használata, ha elérhetőek" msgid "Use Wii Remote" msgstr "Wii távvezérlő használata" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Dinamikus mód használata" @@ -2362,6 +2383,9 @@ msgstr "Értesítések használata a Wii távvezérlő állapotváltozásaihoz" msgid "Use the system default" msgstr "Rendszer alapértelmezés használata" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Használt" diff --git a/src/translations/it.po b/src/translations/it.po index 377c82ef8..e2b9dab96 100644 --- a/src/translations/it.po +++ b/src/translations/it.po @@ -769,6 +769,9 @@ msgstr "Proprietà del dispositivo..." msgid "Devices" msgstr "Dispositivi" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Cartella" @@ -1091,6 +1094,9 @@ msgstr "Raggruppa per genere/album" msgid "Group by Genre/Artist/Album" msgstr "Raggruppa per genere/artista/album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informazioni hardware" @@ -1392,6 +1398,9 @@ msgstr "Scaricamento di Magnatune completato" msgid "Malformed response" msgstr "Risposta non corretta" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Produttore" @@ -1473,6 +1482,9 @@ msgstr "Vicini" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Mai" @@ -1696,6 +1708,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Durata del fumetto" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Preamplificazione" @@ -1877,6 +1892,9 @@ msgstr "Limita ai caratteri ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Rimuovi il dispositivo in sicurezza" @@ -2366,6 +2384,9 @@ msgstr "Utilizza i metadati del guadagno di riproduzione se disponibili" msgid "Use Wii Remote" msgstr "Utilizza Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Usa la modalità dinamica" @@ -2375,6 +2396,9 @@ msgstr "Utilizza le notifiche per segnalare lo stato del Wii Remote" msgid "Use the system default" msgstr "Usa i valori predefiniti di sistema" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Utilizzato" diff --git a/src/translations/ja.po b/src/translations/ja.po index b126ecbff..4380ea058 100644 --- a/src/translations/ja.po +++ b/src/translations/ja.po @@ -760,6 +760,9 @@ msgstr "デバイスのプロパティ..." msgid "Devices" msgstr "デバイス" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "ディレクトリ" @@ -1080,6 +1083,9 @@ msgstr "ジャンル/アルバムでグループ化" msgid "Group by Genre/Artist/Album" msgstr "ジャンル/アーティスト/アルバムでグループ化" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "ハードウェアの情報" @@ -1374,6 +1380,9 @@ msgstr "Magnatune ダウンロードが完了しました" msgid "Malformed response" msgstr "不正な応答です" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "製造元" @@ -1456,6 +1465,9 @@ msgstr "ご近所さん" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "しない" @@ -1678,6 +1690,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "ポップアップの長さ" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "プリアンプ" @@ -1859,6 +1874,9 @@ msgstr "ASCII 文字に限定する" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "デバイスを安全に取り外す" @@ -2337,6 +2355,9 @@ msgstr "利用可能なら Replay Gain のメタデータを使用する" msgid "Use Wii Remote" msgstr "Wii Remote の使用" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2346,6 +2367,9 @@ msgstr "Wii Remote の状態の報告に通知を使用する" msgid "Use the system default" msgstr "システム既定を使用する" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "使用中" diff --git a/src/translations/kk.po b/src/translations/kk.po index 39e08f829..ae829c73f 100644 --- a/src/translations/kk.po +++ b/src/translations/kk.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1351,6 +1357,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1432,6 +1441,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1652,6 +1664,9 @@ msgstr "Поп" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1833,6 +1848,9 @@ msgstr "" msgid "Rock" msgstr "Рок" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2303,6 +2321,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2312,6 +2333,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/lt.po b/src/translations/lt.po index 3d36a764c..1625ae4ee 100644 --- a/src/translations/lt.po +++ b/src/translations/lt.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/nb.po b/src/translations/nb.po index 0de0b142e..b48cc867a 100644 --- a/src/translations/nb.po +++ b/src/translations/nb.po @@ -754,6 +754,9 @@ msgstr "" msgid "Devices" msgstr "Enheter" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1071,6 +1074,9 @@ msgstr "Gruppér etter Sjanger/Album" msgid "Group by Genre/Artist/Album" msgstr "Gruppér etter Sjanger/Artist/Album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1363,6 +1369,9 @@ msgstr "" msgid "Malformed response" msgstr "Ugyldig svar" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1444,6 +1453,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1664,6 +1676,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Hvor lenge skal informasjonsvinduet vises" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Lydforsterkning" @@ -1845,6 +1860,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2316,6 +2334,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2325,6 +2346,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/nl.po b/src/translations/nl.po index d9c9a3d5e..9d1f27919 100644 --- a/src/translations/nl.po +++ b/src/translations/nl.po @@ -761,6 +761,9 @@ msgstr "Apparaateigenschappen..." msgid "Devices" msgstr "Apparaten" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Map" @@ -1082,6 +1085,9 @@ msgstr "Groeperen op genre/album" msgid "Group by Genre/Artist/Album" msgstr "Groeperen op genre/artiest/album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Hardware-informatie" @@ -1378,6 +1384,9 @@ msgstr "Magnatune download voltooid" msgid "Malformed response" msgstr "Foutieve respons" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Fabrikant" @@ -1459,6 +1468,9 @@ msgstr "Buren" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1683,6 +1695,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Popup duur" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Voorversterking" @@ -1864,6 +1879,9 @@ msgstr "Beperken tot ASCII karakters" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Veilig apparaat verwijderen" @@ -2352,6 +2370,9 @@ msgstr "Gebruik Replay Gain metadata indien beschikbaar" msgid "Use Wii Remote" msgstr "Gebruik Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2361,6 +2382,9 @@ msgstr "Gebruik notificaties om Wii Remote status weer te geven" msgid "Use the system default" msgstr "Gebruik de systeem standaard" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Gebruikt" diff --git a/src/translations/oc.po b/src/translations/oc.po index bbbd065cc..f8bd56e74 100644 --- a/src/translations/oc.po +++ b/src/translations/oc.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Dorsièr" @@ -1059,6 +1062,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1349,6 +1355,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1430,6 +1439,9 @@ msgstr "Vesins" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1650,6 +1662,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Pre-amp" @@ -1831,6 +1846,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2301,6 +2319,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2310,6 +2331,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/pl.po b/src/translations/pl.po index 0eceb9890..5819fca08 100644 --- a/src/translations/pl.po +++ b/src/translations/pl.po @@ -764,6 +764,9 @@ msgstr "Ustawienia urządzenia..." msgid "Devices" msgstr "Urządzenia" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Folder" @@ -1084,6 +1087,9 @@ msgstr "Grupuj według Gatunek/Artysta" msgid "Group by Genre/Artist/Album" msgstr "Grupuj według Gatunek/Artysta/Album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informacja o urządzeniu" @@ -1379,6 +1385,9 @@ msgstr "Pobieranie z Magnatune zakończone" msgid "Malformed response" msgstr "Nieprawidłowa odpowiedź" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Wytwórca" @@ -1460,6 +1469,9 @@ msgstr "Sąsiedzi" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nigdy" @@ -1683,6 +1695,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Czas powiadomienia" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Wzmocnienie" @@ -1864,6 +1879,9 @@ msgstr "Ogranicz do znaków ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Bezpiecznie usuń urządzenie" @@ -2346,6 +2364,9 @@ msgstr "Używaj metadanych Replay Gain, jeśli są dostępne" msgid "Use Wii Remote" msgstr "Używaj Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Użyj trybu automatycznego" @@ -2355,6 +2376,9 @@ msgstr "Używaj powiadomień do raportowania statusów urządzenia Wii Remote" msgid "Use the system default" msgstr "Użyj domyślnych ustawień systemowych" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Użyte" diff --git a/src/translations/pt.po b/src/translations/pt.po index 8c6976f9c..83f4408e5 100644 --- a/src/translations/pt.po +++ b/src/translations/pt.po @@ -769,6 +769,9 @@ msgstr "Propriedades do dispositivo..." msgid "Devices" msgstr "Dispositivos" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Diretório" @@ -1091,6 +1094,9 @@ msgstr "Agrupar por género/álbum" msgid "Group by Genre/Artist/Album" msgstr "Agrupar por género/artista/álbum" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informações do equipamento" @@ -1389,6 +1395,9 @@ msgstr "Transferência Magnatune concluída" msgid "Malformed response" msgstr "Resposta inválida" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Fabricante" @@ -1470,6 +1479,9 @@ msgstr "Vizinhos" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nunca" @@ -1693,6 +1705,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Duração do alerta" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Pré-amp" @@ -1874,6 +1889,9 @@ msgstr "Restringir a caracteres ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Remover o dispositivo com segurança" @@ -2359,6 +2377,9 @@ msgstr "Se disponível, utilizar a consistência de metadados" msgid "Use Wii Remote" msgstr "Utilizar Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Utilizar o modo dinâmico" @@ -2368,6 +2389,9 @@ msgstr "Utilizar notificações para reportar o estado do Wii Remote" msgid "Use the system default" msgstr "Utilizar as definições do sistema" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Utilizado" diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po index 16e645605..7557de368 100644 --- a/src/translations/pt_BR.po +++ b/src/translations/pt_BR.po @@ -762,6 +762,9 @@ msgstr "Propriedades do dispositivo..." msgid "Devices" msgstr "Dispositivos" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Diretório" @@ -1084,6 +1087,9 @@ msgstr "Organizar por Gênero/Álbum" msgid "Group by Genre/Artist/Album" msgstr "Organizar por Gênero/Artista/Álbum" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Informação de hardware" @@ -1384,6 +1390,9 @@ msgstr "Download do magnatune finalizado" msgid "Malformed response" msgstr "Resposta má formada" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Fabricante" @@ -1465,6 +1474,9 @@ msgstr "Vizinhos" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nunca" @@ -1689,6 +1701,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Duração do aviso" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Pré-amp" @@ -1870,6 +1885,9 @@ msgstr "Restringir a caracteres ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2341,6 +2359,9 @@ msgstr "Usar metadados do fator de ganho se ele estiver disponível" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2350,6 +2371,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/ro.po b/src/translations/ro.po index 0a9e758a5..15df9c278 100644 --- a/src/translations/ro.po +++ b/src/translations/ro.po @@ -743,6 +743,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1059,6 +1062,9 @@ msgstr "Grupează după gen/album" msgid "Group by Genre/Artist/Album" msgstr "Grupează după gen/artist/album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1350,6 +1356,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1431,6 +1440,9 @@ msgstr "Vecini" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1651,6 +1663,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Preamplificare" @@ -1832,6 +1847,9 @@ msgstr "" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2302,6 +2320,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2311,6 +2332,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/ru.po b/src/translations/ru.po index 0fd88b8f0..79492f46b 100644 --- a/src/translations/ru.po +++ b/src/translations/ru.po @@ -762,6 +762,9 @@ msgstr "Свойства носителя..." msgid "Devices" msgstr "Носители" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Каталог" @@ -1082,6 +1085,9 @@ msgstr "Сортировать по Жанр/Альбом" msgid "Group by Genre/Artist/Album" msgstr "Сортировать по Жанр/Исполнитель/Альбом" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Информация об оборудовании" @@ -1380,6 +1386,9 @@ msgstr "Загрузка Magnatune окончена" msgid "Malformed response" msgstr "Неправильный ответ" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Производитель" @@ -1461,6 +1470,9 @@ msgstr "Соседи" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Никогда" @@ -1683,6 +1695,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Длительность всплывающего сообщения" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Предусиление" @@ -1864,6 +1879,9 @@ msgstr "Ограничить только символами ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Безопасно извлечь устройство" @@ -2347,6 +2365,9 @@ msgstr "Использовать метаданные Replay Gain, если эт msgid "Use Wii Remote" msgstr "Использовать пульт Wii" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Использовать динамический режим" @@ -2356,6 +2377,9 @@ msgstr "Показывать уведомления о статусе пульт msgid "Use the system default" msgstr "Использовать значения по умолчанию" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Использовано" diff --git a/src/translations/sk.po b/src/translations/sk.po index 8ccc316a3..ed8f03e86 100644 --- a/src/translations/sk.po +++ b/src/translations/sk.po @@ -761,6 +761,9 @@ msgstr "Vlastnosti zariadenia..." msgid "Devices" msgstr "Zariadenia" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Priečinok" @@ -1081,6 +1084,9 @@ msgstr "Zoradiť podľa žáner/album" msgid "Group by Genre/Artist/Album" msgstr "Zoradiť podľa žáner/interprét/album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Hardwarové informácie" @@ -1377,6 +1383,9 @@ msgstr "Magnatune sťahovanie hotové" msgid "Malformed response" msgstr "Poškodená odpoveď" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Výrobca" @@ -1458,6 +1467,9 @@ msgstr "Susedia" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nikdy" @@ -1679,6 +1691,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Trvanie upozornenia" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Predzosilnenie" @@ -1860,6 +1875,9 @@ msgstr "Obmedziť na ASCII písmená" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Bezpečne odpojiť zariadenie" @@ -2344,6 +2362,9 @@ msgstr "Použiť metadáta na vyrovnanie hlasitosti ak sú dostupné" msgid "Use Wii Remote" msgstr "Použiť Wii diaľkové" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Použiť dynamický režim" @@ -2353,6 +2374,9 @@ msgstr "Použiť upozornenia na oznamovanie stavu Wii diaľkového" msgid "Use the system default" msgstr "Použiť základný systémový" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Použitých" diff --git a/src/translations/sl.po b/src/translations/sl.po index ad9534529..dd9e807b8 100644 --- a/src/translations/sl.po +++ b/src/translations/sl.po @@ -763,6 +763,9 @@ msgstr "Lastnosti naprave ..." msgid "Devices" msgstr "Naprave" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Mapa" @@ -1083,6 +1086,9 @@ msgstr "Združi po zvrsti/albumu" msgid "Group by Genre/Artist/Album" msgstr "Združi po zvrsti/izvajalcu/albumu" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Podatki o strojni opremi" @@ -1379,6 +1385,9 @@ msgstr "Magnatune prejem je končan" msgid "Malformed response" msgstr "Nepravilno oblikovan odziv" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Proizvajalec" @@ -1460,6 +1469,9 @@ msgstr "Sosedje" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Nikoli" @@ -1682,6 +1694,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Trajanje pojavnega obvestila" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Predojačanje" @@ -1863,6 +1878,9 @@ msgstr "Omeji na znake ASCII" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Varno odstrani napravo" @@ -2345,6 +2363,9 @@ msgstr "Uporabi metapodatke Replay Gain, če je mogoče" msgid "Use Wii Remote" msgstr "Uporabi Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Uporabi dinamični način" @@ -2354,6 +2375,9 @@ msgstr "Uporabi obvestila za poročanje o stanju Wii Remote" msgid "Use the system default" msgstr "Uporabi privzeto za sistem" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Uporabljeno" diff --git a/src/translations/sr.po b/src/translations/sr.po index 60fdef9dc..bc769a894 100644 --- a/src/translations/sr.po +++ b/src/translations/sr.po @@ -745,6 +745,9 @@ msgstr "Својства уређаја..." msgid "Devices" msgstr "Уређаји" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Фасцикла" @@ -1062,6 +1065,9 @@ msgstr "Уреди према жанровима и албумима" msgid "Group by Genre/Artist/Album" msgstr "Групиши према Жанру/Извођачу/Албуму" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Подаци о хардверу" @@ -1354,6 +1360,9 @@ msgstr "Завршено преузимање са Магнатјуна" msgid "Malformed response" msgstr "Лош одговор" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Произвођач" @@ -1435,6 +1444,9 @@ msgstr "Комшије" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1655,6 +1667,9 @@ msgstr "Поп" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Претпојачање" @@ -1836,6 +1851,9 @@ msgstr "Ограничи се на аски знакове" msgid "Rock" msgstr "Рок" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2306,6 +2324,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2315,6 +2336,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/sv.po b/src/translations/sv.po index d7a509d88..2cf039bfb 100644 --- a/src/translations/sv.po +++ b/src/translations/sv.po @@ -767,6 +767,9 @@ msgstr "Enhetsinställningar..." msgid "Devices" msgstr "Enheter" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Katalog" @@ -1087,6 +1090,9 @@ msgstr "Gruppera efter genre/album" msgid "Group by Genre/Artist/Album" msgstr "Gruppera efter genre/artist/album" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Hårdvaruinformation" @@ -1383,6 +1389,9 @@ msgstr "Magnatude-hämtning slutförd" msgid "Malformed response" msgstr "Felformaterat svar" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Tillverkare" @@ -1464,6 +1473,9 @@ msgstr "Grannar" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Aldrig" @@ -1684,6 +1696,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Popup-varaktighet" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Förförstärkare" @@ -1865,6 +1880,9 @@ msgstr "Begränsa till ASCII-tecken" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Säker borttagning av enhet" @@ -2348,6 +2366,9 @@ msgstr "Använd Replay Gain-metadata om det finns tillgängligt" msgid "Use Wii Remote" msgstr "Använd Wii-kontroll" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Aktivera dynamiskt läge" @@ -2357,6 +2378,9 @@ msgstr "Använd notifieringar för rapportering av Wii-kontrollstatus" msgid "Use the system default" msgstr "Använd systemets standard" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Använd" diff --git a/src/translations/tr.po b/src/translations/tr.po index fdc4839b8..8b173387d 100644 --- a/src/translations/tr.po +++ b/src/translations/tr.po @@ -760,6 +760,9 @@ msgstr "Aygıt özellikleri..." msgid "Devices" msgstr "Aygıtlar" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Dizin" @@ -1080,6 +1083,9 @@ msgstr "Tür/Albüme göre grupla" msgid "Group by Genre/Artist/Album" msgstr "Tür/Sanatçı/Albüme göre grupla" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Donanım bilgisi" @@ -1379,6 +1385,9 @@ msgstr "Magnatune indirme bitti" msgid "Malformed response" msgstr "Bozuk yanıt" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Üretici" @@ -1460,6 +1469,9 @@ msgstr "Komşular" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Hiçbir zaman" @@ -1682,6 +1694,9 @@ msgstr "Pop" msgid "Popup duration" msgstr "Açılır pencere süresi" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Ön yükseltici" @@ -1863,6 +1878,9 @@ msgstr "ASCII karakterler olarak kısıtla" msgid "Rock" msgstr "Rock" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Aygıtı güvenli kaldır" @@ -2337,6 +2355,9 @@ msgstr "Varsa Replay Gain verisini kullan" msgid "Use Wii Remote" msgstr "Wii kumandasını kullan" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Dinamik kip kullan" @@ -2346,6 +2367,9 @@ msgstr "Wii kumanda durumunu raporlamak için bildirimleri kullan" msgid "Use the system default" msgstr "Sistem öntanımlıyı kullan" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Kullanılan" diff --git a/src/translations/translations.pot b/src/translations/translations.pot index e39f381be..f06035cbb 100644 --- a/src/translations/translations.pot +++ b/src/translations/translations.pot @@ -733,6 +733,9 @@ msgstr "" msgid "Devices" msgstr "" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "" @@ -1049,6 +1052,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "" @@ -1339,6 +1345,9 @@ msgstr "" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1420,6 +1429,9 @@ msgstr "" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1640,6 +1652,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1821,6 +1836,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2291,6 +2309,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2300,6 +2321,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/uk.po b/src/translations/uk.po index 6f99990dd..47dbde66e 100644 --- a/src/translations/uk.po +++ b/src/translations/uk.po @@ -764,6 +764,9 @@ msgstr "Налаштування пристрою..." msgid "Devices" msgstr "Пристрої" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "Каталог" @@ -1083,6 +1086,9 @@ msgstr "Групувати як Жанр/Альбом" msgid "Group by Genre/Artist/Album" msgstr "Групувати як Жанр/Виконавець/Альбом" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "Відомості про обладнання" @@ -1381,6 +1387,9 @@ msgstr "Завантаження з Magnatune завершено" msgid "Malformed response" msgstr "Спотворений відгук" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "Виробник" @@ -1462,6 +1471,9 @@ msgstr "Сусіди" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "Ніколи" @@ -1684,6 +1696,9 @@ msgstr "Поп" msgid "Popup duration" msgstr "Тривалість виринаючого повідомлення" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "Підсилення" @@ -1865,6 +1880,9 @@ msgstr "Обмежитись символами ASCII" msgid "Rock" msgstr "Рок" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "Безпечно вилучити пристрій" @@ -2342,6 +2360,9 @@ msgstr "Використовувати метадані Replay Gain, якщо н msgid "Use Wii Remote" msgstr "Використовувати Wii Remote" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "Використовувати динамічний режим" @@ -2351,6 +2372,9 @@ msgstr "Використовувати повідомлення для звіт msgid "Use the system default" msgstr "Використовувати системну" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "Використано" diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po index f46e7b7e7..1e0494505 100644 --- a/src/translations/zh_CN.po +++ b/src/translations/zh_CN.po @@ -745,6 +745,9 @@ msgstr "设备属性..." msgid "Devices" msgstr "设备" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "目录" @@ -1061,6 +1064,9 @@ msgstr "" msgid "Group by Genre/Artist/Album" msgstr "" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "硬件信息" @@ -1353,6 +1359,9 @@ msgstr "Magnatune 下载完成" msgid "Malformed response" msgstr "" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1434,6 +1443,9 @@ msgstr "邻居" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1654,6 +1666,9 @@ msgstr "" msgid "Popup duration" msgstr "" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "" @@ -1835,6 +1850,9 @@ msgstr "" msgid "Rock" msgstr "" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2305,6 +2323,9 @@ msgstr "" msgid "Use Wii Remote" msgstr "" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2314,6 +2335,9 @@ msgstr "" msgid "Use the system default" msgstr "" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "" diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po index 43c33189f..d13d27c9b 100644 --- a/src/translations/zh_TW.po +++ b/src/translations/zh_TW.po @@ -747,6 +747,9 @@ msgstr "" msgid "Devices" msgstr "裝置" +msgid "Direct internet connection" +msgstr "" + msgid "Directory" msgstr "目錄" @@ -1063,6 +1066,9 @@ msgstr "根據專輯風格歸類" msgid "Group by Genre/Artist/Album" msgstr "根據風格演唱者專輯歸類" +msgid "HTTP proxy" +msgstr "" + msgid "Hardware information" msgstr "硬體資訊" @@ -1354,6 +1360,9 @@ msgstr "Magnatune下載完成" msgid "Malformed response" msgstr "格式不正確的反應" +msgid "Manual proxy configuration" +msgstr "" + msgid "Manufacturer" msgstr "" @@ -1435,6 +1444,9 @@ msgstr "鄰居" msgid "Network" msgstr "" +msgid "Network Proxy" +msgstr "" + msgid "Never" msgstr "" @@ -1655,6 +1667,9 @@ msgstr "流行音樂" msgid "Popup duration" msgstr "彈出持續時間" +msgid "Port" +msgstr "" + msgid "Pre-amp" msgstr "前置放大" @@ -1836,6 +1851,9 @@ msgstr "限制為 ASCII字符" msgid "Rock" msgstr "搖滾" +msgid "SOCKS proxy" +msgstr "" + msgid "Safely remove device" msgstr "" @@ -2306,6 +2324,9 @@ msgstr "使用回放增益元數據，如果它是可獲得的" msgid "Use Wii Remote" msgstr "使用 Wii 遙控器" +msgid "Use authentication" +msgstr "" + msgid "Use dynamic mode" msgstr "" @@ -2315,6 +2336,9 @@ msgstr "使用通知信息以報告 Wii 遙控器的狀態" msgid "Use the system default" msgstr "使用系統預設" +msgid "Use the system proxy settings" +msgstr "" + msgid "Used" msgstr "已用" diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp index 06923214a..eb56c40d7 100644 --- a/src/ui/settingsdialog.cpp +++ b/src/ui/settingsdialog.cpp @@ -17,6 +17,7 @@ #include "config.h" #include "core/backgroundstreams.h" +#include "core/networkproxyfactory.h" #include "iconloader.h" #include "mainwindow.h" #include "settingsdialog.h" @@ -30,13 +31,13 @@ #include "ui_settingsdialog.h" #ifdef HAVE_LIBLASTFM -#include "radio/lastfmconfig.h" +# include "radio/lastfmconfig.h" #endif #ifdef ENABLE_WIIMOTEDEV -#include "ui/wiimotedevshortcutsconfig.h" -#include "ui_wiimotedevshortcutsconfig.h" -#include "wiimotedev/shortcuts.h" +# include "ui/wiimotedevshortcutsconfig.h" +# include "ui_wiimotedevshortcutsconfig.h" +# include "wiimotedev/shortcuts.h" #endif #ifdef HAVE_GSTREAMER @@ -123,6 +124,7 @@ SettingsDialog::SettingsDialog(BackgroundStreams* streams, QWidget* parent) ui_->list->item(Page_Notifications)->setIcon(IconLoader::Load("help-hint")); ui_->list->item(Page_Library)->setIcon(IconLoader::Load("folder-sound")); ui_->list->item(Page_BackgroundStreams)->setIcon(QIcon(":/icons/32x32/weather-showers-scattered.png")); + ui_->list->item(Page_Proxy)->setIcon(IconLoader::Load("applications-internet")); AddStreams(); @@ -361,6 +363,23 @@ void SettingsDialog::accept() { s.setValue("popup_pos", pretty_popup_->popup_pos()); s.endGroup(); + // Network proxy + NetworkProxyFactory::Mode mode = NetworkProxyFactory::Mode_System; + if (ui_->proxy_direct->isChecked()) mode = NetworkProxyFactory::Mode_Direct; + else if (ui_->proxy_system->isChecked()) mode = NetworkProxyFactory::Mode_System; + else if (ui_->proxy_manual->isChecked()) mode = NetworkProxyFactory::Mode_Manual; + + s.beginGroup(NetworkProxyFactory::kSettingsGroup); + s.setValue("mode", mode); + s.setValue("type", ui_->proxy_type->currentIndex() == 0 ? + QNetworkProxy::HttpProxy : QNetworkProxy::Socks5Proxy); + s.setValue("hostname", ui_->proxy_hostname->text()); + s.setValue("port", ui_->proxy_port->value()); + s.setValue("use_authentication", ui_->proxy_auth->isChecked()); + s.setValue("username", ui_->proxy_username->text()); + s.setValue("password", ui_->proxy_password->text()); + s.endGroup(); + ui_->library_config->Save(); ui_->magnatune->Save(); ui_->global_shortcuts->Save(); @@ -368,6 +387,8 @@ void SettingsDialog::accept() { streams_->SaveStreams(); QDialog::accept(); + + NetworkProxyFactory::Instance()->ReloadSettings(); } void SettingsDialog::showEvent(QShowEvent*) { @@ -513,6 +534,34 @@ void SettingsDialog::showEvent(QShowEvent*) { ui_->library_config->Load(); + // Network proxy + s.beginGroup(NetworkProxyFactory::kSettingsGroup); + NetworkProxyFactory::Mode mode = NetworkProxyFactory::Mode( + s.value("mode", NetworkProxyFactory::Mode_System).toInt()); + switch (mode) { + case NetworkProxyFactory::Mode_Manual: + ui_->proxy_manual->setChecked(true); + break; + + case NetworkProxyFactory::Mode_Direct: + ui_->proxy_direct->setChecked(true); + break; + + case NetworkProxyFactory::Mode_System: + default: + ui_->proxy_system->setChecked(true); + break; + } + + ui_->proxy_type->setCurrentIndex(s.value("type", QNetworkProxy::HttpProxy) + .toInt() == QNetworkProxy::HttpProxy ? 0 : 1); + ui_->proxy_hostname->setText(s.value("hostname").toString()); + ui_->proxy_port->setValue(s.value("port").toInt()); + ui_->proxy_auth->setChecked(s.value("use_authentication", false).toBool()); + ui_->proxy_username->setText(s.value("username").toString()); + ui_->proxy_password->setText(s.value("password").toString()); + s.endGroup(); + loading_settings_ = false; } diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h index 53fc8bb38..ba6b8ce96 100644 --- a/src/ui/settingsdialog.h +++ b/src/ui/settingsdialog.h @@ -63,6 +63,7 @@ class SettingsDialog : public QDialog { #endif Page_Magnatune, Page_BackgroundStreams, + Page_Proxy, #ifdef ENABLE_WIIMOTEDEV Page_Wiimotedev, #endif diff --git a/src/ui/settingsdialog.ui b/src/ui/settingsdialog.ui index 0538a367c..8134c0548 100644 --- a/src/ui/settingsdialog.ui +++ b/src/ui/settingsdialog.ui @@ -98,6 +98,11 @@ Background Streams + + + Network Proxy + + @@ -115,7 +120,7 @@ - 2 + 8 @@ -837,6 +842,139 @@ + + + + + + Use the system proxy settings + + + true + + + + + + + Direct internet connection + + + + + + + Manual proxy configuration + + + + + + + false + + + + 24 + + + + + + + + HTTP proxy + + + + + SOCKS proxy + + + + + + + + + + + Port + + + + + + + 65535 + + + 8080 + + + + + + + + + Use authentication + + + true + + + false + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Username + + + + + + + + + + Password + + + + + + + QLineEdit::Password + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 247 + + + + + + @@ -954,8 +1092,8 @@ accept() - 518 - 524 + 742 + 812 521 @@ -970,8 +1108,8 @@ reject() - 324 - 521 + 548 + 812 322 @@ -986,12 +1124,28 @@ setEnabled(bool) - 476 - 277 + 305 + 82 - 459 - 362 + 305 + 74 + + + + + proxy_manual + toggled(bool) + proxy_manual_container + setEnabled(bool) + + + 342 + 121 + + + 248 + 148