small edit of showing information

This commit is contained in:
arcan1s 2014-08-18 21:17:53 +04:00
parent 709431ead2
commit 8b58f6d383
9 changed files with 182 additions and 140 deletions

View File

@ -20,6 +20,7 @@ Ver.1.3.0
+ add security notes and API descriptions + add security notes and API descriptions
+ add ability to use helper + add ability to use helper
+ add ability to start minimized/maximized/daemonized + add ability to start minimized/maximized/daemonized
+ add ability to don't save profile from WiFi tab
* more correct actions into SettingsWindow * more correct actions into SettingsWindow
* update to library changes * update to library changes
* rewrite tables to use toolTip * rewrite tables to use toolTip

View File

@ -480,10 +480,33 @@ void MainWindow::connectToUnknownEssid(const QString passwd)
netctlCommand->startProfile(profile); netctlCommand->startProfile(profile);
status = netctlCommand->isProfileActive(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")); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done"));
else } else {
message = QApplication::translate("MainWindow", "Connection failed.");
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); 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<QVariant> 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(); updateWifiTab();
} }

View File

@ -56,6 +56,7 @@ MainWindow::MainWindow(QWidget *parent,
qtTranslator(qtAppTranslator), qtTranslator(qtAppTranslator),
translator(appTranslator) translator(appTranslator)
{ {
setWindowIcon(QIcon(":icon"));
if (debug) qDebug() << PDEBUG << ":" << "about" << args[QString("about")].toBool(); if (debug) qDebug() << PDEBUG << ":" << "about" << args[QString("about")].toBool();
if (debug) qDebug() << PDEBUG << ":" << "auto" << args[QString("auto")].toBool(); if (debug) qDebug() << PDEBUG << ":" << "auto" << args[QString("auto")].toBool();
if (debug) qDebug() << PDEBUG << ":" << "config" << configPath; if (debug) qDebug() << PDEBUG << ":" << "config" << configPath;

View File

@ -96,18 +96,23 @@ void TrayIcon::updateMenu()
contextMenu[QString("title")]->setText(QApplication::translate("TrayIcon", "(inactive)")); contextMenu[QString("title")]->setText(QApplication::translate("TrayIcon", "(inactive)"));
} else { } else {
contextMenu[QString("title")]->setIcon(QIcon(QString(":network-idle-64x64"))); contextMenu[QString("title")]->setIcon(QIcon(QString(":network-idle-64x64")));
QStringList status; QStringList currentProfiles, status;
if (netctlAutoStatus) if (netctlAutoStatus) {
currentProfiles.append(current);
status.append(QApplication::translate("TrayIcon", "(netctl-auto)")); status.append(QApplication::translate("TrayIcon", "(netctl-auto)"));
else { } else {
for (int i=0; i<enabled.split(QChar('|')).count(); i++) for (int i=0; i<enabled.split(QChar('|')).count(); i++) {
currentProfiles.append(current.split(QChar('|'))[i]);
if (enabled.split(QChar('|'))[i] == QString("0")) if (enabled.split(QChar('|'))[i] == QString("0"))
status.append(QApplication::translate("TrayIcon", "static")); status.append(QApplication::translate("TrayIcon", "static"));
else else
status.append(QApplication::translate("TrayIcon", "enabled")); status.append(QApplication::translate("TrayIcon", "enabled"));
} }
contextMenu[QString("title")]->setText(current + QString(" ") + }
QString("(") + status.join(QChar('|')) + QString(")")); QStringList profiles;
for (int i=0; i<currentProfiles.count(); i++)
profiles.append(currentProfiles[i] + QString(" (") + status[i] + QString(")"));
contextMenu[QString("title")]->setText(profiles.join(QString(" | ")));
} }
if (netctlAutoStatus) { if (netctlAutoStatus) {

View File

@ -106,6 +106,7 @@ void Netctl::init()
info[QString("extip4")] = QString("N\\A"); info[QString("extip4")] = QString("N\\A");
info[QString("extip6")] = QString("N\\A"); info[QString("extip6")] = QString("N\\A");
info[QString("interfaces")] = 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("intip4")] = QString("N\\A");
info[QString("intip6")] = QString("N\\A"); info[QString("intip6")] = QString("N\\A");
info[QString("profiles")] = QString("N\\A"); info[QString("profiles")] = QString("N\\A");
@ -609,6 +610,11 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
updateIcon(); updateIcon();
} else if (sourceName == QString("current")) { } else if (sourceName == QString("current")) {
info[QString("current")] = value; info[QString("current")] = value;
QStringList profiles;
for (int i=0; i<info[QString("current")].split(QChar('|')).count(); i++)
profiles.append(info[QString("current")].split(QChar('|'))[i] +
QString(" (") + info[QString("status")].split(QChar('|'))[i] + QString(")"));
info[QString("info")] = profiles.join(QString(" | "));
// update text // update text
if (bigInterface) if (bigInterface)
textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]); textLabel->setText(formatLine[0] + parsePattern(textPattern) + formatLine[1]);
@ -626,7 +632,7 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
profileList = value.split(QChar(',')); profileList = value.split(QChar(','));
info[QString("profiles")] = profileList.join(QChar(',')); info[QString("profiles")] = profileList.join(QChar(','));
} else if (sourceName == QString("status")) { } else if (sourceName == QString("status")) {
info[QString("status")] = QString("(") + value + QString(")"); info[QString("status")] = value;
} }
update(); update();
@ -914,7 +920,7 @@ void Netctl::configChanged()
useWifi = cg.readEntry("useWifi", false); useWifi = cg.readEntry("useWifi", false);
bigInterface = cg.readEntry("showBigInterface", true); bigInterface = cg.readEntry("showBigInterface", true);
useHelper = cg.readEntry("useHelper", true); useHelper = cg.readEntry("useHelper", true);
textPattern = cg.readEntry("textPattern", "$current $status<br>IPv4: $intip4<br>IPv6: $intip6"); textPattern = cg.readEntry("textPattern", "$info<br>IPv4: $intip4<br>IPv6: $intip6");
QString textAlign = cg.readEntry("textAlign", "center"); QString textAlign = cg.readEntry("textAlign", "center");
QString fontFamily = cg.readEntry("fontFamily", "Terminus"); QString fontFamily = cg.readEntry("fontFamily", "Terminus");

View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\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: 2014-08-18 10:01+0400\n" "PO-Revision-Date: 2014-08-18 21:17+0400\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
"Language: ru\n" "Language: ru\n"
@ -18,99 +18,99 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n" "X-Generator: Lokalize 1.5\n"
#: netctl.cpp:268 #: netctl.cpp:269
msgid "Set profile %1 disabled" msgid "Set profile %1 disabled"
msgstr "Set profile %1 disabled" msgstr "Set profile %1 disabled"
#: netctl.cpp:271 #: netctl.cpp:272
msgid "Set profile %1 enabled" msgid "Set profile %1 enabled"
msgstr "Set profile %1 enabled" msgstr "Set profile %1 enabled"
#: netctl.cpp:292 #: netctl.cpp:293
msgid "Restart profile %1" msgid "Restart profile %1"
msgstr "Restart profile %1" msgstr "Restart profile %1"
#: netctl.cpp:313 #: netctl.cpp:314
msgid "Start profile %1" msgid "Start profile %1"
msgstr "Start profile %1" msgstr "Start profile %1"
#: netctl.cpp:339 #: netctl.cpp:340
msgid "Stop profile %1" msgid "Stop profile %1"
msgstr "Stop profile %1" msgstr "Stop profile %1"
#: netctl.cpp:359 netctl.cpp:497 #: netctl.cpp:360 netctl.cpp:498
msgid "Stop all profiles" msgid "Stop all profiles"
msgstr "Stop all profiles" msgstr "Stop all profiles"
#: netctl.cpp:379 #: netctl.cpp:380
msgid "Switch to profile %1" msgid "Switch to profile %1"
msgstr "Switch to profile %1" msgstr "Switch to profile %1"
#: netctl.cpp:452 #: netctl.cpp:453
msgid "Start another profile" msgid "Start another profile"
msgstr "Start another profile" msgstr "Start another profile"
#: netctl.cpp:453 #: netctl.cpp:454
msgid "Stop %1" msgid "Stop %1"
msgstr "Stop %1" msgstr "Stop %1"
#: netctl.cpp:454 #: netctl.cpp:455
msgid "Restart %1" msgid "Restart %1"
msgstr "Restart %1" msgstr "Restart %1"
#: netctl.cpp:456 #: netctl.cpp:457
msgid "Disable %1" msgid "Disable %1"
msgstr "Disable %1" msgstr "Disable %1"
#: netctl.cpp:458 #: netctl.cpp:459
msgid "Enable %1" msgid "Enable %1"
msgstr "Enable %1" msgstr "Enable %1"
#: netctl.cpp:461 netctl.cpp:484 #: netctl.cpp:462 netctl.cpp:485
msgid "Start profile" msgid "Start profile"
msgstr "Start profile" msgstr "Start profile"
#: netctl.cpp:492 #: netctl.cpp:493
msgid "Stop profile" msgid "Stop profile"
msgstr "Stop profile" msgstr "Stop profile"
#: netctl.cpp:502 #: netctl.cpp:503
msgid "Switch to profile" msgid "Switch to profile"
msgstr "Switch to profile" msgstr "Switch to profile"
#: netctl.cpp:510 #: netctl.cpp:511
msgid "Restart profile" msgid "Restart profile"
msgstr "Restart profile" msgstr "Restart profile"
#: netctl.cpp:515 #: netctl.cpp:516
msgid "Enable profile" msgid "Enable profile"
msgstr "Enable profile" msgstr "Enable profile"
#: netctl.cpp:519 #: netctl.cpp:520
msgid "Show netctl-gui" msgid "Show netctl-gui"
msgstr "Show netctl-gui" msgstr "Show netctl-gui"
#: netctl.cpp:524 #: netctl.cpp:525
msgid "Show WiFi menu" msgid "Show WiFi menu"
msgstr "Show WiFi menu" msgstr "Show WiFi menu"
#: netctl.cpp:551 #: netctl.cpp:552
msgid "Start GUI" msgid "Start GUI"
msgstr "Start GUI" msgstr "Start GUI"
#: netctl.cpp:562 #: netctl.cpp:563
msgid "Start WiFi menu" msgid "Start WiFi menu"
msgstr "Start WiFi menu" msgstr "Start WiFi menu"
#: netctl.cpp:602 #: netctl.cpp:603
msgid "Network is up" msgid "Network is up"
msgstr "Network is up" msgstr "Network is up"
#: netctl.cpp:606 #: netctl.cpp:607
msgid "Network is down" msgid "Network is down"
msgstr "Network is down" msgstr "Network is down"
#: netctl.cpp:796 #: netctl.cpp:802
msgid "" msgid ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
@ -118,59 +118,59 @@ msgstr ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
#: netctl.cpp:797 #: netctl.cpp:803
msgid "KDE widget which interacts with netctl." msgid "KDE widget which interacts with netctl."
msgstr "KDE widget which interacts with netctl." msgstr "KDE widget which interacts with netctl."
#: netctl.cpp:798 #: netctl.cpp:804
msgid "Translators: %1" msgid "Translators: %1"
msgstr "Translators: %1" msgstr "Translators: %1"
#: netctl.cpp:799 #: netctl.cpp:805
msgid "Links:" msgid "Links:"
msgstr "Links:" msgstr "Links:"
#: netctl.cpp:800 #: netctl.cpp:806
msgid "Homepage" msgid "Homepage"
msgstr "Homepage" msgstr "Homepage"
#: netctl.cpp:801 #: netctl.cpp:807
msgid "Repository" msgid "Repository"
msgstr "Repository" msgstr "Repository"
#: netctl.cpp:802 #: netctl.cpp:808
msgid "Bugtracker" msgid "Bugtracker"
msgstr "Bugtracker" msgstr "Bugtracker"
#: netctl.cpp:803 #: netctl.cpp:809
msgid "Translation issue" msgid "Translation issue"
msgstr "Translation issue" msgstr "Translation issue"
#: netctl.cpp:804 #: netctl.cpp:810
msgid "AUR packages" msgid "AUR packages"
msgstr "AUR packages" msgstr "AUR packages"
#: netctl.cpp:806 #: netctl.cpp:812
msgid "This software is licensed under %1" msgid "This software is licensed under %1"
msgstr "This software is licensed under %1" msgstr "This software is licensed under %1"
#: netctl.cpp:807 #: netctl.cpp:813
msgid "This software uses: %1" msgid "This software uses: %1"
msgstr "This software uses: %1" msgstr "This software uses: %1"
#: netctl.cpp:809 #: netctl.cpp:815
msgid "Netctl plasmoid" msgid "Netctl plasmoid"
msgstr "Netctl plasmoid" msgstr "Netctl plasmoid"
#: netctl.cpp:810 #: netctl.cpp:816
msgid "Appearance" msgid "Appearance"
msgstr "Appearance" msgstr "Appearance"
#: netctl.cpp:811 #: netctl.cpp:817
msgid "DataEngine" msgid "DataEngine"
msgstr "DataEngine" msgstr "DataEngine"
#: netctl.cpp:812 #: netctl.cpp:818
msgid "About" msgid "About"
msgstr "About" msgstr "About"
@ -386,10 +386,11 @@ msgstr "Show 'Start WiFi menu'"
msgid "Show more detailed interface" msgid "Show more detailed interface"
msgstr "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) #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
#: po/rc.cpp:117 rc.cpp:117 #: po/rc.cpp:117 rc.cpp:117
msgid "" msgid ""
"$info - active profile information\n"
"$current - current profile name\n" "$current - current profile name\n"
"$extip4 - external IPv4\n" "$extip4 - external IPv4\n"
"$extip6 - external IPv6\n" "$extip6 - external IPv6\n"
@ -399,6 +400,7 @@ msgid ""
"$profiles - list of the netctl profiles\n" "$profiles - list of the netctl profiles\n"
"$status - current profile status (static/enabled)" "$status - current profile status (static/enabled)"
msgstr "" msgstr ""
"$info - active profile information\n"
"$current - current profile name\n" "$current - current profile name\n"
"$extip4 - external IPv4\n" "$extip4 - external IPv4\n"
"$extip6 - external IPv6\n" "$extip6 - external IPv6\n"
@ -408,12 +410,12 @@ msgstr ""
"$profiles - list of the netctl profiles\n" "$profiles - list of the netctl profiles\n"
"$status - current profile status (static/enabled)" "$status - current profile status (static/enabled)"
#: po/rc.cpp:125 rc.cpp:125 #: po/rc.cpp:126 rc.cpp:126
msgctxt "NAME OF TRANSLATORS" msgctxt "NAME OF TRANSLATORS"
msgid "Your names" msgid "Your names"
msgstr "Evgeniy Alekseev" msgstr "Evgeniy Alekseev"
#: po/rc.cpp:126 rc.cpp:126 #: po/rc.cpp:127 rc.cpp:127
msgctxt "EMAIL OF TRANSLATORS" msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails" msgid "Your emails"
msgstr "esalexeev@gmail.com" msgstr "esalexeev@gmail.com"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,157 +17,157 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: netctl.cpp:268 #: netctl.cpp:269
msgid "Set profile %1 disabled" msgid "Set profile %1 disabled"
msgstr "" msgstr ""
#: netctl.cpp:271 #: netctl.cpp:272
msgid "Set profile %1 enabled" msgid "Set profile %1 enabled"
msgstr "" msgstr ""
#: netctl.cpp:292 #: netctl.cpp:293
msgid "Restart profile %1" msgid "Restart profile %1"
msgstr "" msgstr ""
#: netctl.cpp:313 #: netctl.cpp:314
msgid "Start profile %1" msgid "Start profile %1"
msgstr "" msgstr ""
#: netctl.cpp:339 #: netctl.cpp:340
msgid "Stop profile %1" msgid "Stop profile %1"
msgstr "" msgstr ""
#: netctl.cpp:359 netctl.cpp:497 #: netctl.cpp:360 netctl.cpp:498
msgid "Stop all profiles" msgid "Stop all profiles"
msgstr "" msgstr ""
#: netctl.cpp:379 #: netctl.cpp:380
msgid "Switch to profile %1" msgid "Switch to profile %1"
msgstr "" msgstr ""
#: netctl.cpp:452 #: netctl.cpp:453
msgid "Start another profile" msgid "Start another profile"
msgstr "" msgstr ""
#: netctl.cpp:453 #: netctl.cpp:454
msgid "Stop %1" msgid "Stop %1"
msgstr "" msgstr ""
#: netctl.cpp:454 #: netctl.cpp:455
msgid "Restart %1" msgid "Restart %1"
msgstr "" msgstr ""
#: netctl.cpp:456 #: netctl.cpp:457
msgid "Disable %1" msgid "Disable %1"
msgstr "" msgstr ""
#: netctl.cpp:458 #: netctl.cpp:459
msgid "Enable %1" msgid "Enable %1"
msgstr "" msgstr ""
#: netctl.cpp:461 netctl.cpp:484 #: netctl.cpp:462 netctl.cpp:485
msgid "Start profile" msgid "Start profile"
msgstr "" msgstr ""
#: netctl.cpp:492 #: netctl.cpp:493
msgid "Stop profile" msgid "Stop profile"
msgstr "" msgstr ""
#: netctl.cpp:502 #: netctl.cpp:503
msgid "Switch to profile" msgid "Switch to profile"
msgstr "" msgstr ""
#: netctl.cpp:510 #: netctl.cpp:511
msgid "Restart profile" msgid "Restart profile"
msgstr "" msgstr ""
#: netctl.cpp:515 #: netctl.cpp:516
msgid "Enable profile" msgid "Enable profile"
msgstr "" msgstr ""
#: netctl.cpp:519 #: netctl.cpp:520
msgid "Show netctl-gui" msgid "Show netctl-gui"
msgstr "" msgstr ""
#: netctl.cpp:524 #: netctl.cpp:525
msgid "Show WiFi menu" msgid "Show WiFi menu"
msgstr "" msgstr ""
#: netctl.cpp:551 #: netctl.cpp:552
msgid "Start GUI" msgid "Start GUI"
msgstr "" msgstr ""
#: netctl.cpp:562 #: netctl.cpp:563
msgid "Start WiFi menu" msgid "Start WiFi menu"
msgstr "" msgstr ""
#: netctl.cpp:602 #: netctl.cpp:603
msgid "Network is up" msgid "Network is up"
msgstr "" msgstr ""
#: netctl.cpp:606 #: netctl.cpp:607
msgid "Network is down" msgid "Network is down"
msgstr "" msgstr ""
#: netctl.cpp:796 #: netctl.cpp:802
msgid "" msgid ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
msgstr "" msgstr ""
#: netctl.cpp:797 #: netctl.cpp:803
msgid "KDE widget which interacts with netctl." msgid "KDE widget which interacts with netctl."
msgstr "" msgstr ""
#: netctl.cpp:798 #: netctl.cpp:804
msgid "Translators: %1" msgid "Translators: %1"
msgstr "" msgstr ""
#: netctl.cpp:799 #: netctl.cpp:805
msgid "Links:" msgid "Links:"
msgstr "" msgstr ""
#: netctl.cpp:800 #: netctl.cpp:806
msgid "Homepage" msgid "Homepage"
msgstr "" msgstr ""
#: netctl.cpp:801 #: netctl.cpp:807
msgid "Repository" msgid "Repository"
msgstr "" msgstr ""
#: netctl.cpp:802 #: netctl.cpp:808
msgid "Bugtracker" msgid "Bugtracker"
msgstr "" msgstr ""
#: netctl.cpp:803 #: netctl.cpp:809
msgid "Translation issue" msgid "Translation issue"
msgstr "" msgstr ""
#: netctl.cpp:804 #: netctl.cpp:810
msgid "AUR packages" msgid "AUR packages"
msgstr "" msgstr ""
#: netctl.cpp:806 #: netctl.cpp:812
msgid "This software is licensed under %1" msgid "This software is licensed under %1"
msgstr "" msgstr ""
#: netctl.cpp:807 #: netctl.cpp:813
msgid "This software uses: %1" msgid "This software uses: %1"
msgstr "" msgstr ""
#: netctl.cpp:809 #: netctl.cpp:815
msgid "Netctl plasmoid" msgid "Netctl plasmoid"
msgstr "" msgstr ""
#: netctl.cpp:810 #: netctl.cpp:816
msgid "Appearance" msgid "Appearance"
msgstr "" msgstr ""
#: netctl.cpp:811 #: netctl.cpp:817
msgid "DataEngine" msgid "DataEngine"
msgstr "" msgstr ""
#: netctl.cpp:812 #: netctl.cpp:818
msgid "About" msgid "About"
msgstr "" msgstr ""
@ -383,10 +383,11 @@ msgstr ""
msgid "Show more detailed interface" msgid "Show more detailed interface"
msgstr "" msgstr ""
#. i18n: file: widget.ui:308 #. i18n: file: widget.ui:309
#. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
#: po/rc.cpp:117 rc.cpp:117 #: po/rc.cpp:117 rc.cpp:117
msgid "" msgid ""
"$info - active profile information\n"
"$current - current profile name\n" "$current - current profile name\n"
"$extip4 - external IPv4\n" "$extip4 - external IPv4\n"
"$extip6 - external IPv6\n" "$extip6 - external IPv6\n"
@ -397,12 +398,12 @@ msgid ""
"$status - current profile status (static/enabled)" "$status - current profile status (static/enabled)"
msgstr "" msgstr ""
#: po/rc.cpp:125 rc.cpp:125 #: po/rc.cpp:126 rc.cpp:126
msgctxt "NAME OF TRANSLATORS" msgctxt "NAME OF TRANSLATORS"
msgid "Your names" msgid "Your names"
msgstr "" msgstr ""
#: po/rc.cpp:126 rc.cpp:126 #: po/rc.cpp:127 rc.cpp:127
msgctxt "EMAIL OF TRANSLATORS" msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails" msgid "Your emails"
msgstr "" msgstr ""

View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\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: 2014-08-18 10:02+0400\n" "PO-Revision-Date: 2014-08-18 21:17+0400\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
"Language: ru\n" "Language: ru\n"
@ -18,99 +18,99 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n" "X-Generator: Lokalize 1.5\n"
#: netctl.cpp:268 #: netctl.cpp:269
msgid "Set profile %1 disabled" msgid "Set profile %1 disabled"
msgstr "Выключение автозагрузки профиля %1" msgstr "Выключение автозагрузки профиля %1"
#: netctl.cpp:271 #: netctl.cpp:272
msgid "Set profile %1 enabled" msgid "Set profile %1 enabled"
msgstr "Включение автозагрузки профиля %1" msgstr "Включение автозагрузки профиля %1"
#: netctl.cpp:292 #: netctl.cpp:293
msgid "Restart profile %1" msgid "Restart profile %1"
msgstr "Перезапуск профиля %1" msgstr "Перезапуск профиля %1"
#: netctl.cpp:313 #: netctl.cpp:314
msgid "Start profile %1" msgid "Start profile %1"
msgstr "Запуск профиля %1" msgstr "Запуск профиля %1"
#: netctl.cpp:339 #: netctl.cpp:340
msgid "Stop profile %1" msgid "Stop profile %1"
msgstr "Остановка профиля %1" msgstr "Остановка профиля %1"
#: netctl.cpp:359 netctl.cpp:497 #: netctl.cpp:360 netctl.cpp:498
msgid "Stop all profiles" msgid "Stop all profiles"
msgstr "Остановить все профили" msgstr "Остановить все профили"
#: netctl.cpp:379 #: netctl.cpp:380
msgid "Switch to profile %1" msgid "Switch to profile %1"
msgstr "Переключение на профиль %1" msgstr "Переключение на профиль %1"
#: netctl.cpp:452 #: netctl.cpp:453
msgid "Start another profile" msgid "Start another profile"
msgstr "Запустить другой профиль" msgstr "Запустить другой профиль"
#: netctl.cpp:453 #: netctl.cpp:454
msgid "Stop %1" msgid "Stop %1"
msgstr "Остановить %1" msgstr "Остановить %1"
#: netctl.cpp:454 #: netctl.cpp:455
msgid "Restart %1" msgid "Restart %1"
msgstr "Перезапустить %1" msgstr "Перезапустить %1"
#: netctl.cpp:456 #: netctl.cpp:457
msgid "Disable %1" msgid "Disable %1"
msgstr "Отключить %1" msgstr "Отключить %1"
#: netctl.cpp:458 #: netctl.cpp:459
msgid "Enable %1" msgid "Enable %1"
msgstr "Включить %1" msgstr "Включить %1"
#: netctl.cpp:461 netctl.cpp:484 #: netctl.cpp:462 netctl.cpp:485
msgid "Start profile" msgid "Start profile"
msgstr "Запустить профиль" msgstr "Запустить профиль"
#: netctl.cpp:492 #: netctl.cpp:493
msgid "Stop profile" msgid "Stop profile"
msgstr "Остановить профиль" msgstr "Остановить профиль"
#: netctl.cpp:502 #: netctl.cpp:503
msgid "Switch to profile" msgid "Switch to profile"
msgstr "Переключить профиль" msgstr "Переключить профиль"
#: netctl.cpp:510 #: netctl.cpp:511
msgid "Restart profile" msgid "Restart profile"
msgstr "Перезапустить профиль" msgstr "Перезапустить профиль"
#: netctl.cpp:515 #: netctl.cpp:516
msgid "Enable profile" msgid "Enable profile"
msgstr "Включить профиль" msgstr "Включить профиль"
#: netctl.cpp:519 #: netctl.cpp:520
msgid "Show netctl-gui" msgid "Show netctl-gui"
msgstr "Показать netctl-gui" msgstr "Показать netctl-gui"
#: netctl.cpp:524 #: netctl.cpp:525
msgid "Show WiFi menu" msgid "Show WiFi menu"
msgstr "Запустить WiFi-menu" msgstr "Запустить WiFi-menu"
#: netctl.cpp:551 #: netctl.cpp:552
msgid "Start GUI" msgid "Start GUI"
msgstr "Запуск GUI" msgstr "Запуск GUI"
#: netctl.cpp:562 #: netctl.cpp:563
msgid "Start WiFi menu" msgid "Start WiFi menu"
msgstr "Запуск WiFi-menu" msgstr "Запуск WiFi-menu"
#: netctl.cpp:602 #: netctl.cpp:603
msgid "Network is up" msgid "Network is up"
msgstr "Сеть работает" msgstr "Сеть работает"
#: netctl.cpp:606 #: netctl.cpp:607
msgid "Network is down" msgid "Network is down"
msgstr "Сеть не работает" msgstr "Сеть не работает"
#: netctl.cpp:796 #: netctl.cpp:802
msgid "" msgid ""
"Version %1\n" "Version %1\n"
"(build date %2)" "(build date %2)"
@ -118,59 +118,59 @@ msgstr ""
"Версия %1\n" "Версия %1\n"
"(дата сборки %2)" "(дата сборки %2)"
#: netctl.cpp:797 #: netctl.cpp:803
msgid "KDE widget which interacts with netctl." msgid "KDE widget which interacts with netctl."
msgstr "Виджет KDE, который взаимодействует с netctl." msgstr "Виджет KDE, который взаимодействует с netctl."
#: netctl.cpp:798 #: netctl.cpp:804
msgid "Translators: %1" msgid "Translators: %1"
msgstr "Переводчики: %1" msgstr "Переводчики: %1"
#: netctl.cpp:799 #: netctl.cpp:805
msgid "Links:" msgid "Links:"
msgstr "Ссылки:" msgstr "Ссылки:"
#: netctl.cpp:800 #: netctl.cpp:806
msgid "Homepage" msgid "Homepage"
msgstr "Домашняя страница" msgstr "Домашняя страница"
#: netctl.cpp:801 #: netctl.cpp:807
msgid "Repository" msgid "Repository"
msgstr "Репозиторий" msgstr "Репозиторий"
#: netctl.cpp:802 #: netctl.cpp:808
msgid "Bugtracker" msgid "Bugtracker"
msgstr "Багтрекер" msgstr "Багтрекер"
#: netctl.cpp:803 #: netctl.cpp:809
msgid "Translation issue" msgid "Translation issue"
msgstr "Тикет перевода" msgstr "Тикет перевода"
#: netctl.cpp:804 #: netctl.cpp:810
msgid "AUR packages" msgid "AUR packages"
msgstr "Пакеты в AUR" msgstr "Пакеты в AUR"
#: netctl.cpp:806 #: netctl.cpp:812
msgid "This software is licensed under %1" msgid "This software is licensed under %1"
msgstr "Данное приложение лицензировано под %1" msgstr "Данное приложение лицензировано под %1"
#: netctl.cpp:807 #: netctl.cpp:813
msgid "This software uses: %1" msgid "This software uses: %1"
msgstr "Данное приложение использует: %1" msgstr "Данное приложение использует: %1"
#: netctl.cpp:809 #: netctl.cpp:815
msgid "Netctl plasmoid" msgid "Netctl plasmoid"
msgstr "Netctl plasmoid" msgstr "Netctl plasmoid"
#: netctl.cpp:810 #: netctl.cpp:816
msgid "Appearance" msgid "Appearance"
msgstr "Внешний вид" msgstr "Внешний вид"
#: netctl.cpp:811 #: netctl.cpp:817
msgid "DataEngine" msgid "DataEngine"
msgstr "DataEngine" msgstr "DataEngine"
#: netctl.cpp:812 #: netctl.cpp:818
msgid "About" msgid "About"
msgstr "О программе" msgstr "О программе"
@ -386,10 +386,11 @@ msgstr "Показать 'Запустить WiFi-menu'"
msgid "Show more detailed interface" msgid "Show more detailed interface"
msgstr "Показать более детальный интерфейс" msgstr "Показать более детальный интерфейс"
#. i18n: file: widget.ui:308 #. i18n: file: widget.ui:309
#. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit)
#: po/rc.cpp:117 rc.cpp:117 #: po/rc.cpp:117 rc.cpp:117
msgid "" msgid ""
"$info - active profile information\n"
"$current - current profile name\n" "$current - current profile name\n"
"$extip4 - external IPv4\n" "$extip4 - external IPv4\n"
"$extip6 - external IPv6\n" "$extip6 - external IPv6\n"
@ -399,6 +400,7 @@ msgid ""
"$profiles - list of the netctl profiles\n" "$profiles - list of the netctl profiles\n"
"$status - current profile status (static/enabled)" "$status - current profile status (static/enabled)"
msgstr "" msgstr ""
"$info - информация об активном профиле\n"
"$current - имя текущего профиля\n" "$current - имя текущего профиля\n"
"$extip4 - внешний IPv4\n" "$extip4 - внешний IPv4\n"
"$extip6 - внешний IPv6\n" "$extip6 - внешний IPv6\n"
@ -408,12 +410,12 @@ msgstr ""
"$profiles - список профилей netctl\n" "$profiles - список профилей netctl\n"
"$status - статус текущего профиля (static/enabled)" "$status - статус текущего профиля (static/enabled)"
#: po/rc.cpp:125 rc.cpp:125 #: po/rc.cpp:126 rc.cpp:126
msgctxt "NAME OF TRANSLATORS" msgctxt "NAME OF TRANSLATORS"
msgid "Your names" msgid "Your names"
msgstr "Evgeniy Alekseev" msgstr "Evgeniy Alekseev"
#: po/rc.cpp:126 rc.cpp:126 #: po/rc.cpp:127 rc.cpp:127
msgctxt "EMAIL OF TRANSLATORS" msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails" msgid "Your emails"
msgstr "esalexeev@gmail.com" msgstr "esalexeev@gmail.com"

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>480</width> <width>480</width>
<height>342</height> <height>340</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@ -298,7 +298,8 @@
<item> <item>
<widget class="QPlainTextEdit" name="textEdit"> <widget class="QPlainTextEdit" name="textEdit">
<property name="toolTip"> <property name="toolTip">
<string>$current - current profile name <string>$info - active profile information
$current - current profile name
$extip4 - external IPv4 $extip4 - external IPv4
$extip6 - external IPv6 $extip6 - external IPv6
$interfaces - list of the network interfaces $interfaces - list of the network interfaces