From 1366852a6218e96e5ab017724c89b0643080f95f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 6 Apr 2014 18:45:56 +0400 Subject: [PATCH] refactoring of plasmoid --- sources/dataengine/netctl.h | 10 - sources/plasmoid/configwindow.ui | 12 - sources/plasmoid/netctl.cpp | 306 ++++++++++--------- sources/plasmoid/netctl.h | 36 +-- sources/plasmoid/po/en.po | 101 +++--- sources/plasmoid/po/plasma_applet_netctl.pot | 100 +++--- sources/plasmoid/po/ru.po | 101 +++--- 7 files changed, 325 insertions(+), 341 deletions(-) diff --git a/sources/dataengine/netctl.h b/sources/dataengine/netctl.h index af10d03..4d0b203 100644 --- a/sources/dataengine/netctl.h +++ b/sources/dataengine/netctl.h @@ -37,16 +37,6 @@ protected: private: // configuration QMap configuration; -// // enable check external IP -// QString checkExtIP; -// // path to netctl command -// QString cmd; -// // command to check external IP -// QString extIpCmd; -// // path to ip command -// QString ipCmd; -// // path to directory with network device configuration -// QString netDir; }; diff --git a/sources/plasmoid/configwindow.ui b/sources/plasmoid/configwindow.ui index a80da9c..3d0f594 100644 --- a/sources/plasmoid/configwindow.ui +++ b/sources/plasmoid/configwindow.ui @@ -127,9 +127,6 @@ Browse - - true - @@ -163,9 +160,6 @@ Browse - - true - @@ -577,9 +571,6 @@ Browse - - true - @@ -613,9 +604,6 @@ Browse - - true - diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index 098185c..b7d3337 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -57,6 +57,12 @@ Netctl::~Netctl() void Netctl::init() { + info[QString("name")] = QString("N\\A"); + info[QString("status")] = QString("N\\A"); + info[QString("intIp")] = QString("N\\A"); + info[QString("extIp")] = QString("N\\A"); + info[QString("interfaces")] = QString("lo"); + netctlEngine = dataEngine(QString("netctl")); createActions(); // generate ui @@ -97,18 +103,38 @@ void Netctl::updateInterface(bool setShown) // context menu +void Netctl::enableProfileAutoloadSlot() +{ + QProcess command; + QString commandLine, enableStatus; + if (info[QString("status")].contains(QString("enabled"))) + enableStatus = QString(" disable "); + else + enableStatus = QString(" enable "); + if (useSudo) + commandLine = paths[QString("sudo")] + QString(" \"") + paths[QString("netctl")] + + enableStatus + info[QString("name")] + QString("\""); + else + commandLine = paths[QString("netctl")] + enableStatus + info[QString("name")]; + command.startDetached(commandLine); +} + + void Netctl::startProfileSlot(QAction *profile) { QProcess command; QString commandLine; commandLine = QString(""); if (status) - commandLine = netctlPath + QString(" stop ") + profileName + QString(" && "); + commandLine = paths[QString("netctl")] + QString(" stop ") + + info[QString("name")] + QString(" && "); if (useSudo) - commandLine = sudoPath + QString(" \"") + commandLine + - netctlPath + QString(" start ") + profile->text().remove(QString("&")) + QString("\""); + commandLine = paths[QString("sudo")] + QString(" \"") + commandLine + + paths[QString("netctl")] + QString(" start ") + + profile->text().remove(QString("&")) + QString("\""); else - commandLine = commandLine + netctlPath + QString(" start ") + profile->text().remove(QString("&")); + commandLine = commandLine + paths[QString("netctl")] + QString(" start ") + + profile->text().remove(QString("&")); command.startDetached(commandLine); } @@ -118,9 +144,10 @@ void Netctl::stopProfileSlot() QProcess command; QString commandLine; if (useSudo) - commandLine = sudoPath + QString(" \"") + netctlPath + QString(" stop ") + profileName + QString("\""); + commandLine = paths[QString("sudo")] + QString(" \"") + paths[QString("netctl")] + + QString(" stop ") + info[QString("name")] + QString("\""); else - commandLine = netctlPath + QString(" stop ") + profileName; + commandLine = paths[QString("netctl")] + QString(" stop ") + info[QString("name")]; command.startDetached(commandLine); } @@ -130,66 +157,27 @@ void Netctl::restartProfileSlot() QProcess command; QString commandLine; if (useSudo) - commandLine = sudoPath + QString(" \"") + netctlPath + QString(" restart ") + profileName + QString("\""); + commandLine = paths[QString("sudo")] + QString(" \"") + paths[QString("netctl")] + + QString(" restart ") + info[QString("name")] + QString("\""); else - commandLine = netctlPath + QString(" restart ") + profileName; + commandLine = paths[QString("netctl")] + QString(" restart ") + info[QString("name")]; command.startDetached(commandLine); } -void Netctl::enableProfileAutoloadSlot() -{ - QProcess command; - QString commandLine, enableStatus; - if (profileStatus.contains(QString("enabled"))) - enableStatus = QString(" disable "); - else - enableStatus = QString(" enable "); - if (useSudo) - commandLine = sudoPath + QString(" \"") + netctlPath + enableStatus + profileName + QString("\""); - else - commandLine = netctlPath + enableStatus + profileName; - command.startDetached(commandLine); -} - - -void Netctl::createActions() -{ - menuActions.clear(); - - startProfile = new QAction(i18n("Start profile"), this); - startProfileMenu = new QMenu(NULL); - startProfile->setMenu(startProfileMenu); - connect(startProfileMenu, SIGNAL(triggered(QAction *)), this, SLOT(startProfileSlot(QAction *))); - menuActions.append(startProfile); - - stopProfile = new QAction(i18n("Stop profile"), this); - connect(stopProfile, SIGNAL(triggered(bool)), this, SLOT(stopProfileSlot())); - menuActions.append(stopProfile); - - restartProfile = new QAction(i18n("Restart profile"), this); - connect(restartProfile, SIGNAL(triggered(bool)), this, SLOT(restartProfileSlot())); - menuActions.append(restartProfile); - - enableProfileAutoload = new QAction(i18n("Enable profile"), this); - connect(enableProfileAutoload, SIGNAL(triggered(bool)), this, SLOT(enableProfileAutoloadSlot())); - menuActions.append(enableProfileAutoload); -} - - QList Netctl::contextualActions() { if (status) { startProfile->setText(i18n("Start another profile")); stopProfile->setVisible(true); - stopProfile->setText(i18n("Stop ") + profileName); + stopProfile->setText(i18n("Stop ") + info[QString("name")]); restartProfile->setVisible(true); - restartProfile->setText(i18n("Restart ") + profileName); + restartProfile->setText(i18n("Restart ") + info[QString("name")]); enableProfileAutoload->setVisible(true); - if (profileStatus.contains(QString("enabled"))) - enableProfileAutoload->setText(i18n("Disable ") + profileName); + if (info[QString("status")].contains(QString("enabled"))) + enableProfileAutoload->setText(i18n("Disable ") + info[QString("name")]); else - enableProfileAutoload->setText(i18n("Enable ") + profileName); + enableProfileAutoload->setText(i18n("Enable ") + info[QString("name")]); } else { startProfile->setText(i18n("Start profile")); @@ -208,14 +196,33 @@ QList Netctl::contextualActions() } -// events -void Netctl::showGui() +void Netctl::createActions() { - QProcess command; - command.startDetached(guiPath); + menuActions.clear(); + + startProfile = new QAction(i18n("Start profile"), this); + startProfileMenu = new QMenu(NULL); + startProfile->setMenu(startProfileMenu); + connect(startProfileMenu, SIGNAL(triggered(QAction *)), this, + SLOT(startProfileSlot(QAction *))); + menuActions.append(startProfile); + + stopProfile = new QAction(i18n("Stop profile"), this); + connect(stopProfile, SIGNAL(triggered(bool)), this, SLOT(stopProfileSlot())); + menuActions.append(stopProfile); + + restartProfile = new QAction(i18n("Restart profile"), this); + connect(restartProfile, SIGNAL(triggered(bool)), this, SLOT(restartProfileSlot())); + menuActions.append(restartProfile); + + enableProfileAutoload = new QAction(i18n("Enable profile"), this); + connect(enableProfileAutoload, SIGNAL(triggered(bool)), this, + SLOT(enableProfileAutoloadSlot())); + menuActions.append(enableProfileAutoload); } +// events void Netctl::sendNotification(const QString eventId, const QString message) { KNotification *notification = new KNotification(eventId); @@ -227,6 +234,13 @@ void Netctl::sendNotification(const QString eventId, const QString message) } +void Netctl::showGui() +{ + QProcess command; + command.startDetached(paths[QString("gui")]); +} + + // data engine interaction void Netctl::connectToEngine() { @@ -235,36 +249,18 @@ void Netctl::connectToEngine() netctlEngine->connectSource(QString("currentProfile"), this, autoUpdateInterval); netctlEngine->connectSource(QString("statusString"), this, autoUpdateInterval); updateInterface(false); - if (showBigInterface) { - if (showExtIp) + if (bigInterface[QString("main")]) { + if (bigInterface[QString("extIp")]) netctlEngine->connectSource(QString("extIp"), this, autoUpdateInterval); - if (showIntIp) + if (bigInterface[QString("intIp")]) netctlEngine->connectSource(QString("intIp"), this, autoUpdateInterval); - if (showNetDev) + if (bigInterface[QString("netDev")]) netctlEngine->connectSource(QString("interfaces"), this, autoUpdateInterval); updateInterface(true); } } -void Netctl::disconnectFromEngine() -{ - netctlEngine->disconnectSource(QString("profiles"), this); - netctlEngine->disconnectSource(QString("statusBool"), this); - netctlEngine->disconnectSource(QString("currentProfile"), this); - netctlEngine->disconnectSource(QString("statusString"), this); - if (showBigInterface) { - if (showExtIp) - netctlEngine->disconnectSource(QString("extIp"), this); - if (showIntIp) - netctlEngine->disconnectSource(QString("intIp"), this); - if (showNetDev) - netctlEngine->disconnectSource(QString("interfaces"), this); - } - updateInterface(false); -} - - void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data) { if (data.keys().count() == 0) @@ -274,28 +270,28 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da value = QString("N\\A"); if (sourceName == QString("currentProfile")) { - profileName = value; + info[QString("name")] = value; // update text QStringList text; - text.append(profileName + QString(" ") + profileStatus); - if (showIntIp) - text.append(intIp); - if (showExtIp) - text.append(extIp); - if (showNetDev) - text.append(interfaces); - if (showBigInterface) + text.append(info[QString("name")] + QString(" ") + info[QString("status")]); + if (bigInterface[QString("intIp")]) + text.append(info[QString("intIp")]); + if (bigInterface[QString("extIp")]) + text.append(info[QString("extIp")]); + if (bigInterface[QString("netDev")]) + text.append(info[QString("interfaces")]); + if (bigInterface[QString("main")]) textLabel->setText(formatLine[0] + text.join(QString("
")) + formatLine[1]); } else if (sourceName == QString("extIp")) { - extIp = value; + info[QString("extIp")] = value; } else if (sourceName == QString("intIp")) { - intIp = value; + info[QString("intIp")] = value; } else if (sourceName == QString("interfaces")) { - interfaces = value; + info[QString("interfaces")] = value; } else if (sourceName == QString("profiles")) { profileList = value.split(QString(",")); @@ -303,51 +299,69 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da else if (sourceName == QString("statusBool")) { if (value == QString("true")) { status = true; - iconWidget->setIcon(activeIconPath); + iconWidget->setIcon(paths[QString("active")]); } else { - iconWidget->setIcon(inactiveIconPath); + iconWidget->setIcon(paths[QString("inactive")]); status = false; } } else if (sourceName == QString("statusString")) { - profileStatus = QString("(") + value + QString(")"); + info[QString("status")] = QString("(") + value + QString(")"); } update(); } +void Netctl::disconnectFromEngine() +{ + netctlEngine->disconnectSource(QString("profiles"), this); + netctlEngine->disconnectSource(QString("statusBool"), this); + netctlEngine->disconnectSource(QString("currentProfile"), this); + netctlEngine->disconnectSource(QString("statusString"), this); + if (bigInterface[QString("main")]) { + if (bigInterface[QString("extIp")]) + netctlEngine->disconnectSource(QString("extIp"), this); + if (bigInterface[QString("intIp")]) + netctlEngine->disconnectSource(QString("intIp"), this); + if (bigInterface[QString("netDev")]) + netctlEngine->disconnectSource(QString("interfaces"), this); + } + updateInterface(false); +} + + // configuration interface -void Netctl::selectGuiExe() -{ - KUrl guiUrl = KFileDialog::getOpenUrl(KUrl(), "*"); - if (!guiUrl.isEmpty()) - uiConfig.lineEdit_gui->setText(guiUrl.path()); -} - - -void Netctl::selectNetctlExe() -{ - KUrl netctlUrl = KFileDialog::getOpenUrl(KUrl(), "*"); - if (!netctlUrl.isEmpty()) - uiConfig.lineEdit_netctl->setText(netctlUrl.path()); -} - - void Netctl::selectActiveIcon() { - KUrl activeIconUrl = KFileDialog::getOpenUrl(KUrl(), "*"); - if (!activeIconUrl.isEmpty()) - uiConfig.lineEdit_activeIcon->setText(activeIconUrl.path()); + KUrl url = KFileDialog::getOpenUrl(KUrl(), "*"); + if (!url.isEmpty()) + uiConfig.lineEdit_activeIcon->setText(url.path()); +} + + +void Netctl::selectGuiExe() +{ + KUrl url = KFileDialog::getOpenUrl(KUrl(), "*"); + if (!url.isEmpty()) + uiConfig.lineEdit_gui->setText(url.path()); } void Netctl::selectInactiveIcon() { - KUrl inactiveIconUrl = KFileDialog::getOpenUrl(KUrl(), "*"); - if (!inactiveIconUrl.isEmpty()) - uiConfig.lineEdit_inactiveIcon->setText(inactiveIconUrl.path()); + KUrl url = KFileDialog::getOpenUrl(KUrl(), "*"); + if (!url.isEmpty()) + uiConfig.lineEdit_inactiveIcon->setText(url.path()); +} + + +void Netctl::selectNetctlExe() +{ + KUrl url = KFileDialog::getOpenUrl(KUrl(), "*"); + if (!url.isEmpty()) + uiConfig.lineEdit_netctl->setText(url.path()); } @@ -355,35 +369,42 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent) { QWidget *configwin = new QWidget; uiConfig.setupUi(configwin); - QString text = QString(NAME) + " - " + QString(VERSION) + "\n" + "(c) " + QString(DATE) + " " + QString(AUTHOR); + QString text = QString(NAME) + " - " + QString(VERSION) + "\n" + "(c) " + + QString(DATE) + " " + QString(AUTHOR); uiConfig.label_info->setText(text); uiConfig.spinBox_autoUpdate->setValue(autoUpdateInterval); - uiConfig.lineEdit_gui->setText(guiPath); - uiConfig.lineEdit_netctl->setText(netctlPath); + uiConfig.lineEdit_gui->setText(paths[QString("gui")]); + uiConfig.lineEdit_netctl->setText(paths[QString("netctl")]); if (useSudo) uiConfig.checkBox_sudo->setCheckState(Qt::Checked); else uiConfig.checkBox_sudo->setCheckState(Qt::Unchecked); - uiConfig.lineEdit_sudo->setText(sudoPath); - if (showBigInterface) + uiConfig.lineEdit_sudo->setText(paths[QString("sudo")]); + if (bigInterface[QString("main")]) uiConfig.checkBox_showBigInterface->setCheckState(Qt::Checked); else uiConfig.checkBox_showBigInterface->setCheckState(Qt::Unchecked); - if (showNetDev) + if (bigInterface[QString("netDev")]) uiConfig.checkBox_showNetDev->setCheckState(Qt::Checked); else uiConfig.checkBox_showNetDev->setCheckState(Qt::Unchecked); - if (showExtIp) + if (bigInterface[QString("extIp")]) uiConfig.checkBox_showExtIp->setCheckState(Qt::Checked); else uiConfig.checkBox_showExtIp->setCheckState(Qt::Unchecked); - if (showIntIp) + if (bigInterface[QString("intIp")]) uiConfig.checkBox_showIntIp->setCheckState(Qt::Checked); else uiConfig.checkBox_showIntIp->setCheckState(Qt::Unchecked); setBigInterface(); + KConfigGroup cg = config(); + QString fontFamily = cg.readEntry("fontFamily", "Terminus"); + int fontSize = cg.readEntry("fontSize", 10); + QString fontColor = cg.readEntry("fontColor", "#000000"); + int fontWeight = cg.readEntry("fontWeight", 400); + QString fontStyle = cg.readEntry("fontStyle", "normal"); QFont font = QFont(fontFamily, 12, 400, FALSE); uiConfig.fontComboBox_font->setCurrentFont(font); uiConfig.spinBox_fontSize->setValue(fontSize); @@ -393,12 +414,13 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent) uiConfig.comboBox_fontStyle->setCurrentIndex(0); else if (fontStyle == "italic") uiConfig.comboBox_fontStyle->setCurrentIndex(1); - uiConfig.lineEdit_activeIcon->setText(activeIconPath); - uiConfig.lineEdit_inactiveIcon->setText(inactiveIconPath); + uiConfig.lineEdit_activeIcon->setText(paths[QString("active")]); + uiConfig.lineEdit_inactiveIcon->setText(paths[QString("inactive")]); parent->addPage(configwin, i18n("Netctl plasmoid"), Applet::icon()); - connect(uiConfig.checkBox_showBigInterface, SIGNAL(stateChanged(int)), this, SLOT(setBigInterface())); + connect(uiConfig.checkBox_showBigInterface, SIGNAL(stateChanged(int)), this, + SLOT(setBigInterface())); connect(uiConfig.checkBox_sudo, SIGNAL(stateChanged(int)), this, SLOT(setSudo())); connect(uiConfig.pushButton_gui, SIGNAL(clicked()), this, SLOT(selectGuiExe())); @@ -456,22 +478,24 @@ void Netctl::configChanged() KConfigGroup cg = config(); autoUpdateInterval = cg.readEntry("autoUpdateInterval", 1000); - guiPath = cg.readEntry("guiPath", "/usr/bin/netctl-gui"); - netctlPath = cg.readEntry("netctlPath", "/usr/bin/netctl"); + paths[QString("gui")] = cg.readEntry("guiPath", "/usr/bin/netctl-gui"); + paths[QString("netctl")] = cg.readEntry("netctlPath", "/usr/bin/netctl"); useSudo = cg.readEntry("useSudo", true); - sudoPath = cg.readEntry("sudoPath", "/usr/bin/kdesu -c"); - showBigInterface = cg.readEntry("showBigInterface", true); - showNetDev = cg.readEntry("showNetDev", true); - showExtIp = cg.readEntry("showExtIp", false); - showIntIp = cg.readEntry("showIntIp", true); + paths[QString("sudo")] = cg.readEntry("sudoPath", "/usr/bin/kdesu -c"); + bigInterface[QString("main")] = cg.readEntry("showBigInterface", true); + bigInterface[QString("extIp")] = cg.readEntry("showExtIp", false); + bigInterface[QString("netDev")] = cg.readEntry("showNetDev", true); + bigInterface[QString("intIp")] = cg.readEntry("showIntIp", true); - fontFamily = cg.readEntry("fontFamily", "Terminus"); - fontSize = cg.readEntry("fontSize", 10); - fontColor = cg.readEntry("fontColor", "#000000"); - fontWeight = cg.readEntry("fontWeight", 400); - fontStyle = cg.readEntry("fontStyle", "normal"); - activeIconPath = cg.readEntry("activeIconPath", "/usr/share/icons/hicolor/64x64/apps/netctl-idle.png"); - inactiveIconPath = cg.readEntry("inactiveIconPath", "/usr/share/icons/hicolor/64x64/apps/netctl-offline.png"); + QString fontFamily = cg.readEntry("fontFamily", "Terminus"); + int fontSize = cg.readEntry("fontSize", 10); + QString fontColor = cg.readEntry("fontColor", "#000000"); + int fontWeight = cg.readEntry("fontWeight", 400); + QString fontStyle = cg.readEntry("fontStyle", "normal"); + paths[QString("active")] = cg.readEntry("activeIconPath", + "/usr/share/icons/hicolor/64x64/apps/netctl-idle.png"); + paths[QString("inactive")] = cg.readEntry("inactiveIconPath", + "/usr/share/icons/hicolor/64x64/apps/netctl-offline.png"); formatLine[0] = ("

info; QStringList profileList; - QStringList formatLine; // context menu void createActions(); QList menuActions; - QAction *startProfile; QMenu *startProfileMenu; + QAction *enableProfileAutoload; + QAction *startProfile; QAction *stopProfile; QAction *restartProfile; - QAction *enableProfileAutoload; // data engine Plasma::DataEngine *netctlEngine; void connectToEngine(); @@ -102,21 +97,10 @@ private: Ui::ConfigWindow uiConfig; // configuration int autoUpdateInterval; - QString guiPath; - QString netctlPath; + QMap bigInterface; + QStringList formatLine; + QMap paths; bool useSudo; - QString sudoPath; - bool showBigInterface; - bool showNetDev; - bool showExtIp; - bool showIntIp; - QString fontFamily; - int fontSize; - QString fontColor; - int fontWeight; - QString fontStyle; - QString activeIconPath; - QString inactiveIconPath; }; K_EXPORT_PLASMA_APPLET(netctl, Netctl) diff --git a/sources/plasmoid/po/en.po b/sources/plasmoid/po/en.po index 95fe90e..0e0339d 100644 --- a/sources/plasmoid/po/en.po +++ b/sources/plasmoid/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n" -"POT-Creation-Date: 2014-04-06 12:31+0400\n" +"POT-Creation-Date: 2014-04-06 18:45+0400\n" "PO-Revision-Date: 2014-04-06 12:33+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -18,43 +18,43 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: netctl.cpp:160 netctl.cpp:195 -msgid "Start profile" -msgstr "Start profile" - -#: netctl.cpp:166 -msgid "Stop profile" -msgstr "Stop profile" - -#: netctl.cpp:170 -msgid "Restart profile" -msgstr "Restart profile" - -#: netctl.cpp:174 -msgid "Enable profile" -msgstr "Enable profile" - -#: netctl.cpp:183 +#: netctl.cpp:171 msgid "Start another profile" msgstr "Start another profile" -#: netctl.cpp:185 +#: netctl.cpp:173 msgid "Stop " msgstr "Stop " -#: netctl.cpp:187 +#: netctl.cpp:175 msgid "Restart " msgstr "Restart " -#: netctl.cpp:190 +#: netctl.cpp:178 msgid "Disable " msgstr "Disable " -#: netctl.cpp:192 +#: netctl.cpp:180 msgid "Enable " msgstr "Enable " -#: netctl.cpp:399 +#: netctl.cpp:183 netctl.cpp:203 +msgid "Start profile" +msgstr "Start profile" + +#: netctl.cpp:210 +msgid "Stop profile" +msgstr "Stop profile" + +#: netctl.cpp:214 +msgid "Restart profile" +msgstr "Restart profile" + +#: netctl.cpp:218 +msgid "Enable profile" +msgstr "Enable profile" + +#: netctl.cpp:420 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" @@ -78,146 +78,146 @@ msgstr "Path to GUI" #. i18n: file: configwindow.ui:128 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui) -#. i18n: file: configwindow.ui:164 +#. i18n: file: configwindow.ui:161 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl) -#. i18n: file: configwindow.ui:578 +#. i18n: file: configwindow.ui:572 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon) -#. i18n: file: configwindow.ui:614 +#. i18n: file: configwindow.ui:605 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon) #. i18n: file: configwindow.ui:128 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui) -#. i18n: file: configwindow.ui:164 +#. i18n: file: configwindow.ui:161 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl) -#. i18n: file: configwindow.ui:578 +#. i18n: file: configwindow.ui:572 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon) -#. i18n: file: configwindow.ui:614 +#. i18n: file: configwindow.ui:605 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon) #: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18 #: rc.cpp:78 rc.cpp:84 msgid "Browse" msgstr "Browse" -#. i18n: file: configwindow.ui:148 +#. i18n: file: configwindow.ui:145 #. i18n: ectx: property (text), widget (QLabel, label_netctl) #: po/rc.cpp:15 rc.cpp:15 msgid "Path to netctl" msgstr "Path to netctl" -#. i18n: file: configwindow.ui:184 +#. i18n: file: configwindow.ui:178 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo) #: po/rc.cpp:21 rc.cpp:21 msgid "Use sudo for netctl" msgstr "Use sudo for netctl" -#. i18n: file: configwindow.ui:199 +#. i18n: file: configwindow.ui:193 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface) #: po/rc.cpp:24 rc.cpp:24 msgid "Show more detailed interface" msgstr "Show more detailed interface" -#. i18n: file: configwindow.ui:209 +#. i18n: file: configwindow.ui:203 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev) #: po/rc.cpp:27 rc.cpp:27 msgid "Show network devices" msgstr "Show network devices" -#. i18n: file: configwindow.ui:219 +#. i18n: file: configwindow.ui:213 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp) #: po/rc.cpp:30 rc.cpp:30 msgid "Show external IP" msgstr "Show external IP" -#. i18n: file: configwindow.ui:229 +#. i18n: file: configwindow.ui:223 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp) #: po/rc.cpp:33 rc.cpp:33 msgid "Show internal IP" msgstr "Show internal IP" -#. i18n: file: configwindow.ui:253 +#. i18n: file: configwindow.ui:247 #. i18n: ectx: attribute (title), widget (QWidget, tabAppearance) #: po/rc.cpp:36 rc.cpp:36 msgid "Appearance" msgstr "Appearance" -#. i18n: file: configwindow.ui:267 +#. i18n: file: configwindow.ui:261 #. i18n: ectx: property (text), widget (QLabel, label_font) #: po/rc.cpp:39 rc.cpp:39 msgid "Font" msgstr "Font" -#. i18n: file: configwindow.ui:299 +#. i18n: file: configwindow.ui:293 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font) #: po/rc.cpp:42 rc.cpp:42 msgid "Set font family" msgstr "Set font family" -#. i18n: file: configwindow.ui:316 +#. i18n: file: configwindow.ui:310 #. i18n: ectx: property (text), widget (QLabel, label_fontSize) #: po/rc.cpp:45 rc.cpp:45 msgid "Font size" msgstr "Font size" -#. i18n: file: configwindow.ui:348 +#. i18n: file: configwindow.ui:342 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize) #: po/rc.cpp:48 rc.cpp:48 msgid "Set font size" msgstr "Set font size" -#. i18n: file: configwindow.ui:377 +#. i18n: file: configwindow.ui:371 #. i18n: ectx: property (text), widget (QLabel, label_fontColor) #: po/rc.cpp:51 rc.cpp:51 msgid "Font color" msgstr "Font color" -#. i18n: file: configwindow.ui:409 +#. i18n: file: configwindow.ui:403 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor) #: po/rc.cpp:54 rc.cpp:54 msgid "Set font color" msgstr "Set font color" -#. i18n: file: configwindow.ui:426 +#. i18n: file: configwindow.ui:420 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight) #: po/rc.cpp:57 rc.cpp:57 msgid "Font weight" msgstr "Font weight" -#. i18n: file: configwindow.ui:458 +#. i18n: file: configwindow.ui:452 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight) #: po/rc.cpp:60 rc.cpp:60 msgid "Set font weight" msgstr "Set font weight" -#. i18n: file: configwindow.ui:490 +#. i18n: file: configwindow.ui:484 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle) #: po/rc.cpp:63 rc.cpp:63 msgid "Font style" msgstr "Font style" -#. i18n: file: configwindow.ui:522 +#. i18n: file: configwindow.ui:516 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:66 rc.cpp:66 msgid "Set font style" msgstr "Set font style" -#. i18n: file: configwindow.ui:526 +#. i18n: file: configwindow.ui:520 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:69 rc.cpp:69 msgid "normal" msgstr "normal" -#. i18n: file: configwindow.ui:531 +#. i18n: file: configwindow.ui:525 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:72 rc.cpp:72 msgid "italic" msgstr "italic" -#. i18n: file: configwindow.ui:562 +#. i18n: file: configwindow.ui:556 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon) #: po/rc.cpp:75 rc.cpp:75 msgid "Active icon" msgstr "Active icon" -#. i18n: file: configwindow.ui:598 +#. i18n: file: configwindow.ui:589 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon) #: po/rc.cpp:81 rc.cpp:81 msgid "Inactive icon" @@ -232,4 +232,3 @@ msgstr "Evgeniy Alekseev" 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 fdf482d..a65450d 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: http://kde-look.org/content/show.php?content=98925\n" -"POT-Creation-Date: 2014-04-06 12:31+0400\n" +"POT-Creation-Date: 2014-04-06 18:45+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,43 +17,43 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: netctl.cpp:160 netctl.cpp:195 -msgid "Start profile" -msgstr "" - -#: netctl.cpp:166 -msgid "Stop profile" -msgstr "" - -#: netctl.cpp:170 -msgid "Restart profile" -msgstr "" - -#: netctl.cpp:174 -msgid "Enable profile" -msgstr "" - -#: netctl.cpp:183 +#: netctl.cpp:171 msgid "Start another profile" msgstr "" -#: netctl.cpp:185 +#: netctl.cpp:173 msgid "Stop " msgstr "" -#: netctl.cpp:187 +#: netctl.cpp:175 msgid "Restart " msgstr "" -#: netctl.cpp:190 +#: netctl.cpp:178 msgid "Disable " msgstr "" -#: netctl.cpp:192 +#: netctl.cpp:180 msgid "Enable " msgstr "" -#: netctl.cpp:399 +#: netctl.cpp:183 netctl.cpp:203 +msgid "Start profile" +msgstr "" + +#: netctl.cpp:210 +msgid "Stop profile" +msgstr "" + +#: netctl.cpp:214 +msgid "Restart profile" +msgstr "" + +#: netctl.cpp:218 +msgid "Enable profile" +msgstr "" + +#: netctl.cpp:420 msgid "Netctl plasmoid" msgstr "" @@ -77,146 +77,146 @@ msgstr "" #. i18n: file: configwindow.ui:128 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui) -#. i18n: file: configwindow.ui:164 +#. i18n: file: configwindow.ui:161 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl) -#. i18n: file: configwindow.ui:578 +#. i18n: file: configwindow.ui:572 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon) -#. i18n: file: configwindow.ui:614 +#. i18n: file: configwindow.ui:605 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon) #. i18n: file: configwindow.ui:128 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui) -#. i18n: file: configwindow.ui:164 +#. i18n: file: configwindow.ui:161 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl) -#. i18n: file: configwindow.ui:578 +#. i18n: file: configwindow.ui:572 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon) -#. i18n: file: configwindow.ui:614 +#. i18n: file: configwindow.ui:605 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon) #: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18 #: rc.cpp:78 rc.cpp:84 msgid "Browse" msgstr "" -#. i18n: file: configwindow.ui:148 +#. i18n: file: configwindow.ui:145 #. i18n: ectx: property (text), widget (QLabel, label_netctl) #: po/rc.cpp:15 rc.cpp:15 msgid "Path to netctl" msgstr "" -#. i18n: file: configwindow.ui:184 +#. i18n: file: configwindow.ui:178 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo) #: po/rc.cpp:21 rc.cpp:21 msgid "Use sudo for netctl" msgstr "" -#. i18n: file: configwindow.ui:199 +#. i18n: file: configwindow.ui:193 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface) #: po/rc.cpp:24 rc.cpp:24 msgid "Show more detailed interface" msgstr "" -#. i18n: file: configwindow.ui:209 +#. i18n: file: configwindow.ui:203 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev) #: po/rc.cpp:27 rc.cpp:27 msgid "Show network devices" msgstr "" -#. i18n: file: configwindow.ui:219 +#. i18n: file: configwindow.ui:213 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp) #: po/rc.cpp:30 rc.cpp:30 msgid "Show external IP" msgstr "" -#. i18n: file: configwindow.ui:229 +#. i18n: file: configwindow.ui:223 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp) #: po/rc.cpp:33 rc.cpp:33 msgid "Show internal IP" msgstr "" -#. i18n: file: configwindow.ui:253 +#. i18n: file: configwindow.ui:247 #. i18n: ectx: attribute (title), widget (QWidget, tabAppearance) #: po/rc.cpp:36 rc.cpp:36 msgid "Appearance" msgstr "" -#. i18n: file: configwindow.ui:267 +#. i18n: file: configwindow.ui:261 #. i18n: ectx: property (text), widget (QLabel, label_font) #: po/rc.cpp:39 rc.cpp:39 msgid "Font" msgstr "" -#. i18n: file: configwindow.ui:299 +#. i18n: file: configwindow.ui:293 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font) #: po/rc.cpp:42 rc.cpp:42 msgid "Set font family" msgstr "" -#. i18n: file: configwindow.ui:316 +#. i18n: file: configwindow.ui:310 #. i18n: ectx: property (text), widget (QLabel, label_fontSize) #: po/rc.cpp:45 rc.cpp:45 msgid "Font size" msgstr "" -#. i18n: file: configwindow.ui:348 +#. i18n: file: configwindow.ui:342 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize) #: po/rc.cpp:48 rc.cpp:48 msgid "Set font size" msgstr "" -#. i18n: file: configwindow.ui:377 +#. i18n: file: configwindow.ui:371 #. i18n: ectx: property (text), widget (QLabel, label_fontColor) #: po/rc.cpp:51 rc.cpp:51 msgid "Font color" msgstr "" -#. i18n: file: configwindow.ui:409 +#. i18n: file: configwindow.ui:403 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor) #: po/rc.cpp:54 rc.cpp:54 msgid "Set font color" msgstr "" -#. i18n: file: configwindow.ui:426 +#. i18n: file: configwindow.ui:420 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight) #: po/rc.cpp:57 rc.cpp:57 msgid "Font weight" msgstr "" -#. i18n: file: configwindow.ui:458 +#. i18n: file: configwindow.ui:452 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight) #: po/rc.cpp:60 rc.cpp:60 msgid "Set font weight" msgstr "" -#. i18n: file: configwindow.ui:490 +#. i18n: file: configwindow.ui:484 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle) #: po/rc.cpp:63 rc.cpp:63 msgid "Font style" msgstr "" -#. i18n: file: configwindow.ui:522 +#. i18n: file: configwindow.ui:516 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:66 rc.cpp:66 msgid "Set font style" msgstr "" -#. i18n: file: configwindow.ui:526 +#. i18n: file: configwindow.ui:520 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:69 rc.cpp:69 msgid "normal" msgstr "" -#. i18n: file: configwindow.ui:531 +#. i18n: file: configwindow.ui:525 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:72 rc.cpp:72 msgid "italic" msgstr "" -#. i18n: file: configwindow.ui:562 +#. i18n: file: configwindow.ui:556 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon) #: po/rc.cpp:75 rc.cpp:75 msgid "Active icon" msgstr "" -#. i18n: file: configwindow.ui:598 +#. i18n: file: configwindow.ui:589 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon) #: po/rc.cpp:81 rc.cpp:81 msgid "Inactive icon" diff --git a/sources/plasmoid/po/ru.po b/sources/plasmoid/po/ru.po index f2b7ac2..91e2090 100644 --- a/sources/plasmoid/po/ru.po +++ b/sources/plasmoid/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n" -"POT-Creation-Date: 2014-04-06 12:31+0400\n" +"POT-Creation-Date: 2014-04-06 18:45+0400\n" "PO-Revision-Date: 2014-04-06 12:32+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -18,43 +18,43 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: netctl.cpp:160 netctl.cpp:195 -msgid "Start profile" -msgstr "Запустить профиль" - -#: netctl.cpp:166 -msgid "Stop profile" -msgstr "Остановить профиль" - -#: netctl.cpp:170 -msgid "Restart profile" -msgstr "Перезапустить профиль" - -#: netctl.cpp:174 -msgid "Enable profile" -msgstr "Включить профиль" - -#: netctl.cpp:183 +#: netctl.cpp:171 msgid "Start another profile" msgstr "Запустить другой профиль" -#: netctl.cpp:185 +#: netctl.cpp:173 msgid "Stop " msgstr "Остановить " -#: netctl.cpp:187 +#: netctl.cpp:175 msgid "Restart " msgstr "Перезапустить " -#: netctl.cpp:190 +#: netctl.cpp:178 msgid "Disable " msgstr "Отключить " -#: netctl.cpp:192 +#: netctl.cpp:180 msgid "Enable " msgstr "Включить " -#: netctl.cpp:399 +#: netctl.cpp:183 netctl.cpp:203 +msgid "Start profile" +msgstr "Запустить профиль" + +#: netctl.cpp:210 +msgid "Stop profile" +msgstr "Остановить профиль" + +#: netctl.cpp:214 +msgid "Restart profile" +msgstr "Перезапустить профиль" + +#: netctl.cpp:218 +msgid "Enable profile" +msgstr "Включить профиль" + +#: netctl.cpp:420 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" @@ -78,146 +78,146 @@ msgstr "Путь к GUI" #. i18n: file: configwindow.ui:128 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui) -#. i18n: file: configwindow.ui:164 +#. i18n: file: configwindow.ui:161 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl) -#. i18n: file: configwindow.ui:578 +#. i18n: file: configwindow.ui:572 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon) -#. i18n: file: configwindow.ui:614 +#. i18n: file: configwindow.ui:605 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon) #. i18n: file: configwindow.ui:128 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui) -#. i18n: file: configwindow.ui:164 +#. i18n: file: configwindow.ui:161 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl) -#. i18n: file: configwindow.ui:578 +#. i18n: file: configwindow.ui:572 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon) -#. i18n: file: configwindow.ui:614 +#. i18n: file: configwindow.ui:605 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon) #: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18 #: rc.cpp:78 rc.cpp:84 msgid "Browse" msgstr "Обзор" -#. i18n: file: configwindow.ui:148 +#. i18n: file: configwindow.ui:145 #. i18n: ectx: property (text), widget (QLabel, label_netctl) #: po/rc.cpp:15 rc.cpp:15 msgid "Path to netctl" msgstr "Путь к netctl" -#. i18n: file: configwindow.ui:184 +#. i18n: file: configwindow.ui:178 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo) #: po/rc.cpp:21 rc.cpp:21 msgid "Use sudo for netctl" msgstr "Использовать sudo для netctl" -#. i18n: file: configwindow.ui:199 +#. i18n: file: configwindow.ui:193 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface) #: po/rc.cpp:24 rc.cpp:24 msgid "Show more detailed interface" msgstr "Показать более детальный интерфейс" -#. i18n: file: configwindow.ui:209 +#. i18n: file: configwindow.ui:203 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev) #: po/rc.cpp:27 rc.cpp:27 msgid "Show network devices" msgstr "Показать сетевые устройства" -#. i18n: file: configwindow.ui:219 +#. i18n: file: configwindow.ui:213 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp) #: po/rc.cpp:30 rc.cpp:30 msgid "Show external IP" msgstr "Показать внешний IP" -#. i18n: file: configwindow.ui:229 +#. i18n: file: configwindow.ui:223 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp) #: po/rc.cpp:33 rc.cpp:33 msgid "Show internal IP" msgstr "Показать внутренний IP" -#. i18n: file: configwindow.ui:253 +#. i18n: file: configwindow.ui:247 #. i18n: ectx: attribute (title), widget (QWidget, tabAppearance) #: po/rc.cpp:36 rc.cpp:36 msgid "Appearance" msgstr "Внешний вид" -#. i18n: file: configwindow.ui:267 +#. i18n: file: configwindow.ui:261 #. i18n: ectx: property (text), widget (QLabel, label_font) #: po/rc.cpp:39 rc.cpp:39 msgid "Font" msgstr "Шрифт" -#. i18n: file: configwindow.ui:299 +#. i18n: file: configwindow.ui:293 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font) #: po/rc.cpp:42 rc.cpp:42 msgid "Set font family" msgstr "Укажите шрифт" -#. i18n: file: configwindow.ui:316 +#. i18n: file: configwindow.ui:310 #. i18n: ectx: property (text), widget (QLabel, label_fontSize) #: po/rc.cpp:45 rc.cpp:45 msgid "Font size" msgstr "Размер шрифта" -#. i18n: file: configwindow.ui:348 +#. i18n: file: configwindow.ui:342 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize) #: po/rc.cpp:48 rc.cpp:48 msgid "Set font size" msgstr "Укажите размер шрифта" -#. i18n: file: configwindow.ui:377 +#. i18n: file: configwindow.ui:371 #. i18n: ectx: property (text), widget (QLabel, label_fontColor) #: po/rc.cpp:51 rc.cpp:51 msgid "Font color" msgstr "Цвет шрифта" -#. i18n: file: configwindow.ui:409 +#. i18n: file: configwindow.ui:403 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor) #: po/rc.cpp:54 rc.cpp:54 msgid "Set font color" msgstr "Укажите цвет шрифта" -#. i18n: file: configwindow.ui:426 +#. i18n: file: configwindow.ui:420 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight) #: po/rc.cpp:57 rc.cpp:57 msgid "Font weight" msgstr "Толщина шрифта" -#. i18n: file: configwindow.ui:458 +#. i18n: file: configwindow.ui:452 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight) #: po/rc.cpp:60 rc.cpp:60 msgid "Set font weight" msgstr "Укажите ширину шрифта" -#. i18n: file: configwindow.ui:490 +#. i18n: file: configwindow.ui:484 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle) #: po/rc.cpp:63 rc.cpp:63 msgid "Font style" msgstr "Стиль шрифта" -#. i18n: file: configwindow.ui:522 +#. i18n: file: configwindow.ui:516 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:66 rc.cpp:66 msgid "Set font style" msgstr "Укажите стиль шрифта" -#. i18n: file: configwindow.ui:526 +#. i18n: file: configwindow.ui:520 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:69 rc.cpp:69 msgid "normal" msgstr "normal" -#. i18n: file: configwindow.ui:531 +#. i18n: file: configwindow.ui:525 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle) #: po/rc.cpp:72 rc.cpp:72 msgid "italic" msgstr "italic" -#. i18n: file: configwindow.ui:562 +#. i18n: file: configwindow.ui:556 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon) #: po/rc.cpp:75 rc.cpp:75 msgid "Active icon" msgstr "Иконка активного подключения" -#. i18n: file: configwindow.ui:598 +#. i18n: file: configwindow.ui:589 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon) #: po/rc.cpp:81 rc.cpp:81 msgid "Inactive icon" @@ -232,4 +232,3 @@ msgstr "Evgeniy Alekseev" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" -