diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml index 5af063c..5412481 100644 --- a/sources/awesome-widget/package/contents/ui/main.qml +++ b/sources/awesome-widget/package/contents/ui/main.qml @@ -93,7 +93,7 @@ Item { onNewData: { if (debug) console.debug("Update source", sourceName) -// systemmonitorDE.interval = plasmoid.configuration.interval + systemmonitorDE.interval = plasmoid.configuration.interval awKeys.dataUpdateReceived(sourceName, data, settings) } @@ -113,7 +113,7 @@ Item { onNewData: { if (debug) console.debug("Update source", sourceName) -// extsysmonDE.interval = plasmoid.configuration.interval + extsysmonDE.interval = plasmoid.configuration.interval awKeys.dataUpdateReceived(sourceName, data, settings) } @@ -176,7 +176,7 @@ Item { awKeys.needTextToBeUpdated.connect(needTextUpdate) awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate) // check updates if required - if (plasmoid.configuration.checkUpdates) return action_checkUpdates() + if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false) } onDropSource: { @@ -235,7 +235,7 @@ Item { function action_checkUpdates() { if (debug) console.debug() - return awActions.checkUpdates() + return awActions.checkUpdates(true) } function action_showReadme() { diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index feef7c1..fb464ea 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -52,12 +52,15 @@ AWActions::~AWActions() } -void AWActions::checkUpdates() +void AWActions::checkUpdates(const bool showAnyway) { qCDebug(LOG_AW); QNetworkAccessManager *manager = new QNetworkAccessManager(this); - connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(versionReplyRecieved(QNetworkReply *))); + connect(manager, &QNetworkAccessManager::finished, + [showAnyway, this](QNetworkReply *reply) { + return versionReplyRecieved(reply, showAnyway); + }); manager->get(QNetworkRequest(QUrl(VERSION_API))); } @@ -94,12 +97,6 @@ void AWActions::runCmd(const QString cmd) const } -void AWActions::sendEmail() const -{ - qCDebug(LOG_AW); -} - - void AWActions::showReadme() const { qCDebug(LOG_AW); @@ -228,9 +225,21 @@ void AWActions::sendNotification(const QString eventId, const QString message, } -void AWActions::showUpdates(QString version) const +void AWActions::showInfo(const QString version) const { qCDebug(LOG_AW); + qCDebug(LOG_AW) << "Version" << version; + + QString text = i18n("You are using the actual version %1", version); + QMessageBox::information(nullptr, i18n("No new version found"), text); +} + + + +void AWActions::showUpdates(const QString version) const +{ + qCDebug(LOG_AW); + qCDebug(LOG_AW) << "Version" << version; QString text; text += i18n("Current version : %1", QString(VERSION)) + QString("\n"); @@ -247,7 +256,7 @@ void AWActions::showUpdates(QString version) const } -void AWActions::versionReplyRecieved(QNetworkReply *reply) const +void AWActions::versionReplyRecieved(QNetworkReply *reply, const bool showAnyway) const { qCDebug(LOG_AW); qCDebug(LOG_AW) << "Return code" << reply->error(); @@ -278,4 +287,6 @@ void AWActions::versionReplyRecieved(QNetworkReply *reply) const ((old_major == new_major) && (old_minor < new_minor)) || ((old_major == new_major) && (old_minor == new_minor) && (old_patch < new_patch))) return showUpdates(version); + else if (showAnyway) + return showInfo(version); } diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h index aad01c6..79aff79 100644 --- a/sources/awesome-widget/plugin/awactions.h +++ b/sources/awesome-widget/plugin/awactions.h @@ -33,11 +33,10 @@ public: explicit AWActions(QObject *parent = nullptr); virtual ~AWActions(); - Q_INVOKABLE void checkUpdates(); + Q_INVOKABLE void checkUpdates(const bool showAnyway = false); Q_INVOKABLE bool dropCache() const; Q_INVOKABLE bool isDebugEnabled() const; Q_INVOKABLE void runCmd(const QString cmd = QString("/usr/bin/true")) const; - Q_INVOKABLE void sendEmail() const; Q_INVOKABLE void showReadme() const; // configuration slots Q_INVOKABLE QString getAboutText(const QString type = QString("header")) const; @@ -51,8 +50,9 @@ public slots: const bool enablePopup = false); private slots: - void showUpdates(QString version) const; - void versionReplyRecieved(QNetworkReply *reply) const; + void showInfo(const QString version) const; + void showUpdates(const QString version) const; + void versionReplyRecieved(QNetworkReply *reply, const bool showAnyway) const; private: }; diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml index bfab79e..23177d7 100644 --- a/sources/desktop-panel/package/contents/ui/about.qml +++ b/sources/desktop-panel/package/contents/ui/about.qml @@ -99,6 +99,7 @@ Item { QtControls.Label { QtLayouts.Layout.fillHeight: true QtLayouts.Layout.fillWidth: true + wrapMode: Text.WordWrap horizontalAlignment: Text.AlignJustify verticalAlignment: Text.AlignTop textFormat: Text.RichText diff --git a/sources/translations/awesome-widgets.pot b/sources/translations/awesome-widgets.pot index f474e6c..1cb60cf 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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -202,7 +202,7 @@ msgstr "" msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" msgid "Number of values for tooltips" @@ -211,24 +211,45 @@ msgstr "" msgid "Background" msgstr "" +msgid "Background color" +msgstr "" + +msgid "CPU" +msgstr "" + msgid "CPU color" msgstr "" +msgid "CPU clock" +msgstr "" + msgid "CPU clock color" msgstr "" +msgid "Memory" +msgstr "" + msgid "Memory color" msgstr "" +msgid "Swap" +msgstr "" + msgid "Swap color" msgstr "" +msgid "Network" +msgstr "" + msgid "Download speed color" msgstr "" msgid "Upload speed color" msgstr "" +msgid "Battery" +msgstr "" + msgid "Battery active color" msgstr "" @@ -246,18 +267,9 @@ msgstr "" msgid "Bars" msgstr "" -msgid "CPU" -msgstr "" - msgid "Desktops" msgstr "" -msgid "Memory" -msgstr "" - -msgid "Network" -msgstr "" - msgid "Scripts" msgstr "" @@ -336,6 +348,12 @@ msgstr "" msgid "Select font" msgstr "" +msgid "You are using the actual version %1" +msgstr "" + +msgid "No new version found" +msgstr "" + msgid "Current version : %1" msgstr "" @@ -348,6 +366,12 @@ msgstr "" msgid "There are updates" msgstr "" +msgid "Select tag" +msgstr "" + +msgid "Tag" +msgstr "" + msgid "AC online" msgstr "" @@ -378,12 +402,6 @@ msgstr "" msgid "Swap is used" msgstr "" -msgid "Select tag" -msgstr "" - -msgid "Tag" -msgstr "" - msgid "Copy" msgstr "" diff --git a/sources/translations/en.po b/sources/translations/en.po index c8f2279..bea2b78 100644 --- a/sources/translations/en.po +++ b/sources/translations/en.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-09-02 00:03+0300\n" -"PO-Revision-Date: 2015-09-02 00:18+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" +"PO-Revision-Date: 2015-09-06 21:11+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: English \n" "Language: ru\n" @@ -203,10 +203,10 @@ msgstr "Check updates" msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgid "Number of values for tooltips" msgstr "Number of values for tooltips" @@ -214,24 +214,45 @@ msgstr "Number of values for tooltips" msgid "Background" msgstr "Background" +msgid "Background color" +msgstr "Background color" + +msgid "CPU" +msgstr "CPU" + msgid "CPU color" msgstr "CPU color" +msgid "CPU clock" +msgstr "CPU clock" + msgid "CPU clock color" msgstr "CPU clock color" +msgid "Memory" +msgstr "Memory" + msgid "Memory color" msgstr "Memory color" +msgid "Swap" +msgstr "Swap" + msgid "Swap color" msgstr "Swap color" +msgid "Network" +msgstr "Network" + msgid "Download speed color" msgstr "Download speed color" msgid "Upload speed color" msgstr "Upload speed color" +msgid "Battery" +msgstr "Battery" + msgid "Battery active color" msgstr "Battery active color" @@ -251,18 +272,9 @@ msgstr "AC" msgid "Bars" msgstr "Bars" -msgid "CPU" -msgstr "CPU" - msgid "Desktops" msgstr "Desktops" -msgid "Memory" -msgstr "Memory" - -msgid "Network" -msgstr "Network" - msgid "Scripts" msgstr "Scripts" @@ -341,6 +353,12 @@ msgstr "This software uses: %1" msgid "Select font" msgstr "Select font" +msgid "You are using the actual version %1" +msgstr "You are using the actual version %1" + +msgid "No new version found" +msgstr "No new version found" + msgid "Current version : %1" msgstr "Current version : %1" @@ -353,6 +371,12 @@ msgstr "Click \"Ok\" to download" msgid "There are updates" msgstr "There are updates" +msgid "Select tag" +msgstr "Select tag" + +msgid "Tag" +msgstr "Tag" + msgid "AC online" msgstr "AC online" @@ -383,12 +407,6 @@ msgstr "KB/s" msgid "Swap is used" msgstr "Swap is used" -msgid "Select tag" -msgstr "Select tag" - -msgid "Tag" -msgstr "Tag" - msgid "Copy" msgstr "Copy" @@ -764,9 +782,6 @@ msgstr "esalexeev@gmail.com" #~ "...\n" #~ "$cpuN - load CPU for core N, %" -#~ msgid "CPU Clock" -#~ msgstr "CPU Clock" - #~ msgid "" #~ "$cpucl - average CPU clock, MHz\n" #~ "$cpucl0 - CPU clock for core 0, MHz\n" @@ -813,9 +828,6 @@ msgstr "esalexeev@gmail.com" #~ "$memtotmb - total RAM, MB\n" #~ "$memtotgb - total RAM, GB" -#~ msgid "Swap" -#~ msgstr "Swap" - #~ msgid "" #~ "$swap - swap usage, %\n" #~ "$swapmb - swap usage, MB\n" @@ -871,9 +883,6 @@ msgstr "esalexeev@gmail.com" #~ "$up - upload speed, KB/s\n" #~ "$netdev - current network device" -#~ msgid "Battery" -#~ msgstr "Battery" - #~ msgid "" #~ "$bat - battery charge, %\n" #~ "$ac - AC status" diff --git a/sources/translations/es.po b/sources/translations/es.po index 57c740d..1f900cf 100644 --- a/sources/translations/es.po +++ b/sources/translations/es.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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: 2015-07-31 22:13+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Spanish \n" @@ -204,9 +204,10 @@ msgstr "Mostrar el README" msgid "Check updates" msgstr "Comprobar actualizaciones" +#, fuzzy msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "Las etiquetas para CPU, frecuencia de la CPU, memoria, swap y red soportan " "ventanas emergentes. Para habilitarlas marca respectivas las cajas de " @@ -218,24 +219,47 @@ msgstr "Número de valores para las ventanas emergentes" msgid "Background" msgstr "Fondo" +#, fuzzy +msgid "Background color" +msgstr "Fondo" + +msgid "CPU" +msgstr "CPU" + msgid "CPU color" msgstr "Color de la CPU" +#, fuzzy +msgid "CPU clock" +msgstr "Frecuencia de la CPU" + msgid "CPU clock color" msgstr "Color de la frecuencia de la CPU" +msgid "Memory" +msgstr "Memoria" + msgid "Memory color" msgstr "Color de la memoria" +msgid "Swap" +msgstr "Swap" + msgid "Swap color" msgstr "Color de la swap" +msgid "Network" +msgstr "Red" + msgid "Download speed color" msgstr "Color de la velocidad de recepción" msgid "Upload speed color" msgstr "Color de la velocidad de envío" +msgid "Battery" +msgstr "Batería" + msgid "Battery active color" msgstr "Color de la batería activa" @@ -255,18 +279,9 @@ msgstr "" msgid "Bars" msgstr "Barras" -msgid "CPU" -msgstr "CPU" - msgid "Desktops" msgstr "" -msgid "Memory" -msgstr "Memoria" - -msgid "Network" -msgstr "Red" - #, fuzzy msgid "Scripts" msgstr "Editar scripts" @@ -349,6 +364,13 @@ msgstr "Este software usa: %1" msgid "Select font" msgstr "Elegir tipo de letra" +msgid "You are using the actual version %1" +msgstr "" + +#, fuzzy +msgid "No new version found" +msgstr "Nueva versión: %1" + msgid "Current version : %1" msgstr "Versión actual: %1" @@ -361,6 +383,12 @@ msgstr "Haz clic en «Ok» para descargar" msgid "There are updates" msgstr "Hay actualizaciones disponibles" +msgid "Select tag" +msgstr "Elegir etiqueta" + +msgid "Tag" +msgstr "Etiqueta" + msgid "AC online" msgstr "Alimentación conectada" @@ -391,12 +419,6 @@ msgstr "" msgid "Swap is used" msgstr "Swap está en uso" -msgid "Select tag" -msgstr "Elegir etiqueta" - -msgid "Tag" -msgstr "Etiqueta" - msgid "Copy" msgstr "Copiar" @@ -759,9 +781,6 @@ msgstr "Tu correo electrónico" #~ "...\n" #~ "$cpuN - carga de la CPU para el núcleo N, %" -#~ msgid "CPU Clock" -#~ msgstr "Frecuencia de la CPU" - #~ msgid "" #~ "$cpucl - average CPU clock, MHz\n" #~ "$cpucl0 - CPU clock for core 0, MHz\n" @@ -810,9 +829,6 @@ msgstr "Tu correo electrónico" #~ "$memtotmb - uso total de la RAM, MB\n" #~ "$memtotgb - uso total de la RAM, GB" -#~ msgid "Swap" -#~ msgstr "Swap" - #~ msgid "" #~ "$swap - swap usage, %\n" #~ "$swapmb - swap usage, MB\n" @@ -875,9 +891,6 @@ msgstr "Tu correo electrónico" #~ "$up - velocidad de envío, KB/s\n" #~ "$netdev - dispositivo de red actual" -#~ msgid "Battery" -#~ msgstr "Batería" - #~ msgid "" #~ "$bat - battery charge, %\n" #~ "$ac - AC status" diff --git a/sources/translations/fr.po b/sources/translations/fr.po index d5802a7..a33e7eb 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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: 2015-07-31 22:16+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: French \n" @@ -206,9 +206,10 @@ msgstr "Voir le README" msgid "Check updates" msgstr "Vérifier les mises à jour" +#, fuzzy msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "CPU, horloge du CPU, mémoire vive, mémoire swap et noms réseau gèrent les " "conseils visuels. Pour les activer cochez simplement les cases " @@ -220,24 +221,47 @@ msgstr "Nombre d'éléments pour les conseils" msgid "Background" msgstr "Fond" +#, fuzzy +msgid "Background color" +msgstr "Fond" + +msgid "CPU" +msgstr "CPU" + msgid "CPU color" msgstr "Couleur processeur" +#, fuzzy +msgid "CPU clock" +msgstr "Horloge processeur" + msgid "CPU clock color" msgstr "Couleur de l'horloge processeur" +msgid "Memory" +msgstr "Mémoire" + msgid "Memory color" msgstr "Couleur de la mémoire" +msgid "Swap" +msgstr "mémoire d'échange (swap)" + msgid "Swap color" msgstr "Couleur de la mémoire d'échange" +msgid "Network" +msgstr "Réseau" + msgid "Download speed color" msgstr "Couleur de la vitesse de téléchargement" msgid "Upload speed color" msgstr "Couleur du téléversement" +msgid "Battery" +msgstr "Batterie" + msgid "Battery active color" msgstr "Couleur active batterie" @@ -257,18 +281,9 @@ msgstr "" msgid "Bars" msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "Desktops" msgstr "" -msgid "Memory" -msgstr "Mémoire" - -msgid "Network" -msgstr "Réseau" - #, fuzzy msgid "Scripts" msgstr "Modifier les scripts" @@ -351,6 +366,13 @@ msgstr "Ce logiciel utilise: %1" msgid "Select font" msgstr "Sélectionner une couleur" +msgid "You are using the actual version %1" +msgstr "" + +#, fuzzy +msgid "No new version found" +msgstr "Nouvelle version" + #, fuzzy msgid "Current version : %1" msgstr "Version actuelle" @@ -365,6 +387,12 @@ msgstr "Cliquer sur \"Valider\" pour télécharger" msgid "There are updates" msgstr "Des mises à jour sont disponibles" +msgid "Select tag" +msgstr "Sélectionner l'étiquette" + +msgid "Tag" +msgstr "Étiquette" + msgid "AC online" msgstr "Alimentation branchée" @@ -395,12 +423,6 @@ msgstr "" msgid "Swap is used" msgstr "Fichier d'échange utilisé" -msgid "Select tag" -msgstr "Sélectionner l'étiquette" - -msgid "Tag" -msgstr "Étiquette" - msgid "Copy" msgstr "Copier" @@ -761,9 +783,6 @@ msgstr "esalexeev@gmail.com mermouy@gmail.com" #~ "...\n" #~ "$cpuN - charge processeur pour le coeur N, %" -#~ msgid "CPU Clock" -#~ msgstr "Horloge processeur" - #~ msgid "" #~ "$cpucl - average CPU clock, MHz\n" #~ "$cpucl0 - CPU clock for core 0, MHz\n" @@ -810,9 +829,6 @@ msgstr "esalexeev@gmail.com mermouy@gmail.com" #~ "$memtotmb - RAM, MB\n" #~ "$memtotgb - RAM, GB" -#~ msgid "Swap" -#~ msgstr "mémoire d'échange (swap)" - #~ msgid "" #~ "$swap - swap usage, %\n" #~ "$swapmb - swap usage, MB\n" @@ -873,9 +889,6 @@ msgstr "esalexeev@gmail.com mermouy@gmail.com" #~ "$up - vitesse ascendante, KB/s\n" #~ "$netdev - périphérique réseau actuel" -#~ msgid "Battery" -#~ msgstr "Batterie" - #~ msgid "" #~ "$bat - battery charge, %\n" #~ "$ac - AC status" diff --git a/sources/translations/nl.po b/sources/translations/nl.po index 73534e3..46d0e7c 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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: 2015-08-20 22:52+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Dutch \n" @@ -207,9 +207,10 @@ msgstr "README weergeven" msgid "Check updates" msgstr "Controleren op updates" +#, fuzzy msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "CPU, CPU-klok, geheugen, swap en netwerklabels-ondersteuning in een " "grafische opmerkingsballon. Vink ze aan om ze in te schakelen." @@ -220,24 +221,48 @@ msgstr "Aantal waarden voor de opmerkingsballonnen" msgid "Background" msgstr "Achtergrond" +#, fuzzy +msgid "Background color" +msgstr "Achtergrond" + +msgid "CPU" +msgstr "" + msgid "CPU color" msgstr "CPU-kleur" +#, fuzzy +msgid "CPU clock" +msgstr "CPU-kleur" + msgid "CPU clock color" msgstr "CPU-klokkleur" +#, fuzzy +msgid "Memory" +msgstr "Geheugenkleur" + msgid "Memory color" msgstr "Geheugenkleur" +msgid "Swap" +msgstr "" + msgid "Swap color" msgstr "Swap-kleur" +msgid "Network" +msgstr "" + msgid "Download speed color" msgstr "Kleur van downloadsnelheid" msgid "Upload speed color" msgstr "Kleur van uploadsnelheid" +msgid "Battery" +msgstr "" + msgid "Battery active color" msgstr "Kleur van actieve accu" @@ -257,19 +282,9 @@ msgstr "" msgid "Bars" msgstr "Balken" -msgid "CPU" -msgstr "" - msgid "Desktops" msgstr "" -#, fuzzy -msgid "Memory" -msgstr "Geheugenkleur" - -msgid "Network" -msgstr "" - #, fuzzy msgid "Scripts" msgstr "Scripts bewerken" @@ -353,6 +368,13 @@ msgstr "Deze software gebruikt: %1" msgid "Select font" msgstr "Lettertype selecteren" +msgid "You are using the actual version %1" +msgstr "" + +#, fuzzy +msgid "No new version found" +msgstr "Nieuwe versie: %1" + msgid "Current version : %1" msgstr "Huidige versie: %1" @@ -365,6 +387,12 @@ msgstr "Klik op \"OK\" om te downloaden" msgid "There are updates" msgstr "Er zijn updates" +msgid "Select tag" +msgstr "Sleutelwoord selecteren" + +msgid "Tag" +msgstr "Sleutelwoord" + msgid "AC online" msgstr "AC online" @@ -396,12 +424,6 @@ msgstr "" msgid "Swap is used" msgstr "Swap wordt gebruikt" -msgid "Select tag" -msgstr "Sleutelwoord selecteren" - -msgid "Tag" -msgstr "Sleutelwoord" - msgid "Copy" msgstr "Kopiëren" diff --git a/sources/translations/pt_BR.po b/sources/translations/pt_BR.po index 5ffd67d..31801fa 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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: 2015-07-31 22:21+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -205,9 +205,10 @@ msgstr "Mostrar README" msgid "Check updates" msgstr "Checar por atualizações" +#, fuzzy msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "Os rótulos de CPU, frequência de GPU, memória, swap e rede suportam dica de " "contexto gráfica. Para ativá-los, basta selecionar a caixa necessária." @@ -218,24 +219,47 @@ msgstr "Número de valores para dicas de contexto" msgid "Background" msgstr "Plano de fundo" +#, fuzzy +msgid "Background color" +msgstr "Plano de fundo" + +msgid "CPU" +msgstr "CPU" + msgid "CPU color" msgstr "Cor da CPU" +#, fuzzy +msgid "CPU clock" +msgstr "Frequência da CPU " + msgid "CPU clock color" msgstr "Cor do relógio da CPU" +msgid "Memory" +msgstr "Memória" + msgid "Memory color" msgstr "Cor da memória" +msgid "Swap" +msgstr "Swap" + msgid "Swap color" msgstr "Cor da swap" +msgid "Network" +msgstr "Rede" + msgid "Download speed color" msgstr "Cor da velocidade de download" msgid "Upload speed color" msgstr "Cor da velocidade de upload" +msgid "Battery" +msgstr "Bateria" + msgid "Battery active color" msgstr "Cor da bateria ativa" @@ -255,18 +279,9 @@ msgstr "" msgid "Bars" msgstr "Barras" -msgid "CPU" -msgstr "CPU" - msgid "Desktops" msgstr "" -msgid "Memory" -msgstr "Memória" - -msgid "Network" -msgstr "Rede" - #, fuzzy msgid "Scripts" msgstr "Editar scripts" @@ -349,6 +364,13 @@ msgstr "Este software usa: %1" msgid "Select font" msgstr "Selecionar fonte" +msgid "You are using the actual version %1" +msgstr "" + +#, fuzzy +msgid "No new version found" +msgstr "Nova versão: %1" + msgid "Current version : %1" msgstr "Versão atual: %1" @@ -361,6 +383,12 @@ msgstr "Clique \"Ok\" para baixar" msgid "There are updates" msgstr "Há atualizações disponíveis" +msgid "Select tag" +msgstr "Selecionar tag" + +msgid "Tag" +msgstr "Tag" + msgid "AC online" msgstr "Carregador conectado" @@ -391,12 +419,6 @@ msgstr "" msgid "Swap is used" msgstr "Swap está sendo usado" -msgid "Select tag" -msgstr "Selecionar tag" - -msgid "Tag" -msgstr "Tag" - msgid "Copy" msgstr "Copiar" @@ -751,9 +773,6 @@ msgstr "under@insicuri.net" #~ "...\n" #~ "$cpuN - carga total para o núcleo N da CPU, %" -#~ msgid "CPU Clock" -#~ msgstr "Frequência da CPU " - #~ msgid "" #~ "$cpucl - average CPU clock, MHz\n" #~ "$cpucl0 - CPU clock for core 0, MHz\n" @@ -802,9 +821,6 @@ msgstr "under@insicuri.net" #~ "$memtotmb - RAM total, MB\n" #~ "$memtotgb - RAM total, GB" -#~ msgid "Swap" -#~ msgstr "Swap" - #~ msgid "" #~ "$swap - swap usage, %\n" #~ "$swapmb - swap usage, MB\n" @@ -866,9 +882,6 @@ msgstr "under@insicuri.net" #~ "$up - velocidade de upload, KB/s\n" #~ "$netdev - dispositivo de rede atual" -#~ msgid "Battery" -#~ msgstr "Bateria" - #~ msgid "" #~ "$bat - battery charge, %\n" #~ "$ac - AC status" diff --git a/sources/translations/ru.po b/sources/translations/ru.po index c9faf51..96b5dae 100644 --- a/sources/translations/ru.po +++ b/sources/translations/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-09-02 00:03+0300\n" -"PO-Revision-Date: 2015-09-02 00:19+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" +"PO-Revision-Date: 2015-09-06 21:12+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -203,11 +203,10 @@ msgstr "Проверить обновления" msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "Поля \"CPU\", \"Частота CPU\", \"Память\", \"Swap\", \"Сеть\" поддерживают " -"графический тултип. Чтобы включить его, просто сделайте требуемые чекбоксы " -"полностью чекнутыми." +"графический тултип. Чтобы включить его, просто выделите требуемые чекбоксы." msgid "Number of values for tooltips" msgstr "Число хранящихся значений" @@ -215,24 +214,45 @@ msgstr "Число хранящихся значений" msgid "Background" msgstr "Фон" +msgid "Background color" +msgstr "Цвет фона" + +msgid "CPU" +msgstr "CPU" + msgid "CPU color" msgstr "Цвет CPU" +msgid "CPU clock" +msgstr "Частота CPU" + msgid "CPU clock color" msgstr "Цвет частоты CPU" +msgid "Memory" +msgstr "Память" + msgid "Memory color" msgstr "Цвет памяти" +msgid "Swap" +msgstr "Swap" + msgid "Swap color" msgstr "Цвет swap" +msgid "Network" +msgstr "Сеть" + msgid "Download speed color" msgstr "Цвет скорости загрузки" msgid "Upload speed color" msgstr "Цвет скорости отдачи" +msgid "Battery" +msgstr "Батарея" + msgid "Battery active color" msgstr "Цвет заряжаемой батареи" @@ -252,18 +272,9 @@ msgstr "Адаптор питания" msgid "Bars" msgstr "Бары" -msgid "CPU" -msgstr "CPU" - msgid "Desktops" msgstr "Рабочие столы" -msgid "Memory" -msgstr "Память" - -msgid "Network" -msgstr "Сеть" - msgid "Scripts" msgstr "Скрипты" @@ -342,6 +353,12 @@ msgstr "Данное приложение использует: %1" msgid "Select font" msgstr "Выберете шрифт" +msgid "You are using the actual version %1" +msgstr "Вы используете актуальную версию %1" + +msgid "No new version found" +msgstr "Обновления не найдены" + msgid "Current version : %1" msgstr "Текущая версия : %1" @@ -354,6 +371,12 @@ msgstr "Нажмите \"Ok\" для загрузки" msgid "There are updates" msgstr "Найдены обновления" +msgid "Select tag" +msgstr "Выберете тег" + +msgid "Tag" +msgstr "Тег" + msgid "AC online" msgstr "AC подключен" @@ -384,12 +407,6 @@ msgstr "КБ/с" msgid "Swap is used" msgstr "Используется своп" -msgid "Select tag" -msgstr "Выберете тег" - -msgid "Tag" -msgstr "Тег" - msgid "Copy" msgstr "Копировать" @@ -765,9 +782,6 @@ msgstr "esalexeev@gmail.com" #~ "...\n" #~ "$cpuN - загрузка CPU для ядра N, %" -#~ msgid "CPU Clock" -#~ msgstr "Частота CPU" - #~ msgid "" #~ "$cpucl - average CPU clock, MHz\n" #~ "$cpucl0 - CPU clock for core 0, MHz\n" @@ -815,9 +829,6 @@ msgstr "esalexeev@gmail.com" #~ "$memtotmb - RAM, MB\n" #~ "$memtotgb - RAM, GB" -#~ msgid "Swap" -#~ msgstr "Swap" - #~ msgid "" #~ "$swap - swap usage, %\n" #~ "$swapmb - swap usage, MB\n" @@ -871,9 +882,6 @@ msgstr "esalexeev@gmail.com" #~ "$up - скорость загрузки, KB/s\n" #~ "$netdev - текущее устройство" -#~ msgid "Battery" -#~ msgstr "Батарея" - #~ msgid "" #~ "$bat - battery charge, %\n" #~ "$ac - AC status" diff --git a/sources/translations/uk.po b/sources/translations/uk.po index 7e63f2e..9aba4d4 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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: 2015-07-31 22:23+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Ukrainian \n" @@ -204,9 +204,10 @@ msgstr "Показати README" msgid "Check updates" msgstr "Шукати оновлення" +#, fuzzy msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "Поля \"CPU\", \"Частота CPU\", \"Пам’ять\", \"Swap\" та \"Мережа\" " "підтримують графічні підказки. Щоб їх задіяти, просто зробіть необхідні " @@ -218,24 +219,47 @@ msgstr "Кількість значень для підказки" msgid "Background" msgstr "Фон" +#, fuzzy +msgid "Background color" +msgstr "Фон" + +msgid "CPU" +msgstr "CPU" + msgid "CPU color" msgstr "Колір CPU" +#, fuzzy +msgid "CPU clock" +msgstr "Частота CPU" + msgid "CPU clock color" msgstr "Колір частоти CPU" +msgid "Memory" +msgstr "Пам’ять" + msgid "Memory color" msgstr "Колір пам’яті" +msgid "Swap" +msgstr "Swap" + msgid "Swap color" msgstr "Колір swap" +msgid "Network" +msgstr "Мережа" + msgid "Download speed color" msgstr "Колір швидкості скачування" msgid "Upload speed color" msgstr "Колір швидкості віддачі" +msgid "Battery" +msgstr "Батарея" + msgid "Battery active color" msgstr "Колір батареї, що заряджається" @@ -255,18 +279,9 @@ msgstr "" msgid "Bars" msgstr "Бари" -msgid "CPU" -msgstr "CPU" - msgid "Desktops" msgstr "" -msgid "Memory" -msgstr "Пам’ять" - -msgid "Network" -msgstr "Мережа" - #, fuzzy msgid "Scripts" msgstr "Редагувати скрипти" @@ -349,6 +364,13 @@ msgstr "Ця програма використовує: %1" msgid "Select font" msgstr "Оберіть шрифт" +msgid "You are using the actual version %1" +msgstr "" + +#, fuzzy +msgid "No new version found" +msgstr "Нова версія : %1" + msgid "Current version : %1" msgstr "Поточна версія : %1" @@ -361,6 +383,12 @@ msgstr "Натисніть \"Ok\" для завантаження" msgid "There are updates" msgstr "Знайдені оновлення" +msgid "Select tag" +msgstr "Оберіть тег" + +msgid "Tag" +msgstr "Тег" + msgid "AC online" msgstr "AC підключений" @@ -391,12 +419,6 @@ msgstr "" msgid "Swap is used" msgstr "Використовується swap" -msgid "Select tag" -msgstr "Оберіть тег" - -msgid "Tag" -msgstr "Тег" - msgid "Copy" msgstr "Копіювати" @@ -762,9 +784,6 @@ msgstr "sarumyan@i.ua" #~ "...\n" #~ "$cpuN - завантаження CPU для ядра N, %" -#~ msgid "CPU Clock" -#~ msgstr "Частота CPU" - #~ msgid "" #~ "$cpucl - average CPU clock, MHz\n" #~ "$cpucl0 - CPU clock for core 0, MHz\n" @@ -809,9 +828,6 @@ msgstr "sarumyan@i.ua" #~ "$memmb - використання RAM, MB\n" #~ "$memgb - використання RAM, GB" -#~ msgid "Swap" -#~ msgstr "Swap" - #~ msgid "" #~ "$swap - swap usage, %\n" #~ "$swapmb - swap usage, MB\n" @@ -865,9 +881,6 @@ msgstr "sarumyan@i.ua" #~ "$up - швидкість віддачі, KB/s\n" #~ "$netdev - поточний мережевий пристрій" -#~ msgid "Battery" -#~ msgstr "Батарея" - #~ msgid "" #~ "$bat - battery charge, %\n" #~ "$ac - AC status" diff --git a/sources/translations/zh.po b/sources/translations/zh.po index 91c5081..e4d03cf 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-09-02 00:03+0300\n" +"POT-Creation-Date: 2015-09-06 21:11+0300\n" "PO-Revision-Date: 2015-07-31 22:24+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -206,9 +206,10 @@ msgstr "显示帮助文档" msgid "Check updates" msgstr "" +#, fuzzy msgid "" "CPU, CPU clock, memory, swap and network labels support graphical tooltip. " -"To enable them just make needed checkbox fully checked." +"To enable them just make needed checkbox checked." msgstr "" "CPU， CPU 时钟，内存，虚拟内存和网络连接标签均支持图形化提示显示。 请在相应复" "选框中勾选以启用该功能。 " @@ -219,24 +220,49 @@ msgstr "提示的数值" msgid "Background" msgstr "背景" +#, fuzzy +msgid "Background color" +msgstr "背景" + +msgid "CPU" +msgstr "" + msgid "CPU color" msgstr "CPU 颜色" +#, fuzzy +msgid "CPU clock" +msgstr "CPU 颜色" + msgid "CPU clock color" msgstr "CPU 时钟颜色" +#, fuzzy +msgid "Memory" +msgstr "内存显示颜色" + msgid "Memory color" msgstr "内存显示颜色" +msgid "Swap" +msgstr "" + msgid "Swap color" msgstr "虚拟内存颜色" +msgid "Network" +msgstr "" + msgid "Download speed color" msgstr "下载速度颜色" msgid "Upload speed color" msgstr "上传速度颜色" +#, fuzzy +msgid "Battery" +msgstr "电池设备" + msgid "Battery active color" msgstr "电池使用状态提示颜色" @@ -256,19 +282,9 @@ msgstr "" msgid "Bars" msgstr "" -msgid "CPU" -msgstr "" - msgid "Desktops" msgstr "" -#, fuzzy -msgid "Memory" -msgstr "内存显示颜色" - -msgid "Network" -msgstr "" - msgid "Scripts" msgstr "" @@ -349,6 +365,12 @@ msgstr "" msgid "Select font" msgstr "选择字体" +msgid "You are using the actual version %1" +msgstr "" + +msgid "No new version found" +msgstr "" + msgid "Current version : %1" msgstr "" @@ -361,6 +383,13 @@ msgstr "" msgid "There are updates" msgstr "" +#, fuzzy +msgid "Select tag" +msgstr "选择字体" + +msgid "Tag" +msgstr "" + #, fuzzy msgid "AC online" msgstr "外接电源使用中标签" @@ -393,13 +422,6 @@ msgstr "" msgid "Swap is used" msgstr "" -#, fuzzy -msgid "Select tag" -msgstr "选择字体" - -msgid "Tag" -msgstr "" - msgid "Copy" msgstr "" @@ -697,8 +719,5 @@ msgstr "用户邮箱" #~ msgid "Desktop check cmd" #~ msgstr "检测桌面命令" -#~ msgid "Battery device" -#~ msgstr "电池设备" - #~ msgid "\"/sys/class/power_supply/BAT0/capacity\" by default" #~ msgstr "默认为 \"/sys/class/power_supply/BAT0/capacity\""