From 4c9c7b00a1313de37510cf09f23f6becbd9fa56e Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 6 Aug 2014 00:12:52 +0400 Subject: [PATCH] update gui --- README.md | 1 - sources/CMakeLists.txt | 2 +- sources/gui/src/aboutwindow.cpp | 10 +- sources/gui/src/mainwindow.cpp | 28 ++-- sources/gui/src/netctlautowindow.cpp | 34 ++-- sources/plasmoid/netctl.cpp | 10 +- sources/plasmoid/po/en.po | 78 ++++----- sources/plasmoid/po/plasma_applet_netctl.pot | 76 ++++----- sources/plasmoid/po/ru.po | 80 ++++----- sources/resources/translations/en.ts | 4 + sources/resources/translations/netctl-gui.ts | 161 ++++++++++--------- sources/resources/translations/ru.ts | 6 +- sources/version.h.in | 1 + 13 files changed, 264 insertions(+), 227 deletions(-) diff --git a/README.md b/README.md index b0bfdbe..566863e 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,6 @@ Additional information TODO (wish list) ---------------- -* refactoring of GUI according to library changes * rewrite changelog to more comfortable format Links diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index bea789b..cf40f43 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -10,7 +10,7 @@ set (PROJECT_AUTHOR "Evgeniy Alekseev") set (PROJECT_CONTACT "esalexeev@gmail.com") set (PROJECT_LICENSE "GPLv3") set (PROJECT_VERSION_MAJOR 1) -set (PROJECT_VERSION_MINOR 2) +set (PROJECT_VERSION_MINOR 3) set (PROJECT_VERSION_PATCH 0) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) diff --git a/sources/gui/src/aboutwindow.cpp b/sources/gui/src/aboutwindow.cpp index 60b8508..73fcac0 100644 --- a/sources/gui/src/aboutwindow.cpp +++ b/sources/gui/src/aboutwindow.cpp @@ -49,6 +49,12 @@ void AboutWindow::createText() { if (debug) qDebug() << "[AboutWindow]" << "[createText]"; + QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); + for (int i=0; i%1 (%2 license)") + .arg(trdPartyList[i].split(QChar(','))[0]) + .arg(trdPartyList[i].split(QChar(','))[1]) + .arg(trdPartyList[i].split(QChar(','))[2]); uiAbout->label_name->setText(QString(NAME)); uiAbout->label_version->setText(QApplication::translate("AboutWindow", "Version %1\n(build date %2)") .arg(QString(VERSION)).arg(QString(BUILD_DATE))); @@ -61,8 +67,8 @@ void AboutWindow::createText() QString("%2
").arg(QString(TRANSLATION)).arg(QApplication::translate("AboutWindow", "Translation issue")) +\ QString("%2").arg(QString(AUR_PACKAGES)).arg(QApplication::translate("AboutWindow", "AUR packages"))); uiAbout->label_license->setText(QString("© %1 %3
").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + - QApplication::translate("AboutWindow", "This software is licensed under %1").arg(QString(LICENSE)) + - QString("
")); + QApplication::translate("AboutWindow", "This software is licensed under %1").arg(QString(LICENSE)) + QString("
") + + QApplication::translate("AboutWindow", "This software uses: %1").arg(trdPartyList.join(QString(", "))) + QString("")); } diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 8d2a02d..3e9f64f 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -396,7 +396,7 @@ void MainWindow::updateMainTab() return errorWin->showWindow(1, QString("[MainWindow] : [updateMainTab]")); ui->tabWidget->setDisabled(true); - QList profiles = netctlCommand->getProfileList(); + QList profiles = netctlCommand->getProfileList(); if (netctlCommand->isNetctlAutoRunning()) ui->widget_netctlAuto->setHidden(false); @@ -418,13 +418,13 @@ void MainWindow::updateMainTab() // create items for (int i=0; itableWidget_main->setItem(i, 0, new QTableWidgetItem(profiles[i][0])); + ui->tableWidget_main->setItem(i, 0, new QTableWidgetItem(profiles[i].name)); ui->tableWidget_main->item(i, 0)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); // description - ui->tableWidget_main->setItem(i, 1, new QTableWidgetItem(profiles[i][1])); + ui->tableWidget_main->setItem(i, 1, new QTableWidgetItem(profiles[i].description)); ui->tableWidget_main->item(i, 1)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); // status - ui->tableWidget_main->setItem(i, 2, new QTableWidgetItem(profiles[i][2])); + ui->tableWidget_main->setItem(i, 2, new QTableWidgetItem(profiles[i].status)); ui->tableWidget_main->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); } @@ -513,9 +513,9 @@ void MainWindow::updateWifiTab() if (!checkExternalApps(QString("wpasup"))) return errorWin->showWindow(1, QString("[MainWindow] : [updateWifiTab]")); - QList scanResults = wpaCommand->scanWifi(); - ui->tabWidget->setDisabled(true); + QList scanResults = wpaCommand->scanWifi(); + ui->tableWidget_wifi->setSortingEnabled(false); ui->tableWidget_wifi->selectRow(-1); ui->tableWidget_wifi->sortByColumn(0, Qt::AscendingOrder); @@ -532,16 +532,16 @@ void MainWindow::updateWifiTab() // create items for (int i=0; itableWidget_wifi->setItem(i, 0, new QTableWidgetItem(scanResults[i][0])); + ui->tableWidget_wifi->setItem(i, 0, new QTableWidgetItem(scanResults[i].name)); ui->tableWidget_wifi->item(i, 0)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); // status - ui->tableWidget_wifi->setItem(i, 1, new QTableWidgetItem(scanResults[i][1])); + ui->tableWidget_wifi->setItem(i, 1, new QTableWidgetItem(scanResults[i].status)); ui->tableWidget_wifi->item(i, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); // signal - ui->tableWidget_wifi->setItem(i, 2, new QTableWidgetItem(scanResults[i][2])); + ui->tableWidget_wifi->setItem(i, 2, new QTableWidgetItem(scanResults[i].signal)); ui->tableWidget_wifi->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); // security - ui->tableWidget_wifi->setItem(i, 3, new QTableWidgetItem(scanResults[i][3])); + ui->tableWidget_wifi->setItem(i, 3, new QTableWidgetItem(scanResults[i].security)); ui->tableWidget_wifi->item(i, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); } @@ -936,9 +936,9 @@ void MainWindow::profileTabClear() if (debug) qDebug() << "[MainWindow]" << "[profileTabClear]"; ui->comboBox_profile->clear(); - QList profiles = netctlCommand->getProfileList(); + QList profiles = netctlCommand->getProfileList(); for (int i=0; icomboBox_profile->addItem(profiles[i][0]); + ui->comboBox_profile->addItem(profiles[i].name); ui->comboBox_profile->setCurrentIndex(-1); generalWid->clear(); @@ -1268,12 +1268,12 @@ void MainWindow::connectToUnknownEssid(const QString passwd) if (passwdWid != 0) delete passwdWid; - if (netctlCommand->getInterfaceList().isEmpty()) + if (netctlCommand->getWirelessInterfaceList().isEmpty()) return; QMap settings; settings[QString("Description")] = QString("'Automatically generated profile by Netctl GUI'"); - settings[QString("Interface")] = netctlCommand->getInterfaceList()[0]; + settings[QString("Interface")] = netctlCommand->getWirelessInterfaceList()[0]; settings[QString("Connection")] = QString("wireless"); QString security = ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 3)->text(); if (checkState(QString("WPA"), security)) diff --git a/sources/gui/src/netctlautowindow.cpp b/sources/gui/src/netctlautowindow.cpp index faf5c89..efe2bcc 100644 --- a/sources/gui/src/netctlautowindow.cpp +++ b/sources/gui/src/netctlautowindow.cpp @@ -88,7 +88,7 @@ void NetctlAutoWindow::netctlAutoUpdateTable() if (debug) qDebug() << "[NetctlAutoWindow]" << "[netctlAutoUpdateTable]"; ui->tableWidget->setDisabled(true); - QList profiles = netctlCommand->getProfileListFromNetctlAuto(); + QList profiles = netctlCommand->getProfileListFromNetctlAuto(); // actions if (netctlCommand->isNetctlAutoEnabled()) @@ -99,12 +99,16 @@ void NetctlAutoWindow::netctlAutoUpdateTable() if (netctlCommand->isNetctlAutoRunning()) { ui->label_info->setText(QApplication::translate("NetctlAutoWindow", "netctl-auto is running")); ui->actionStartService->setText(QApplication::translate("NetctlAutoWindow", "Stop service")); + ui->actionDisableAll->setVisible(true); + ui->actionEnableAll->setVisible(true); ui->actionRestartService->setVisible(true); } else { - ui->actionStartService->setText(QApplication::translate("NetctlAutoWindow", "Start service")); - ui->actionRestartService->setVisible(false); ui->label_info->setText(QApplication::translate("NetctlAutoWindow", "netctl-auto is not running")); + ui->actionStartService->setText(QApplication::translate("NetctlAutoWindow", "Start service")); + ui->actionDisableAll->setVisible(false); + ui->actionEnableAll->setVisible(false); + ui->actionRestartService->setVisible(false); netctlAutoRefreshButtons(0, 0); return; } @@ -125,30 +129,26 @@ void NetctlAutoWindow::netctlAutoUpdateTable() // create items for (int i=0; itableWidget->setItem(i, 0, new QTableWidgetItem(profiles[i][0])); + ui->tableWidget->setItem(i, 0, new QTableWidgetItem(profiles[i].name)); ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); - if (profiles[i][2] == QString("*")) { + // description + ui->tableWidget->setItem(i, 1, new QTableWidgetItem(profiles[i].description)); + ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); + if (profiles[i].status == QString("*")) { + // active QFont font; font.setBold(true); ui->tableWidget->item(i, 0)->setFont(font); - } - else if (profiles[i][2] == QString("!")) { - QFont font; - font.setItalic(true); - ui->tableWidget->item(i, 0)->setFont(font); - } - // description - ui->tableWidget->setItem(i, 1, new QTableWidgetItem(profiles[i][1])); - ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); - if (profiles[i][2] == QString("*")) { - // active ui->tableWidget->setItem(i, 2, new QTableWidgetItem(QApplication::translate("NetctlAutoWindow", "yes"))); ui->tableWidget->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); } else ui->tableWidget->setItem(i, 2, new QTableWidgetItem(QString(""))); - if (profiles[i][2] == QString("!")) { + if (profiles[i].status == QString("!")) { // disabled + QFont font; + font.setItalic(true); + ui->tableWidget->item(i, 0)->setFont(font); ui->tableWidget->setItem(i, 3, new QTableWidgetItem(QApplication::translate("NetctlAutoWindow", "yes"))); ui->tableWidget->item(i, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); } diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index 8aeae7f..58cf1e6 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -711,6 +711,12 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent) uiDEConfig.lineEdit_extIp6->setText(deSettings[QString("EXTIP6CMD")]); setDataEngineExternalIp6(); + QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); + for (int i=0; i%1 (%2 license)") + .arg(trdPartyList[i].split(QChar(','))[0]) + .arg(trdPartyList[i].split(QChar(','))[1]) + .arg(trdPartyList[i].split(QChar(','))[2]); uiAboutConfig.label_name->setText(QString(NAME)); uiAboutConfig.label_version->setText(i18n("Version %1\n(build date %2)", QString(VERSION), QString(BUILD_DATE))); uiAboutConfig.label_description->setText(i18n("KDE widget which interacts with netctl.")); @@ -722,8 +728,8 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent) QString("%2
").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) + QString("%2").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages"))); uiAboutConfig.label_license->setText(QString("© %1 %3
").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + - i18n("This software is licensed under %1", QString(LICENSE)) + - QString("
")); + i18n("This software is licensed under %1", QString(LICENSE)) + QString("
") + + i18n("This software uses: %1", trdPartyList.join(QString(", "))) + QString("")); parent->addPage(configWidget, i18n("Netctl plasmoid"), Applet::icon()); parent->addPage(appWidget, i18n("Appearance"), QString("preferences-desktop-theme")); diff --git a/sources/plasmoid/po/en.po b/sources/plasmoid/po/en.po index a6b9736..fc608cb 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: http://kde-look.org/content/show.php?content=98925\n" -"POT-Creation-Date: 2014-08-05 20:32+0400\n" -"PO-Revision-Date: 2014-08-05 20:33+0400\n" +"POT-Creation-Date: 2014-08-06 00:06+0400\n" +"PO-Revision-Date: 2014-08-06 00:06+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -18,91 +18,91 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: netctl.cpp:296 +#: netctl.cpp:297 msgid "Set profile %1 disabled" msgstr "Set profile %1 disabled" -#: netctl.cpp:300 +#: netctl.cpp:301 msgid "Set profile %1 enabled" msgstr "Set profile %1 enabled" -#: netctl.cpp:317 +#: netctl.cpp:318 msgid "Start profile %1" msgstr "Start profile %1" -#: netctl.cpp:335 +#: netctl.cpp:336 msgid "Stop profile %1" msgstr "Stop profile %1" -#: netctl.cpp:352 +#: netctl.cpp:353 msgid "Switch to profile %1" msgstr "Switch to profile %1" -#: netctl.cpp:366 +#: netctl.cpp:367 msgid "Restart profile %1" msgstr "Restart profile %1" -#: netctl.cpp:405 +#: netctl.cpp:406 msgid "Start another profile" msgstr "Start another profile" -#: netctl.cpp:406 +#: netctl.cpp:407 msgid "Stop %1" msgstr "Stop %1" -#: netctl.cpp:407 +#: netctl.cpp:408 msgid "Restart %1" msgstr "Restart %1" -#: netctl.cpp:409 +#: netctl.cpp:410 msgid "Disable %1" msgstr "Disable %1" -#: netctl.cpp:411 +#: netctl.cpp:412 msgid "Enable %1" msgstr "Enable %1" -#: netctl.cpp:414 netctl.cpp:437 +#: netctl.cpp:415 netctl.cpp:438 msgid "Start profile" msgstr "Start profile" -#: netctl.cpp:445 +#: netctl.cpp:446 msgid "Stop profile" msgstr "Stop profile" -#: netctl.cpp:450 +#: netctl.cpp:451 msgid "Switch to profile" msgstr "Switch to profile" -#: netctl.cpp:458 +#: netctl.cpp:459 msgid "Restart profile" msgstr "Restart profile" -#: netctl.cpp:463 +#: netctl.cpp:464 msgid "Enable profile" msgstr "Enable profile" -#: netctl.cpp:467 +#: netctl.cpp:468 msgid "Show WiFi menu" msgstr "Show WiFi menu" -#: netctl.cpp:494 +#: netctl.cpp:495 msgid "Start GUI" msgstr "Start GUI" -#: netctl.cpp:505 +#: netctl.cpp:506 msgid "Start WiFi menu" msgstr "Start WiFi menu" -#: netctl.cpp:569 +#: netctl.cpp:570 msgid "Network is up" msgstr "Network is up" -#: netctl.cpp:574 +#: netctl.cpp:575 msgid "Network is down" msgstr "Network is down" -#: netctl.cpp:714 +#: netctl.cpp:721 msgid "" "Version %1\n" "(build date %2)" @@ -110,55 +110,59 @@ msgstr "" "Version %1\n" "(build date %2)" -#: netctl.cpp:715 +#: netctl.cpp:722 msgid "KDE widget which interacts with netctl." msgstr "KDE widget which interacts with netctl." -#: netctl.cpp:716 +#: netctl.cpp:723 msgid "Translators: %1" msgstr "Translators: %1" -#: netctl.cpp:717 +#: netctl.cpp:724 msgid "Links:" msgstr "Links:" -#: netctl.cpp:718 +#: netctl.cpp:725 msgid "Homepage" msgstr "Homepage" -#: netctl.cpp:719 +#: netctl.cpp:726 msgid "Repository" msgstr "Repository" -#: netctl.cpp:720 +#: netctl.cpp:727 msgid "Bugtracker" msgstr "Bugtracker" -#: netctl.cpp:721 +#: netctl.cpp:728 msgid "Translation issue" msgstr "Translation issue" -#: netctl.cpp:722 +#: netctl.cpp:729 msgid "AUR packages" msgstr "AUR packages" -#: netctl.cpp:724 +#: netctl.cpp:731 msgid "This software is licensed under %1" msgstr "This software is licensed under %1" -#: netctl.cpp:727 +#: netctl.cpp:732 +msgid "This software uses: %1" +msgstr "This software uses: %1" + +#: netctl.cpp:734 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:728 +#: netctl.cpp:735 msgid "Appearance" msgstr "Appearance" -#: netctl.cpp:729 +#: netctl.cpp:736 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:730 +#: netctl.cpp:737 msgid "About" msgstr "About" diff --git a/sources/plasmoid/po/plasma_applet_netctl.pot b/sources/plasmoid/po/plasma_applet_netctl.pot index 8a74621..8f03240 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-08-05 20:32+0400\n" +"POT-Creation-Date: 2014-08-06 00:06+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,145 +17,149 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: netctl.cpp:296 +#: netctl.cpp:297 msgid "Set profile %1 disabled" msgstr "" -#: netctl.cpp:300 +#: netctl.cpp:301 msgid "Set profile %1 enabled" msgstr "" -#: netctl.cpp:317 +#: netctl.cpp:318 msgid "Start profile %1" msgstr "" -#: netctl.cpp:335 +#: netctl.cpp:336 msgid "Stop profile %1" msgstr "" -#: netctl.cpp:352 +#: netctl.cpp:353 msgid "Switch to profile %1" msgstr "" -#: netctl.cpp:366 +#: netctl.cpp:367 msgid "Restart profile %1" msgstr "" -#: netctl.cpp:405 +#: netctl.cpp:406 msgid "Start another profile" msgstr "" -#: netctl.cpp:406 +#: netctl.cpp:407 msgid "Stop %1" msgstr "" -#: netctl.cpp:407 +#: netctl.cpp:408 msgid "Restart %1" msgstr "" -#: netctl.cpp:409 +#: netctl.cpp:410 msgid "Disable %1" msgstr "" -#: netctl.cpp:411 +#: netctl.cpp:412 msgid "Enable %1" msgstr "" -#: netctl.cpp:414 netctl.cpp:437 +#: netctl.cpp:415 netctl.cpp:438 msgid "Start profile" msgstr "" -#: netctl.cpp:445 +#: netctl.cpp:446 msgid "Stop profile" msgstr "" -#: netctl.cpp:450 +#: netctl.cpp:451 msgid "Switch to profile" msgstr "" -#: netctl.cpp:458 +#: netctl.cpp:459 msgid "Restart profile" msgstr "" -#: netctl.cpp:463 +#: netctl.cpp:464 msgid "Enable profile" msgstr "" -#: netctl.cpp:467 +#: netctl.cpp:468 msgid "Show WiFi menu" msgstr "" -#: netctl.cpp:494 +#: netctl.cpp:495 msgid "Start GUI" msgstr "" -#: netctl.cpp:505 +#: netctl.cpp:506 msgid "Start WiFi menu" msgstr "" -#: netctl.cpp:569 +#: netctl.cpp:570 msgid "Network is up" msgstr "" -#: netctl.cpp:574 +#: netctl.cpp:575 msgid "Network is down" msgstr "" -#: netctl.cpp:714 +#: netctl.cpp:721 msgid "" "Version %1\n" "(build date %2)" msgstr "" -#: netctl.cpp:715 +#: netctl.cpp:722 msgid "KDE widget which interacts with netctl." msgstr "" -#: netctl.cpp:716 +#: netctl.cpp:723 msgid "Translators: %1" msgstr "" -#: netctl.cpp:717 +#: netctl.cpp:724 msgid "Links:" msgstr "" -#: netctl.cpp:718 +#: netctl.cpp:725 msgid "Homepage" msgstr "" -#: netctl.cpp:719 +#: netctl.cpp:726 msgid "Repository" msgstr "" -#: netctl.cpp:720 +#: netctl.cpp:727 msgid "Bugtracker" msgstr "" -#: netctl.cpp:721 +#: netctl.cpp:728 msgid "Translation issue" msgstr "" -#: netctl.cpp:722 +#: netctl.cpp:729 msgid "AUR packages" msgstr "" -#: netctl.cpp:724 +#: netctl.cpp:731 msgid "This software is licensed under %1" msgstr "" -#: netctl.cpp:727 +#: netctl.cpp:732 +msgid "This software uses: %1" +msgstr "" + +#: netctl.cpp:734 msgid "Netctl plasmoid" msgstr "" -#: netctl.cpp:728 +#: netctl.cpp:735 msgid "Appearance" msgstr "" -#: netctl.cpp:729 +#: netctl.cpp:736 msgid "DataEngine" msgstr "" -#: netctl.cpp:730 +#: netctl.cpp:737 msgid "About" msgstr "" diff --git a/sources/plasmoid/po/ru.po b/sources/plasmoid/po/ru.po index e31b7bc..15382be 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: http://kde-look.org/content/show.php?content=98925\n" -"POT-Creation-Date: 2014-08-05 20:32+0400\n" -"PO-Revision-Date: 2014-08-05 20:36+0400\n" +"POT-Creation-Date: 2014-08-06 00:06+0400\n" +"PO-Revision-Date: 2014-08-06 00:07+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -18,91 +18,91 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: netctl.cpp:296 +#: netctl.cpp:297 msgid "Set profile %1 disabled" msgstr "Выключение автозагрузки профиля %1" -#: netctl.cpp:300 +#: netctl.cpp:301 msgid "Set profile %1 enabled" msgstr "Включение автозагрузки профиля %1" -#: netctl.cpp:317 +#: netctl.cpp:318 msgid "Start profile %1" msgstr "Запуск профиля %1" -#: netctl.cpp:335 +#: netctl.cpp:336 msgid "Stop profile %1" msgstr "Остановка профиля %1" -#: netctl.cpp:352 +#: netctl.cpp:353 msgid "Switch to profile %1" msgstr "Переключение на профиль %1" -#: netctl.cpp:366 +#: netctl.cpp:367 msgid "Restart profile %1" msgstr "Перезапуск профиля %1" -#: netctl.cpp:405 +#: netctl.cpp:406 msgid "Start another profile" msgstr "Запустить другой профиль" -#: netctl.cpp:406 +#: netctl.cpp:407 msgid "Stop %1" msgstr "Остановить %1" -#: netctl.cpp:407 +#: netctl.cpp:408 msgid "Restart %1" msgstr "Перезапустить %1" -#: netctl.cpp:409 +#: netctl.cpp:410 msgid "Disable %1" msgstr "Отключить %1" -#: netctl.cpp:411 +#: netctl.cpp:412 msgid "Enable %1" msgstr "Включить %1" -#: netctl.cpp:414 netctl.cpp:437 +#: netctl.cpp:415 netctl.cpp:438 msgid "Start profile" msgstr "Запустить профиль" -#: netctl.cpp:445 +#: netctl.cpp:446 msgid "Stop profile" msgstr "Остановить профиль" -#: netctl.cpp:450 +#: netctl.cpp:451 msgid "Switch to profile" msgstr "Переключить профиль" -#: netctl.cpp:458 +#: netctl.cpp:459 msgid "Restart profile" msgstr "Перезапустить профиль" -#: netctl.cpp:463 +#: netctl.cpp:464 msgid "Enable profile" msgstr "Включить профиль" -#: netctl.cpp:467 +#: netctl.cpp:468 msgid "Show WiFi menu" msgstr "Запустить WiFi-menu" -#: netctl.cpp:494 +#: netctl.cpp:495 msgid "Start GUI" msgstr "Запуск GUI" -#: netctl.cpp:505 +#: netctl.cpp:506 msgid "Start WiFi menu" msgstr "Запуск WiFi-menu" -#: netctl.cpp:569 +#: netctl.cpp:570 msgid "Network is up" msgstr "Сеть работает" -#: netctl.cpp:574 +#: netctl.cpp:575 msgid "Network is down" msgstr "Сеть не работает" -#: netctl.cpp:714 +#: netctl.cpp:721 msgid "" "Version %1\n" "(build date %2)" @@ -110,55 +110,59 @@ msgstr "" "Версия %1\n" "(дата сборки %2)" -#: netctl.cpp:715 +#: netctl.cpp:722 msgid "KDE widget which interacts with netctl." msgstr "Виджет KDE, который взаимодействует с netctl." -#: netctl.cpp:716 +#: netctl.cpp:723 msgid "Translators: %1" msgstr "Переводчики: %1" -#: netctl.cpp:717 +#: netctl.cpp:724 msgid "Links:" msgstr "Ссылки:" -#: netctl.cpp:718 +#: netctl.cpp:725 msgid "Homepage" msgstr "Домашняя страница" -#: netctl.cpp:719 +#: netctl.cpp:726 msgid "Repository" msgstr "Репозиторий" -#: netctl.cpp:720 +#: netctl.cpp:727 msgid "Bugtracker" msgstr "Багтрекер" -#: netctl.cpp:721 +#: netctl.cpp:728 msgid "Translation issue" msgstr "Тикет перевода" -#: netctl.cpp:722 +#: netctl.cpp:729 msgid "AUR packages" msgstr "Пакеты в AUR" -#: netctl.cpp:724 +#: netctl.cpp:731 msgid "This software is licensed under %1" -msgstr "Данное программное обеспечение лицензировано под %1" +msgstr "Данное приложение лицензировано под %1" -#: netctl.cpp:727 +#: netctl.cpp:732 +msgid "This software uses: %1" +msgstr "Данное приложение использует: %1" + +#: netctl.cpp:734 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:728 +#: netctl.cpp:735 msgid "Appearance" msgstr "Внешний вид" -#: netctl.cpp:729 +#: netctl.cpp:736 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:730 +#: netctl.cpp:737 msgid "About" msgstr "О программе" diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts index 1c846d2..b3a7077 100644 --- a/sources/resources/translations/en.ts +++ b/sources/resources/translations/en.ts @@ -49,6 +49,10 @@ Translators: %1 Translators: %1 + + This software uses: %1 + This software uses: %1 + BridgeWidget diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts index 5183e5d..13d3a0c 100644 --- a/sources/resources/translations/netctl-gui.ts +++ b/sources/resources/translations/netctl-gui.ts @@ -4,56 +4,61 @@ AboutWindow - + Version %1 (build date %2) - + Qt-based graphical interface for netctl. - + Translators: %1 - + Links: - + Homepage - + Repository - + Bugtracker - + Translation issue - + AUR packages - + This software is licensed under %1 + + + This software uses: %1 + + About @@ -738,30 +743,30 @@ - - + + Name - + Description - - + + Status - - + + @@ -781,9 +786,9 @@ - - - + + + Start @@ -841,13 +846,13 @@ - + Signal - + Security @@ -888,35 +893,35 @@ - - - + + + Start profile - + Restart profile - - - + + + Enable profile - + Edit profile - + Remove profile @@ -943,79 +948,79 @@ - + Ready - - - + + + Updated - - + + Stop profile - - + + Disable profile - - + + Stop WiFi - - - - - + + + + + Start WiFi - - - - - - - - - - - - + + + + + + + + + + + + Done - - - - - - - - - - - - + + + + + + + + + + + + Error - - + + Stop @@ -1325,25 +1330,25 @@ - + Name - + Description - + Active - + Disabled @@ -1385,7 +1390,7 @@ - + Start service @@ -1396,7 +1401,7 @@ - + yes diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts index 0423941..f2acdce 100644 --- a/sources/resources/translations/ru.ts +++ b/sources/resources/translations/ru.ts @@ -39,7 +39,7 @@ This software is licensed under %1 - Данной программное обеспечение лицензировано под %1 + Данное приложение лицензировано под %1 About @@ -49,6 +49,10 @@ Translators: %1 Переводчики: %1 + + This software uses: %1 + Данное приложение использует: %1 + BridgeWidget diff --git a/sources/version.h.in b/sources/version.h.in index e0fc3e0..f05caf9 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -7,6 +7,7 @@ #define TRANSLATORS "" #define EMAIL "@PROJECT_CONTACT@" #define LICENSE "@PROJECT_LICENSE@" +#define TRDPARTY_LICENSE "tasks,BSD,https://github.com/mhogomchungu/tasks;" #define HOMEPAGE "http://arcanis.name/projects/netctl-gui/" #define REPOSITORY "https://github.com/arcan1s/netctl-gui"