diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml index 0440de8..6cde341 100644 --- a/sources/awesome-widget/package/contents/ui/about.qml +++ b/sources/awesome-widget/package/contents/ui/about.qml @@ -97,6 +97,15 @@ Item { text: awActions.getAboutText("translators") } + QtControls.Label { + QtLayouts.Layout.fillWidth: true + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + textFormat: Text.RichText + text: awActions.getAboutText("3rdparty") + onLinkActivated: Qt.openUrlExternally(link); + } + QtControls.Label { QtLayouts.Layout.fillHeight: true QtLayouts.Layout.fillWidth: true @@ -104,7 +113,7 @@ Item { horizontalAlignment: Text.AlignJustify verticalAlignment: Text.AlignTop textFormat: Text.RichText - text: awActions.getAboutText("3rdparty") + text: awActions.getAboutText("thanks") onLinkActivated: Qt.openUrlExternally(link); } } diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index 6a181c5..399219b 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -144,6 +144,14 @@ QString AWActions::getAboutText(const QString type) const .arg(trdPartyList.at(i).split(QChar(','))[1]) .arg(trdPartyList.at(i).split(QChar(','))[2]); text = i18n("This software uses: %1", trdPartyList.join(QString(", "))); + } else if (type == QString("thanks")) { + QStringList thanks = QString(SPECIAL_THANKS) + .split(QChar(';'), QString::SkipEmptyParts); + for (int i = 0; i < thanks.count(); i++) + thanks[i] = QString("%1") + .arg(thanks.at(i).split(QChar(','))[0]) + .arg(thanks.at(i).split(QChar(','))[1]); + text = i18n("Special thanks to %1", thanks.join(QString(", "))); } return text; diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp index eeb7e44..1e313f7 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp @@ -17,8 +17,6 @@ #include "awdataengineaggregator.h" -#include - #include "awdebug.h" #include "awkeys.h" @@ -41,6 +39,7 @@ AWDataEngineAggregator::~AWDataEngineAggregator() // disconnect sources first disconnectSources(); m_dataEngines.clear(); + delete m_consumer; } @@ -84,12 +83,12 @@ void AWDataEngineAggregator::reconnectSources() void AWDataEngineAggregator::initDataEngines() { - Plasma::DataEngineConsumer *deConsumer = new Plasma::DataEngineConsumer(); + m_consumer = new Plasma::DataEngineConsumer(); m_dataEngines[QString("systemmonitor")] - = deConsumer->dataEngine(QString("systemmonitor")); + = m_consumer->dataEngine(QString("systemmonitor")); m_dataEngines[QString("extsysmon")] - = deConsumer->dataEngine(QString("extsysmon")); - m_dataEngines[QString("time")] = deConsumer->dataEngine(QString("time")); + = m_consumer->dataEngine(QString("extsysmon")); + m_dataEngines[QString("time")] = m_consumer->dataEngine(QString("time")); // additional method required by systemmonitor structure connect(m_dataEngines[QString("systemmonitor")], diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.h b/sources/awesome-widget/plugin/awdataengineaggregator.h index 5a86ab6..1f030b2 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.h +++ b/sources/awesome-widget/plugin/awdataengineaggregator.h @@ -20,6 +20,7 @@ #define AWDATAENGINEAGGREGATOR_H #include +#include #include @@ -43,6 +44,7 @@ public slots: private: void initDataEngines(); + Plasma::DataEngineConsumer *m_consumer = nullptr; QHash m_dataEngines; int m_interval; }; diff --git a/sources/awesomewidgets/awesomewidgets-extweather-ids.json b/sources/awesomewidgets/awesomewidgets-extweather-ids.json index 094ce99..69f9085 100644 --- a/sources/awesomewidgets/awesomewidgets-extweather-ids.json +++ b/sources/awesomewidgets/awesomewidgets-extweather-ids.json @@ -1,139 +1,113 @@ { - "__url": "http://openweathermap.org/weather-conditions", + "__url": "https://developer.yahoo.com/weather/documentation.html", "image": { "__comment": "should be described as html image with full path inside", - "default": "", + "default": "", - "800": "", - - "801": "", - - "802": "", - "803": "", - - "804": "", - - "300": "", - "301": "", - "302": "", - "310": "", - "311": "", - "312": "", - "313": "", - "314": "", - "321": "", - "520": "", - "521": "", - "522": "", - "531": "", - - "500": "", - "501": "", - "502": "", - "503": "", - "504": "", - - "200": "", - "201": "", - "202": "", - "210": "", - "211": "", - "212": "", - "221": "", - "230": "", - "231": "", - "232": "", - - "511": "", - "600": "", - "601": "", - "602": "", - "611": "", - "612": "", - "615": "", - "616": "", - "620": "", - "621": "", - "622": "", - - "701": "", - "711": "", - "721": "", - "731": "", - "741": "", - "751": "", - "761": "", - "762": "", - "771": "", - "781": "" + "0": "", + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", + "7": "", + "8": "", + "9": "", + "10": "", + "11": "", + "12": "", + "13": "", + "14": "", + "15": "", + "16": "", + "17": "", + "18": "", + "19": "", + "20": "", + "21": "", + "22": "", + "23": "", + "24": "", + "25": "", + "26": "", + "27": "", + "28": "", + "29": "", + "30": "", + "31": "", + "32": "", + "33": "", + "34": "", + "35": "", + "36": "", + "37": "", + "38": "", + "39": "", + "40": "", + "41": "", + "42": "", + "43": "", + "44": "", + "45": "", + "46": "", + "47": "", + "3200": "" }, "text": { "default": "\u2604", + "3200": "\u2604", - "800": "\u2600", - - "801": "\u26C5", - - "802": "\u2601", - "803": "\u2601", - - "804": "\u2601", - - "300": "\u2602", - "301": "\u2602", - "302": "\u2602", - "310": "\u2602", - "311": "\u2602", - "312": "\u2602", - "313": "\u2602", - "314": "\u2602", - "321": "\u2602", - "520": "\u2602", - "521": "\u2602", - "522": "\u2602", - "531": "\u2602", - - "500": "\u2614", - "501": "\u2614", - "502": "\u2614", - "503": "\u2614", - "504": "\u2614", - - "200": "\u2608", - "201": "\u2608", - "202": "\u2608", - "210": "\u2608", - "211": "\u2608", - "212": "\u2608", - "221": "\u2608", - "230": "\u2608", - "231": "\u2608", - "232": "\u2608", - - "511": "\u2603", - "600": "\u2603", - "601": "\u2603", - "602": "\u2603", - "611": "\u2603", - "612": "\u2603", - "615": "\u2603", - "616": "\u2603", - "620": "\u2603", - "621": "\u2603", - "622": "\u2603", - - "701": "\u26C5", - "711": "\u26C5", - "721": "\u26C5", - "731": "\u26C5", - "741": "\u26C5", - "751": "\u26C5", - "761": "\u26C5", - "762": "\u26C5", - "771": "\u26C5", - "781": "\u26C5" + "0": "\u2604", + "1": "\u2604", + "2": "\u2604", + "3": "\u26C8", + "4": "\u26C8", + "5": "\u2614", + "6": "\u2614", + "7": "\u2614", + "8": "\u2614", + "9": "\u2614", + "10": "\u2614", + "11": "\u2614", + "12": "\u2614", + "13": "\u26C4", + "14": "\u26C7", + "15": "\u26C7", + "16": "\u2614", + "17": "\u2614", + "18": "\u2614", + "19": "\u26C5", + "20": "\u26C5", + "21": "\u26C5", + "22": "\u26C5", + "23": "\u26C5", + "24": "\u26C5", + "25": "\u26C5", + "26": "\u2601", + "27": "\u2601", + "28": "\u2601", + "29": "\u2601", + "30": "\u2601", + "31": "\u263D", + "32": "\u2600", + "33": "\u263D", + "34": "\u2600", + "35": "\u2614", + "36": "\u2600", + "37": "\u26C8", + "38": "\u26C8", + "39": "\u26C8", + "40": "\u26C7", + "41": "\u26C7", + "42": "\u26C7", + "43": "\u26C7", + "44": "\u2601", + "45": "\u26C8", + "46": "\u26C7", + "47": "\u26C8" } } diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index dc26994..5a7f326 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -279,8 +279,7 @@ get quotes for the instrument. Refer to \ QString ExtQuotes::url() const { - QString apiUrl = QString(YAHOO_URL); - apiUrl.replace(QString("$TICKER"), m_ticker); + QString apiUrl = QString(YAHOO_QUOTES_URL).arg(m_ticker); qCInfo(LOG_LIB) << "API url" << apiUrl; return apiUrl; diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h index c271b8c..0c16351 100644 --- a/sources/awesomewidgets/extquotes.h +++ b/sources/awesomewidgets/extquotes.h @@ -22,10 +22,10 @@ #include "abstractextitem.h" -#define YAHOO_URL \ +#define YAHOO_QUOTES_URL \ "https://query.yahooapis.com/v1/public/yql?q=select * from " \ "yahoo.finance.quotes where " \ - "symbol=\"$TICKER\"&env=store://datatables.org/" \ + "symbol=\"%1\"&env=store://datatables.org/" \ "alltableswithkeys&format=json" diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index 6245af4..d6342fa 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -235,9 +235,8 @@ QVariantHash ExtWeather::run() if (times == 1) { qCInfo(LOG_LIB) << "Send request"; isRunning = true; - QNetworkReply *reply - = manager->get(QNetworkRequest(QUrl(url(m_ts != 0)))); - new QReplyTimeout(reply, 1000); + QNetworkReply *reply = manager->get(QNetworkRequest(QUrl(url()))); + new QReplyTimeout(reply, 5000); } // update value @@ -319,51 +318,52 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply) } // convert to map - QVariantMap json = jsonDoc.toVariant().toMap(); - if (json[QString("cod")].toInt() != 200) { - qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code" - << json[QString("cod")].toInt(); + QVariantMap json = jsonDoc.toVariant().toMap()[QString("query")].toMap(); + if (json[QString("count")].toInt() != 1) { + qCWarning(LOG_LIB) << "Found data count" + << json[QString("count")].toInt() << "is not 1"; return; } + QVariantMap results + = json[QString("results")].toMap()[QString("channel")].toMap(); + QVariantMap item = results[QString("item")].toMap(); - QVariantHash data; if (m_ts == 0) { - data = parseSingleJson(json); + // current weather + int id = item[QString("condition")].toMap()[QString("code")].toInt(); + values[tag(QString("weatherId"))] = id; + values[tag(QString("weather"))] = weatherFromInt(id); + values[tag(QString("temperature"))] + = item[QString("condition")].toMap()[QString("temp")].toInt(); + values[tag(QString("timestamp"))] + = item[QString("condition")].toMap()[QString("date")].toString(); + values[tag(QString("humidity"))] = results[QString("atmosphere")] + .toMap()[QString("humidity")] + .toInt(); + values[tag(QString("pressure"))] + = static_cast(results[QString("atmosphere")] + .toMap()[QString("pressure")] + .toFloat()); } else { - QVariantList list = json[QString("list")].toList(); - data = parseSingleJson(list.count() <= m_ts ? list.at(m_ts - 1).toMap() - : list.last().toMap()); + // forecast weather + QVariantList weatherList = item[QString("forecast")].toList(); + QVariantMap weatherMap = weatherList.count() < m_ts + ? weatherList.last().toMap() + : weatherList.at(m_ts).toMap(); + int id = weatherMap[QString("code")].toInt(); + values[tag(QString("weatherId"))] = id; + values[tag(QString("weather"))] = weatherFromInt(id); + values[tag(QString("timestamp"))] + = weatherMap[QString("date")].toString(); + // yahoo provides high and low temperatures. Lets calculate average one + values[tag(QString("temperature"))] + = (weatherMap[QString("high")].toFloat() + + weatherMap[QString("low")].toFloat()) + / 2.0; + // ... and no forecast data for humidity and pressure + values[tag(QString("humidity"))] = 0; + values[tag(QString("pressure"))] = 0.0; } - foreach (QString key, data.keys()) - values[tag(key)] = data[key]; -} - - -QVariantHash ExtWeather::parseSingleJson(const QVariantMap json) const -{ - qCDebug(LOG_LIB) << "Single json data" << json; - - QVariantHash output; - - // weather status - QVariantList weather = json[QString("weather")].toList(); - if (!weather.isEmpty()) { - int _id = weather.first().toMap()[QString("id")].toInt(); - output[QString("weatherId")] = _id; - output[QString("weather")] = weatherFromInt(_id); - } - - // main data - QVariantMap mainWeather = json[QString("main")].toMap(); - if (!weather.isEmpty()) { - output[QString("humidity")] - = mainWeather[QString("humidity")].toFloat(); - output[QString("pressure")] - = mainWeather[QString("pressure")].toFloat(); - output[QString("temperature")] = mainWeather[QString("temp")].toFloat(); - } - - return output; } @@ -381,13 +381,10 @@ void ExtWeather::translate() } -QString ExtWeather::url(const bool isForecast) const +QString ExtWeather::url() const { - qCDebug(LOG_LIB) << "Is forecast" << isForecast; - QString apiUrl = isForecast ? QString(OWM_FORECAST_URL) : QString(OWM_URL); - apiUrl.replace(QString("$CITY"), m_city); - apiUrl.replace(QString("$COUNTRY"), m_country); + QString apiUrl = QString(YAHOO_WEATHER_URL).arg(m_city).arg(m_country); qCInfo(LOG_LIB) << "API url" << apiUrl; return apiUrl; diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h index 0639314..eafac3e 100644 --- a/sources/awesomewidgets/extweather.h +++ b/sources/awesomewidgets/extweather.h @@ -22,12 +22,10 @@ #include "abstractextitem.h" -#define OWM_URL \ - "http://api.openweathermap.org/data/2.5/" \ - "weather?q=$CITY,$COUNTRY&units=metric" -#define OWM_FORECAST_URL \ - "http://api.openweathermap.org/data/2.5/" \ - "forecast?q=$CITY,$COUNTRY&units=metric" +#define YAHOO_WEATHER_URL \ + "https://query.yahooapis.com/v1/public/yql?format=json&q=select * from " \ + "weather.forecast where u='c' and woeid in (select woeid from " \ + "geo.places(1) where text='%1, %2')" namespace Ui @@ -76,9 +74,8 @@ private: QNetworkAccessManager *manager; bool isRunning = false; Ui::ExtWeather *ui; - QVariantHash parseSingleJson(const QVariantMap json) const; void translate(); - QString url(const bool isForecast = false) const; + QString url() const; // properties QString m_city = QString("London"); QString m_country = QString("uk"); diff --git a/sources/awesomewidgets/weather/0.gif b/sources/awesomewidgets/weather/0.gif new file mode 100644 index 0000000..7db0580 Binary files /dev/null and b/sources/awesomewidgets/weather/0.gif differ diff --git a/sources/awesomewidgets/weather/01d.png b/sources/awesomewidgets/weather/01d.png deleted file mode 100644 index 7d2f792..0000000 Binary files a/sources/awesomewidgets/weather/01d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/02d.png b/sources/awesomewidgets/weather/02d.png deleted file mode 100644 index d86a99c..0000000 Binary files a/sources/awesomewidgets/weather/02d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/03d.png b/sources/awesomewidgets/weather/03d.png deleted file mode 100644 index 8a4a8e9..0000000 Binary files a/sources/awesomewidgets/weather/03d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/04d.png b/sources/awesomewidgets/weather/04d.png deleted file mode 100644 index 4677b85..0000000 Binary files a/sources/awesomewidgets/weather/04d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/09d.png b/sources/awesomewidgets/weather/09d.png deleted file mode 100644 index b7cb53b..0000000 Binary files a/sources/awesomewidgets/weather/09d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/1.gif b/sources/awesomewidgets/weather/1.gif new file mode 100644 index 0000000..bdf5a7a Binary files /dev/null and b/sources/awesomewidgets/weather/1.gif differ diff --git a/sources/awesomewidgets/weather/10.gif b/sources/awesomewidgets/weather/10.gif new file mode 100644 index 0000000..94673cb Binary files /dev/null and b/sources/awesomewidgets/weather/10.gif differ diff --git a/sources/awesomewidgets/weather/10d.png b/sources/awesomewidgets/weather/10d.png deleted file mode 100644 index b1e1f83..0000000 Binary files a/sources/awesomewidgets/weather/10d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/11.gif b/sources/awesomewidgets/weather/11.gif new file mode 100644 index 0000000..15290ec Binary files /dev/null and b/sources/awesomewidgets/weather/11.gif differ diff --git a/sources/awesomewidgets/weather/11d.png b/sources/awesomewidgets/weather/11d.png deleted file mode 100644 index f3ce654..0000000 Binary files a/sources/awesomewidgets/weather/11d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/12.gif b/sources/awesomewidgets/weather/12.gif new file mode 100644 index 0000000..2f412db Binary files /dev/null and b/sources/awesomewidgets/weather/12.gif differ diff --git a/sources/awesomewidgets/weather/13.gif b/sources/awesomewidgets/weather/13.gif new file mode 100644 index 0000000..4befd50 Binary files /dev/null and b/sources/awesomewidgets/weather/13.gif differ diff --git a/sources/awesomewidgets/weather/13d.png b/sources/awesomewidgets/weather/13d.png deleted file mode 100644 index 7b64a6c..0000000 Binary files a/sources/awesomewidgets/weather/13d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/14.gif b/sources/awesomewidgets/weather/14.gif new file mode 100644 index 0000000..b68e55a Binary files /dev/null and b/sources/awesomewidgets/weather/14.gif differ diff --git a/sources/awesomewidgets/weather/15.gif b/sources/awesomewidgets/weather/15.gif new file mode 100644 index 0000000..9918287 Binary files /dev/null and b/sources/awesomewidgets/weather/15.gif differ diff --git a/sources/awesomewidgets/weather/16.gif b/sources/awesomewidgets/weather/16.gif new file mode 100644 index 0000000..f805f62 Binary files /dev/null and b/sources/awesomewidgets/weather/16.gif differ diff --git a/sources/awesomewidgets/weather/17.gif b/sources/awesomewidgets/weather/17.gif new file mode 100644 index 0000000..7db0580 Binary files /dev/null and b/sources/awesomewidgets/weather/17.gif differ diff --git a/sources/awesomewidgets/weather/18.gif b/sources/awesomewidgets/weather/18.gif new file mode 100644 index 0000000..e8f808b Binary files /dev/null and b/sources/awesomewidgets/weather/18.gif differ diff --git a/sources/awesomewidgets/weather/19.gif b/sources/awesomewidgets/weather/19.gif new file mode 100644 index 0000000..7e142dc Binary files /dev/null and b/sources/awesomewidgets/weather/19.gif differ diff --git a/sources/awesomewidgets/weather/2.gif b/sources/awesomewidgets/weather/2.gif new file mode 100644 index 0000000..bdf5a7a Binary files /dev/null and b/sources/awesomewidgets/weather/2.gif differ diff --git a/sources/awesomewidgets/weather/20.gif b/sources/awesomewidgets/weather/20.gif new file mode 100644 index 0000000..0aa42a2 Binary files /dev/null and b/sources/awesomewidgets/weather/20.gif differ diff --git a/sources/awesomewidgets/weather/21.gif b/sources/awesomewidgets/weather/21.gif new file mode 100644 index 0000000..47b0015 Binary files /dev/null and b/sources/awesomewidgets/weather/21.gif differ diff --git a/sources/awesomewidgets/weather/22.gif b/sources/awesomewidgets/weather/22.gif new file mode 100644 index 0000000..a79aafc Binary files /dev/null and b/sources/awesomewidgets/weather/22.gif differ diff --git a/sources/awesomewidgets/weather/23.gif b/sources/awesomewidgets/weather/23.gif new file mode 100644 index 0000000..66daadb Binary files /dev/null and b/sources/awesomewidgets/weather/23.gif differ diff --git a/sources/awesomewidgets/weather/24.gif b/sources/awesomewidgets/weather/24.gif new file mode 100644 index 0000000..66daadb Binary files /dev/null and b/sources/awesomewidgets/weather/24.gif differ diff --git a/sources/awesomewidgets/weather/25.gif b/sources/awesomewidgets/weather/25.gif new file mode 100644 index 0000000..6d8e2a1 Binary files /dev/null and b/sources/awesomewidgets/weather/25.gif differ diff --git a/sources/awesomewidgets/weather/26.gif b/sources/awesomewidgets/weather/26.gif new file mode 100644 index 0000000..8ed0378 Binary files /dev/null and b/sources/awesomewidgets/weather/26.gif differ diff --git a/sources/awesomewidgets/weather/27.gif b/sources/awesomewidgets/weather/27.gif new file mode 100644 index 0000000..17461bd Binary files /dev/null and b/sources/awesomewidgets/weather/27.gif differ diff --git a/sources/awesomewidgets/weather/28.gif b/sources/awesomewidgets/weather/28.gif new file mode 100644 index 0000000..7b14b7a Binary files /dev/null and b/sources/awesomewidgets/weather/28.gif differ diff --git a/sources/awesomewidgets/weather/29.gif b/sources/awesomewidgets/weather/29.gif new file mode 100644 index 0000000..3669d6f Binary files /dev/null and b/sources/awesomewidgets/weather/29.gif differ diff --git a/sources/awesomewidgets/weather/3.gif b/sources/awesomewidgets/weather/3.gif new file mode 100644 index 0000000..7db0580 Binary files /dev/null and b/sources/awesomewidgets/weather/3.gif differ diff --git a/sources/awesomewidgets/weather/30.gif b/sources/awesomewidgets/weather/30.gif new file mode 100644 index 0000000..8178a2e Binary files /dev/null and b/sources/awesomewidgets/weather/30.gif differ diff --git a/sources/awesomewidgets/weather/31.gif b/sources/awesomewidgets/weather/31.gif new file mode 100644 index 0000000..e0c709f Binary files /dev/null and b/sources/awesomewidgets/weather/31.gif differ diff --git a/sources/awesomewidgets/weather/32.gif b/sources/awesomewidgets/weather/32.gif new file mode 100644 index 0000000..203ad8b Binary files /dev/null and b/sources/awesomewidgets/weather/32.gif differ diff --git a/sources/awesomewidgets/weather/3200.gif b/sources/awesomewidgets/weather/3200.gif new file mode 100644 index 0000000..e23b248 Binary files /dev/null and b/sources/awesomewidgets/weather/3200.gif differ diff --git a/sources/awesomewidgets/weather/33.gif b/sources/awesomewidgets/weather/33.gif new file mode 100644 index 0000000..f67352d Binary files /dev/null and b/sources/awesomewidgets/weather/33.gif differ diff --git a/sources/awesomewidgets/weather/34.gif b/sources/awesomewidgets/weather/34.gif new file mode 100644 index 0000000..8e593e9 Binary files /dev/null and b/sources/awesomewidgets/weather/34.gif differ diff --git a/sources/awesomewidgets/weather/35.gif b/sources/awesomewidgets/weather/35.gif new file mode 100644 index 0000000..7db0580 Binary files /dev/null and b/sources/awesomewidgets/weather/35.gif differ diff --git a/sources/awesomewidgets/weather/36.gif b/sources/awesomewidgets/weather/36.gif new file mode 100644 index 0000000..d7daaf4 Binary files /dev/null and b/sources/awesomewidgets/weather/36.gif differ diff --git a/sources/awesomewidgets/weather/37.gif b/sources/awesomewidgets/weather/37.gif new file mode 100644 index 0000000..75b00e5 Binary files /dev/null and b/sources/awesomewidgets/weather/37.gif differ diff --git a/sources/awesomewidgets/weather/38.gif b/sources/awesomewidgets/weather/38.gif new file mode 100644 index 0000000..75b00e5 Binary files /dev/null and b/sources/awesomewidgets/weather/38.gif differ diff --git a/sources/awesomewidgets/weather/39.gif b/sources/awesomewidgets/weather/39.gif new file mode 100644 index 0000000..2f412db Binary files /dev/null and b/sources/awesomewidgets/weather/39.gif differ diff --git a/sources/awesomewidgets/weather/4.gif b/sources/awesomewidgets/weather/4.gif new file mode 100644 index 0000000..7db0580 Binary files /dev/null and b/sources/awesomewidgets/weather/4.gif differ diff --git a/sources/awesomewidgets/weather/40.gif b/sources/awesomewidgets/weather/40.gif new file mode 100644 index 0000000..2f412db Binary files /dev/null and b/sources/awesomewidgets/weather/40.gif differ diff --git a/sources/awesomewidgets/weather/41.gif b/sources/awesomewidgets/weather/41.gif new file mode 100644 index 0000000..f805f62 Binary files /dev/null and b/sources/awesomewidgets/weather/41.gif differ diff --git a/sources/awesomewidgets/weather/42.gif b/sources/awesomewidgets/weather/42.gif new file mode 100644 index 0000000..f805f62 Binary files /dev/null and b/sources/awesomewidgets/weather/42.gif differ diff --git a/sources/awesomewidgets/weather/43.gif b/sources/awesomewidgets/weather/43.gif new file mode 100644 index 0000000..1db832e Binary files /dev/null and b/sources/awesomewidgets/weather/43.gif differ diff --git a/sources/awesomewidgets/weather/44.gif b/sources/awesomewidgets/weather/44.gif new file mode 100644 index 0000000..8178a2e Binary files /dev/null and b/sources/awesomewidgets/weather/44.gif differ diff --git a/sources/awesomewidgets/weather/45.gif b/sources/awesomewidgets/weather/45.gif new file mode 100644 index 0000000..5939640 Binary files /dev/null and b/sources/awesomewidgets/weather/45.gif differ diff --git a/sources/awesomewidgets/weather/46.gif b/sources/awesomewidgets/weather/46.gif new file mode 100644 index 0000000..55b5126 Binary files /dev/null and b/sources/awesomewidgets/weather/46.gif differ diff --git a/sources/awesomewidgets/weather/47.gif b/sources/awesomewidgets/weather/47.gif new file mode 100644 index 0000000..aac25aa Binary files /dev/null and b/sources/awesomewidgets/weather/47.gif differ diff --git a/sources/awesomewidgets/weather/5.gif b/sources/awesomewidgets/weather/5.gif new file mode 100644 index 0000000..7881d41 Binary files /dev/null and b/sources/awesomewidgets/weather/5.gif differ diff --git a/sources/awesomewidgets/weather/50d.png b/sources/awesomewidgets/weather/50d.png deleted file mode 100644 index 18afb34..0000000 Binary files a/sources/awesomewidgets/weather/50d.png and /dev/null differ diff --git a/sources/awesomewidgets/weather/6.gif b/sources/awesomewidgets/weather/6.gif new file mode 100644 index 0000000..e8f808b Binary files /dev/null and b/sources/awesomewidgets/weather/6.gif differ diff --git a/sources/awesomewidgets/weather/7.gif b/sources/awesomewidgets/weather/7.gif new file mode 100644 index 0000000..226e31f Binary files /dev/null and b/sources/awesomewidgets/weather/7.gif differ diff --git a/sources/awesomewidgets/weather/8.gif b/sources/awesomewidgets/weather/8.gif new file mode 100644 index 0000000..63645a6 Binary files /dev/null and b/sources/awesomewidgets/weather/8.gif differ diff --git a/sources/awesomewidgets/weather/9.gif b/sources/awesomewidgets/weather/9.gif new file mode 100644 index 0000000..b08ac3b Binary files /dev/null and b/sources/awesomewidgets/weather/9.gif differ diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml index 3b29952..ba648f7 100644 --- a/sources/desktop-panel/package/contents/ui/about.qml +++ b/sources/desktop-panel/package/contents/ui/about.qml @@ -98,6 +98,15 @@ Item { text: dpAdds.getAboutText("translators") } + QtControls.Label { + QtLayouts.Layout.fillWidth: true + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + textFormat: Text.RichText + text: dpAdds.getAboutText("3rdparty") + onLinkActivated: Qt.openUrlExternally(link); + } + QtControls.Label { QtLayouts.Layout.fillHeight: true QtLayouts.Layout.fillWidth: true @@ -105,7 +114,7 @@ Item { horizontalAlignment: Text.AlignJustify verticalAlignment: Text.AlignTop textFormat: Text.RichText - text: dpAdds.getAboutText("3rdparty") + text: dpAdds.getAboutText("thanks") onLinkActivated: Qt.openUrlExternally(link); } } diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index 702f570..f54c3d2 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -301,6 +301,14 @@ QString DPAdds::getAboutText(const QString type) const .arg(trdPartyList.at(i).split(QChar(',')).at(1)) .arg(trdPartyList.at(i).split(QChar(',')).at(2)); text = i18n("This software uses: %1", trdPartyList.join(QString(", "))); + } else if (type == QString("thanks")) { + QStringList thanks = QString(SPECIAL_THANKS) + .split(QChar(';'), QString::SkipEmptyParts); + for (int i = 0; i < thanks.count(); i++) + thanks[i] = QString("%1") + .arg(thanks.at(i).split(QChar(','))[0]) + .arg(thanks.at(i).split(QChar(','))[1]); + text = i18n("Special thanks to %1", thanks.join(QString(", "))); } return text; diff --git a/sources/extsysmon/sources/weathersource.cpp b/sources/extsysmon/sources/weathersource.cpp index f805432..5ff30a0 100644 --- a/sources/extsysmon/sources/weathersource.cpp +++ b/sources/extsysmon/sources/weathersource.cpp @@ -92,7 +92,7 @@ QVariantMap WeatherSource::initialData(QString source) const = QString("Atmospheric pressure for '%1'") .arg(extWeather->itemByTagNumber(ind)->uniq()); data[QString("type")] = QString("integer"); - data[QString("units")] = QString("hPa"); + data[QString("units")] = QString("mb"); } else if (source.startsWith(QString("weather/temperature"))) { data[QString("min")] = 0.0; data[QString("max")] = 0.0; @@ -101,6 +101,14 @@ QVariantMap WeatherSource::initialData(QString source) const .arg(extWeather->itemByTagNumber(ind)->uniq()); data[QString("type")] = QString("float"); data[QString("units")] = QString("°C"); + } else if (source.startsWith(QString("weather/timestamp"))) { + data[QString("min")] = QString(""); + data[QString("max")] = QString(""); + data[QString("name")] + = QString("Timestamp for '%1'") + .arg(extWeather->itemByTagNumber(ind)->uniq()); + data[QString("type")] = QString("QString"); + data[QString("units")] = QString(""); } return data; @@ -127,6 +135,8 @@ QStringList WeatherSource::getSources() QString("weather/%1").arg(item->tag(QString("pressure")))); sources.append( QString("weather/%1").arg(item->tag(QString("temperature")))); + sources.append( + QString("weather/%1").arg(item->tag(QString("timestamp")))); } return sources; diff --git a/sources/translations/awesome-widgets.pot b/sources/translations/awesome-widgets.pot index 8f500e6..437a528 100644 --- a/sources/translations/awesome-widgets.pot +++ b/sources/translations/awesome-widgets.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -110,9 +110,36 @@ msgstr "" msgid "Export configuration" msgstr "" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +msgid "Could not save configuration file" +msgstr "" + msgid "Import configuration" msgstr "" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +msgid "Import extensions" +msgstr "" + +msgid "Import additional files" +msgstr "" + msgid "Font" msgstr "" @@ -378,6 +405,9 @@ msgstr "" msgid "This software uses: %1" msgstr "" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "" @@ -399,33 +429,6 @@ msgstr "" msgid "There are updates" msgstr "" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -msgid "Could not save configuration file" -msgstr "" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -msgid "Import extensions" -msgstr "" - -msgid "Import additional files" -msgstr "" - msgid "AC online" msgstr "" diff --git a/sources/translations/en.po b/sources/translations/en.po index 42d6afa..c40d104 100644 --- a/sources/translations/en.po +++ b/sources/translations/en.po @@ -1,13 +1,13 @@ # Copyright (C) 2014 # This file is distributed under the same license as the PyTextMonitor package. # -# Evgeniy Alekseev , 2014, 2015. +# Evgeniy Alekseev , 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" -"PO-Revision-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" +"PO-Revision-Date: 2016-01-26 21:48+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: English \n" "Language: ru\n" @@ -111,9 +111,36 @@ msgstr "Drop key cache" msgid "Export configuration" msgstr "Export configuration" +msgid "Export" +msgstr "Export" + +msgid "Success" +msgstr "Success" + +msgid "Please note that binary files were not copied" +msgstr "Please note that binary files were not copied" + +msgid "Ooops..." +msgstr "Ooops..." + +msgid "Could not save configuration file" +msgstr "Could not save configuration file" + msgid "Import configuration" msgstr "Import configuration" +msgid "Import" +msgstr "Import" + +msgid "Import plasmoid settings" +msgstr "Import plasmoid settings" + +msgid "Import extensions" +msgstr "Import extensions" + +msgid "Import additional files" +msgstr "Import additional files" + msgid "Font" msgstr "Font" @@ -383,6 +410,9 @@ msgstr "Translators: %1" msgid "This software uses: %1" msgstr "This software uses: %1" +msgid "Special thanks to %1" +msgstr "Special thanks to %1" + msgid "Select font" msgstr "Select font" @@ -404,33 +434,6 @@ msgstr "Click \"Ok\" to download" msgid "There are updates" msgstr "There are updates" -msgid "Export" -msgstr "Export" - -msgid "Success" -msgstr "Success" - -msgid "Please note that binary files were not copied" -msgstr "Please note that binary files were not copied" - -msgid "Ooops..." -msgstr "Ooops..." - -msgid "Could not save configuration file" -msgstr "Could not save configuration file" - -msgid "Import" -msgstr "Import" - -msgid "Import plasmoid settings" -msgstr "Import plasmoid settings" - -msgid "Import extensions" -msgstr "Import extensions" - -msgid "Import additional files" -msgstr "Import additional files" - msgid "AC online" msgstr "AC online" diff --git a/sources/translations/es.po b/sources/translations/es.po index 4984b2a..b1b6c63 100644 --- a/sources/translations/es.po +++ b/sources/translations/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Awesome widgets\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: 2015-09-26 22:07+0000\n" "Last-Translator: Ernesto Avilés Vázquez \n" "Language-Team: Spanish (http://www.transifex.com/arcanis/awesome-widgets/" @@ -113,9 +113,38 @@ msgstr "Borrar caché de claves" msgid "Export configuration" msgstr "" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +msgid "Could not save configuration file" +msgstr "" + msgid "Import configuration" msgstr "" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +#, fuzzy +msgid "Import extensions" +msgstr "Extensiones" + +#, fuzzy +msgid "Import additional files" +msgstr "Filtros adicionales" + msgid "Font" msgstr "Tipo de letra" @@ -386,6 +415,9 @@ msgstr "Traductores: %1" msgid "This software uses: %1" msgstr "Este software usa: %1" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "Elegir tipo de letra" @@ -407,35 +439,6 @@ msgstr "Haz clic en «Ok» para descargar" msgid "There are updates" msgstr "Hay actualizaciones disponibles" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -msgid "Could not save configuration file" -msgstr "" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -#, fuzzy -msgid "Import extensions" -msgstr "Extensiones" - -#, fuzzy -msgid "Import additional files" -msgstr "Filtros adicionales" - msgid "AC online" msgstr "Alimentación conectada" diff --git a/sources/translations/fr.po b/sources/translations/fr.po index c11dd66..34ddcf5 100644 --- a/sources/translations/fr.po +++ b/sources/translations/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: 2015-07-31 22:16+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: French \n" @@ -115,9 +115,36 @@ msgstr "" msgid "Export configuration" msgstr "" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +msgid "Could not save configuration file" +msgstr "" + msgid "Import configuration" msgstr "" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +msgid "Import extensions" +msgstr "" + +msgid "Import additional files" +msgstr "" + msgid "Font" msgstr "Police" @@ -398,6 +425,9 @@ msgstr "Traducteurs: %1" msgid "This software uses: %1" msgstr "Ce logiciel utilise: %1" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "Sélectionner une couleur" @@ -422,33 +452,6 @@ msgstr "Cliquer sur \"Valider\" pour télécharger" msgid "There are updates" msgstr "Des mises à jour sont disponibles" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -msgid "Could not save configuration file" -msgstr "" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -msgid "Import extensions" -msgstr "" - -msgid "Import additional files" -msgstr "" - msgid "AC online" msgstr "Alimentation branchée" diff --git a/sources/translations/nl.po b/sources/translations/nl.po index aaaadaf..9c4a562 100644 --- a/sources/translations/nl.po +++ b/sources/translations/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Awesome widgets\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: 2015-08-20 22:52+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Dutch \n" @@ -116,10 +116,38 @@ msgstr "" msgid "Export configuration" msgstr "Configuratie" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +#, fuzzy +msgid "Could not save configuration file" +msgstr "Configuratie" + #, fuzzy msgid "Import configuration" msgstr "Configuratie" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +msgid "Import extensions" +msgstr "" + +msgid "Import additional files" +msgstr "" + msgid "Font" msgstr "Lettertype" @@ -402,6 +430,9 @@ msgstr "Vertalers: %1" msgid "This software uses: %1" msgstr "Deze software gebruikt: %1" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "Lettertype selecteren" @@ -424,34 +455,6 @@ msgstr "Klik op \"OK\" om te downloaden" msgid "There are updates" msgstr "Er zijn updates" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -#, fuzzy -msgid "Could not save configuration file" -msgstr "Configuratie" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -msgid "Import extensions" -msgstr "" - -msgid "Import additional files" -msgstr "" - msgid "AC online" msgstr "AC online" diff --git a/sources/translations/pt_BR.po b/sources/translations/pt_BR.po index 24bf696..9cb71f1 100644 --- a/sources/translations/pt_BR.po +++ b/sources/translations/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: 2015-07-31 22:21+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -115,10 +115,38 @@ msgstr "" msgid "Export configuration" msgstr "Configuração" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +#, fuzzy +msgid "Could not save configuration file" +msgstr "Configuração" + #, fuzzy msgid "Import configuration" msgstr "Configuração" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +msgid "Import extensions" +msgstr "" + +msgid "Import additional files" +msgstr "" + msgid "Font" msgstr "Tamanho da fonte" @@ -398,6 +426,9 @@ msgstr "Tradutores: %1" msgid "This software uses: %1" msgstr "Este software usa: %1" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "Selecionar fonte" @@ -420,34 +451,6 @@ msgstr "Clique \"Ok\" para baixar" msgid "There are updates" msgstr "Há atualizações disponíveis" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -#, fuzzy -msgid "Could not save configuration file" -msgstr "Configuração" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -msgid "Import extensions" -msgstr "" - -msgid "Import additional files" -msgstr "" - msgid "AC online" msgstr "Carregador conectado" diff --git a/sources/translations/ru.po b/sources/translations/ru.po index d6125a1..97a8e6b 100644 --- a/sources/translations/ru.po +++ b/sources/translations/ru.po @@ -1,13 +1,13 @@ # Copyright (C) 2014 # This file is distributed under the same license as the PyTextMonitor package. # -# Evgeniy Alekseev , 2014, 2015. +# Evgeniy Alekseev , 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" -"PO-Revision-Date: 2015-10-20 01:22+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" +"PO-Revision-Date: 2016-01-26 21:49+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -111,9 +111,36 @@ msgstr "Сбросить кеш ключей" msgid "Export configuration" msgstr "Экспорт настроек" +msgid "Export" +msgstr "Экспорт" + +msgid "Success" +msgstr "Успешно" + +msgid "Please note that binary files were not copied" +msgstr "Пожалуйста, обратите внимание, что бинарные файлы не были скопированы" + +msgid "Ooops..." +msgstr "Ууупс..." + +msgid "Could not save configuration file" +msgstr "Не могу сохранить файл настроек" + msgid "Import configuration" msgstr "Импорт настроек" +msgid "Import" +msgstr "Импорт" + +msgid "Import plasmoid settings" +msgstr "Импорт настроек плазмоида" + +msgid "Import extensions" +msgstr "Импорт расширений" + +msgid "Import additional files" +msgstr "Импорт дополнительных файлов" + msgid "Font" msgstr "Шрифт" @@ -383,6 +410,9 @@ msgstr "Переводчики: %1" msgid "This software uses: %1" msgstr "Данное приложение использует: %1" +msgid "Special thanks to %1" +msgstr "Отдельно спасибо %1" + msgid "Select font" msgstr "Выберете шрифт" @@ -404,33 +434,6 @@ msgstr "Нажмите \"Ok\" для загрузки" msgid "There are updates" msgstr "Найдены обновления" -msgid "Export" -msgstr "Экспорт" - -msgid "Success" -msgstr "Успешно" - -msgid "Please note that binary files were not copied" -msgstr "Пожалуйста, обратите внимание, что бинарные файлы не были скопированы" - -msgid "Ooops..." -msgstr "Ууупс..." - -msgid "Could not save configuration file" -msgstr "Не могу сохранить файл настроек" - -msgid "Import" -msgstr "Импорт" - -msgid "Import plasmoid settings" -msgstr "Импорт настроек плазмоида" - -msgid "Import extensions" -msgstr "Импорт расширений" - -msgid "Import additional files" -msgstr "Импорт дополнительных файлов" - msgid "AC online" msgstr "AC подключен" diff --git a/sources/translations/uk.po b/sources/translations/uk.po index 07013d9..330f72e 100644 --- a/sources/translations/uk.po +++ b/sources/translations/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: 2015-09-27 12:37+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Ukrainian \n" @@ -114,10 +114,40 @@ msgstr "Скинути кеш ключів" msgid "Export configuration" msgstr "Налаштування" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +#, fuzzy +msgid "Could not save configuration file" +msgstr "Налаштування" + #, fuzzy msgid "Import configuration" msgstr "Налаштування" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +#, fuzzy +msgid "Import extensions" +msgstr "Розширення" + +#, fuzzy +msgid "Import additional files" +msgstr "Додаткові фільтри" + msgid "Font" msgstr "Шрифт" @@ -398,6 +428,9 @@ msgstr "Перекладачі: %1" msgid "This software uses: %1" msgstr "Ця програма використовує: %1" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "Оберіть шрифт" @@ -420,36 +453,6 @@ msgstr "Натисніть \"Ok\" для завантаження" msgid "There are updates" msgstr "Знайдені оновлення" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -#, fuzzy -msgid "Could not save configuration file" -msgstr "Налаштування" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -#, fuzzy -msgid "Import extensions" -msgstr "Розширення" - -#, fuzzy -msgid "Import additional files" -msgstr "Додаткові фільтри" - msgid "AC online" msgstr "AC підключений" diff --git a/sources/translations/zh.po b/sources/translations/zh.po index 5a11637..20de05f 100644 --- a/sources/translations/zh.po +++ b/sources/translations/zh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-10-20 01:21+0300\n" +"POT-Creation-Date: 2016-01-26 21:48+0300\n" "PO-Revision-Date: 2015-07-31 22:24+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -111,9 +111,36 @@ msgstr "" msgid "Export configuration" msgstr "" +msgid "Export" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "Please note that binary files were not copied" +msgstr "" + +msgid "Ooops..." +msgstr "" + +msgid "Could not save configuration file" +msgstr "" + msgid "Import configuration" msgstr "" +msgid "Import" +msgstr "" + +msgid "Import plasmoid settings" +msgstr "" + +msgid "Import extensions" +msgstr "" + +msgid "Import additional files" +msgstr "" + msgid "Font" msgstr "字体" @@ -397,6 +424,9 @@ msgstr "" msgid "This software uses: %1" msgstr "" +msgid "Special thanks to %1" +msgstr "" + msgid "Select font" msgstr "选择字体" @@ -418,33 +448,6 @@ msgstr "" msgid "There are updates" msgstr "" -msgid "Export" -msgstr "" - -msgid "Success" -msgstr "" - -msgid "Please note that binary files were not copied" -msgstr "" - -msgid "Ooops..." -msgstr "" - -msgid "Could not save configuration file" -msgstr "" - -msgid "Import" -msgstr "" - -msgid "Import plasmoid settings" -msgstr "" - -msgid "Import extensions" -msgstr "" - -msgid "Import additional files" -msgstr "" - #, fuzzy msgid "AC online" msgstr "外接电源使用中标签" diff --git a/sources/version.h.in b/sources/version.h.in index eec6074..10ab084 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -11,6 +11,7 @@ #define EMAIL "@PROJECT_CONTACT@" #define LICENSE "@PROJECT_LICENSE@" #define TRDPARTY_LICENSE "tasks,BSD,https://github.com/mhogomchungu/tasks;QReplyTimeout wrapper,no,http://codereview.stackexchange.com/questions/30031/qnetworkreply-network-reply-timeout-helper" +#define SPECIAL_THANKS "Yahoo! Finance,https://finance.yahoo.com/;Yahoo! Weather,https://weather.yahoo.com/;JetBrains,https://www.jetbrains.com/" // configuraion // graphical items api version