From 8b58f6d383ebd5802805b934cccbb5ebde5767e2 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 18 Aug 2014 21:17:53 +0400 Subject: [PATCH] small edit of showing information --- CHANGELOG | 1 + sources/gui/src/mainpublicslots.cpp | 27 +++++- sources/gui/src/mainwindow.cpp | 1 + sources/gui/src/trayicon.cpp | 17 ++-- sources/plasmoid/netctl.cpp | 10 ++- sources/plasmoid/po/en.po | 88 ++++++++++---------- sources/plasmoid/po/plasma_applet_netctl.pot | 85 +++++++++---------- sources/plasmoid/po/ru.po | 88 ++++++++++---------- sources/plasmoid/widget.ui | 5 +- 9 files changed, 182 insertions(+), 140 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1f9b134..80950a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ Ver.1.3.0 + add security notes and API descriptions + add ability to use helper + add ability to start minimized/maximized/daemonized + + add ability to don't save profile from WiFi tab * more correct actions into SettingsWindow * update to library changes * rewrite tables to use toolTip diff --git a/sources/gui/src/mainpublicslots.cpp b/sources/gui/src/mainpublicslots.cpp index 0c3fc6a..0ba38cf 100644 --- a/sources/gui/src/mainpublicslots.cpp +++ b/sources/gui/src/mainpublicslots.cpp @@ -480,10 +480,33 @@ void MainWindow::connectToUnknownEssid(const QString passwd) netctlCommand->startProfile(profile); status = netctlCommand->isProfileActive(profile); } - if (status) + QString message; + if (status) { + message = QApplication::translate("MainWindow", "Connection is successfully."); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done")); - else + } else { + message = QApplication::translate("MainWindow", "Connection failed."); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); + } + message += QString("\n"); + message += QApplication::translate("MainWindow", "Do you want to save profile %1?").arg(profile); + int select = QMessageBox::question(this, QApplication::translate("MainWindow", "WiFi menu"), + message, QMessageBox::Save | QMessageBox::Discard, QMessageBox::Save); + switch (select) { + case QMessageBox::Save: + break; + case QMessageBox::Discard: + default: + if (useHelper) { + QList args; + args.append(profile); + sendDBusRequest(DBUS_HELPER_SERVICE, DBUS_CTRL_PATH, + DBUS_HELPER_INTERFACE, QString("Remove"), + args, true, debug)[0].toBool(); + } else + netctlProfile->removeProfile(profile); + break; + } updateWifiTab(); } diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index b987d72..8199bcd 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -56,6 +56,7 @@ MainWindow::MainWindow(QWidget *parent, qtTranslator(qtAppTranslator), translator(appTranslator) { + setWindowIcon(QIcon(":icon")); if (debug) qDebug() << PDEBUG << ":" << "about" << args[QString("about")].toBool(); if (debug) qDebug() << PDEBUG << ":" << "auto" << args[QString("auto")].toBool(); if (debug) qDebug() << PDEBUG << ":" << "config" << configPath; diff --git a/sources/gui/src/trayicon.cpp b/sources/gui/src/trayicon.cpp index f16187b..0bdbb46 100644 --- a/sources/gui/src/trayicon.cpp +++ b/sources/gui/src/trayicon.cpp @@ -96,18 +96,23 @@ void TrayIcon::updateMenu() contextMenu[QString("title")]->setText(QApplication::translate("TrayIcon", "(inactive)")); } else { contextMenu[QString("title")]->setIcon(QIcon(QString(":network-idle-64x64"))); - QStringList status; - if (netctlAutoStatus) + QStringList currentProfiles, status; + if (netctlAutoStatus) { + currentProfiles.append(current); status.append(QApplication::translate("TrayIcon", "(netctl-auto)")); - else { - for (int i=0; isetText(current + QString(" ") + - QString("(") + status.join(QChar('|')) + QString(")")); + QStringList profiles; + for (int i=0; isetText(profiles.join(QString(" | "))); } if (netctlAutoStatus) { diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index 7e22469..8284a90 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -106,6 +106,7 @@ void Netctl::init() info[QString("extip4")] = QString("N\\A"); info[QString("extip6")] = QString("N\\A"); info[QString("interfaces")] = QString("N\\A"); + info[QString("info")] = QString("N\\A (N\\A)"); info[QString("intip4")] = QString("N\\A"); info[QString("intip6")] = QString("N\\A"); info[QString("profiles")] = QString("N\\A"); @@ -609,6 +610,11 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da updateIcon(); } else if (sourceName == QString("current")) { info[QString("current")] = value; + QStringList profiles; + for (int i=0; isetText(formatLine[0] + parsePattern(textPattern) + formatLine[1]); @@ -626,7 +632,7 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da profileList = value.split(QChar(',')); info[QString("profiles")] = profileList.join(QChar(',')); } else if (sourceName == QString("status")) { - info[QString("status")] = QString("(") + value + QString(")"); + info[QString("status")] = value; } update(); @@ -914,7 +920,7 @@ void Netctl::configChanged() useWifi = cg.readEntry("useWifi", false); bigInterface = cg.readEntry("showBigInterface", true); useHelper = cg.readEntry("useHelper", true); - textPattern = cg.readEntry("textPattern", "$current $status
IPv4: $intip4
IPv6: $intip6"); + textPattern = cg.readEntry("textPattern", "$info
IPv4: $intip4
IPv6: $intip6"); QString textAlign = cg.readEntry("textAlign", "center"); QString fontFamily = cg.readEntry("fontFamily", "Terminus"); diff --git a/sources/plasmoid/po/en.po b/sources/plasmoid/po/en.po index 08c9b57..573d8a4 100644 --- a/sources/plasmoid/po/en.po +++ b/sources/plasmoid/po/en.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n" -"POT-Creation-Date: 2014-08-18 10:01+0400\n" -"PO-Revision-Date: 2014-08-18 10:01+0400\n" +"POT-Creation-Date: 2014-08-18 21:17+0400\n" +"PO-Revision-Date: 2014-08-18 21:17+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -18,99 +18,99 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: netctl.cpp:268 +#: netctl.cpp:269 msgid "Set profile %1 disabled" msgstr "Set profile %1 disabled" -#: netctl.cpp:271 +#: netctl.cpp:272 msgid "Set profile %1 enabled" msgstr "Set profile %1 enabled" -#: netctl.cpp:292 +#: netctl.cpp:293 msgid "Restart profile %1" msgstr "Restart profile %1" -#: netctl.cpp:313 +#: netctl.cpp:314 msgid "Start profile %1" msgstr "Start profile %1" -#: netctl.cpp:339 +#: netctl.cpp:340 msgid "Stop profile %1" msgstr "Stop profile %1" -#: netctl.cpp:359 netctl.cpp:497 +#: netctl.cpp:360 netctl.cpp:498 msgid "Stop all profiles" msgstr "Stop all profiles" -#: netctl.cpp:379 +#: netctl.cpp:380 msgid "Switch to profile %1" msgstr "Switch to profile %1" -#: netctl.cpp:452 +#: netctl.cpp:453 msgid "Start another profile" msgstr "Start another profile" -#: netctl.cpp:453 +#: netctl.cpp:454 msgid "Stop %1" msgstr "Stop %1" -#: netctl.cpp:454 +#: netctl.cpp:455 msgid "Restart %1" msgstr "Restart %1" -#: netctl.cpp:456 +#: netctl.cpp:457 msgid "Disable %1" msgstr "Disable %1" -#: netctl.cpp:458 +#: netctl.cpp:459 msgid "Enable %1" msgstr "Enable %1" -#: netctl.cpp:461 netctl.cpp:484 +#: netctl.cpp:462 netctl.cpp:485 msgid "Start profile" msgstr "Start profile" -#: netctl.cpp:492 +#: netctl.cpp:493 msgid "Stop profile" msgstr "Stop profile" -#: netctl.cpp:502 +#: netctl.cpp:503 msgid "Switch to profile" msgstr "Switch to profile" -#: netctl.cpp:510 +#: netctl.cpp:511 msgid "Restart profile" msgstr "Restart profile" -#: netctl.cpp:515 +#: netctl.cpp:516 msgid "Enable profile" msgstr "Enable profile" -#: netctl.cpp:519 +#: netctl.cpp:520 msgid "Show netctl-gui" msgstr "Show netctl-gui" -#: netctl.cpp:524 +#: netctl.cpp:525 msgid "Show WiFi menu" msgstr "Show WiFi menu" -#: netctl.cpp:551 +#: netctl.cpp:552 msgid "Start GUI" msgstr "Start GUI" -#: netctl.cpp:562 +#: netctl.cpp:563 msgid "Start WiFi menu" msgstr "Start WiFi menu" -#: netctl.cpp:602 +#: netctl.cpp:603 msgid "Network is up" msgstr "Network is up" -#: netctl.cpp:606 +#: netctl.cpp:607 msgid "Network is down" msgstr "Network is down" -#: netctl.cpp:796 +#: netctl.cpp:802 msgid "" "Version %1\n" "(build date %2)" @@ -118,59 +118,59 @@ msgstr "" "Version %1\n" "(build date %2)" -#: netctl.cpp:797 +#: netctl.cpp:803 msgid "KDE widget which interacts with netctl." msgstr "KDE widget which interacts with netctl." -#: netctl.cpp:798 +#: netctl.cpp:804 msgid "Translators: %1" msgstr "Translators: %1" -#: netctl.cpp:799 +#: netctl.cpp:805 msgid "Links:" msgstr "Links:" -#: netctl.cpp:800 +#: netctl.cpp:806 msgid "Homepage" msgstr "Homepage" -#: netctl.cpp:801 +#: netctl.cpp:807 msgid "Repository" msgstr "Repository" -#: netctl.cpp:802 +#: netctl.cpp:808 msgid "Bugtracker" msgstr "Bugtracker" -#: netctl.cpp:803 +#: netctl.cpp:809 msgid "Translation issue" msgstr "Translation issue" -#: netctl.cpp:804 +#: netctl.cpp:810 msgid "AUR packages" msgstr "AUR packages" -#: netctl.cpp:806 +#: netctl.cpp:812 msgid "This software is licensed under %1" msgstr "This software is licensed under %1" -#: netctl.cpp:807 +#: netctl.cpp:813 msgid "This software uses: %1" msgstr "This software uses: %1" -#: netctl.cpp:809 +#: netctl.cpp:815 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:810 +#: netctl.cpp:816 msgid "Appearance" msgstr "Appearance" -#: netctl.cpp:811 +#: netctl.cpp:817 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:812 +#: netctl.cpp:818 msgid "About" msgstr "About" @@ -386,10 +386,11 @@ msgstr "Show 'Start WiFi menu'" msgid "Show more detailed interface" msgstr "Show more detailed interface" -#. i18n: file: widget.ui:308 +#. i18n: file: widget.ui:309 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) #: po/rc.cpp:117 rc.cpp:117 msgid "" +"$info - active profile information\n" "$current - current profile name\n" "$extip4 - external IPv4\n" "$extip6 - external IPv6\n" @@ -399,6 +400,7 @@ msgid "" "$profiles - list of the netctl profiles\n" "$status - current profile status (static/enabled)" msgstr "" +"$info - active profile information\n" "$current - current profile name\n" "$extip4 - external IPv4\n" "$extip6 - external IPv6\n" @@ -408,12 +410,12 @@ msgstr "" "$profiles - list of the netctl profiles\n" "$status - current profile status (static/enabled)" -#: po/rc.cpp:125 rc.cpp:125 +#: po/rc.cpp:126 rc.cpp:126 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: po/rc.cpp:126 rc.cpp:126 +#: po/rc.cpp:127 rc.cpp:127 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" diff --git a/sources/plasmoid/po/plasma_applet_netctl.pot b/sources/plasmoid/po/plasma_applet_netctl.pot index 7af8f06..706b5d7 100644 --- a/sources/plasmoid/po/plasma_applet_netctl.pot +++ b/sources/plasmoid/po/plasma_applet_netctl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n" -"POT-Creation-Date: 2014-08-18 10:01+0400\n" +"POT-Creation-Date: 2014-08-18 21:17+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,157 +17,157 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: netctl.cpp:268 +#: netctl.cpp:269 msgid "Set profile %1 disabled" msgstr "" -#: netctl.cpp:271 +#: netctl.cpp:272 msgid "Set profile %1 enabled" msgstr "" -#: netctl.cpp:292 +#: netctl.cpp:293 msgid "Restart profile %1" msgstr "" -#: netctl.cpp:313 +#: netctl.cpp:314 msgid "Start profile %1" msgstr "" -#: netctl.cpp:339 +#: netctl.cpp:340 msgid "Stop profile %1" msgstr "" -#: netctl.cpp:359 netctl.cpp:497 +#: netctl.cpp:360 netctl.cpp:498 msgid "Stop all profiles" msgstr "" -#: netctl.cpp:379 +#: netctl.cpp:380 msgid "Switch to profile %1" msgstr "" -#: netctl.cpp:452 +#: netctl.cpp:453 msgid "Start another profile" msgstr "" -#: netctl.cpp:453 +#: netctl.cpp:454 msgid "Stop %1" msgstr "" -#: netctl.cpp:454 +#: netctl.cpp:455 msgid "Restart %1" msgstr "" -#: netctl.cpp:456 +#: netctl.cpp:457 msgid "Disable %1" msgstr "" -#: netctl.cpp:458 +#: netctl.cpp:459 msgid "Enable %1" msgstr "" -#: netctl.cpp:461 netctl.cpp:484 +#: netctl.cpp:462 netctl.cpp:485 msgid "Start profile" msgstr "" -#: netctl.cpp:492 +#: netctl.cpp:493 msgid "Stop profile" msgstr "" -#: netctl.cpp:502 +#: netctl.cpp:503 msgid "Switch to profile" msgstr "" -#: netctl.cpp:510 +#: netctl.cpp:511 msgid "Restart profile" msgstr "" -#: netctl.cpp:515 +#: netctl.cpp:516 msgid "Enable profile" msgstr "" -#: netctl.cpp:519 +#: netctl.cpp:520 msgid "Show netctl-gui" msgstr "" -#: netctl.cpp:524 +#: netctl.cpp:525 msgid "Show WiFi menu" msgstr "" -#: netctl.cpp:551 +#: netctl.cpp:552 msgid "Start GUI" msgstr "" -#: netctl.cpp:562 +#: netctl.cpp:563 msgid "Start WiFi menu" msgstr "" -#: netctl.cpp:602 +#: netctl.cpp:603 msgid "Network is up" msgstr "" -#: netctl.cpp:606 +#: netctl.cpp:607 msgid "Network is down" msgstr "" -#: netctl.cpp:796 +#: netctl.cpp:802 msgid "" "Version %1\n" "(build date %2)" msgstr "" -#: netctl.cpp:797 +#: netctl.cpp:803 msgid "KDE widget which interacts with netctl." msgstr "" -#: netctl.cpp:798 +#: netctl.cpp:804 msgid "Translators: %1" msgstr "" -#: netctl.cpp:799 +#: netctl.cpp:805 msgid "Links:" msgstr "" -#: netctl.cpp:800 +#: netctl.cpp:806 msgid "Homepage" msgstr "" -#: netctl.cpp:801 +#: netctl.cpp:807 msgid "Repository" msgstr "" -#: netctl.cpp:802 +#: netctl.cpp:808 msgid "Bugtracker" msgstr "" -#: netctl.cpp:803 +#: netctl.cpp:809 msgid "Translation issue" msgstr "" -#: netctl.cpp:804 +#: netctl.cpp:810 msgid "AUR packages" msgstr "" -#: netctl.cpp:806 +#: netctl.cpp:812 msgid "This software is licensed under %1" msgstr "" -#: netctl.cpp:807 +#: netctl.cpp:813 msgid "This software uses: %1" msgstr "" -#: netctl.cpp:809 +#: netctl.cpp:815 msgid "Netctl plasmoid" msgstr "" -#: netctl.cpp:810 +#: netctl.cpp:816 msgid "Appearance" msgstr "" -#: netctl.cpp:811 +#: netctl.cpp:817 msgid "DataEngine" msgstr "" -#: netctl.cpp:812 +#: netctl.cpp:818 msgid "About" msgstr "" @@ -383,10 +383,11 @@ msgstr "" msgid "Show more detailed interface" msgstr "" -#. i18n: file: widget.ui:308 +#. i18n: file: widget.ui:309 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) #: po/rc.cpp:117 rc.cpp:117 msgid "" +"$info - active profile information\n" "$current - current profile name\n" "$extip4 - external IPv4\n" "$extip6 - external IPv6\n" @@ -397,12 +398,12 @@ msgid "" "$status - current profile status (static/enabled)" msgstr "" -#: po/rc.cpp:125 rc.cpp:125 +#: po/rc.cpp:126 rc.cpp:126 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "" -#: po/rc.cpp:126 rc.cpp:126 +#: po/rc.cpp:127 rc.cpp:127 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "" diff --git a/sources/plasmoid/po/ru.po b/sources/plasmoid/po/ru.po index 3e110da..2faf3cf 100644 --- a/sources/plasmoid/po/ru.po +++ b/sources/plasmoid/po/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n" -"POT-Creation-Date: 2014-08-18 10:01+0400\n" -"PO-Revision-Date: 2014-08-18 10:02+0400\n" +"POT-Creation-Date: 2014-08-18 21:17+0400\n" +"PO-Revision-Date: 2014-08-18 21:17+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -18,99 +18,99 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: netctl.cpp:268 +#: netctl.cpp:269 msgid "Set profile %1 disabled" msgstr "Выключение автозагрузки профиля %1" -#: netctl.cpp:271 +#: netctl.cpp:272 msgid "Set profile %1 enabled" msgstr "Включение автозагрузки профиля %1" -#: netctl.cpp:292 +#: netctl.cpp:293 msgid "Restart profile %1" msgstr "Перезапуск профиля %1" -#: netctl.cpp:313 +#: netctl.cpp:314 msgid "Start profile %1" msgstr "Запуск профиля %1" -#: netctl.cpp:339 +#: netctl.cpp:340 msgid "Stop profile %1" msgstr "Остановка профиля %1" -#: netctl.cpp:359 netctl.cpp:497 +#: netctl.cpp:360 netctl.cpp:498 msgid "Stop all profiles" msgstr "Остановить все профили" -#: netctl.cpp:379 +#: netctl.cpp:380 msgid "Switch to profile %1" msgstr "Переключение на профиль %1" -#: netctl.cpp:452 +#: netctl.cpp:453 msgid "Start another profile" msgstr "Запустить другой профиль" -#: netctl.cpp:453 +#: netctl.cpp:454 msgid "Stop %1" msgstr "Остановить %1" -#: netctl.cpp:454 +#: netctl.cpp:455 msgid "Restart %1" msgstr "Перезапустить %1" -#: netctl.cpp:456 +#: netctl.cpp:457 msgid "Disable %1" msgstr "Отключить %1" -#: netctl.cpp:458 +#: netctl.cpp:459 msgid "Enable %1" msgstr "Включить %1" -#: netctl.cpp:461 netctl.cpp:484 +#: netctl.cpp:462 netctl.cpp:485 msgid "Start profile" msgstr "Запустить профиль" -#: netctl.cpp:492 +#: netctl.cpp:493 msgid "Stop profile" msgstr "Остановить профиль" -#: netctl.cpp:502 +#: netctl.cpp:503 msgid "Switch to profile" msgstr "Переключить профиль" -#: netctl.cpp:510 +#: netctl.cpp:511 msgid "Restart profile" msgstr "Перезапустить профиль" -#: netctl.cpp:515 +#: netctl.cpp:516 msgid "Enable profile" msgstr "Включить профиль" -#: netctl.cpp:519 +#: netctl.cpp:520 msgid "Show netctl-gui" msgstr "Показать netctl-gui" -#: netctl.cpp:524 +#: netctl.cpp:525 msgid "Show WiFi menu" msgstr "Запустить WiFi-menu" -#: netctl.cpp:551 +#: netctl.cpp:552 msgid "Start GUI" msgstr "Запуск GUI" -#: netctl.cpp:562 +#: netctl.cpp:563 msgid "Start WiFi menu" msgstr "Запуск WiFi-menu" -#: netctl.cpp:602 +#: netctl.cpp:603 msgid "Network is up" msgstr "Сеть работает" -#: netctl.cpp:606 +#: netctl.cpp:607 msgid "Network is down" msgstr "Сеть не работает" -#: netctl.cpp:796 +#: netctl.cpp:802 msgid "" "Version %1\n" "(build date %2)" @@ -118,59 +118,59 @@ msgstr "" "Версия %1\n" "(дата сборки %2)" -#: netctl.cpp:797 +#: netctl.cpp:803 msgid "KDE widget which interacts with netctl." msgstr "Виджет KDE, который взаимодействует с netctl." -#: netctl.cpp:798 +#: netctl.cpp:804 msgid "Translators: %1" msgstr "Переводчики: %1" -#: netctl.cpp:799 +#: netctl.cpp:805 msgid "Links:" msgstr "Ссылки:" -#: netctl.cpp:800 +#: netctl.cpp:806 msgid "Homepage" msgstr "Домашняя страница" -#: netctl.cpp:801 +#: netctl.cpp:807 msgid "Repository" msgstr "Репозиторий" -#: netctl.cpp:802 +#: netctl.cpp:808 msgid "Bugtracker" msgstr "Багтрекер" -#: netctl.cpp:803 +#: netctl.cpp:809 msgid "Translation issue" msgstr "Тикет перевода" -#: netctl.cpp:804 +#: netctl.cpp:810 msgid "AUR packages" msgstr "Пакеты в AUR" -#: netctl.cpp:806 +#: netctl.cpp:812 msgid "This software is licensed under %1" msgstr "Данное приложение лицензировано под %1" -#: netctl.cpp:807 +#: netctl.cpp:813 msgid "This software uses: %1" msgstr "Данное приложение использует: %1" -#: netctl.cpp:809 +#: netctl.cpp:815 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:810 +#: netctl.cpp:816 msgid "Appearance" msgstr "Внешний вид" -#: netctl.cpp:811 +#: netctl.cpp:817 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:812 +#: netctl.cpp:818 msgid "About" msgstr "О программе" @@ -386,10 +386,11 @@ msgstr "Показать 'Запустить WiFi-menu'" msgid "Show more detailed interface" msgstr "Показать более детальный интерфейс" -#. i18n: file: widget.ui:308 +#. i18n: file: widget.ui:309 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) #: po/rc.cpp:117 rc.cpp:117 msgid "" +"$info - active profile information\n" "$current - current profile name\n" "$extip4 - external IPv4\n" "$extip6 - external IPv6\n" @@ -399,6 +400,7 @@ msgid "" "$profiles - list of the netctl profiles\n" "$status - current profile status (static/enabled)" msgstr "" +"$info - информация об активном профиле\n" "$current - имя текущего профиля\n" "$extip4 - внешний IPv4\n" "$extip6 - внешний IPv6\n" @@ -408,12 +410,12 @@ msgstr "" "$profiles - список профилей netctl\n" "$status - статус текущего профиля (static/enabled)" -#: po/rc.cpp:125 rc.cpp:125 +#: po/rc.cpp:126 rc.cpp:126 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: po/rc.cpp:126 rc.cpp:126 +#: po/rc.cpp:127 rc.cpp:127 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" diff --git a/sources/plasmoid/widget.ui b/sources/plasmoid/widget.ui index cd248b0..f4b1d07 100644 --- a/sources/plasmoid/widget.ui +++ b/sources/plasmoid/widget.ui @@ -7,7 +7,7 @@ 0 0 480 - 342 + 340 @@ -298,7 +298,8 @@ - $current - current profile name + $info - active profile information +$current - current profile name $extip4 - external IPv4 $extip6 - external IPv6 $interfaces - list of the network interfaces