From d17543a07534d602f32ba2d4b128982bd8cec1b6 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 11 Jul 2014 20:59:01 +0400 Subject: [PATCH] add null translation file --- CHANGELOG | 1 + sources/gui/src/mainwindow.cpp | 20 +- sources/gui/src/mainwindow.h | 2 + sources/gui/src/mainwindow.ui | 9 + sources/gui/src/netctlautowindow.cpp | 111 + sources/gui/src/netctlautowindow.h | 59 + sources/gui/src/netctlautowindow.ui | 197 ++ sources/resources/translations/en.ts | 114 +- sources/resources/translations/netctl-gui.ts | 1997 ++++++++++++++++++ sources/resources/translations/ru.ts | 114 +- 10 files changed, 2604 insertions(+), 20 deletions(-) create mode 100644 sources/gui/src/netctlautowindow.cpp create mode 100644 sources/gui/src/netctlautowindow.h create mode 100644 sources/gui/src/netctlautowindow.ui create mode 100644 sources/resources/translations/netctl-gui.ts diff --git a/CHANGELOG b/CHANGELOG index 85064c4..66d4e63 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ Ver.1.2.0: + [gui] added support of hidden wifi network + [gui] added contextual menu to tables + [gui] added actions menu ++ [gui] added clear() function to profileTab + [lib] detached backend from frontend * [all] small changes in the project architecture * [gui] more debug information diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 4381e28..7f971c9 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -34,6 +34,7 @@ #include "ipwidget.h" #include "macvlanwidget.h" #include "mobilewidget.h" +#include "netctlautowindow.h" #include "passwdwidget.h" #include "pppoewidget.h" #include "settingswindow.h" @@ -63,6 +64,7 @@ MainWindow::MainWindow(QWidget *parent, const bool defaultSettings, const bool d configuration = settingsWin->getSettings(); // gui + netctlAutoWin = new NetctlAutoWindow(this, debug, configuration); generalWid = new GeneralWidget(this, configuration); ui->scrollAreaWidgetContents->layout()->addWidget(generalWid); ipWid = new IpWidget(this); @@ -117,6 +119,7 @@ MainWindow::~MainWindow() delete vlanWid; delete wirelessWid; + delete netctlAutoWin; delete settingsWin; delete ui; } @@ -167,6 +170,7 @@ void MainWindow::createActions() if (debug) qDebug() << "[MainWindow]" << "[createActions]"; connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int))); + connect(ui->actionNetctlAuto, SIGNAL(triggered(bool)), netctlAutoWin, SLOT(showWindow())); connect(ui->actionSettings, SIGNAL(triggered(bool)), settingsWin, SLOT(showWindow())); connect(ui->actionQuit, SIGNAL(triggered(bool)), this, SLOT(close())); @@ -363,10 +367,14 @@ void MainWindow::updateMenuMain() ui->actionMainStart->setIcon(QIcon::fromTheme("dialog-apply")); } ui->actionMainStart->setVisible(true); - if (checkState(QString("enabled"), item)) + if (checkState(QString("enabled"), item)) { ui->actionMainEnable->setText(QApplication::translate("MainWindow", "Disable profile")); - else + ui->actionMainEnable->setIcon(QIcon::fromTheme("edit-remove")); + } + else { ui->actionMainEnable->setText(QApplication::translate("MainWindow", "Enable profile")); + ui->actionMainEnable->setIcon(QIcon::fromTheme("edit-add")); + } ui->actionMainEnable->setVisible(true); ui->actionMainEdit->setVisible(true); ui->actionMainRemove->setVisible(true); @@ -518,10 +526,14 @@ void MainWindow::mainTabContextualMenu(const QPoint &pos) startProfile->setText(QApplication::translate("MainWindow", "Start profile")); startProfile->setIcon(QIcon::fromTheme("dialog-apply")); } - if (checkState(QString("enabled"), item)) + if (checkState(QString("enabled"), item)) { enableProfile->setText(QApplication::translate("MainWindow", "Disable profile")); - else + enableProfile->setIcon(QIcon::fromTheme("edit-remove")); + } + else { enableProfile->setText(QApplication::translate("MainWindow", "Enable profile")); + enableProfile->setIcon(QIcon::fromTheme("edit-add")); + } // actions QAction *action = menu.exec(ui->tableWidget_main->viewport()->mapToGlobal(pos)); diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h index 39923a3..f9bd81f 100644 --- a/sources/gui/src/mainwindow.h +++ b/sources/gui/src/mainwindow.h @@ -31,6 +31,7 @@ class IpWidget; class MacvlanWidget; class MobileWidget; class Netctl; +class NetctlAutoWindow; class NetctlProfile; class PasswdWidget; class PppoeWidget; @@ -96,6 +97,7 @@ private slots: private: // ui Ui::MainWindow *ui; + NetctlAutoWindow *netctlAutoWin; BridgeWidget *bridgeWid; EthernetWidget *ethernetWid; GeneralWidget *generalWid; diff --git a/sources/gui/src/mainwindow.ui b/sources/gui/src/mainwindow.ui index 1a16241..5338a8c 100644 --- a/sources/gui/src/mainwindow.ui +++ b/sources/gui/src/mainwindow.ui @@ -349,6 +349,7 @@ Menu + @@ -426,6 +427,9 @@ + + + Enable profile @@ -494,6 +498,11 @@ Remove profile + + + netctl-auto + + tabWidget diff --git a/sources/gui/src/netctlautowindow.cpp b/sources/gui/src/netctlautowindow.cpp new file mode 100644 index 0000000..c55672f --- /dev/null +++ b/sources/gui/src/netctlautowindow.cpp @@ -0,0 +1,111 @@ +/*************************************************************************** + * This file is part of netctl-gui * + * * + * netctl-gui is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * netctl-gui is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with netctl-gui. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + +#include "netctlautowindow.h" +#include "ui_netctlautowindow.h" + +#include + +#include + + +NetctlAutoWindow::NetctlAutoWindow(QWidget *parent, const bool debugCmd, const QMap settings) + : QMainWindow(parent), + ui(new Ui::NetctlAutoWindow), + debug(debugCmd) +{ + ui->setupUi(this); + netctlCommand = new Netctl(debug, settings); +} + + +NetctlAutoWindow::~NetctlAutoWindow() +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[~NetctlAutoWindow]"; + + delete ui; +} + + +void NetctlAutoWindow::createActions() +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[createActions]"; + +// connect(ui->comboBox_language, SIGNAL(currentIndexChanged(int)), ui->label_info, SLOT(show())); +// connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close())); +// connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(setDefault())); +// connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(saveSettings())); +// connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(close())); +// // buttons +// connect(ui->pushButton_interfaceDir, SIGNAL(clicked(bool)), SLOT(selectIfaceDir())); +// connect(ui->pushButton_netctlPath, SIGNAL(clicked(bool)), SLOT(selectNetctlPath())); +// connect(ui->pushButton_profilePath, SIGNAL(clicked(bool)), SLOT(selectProfileDir())); +// connect(ui->pushButton_rfkill, SIGNAL(clicked(bool)), SLOT(selectRfkillDir())); +// connect(ui->pushButton_sudo, SIGNAL(clicked(bool)), SLOT(selectSudoPath())); +// connect(ui->pushButton_wpaCliPath, SIGNAL(clicked(bool)), SLOT(selectWpaCliPath())); +// connect(ui->pushButton_wpaSupPath, SIGNAL(clicked(bool)), SLOT(selectWpaSupPath())); +} + + +// ESC press event +void NetctlAutoWindow::keyPressEvent(QKeyEvent *pressedKey) +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[keyPressEvent]"; + + if (pressedKey->key() == Qt::Key_Escape) + close(); +} + + +void NetctlAutoWindow::showWindow() +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[showWindow]"; + + clear(); + appendActiveProfiles(); + appendAvailableProfiles(); + show(); +} + + +void NetctlAutoWindow::appendActiveProfiles() +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[appendActiveProfiles]"; + + +} + + +void NetctlAutoWindow::appendAvailableProfiles() +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[appendAvailableProfiles]"; + + QList profiles = netctlCommand->getProfileList(); + for (int i=0; ilistWidget_available->addItem(profiles[i][0]); +} + + +void NetctlAutoWindow::clear() +{ + if (debug) qDebug() << "[NetctlAutoWindow]" << "[clear]"; + + ui->listWidget_available->setCurrentRow(-1); + ui->listWidget_available->clear(); + ui->listWidget_active->clear(); + ui->listWidget_active->setCurrentRow(-1); +} diff --git a/sources/gui/src/netctlautowindow.h b/sources/gui/src/netctlautowindow.h new file mode 100644 index 0000000..0fed862 --- /dev/null +++ b/sources/gui/src/netctlautowindow.h @@ -0,0 +1,59 @@ +/*************************************************************************** + * This file is part of netctl-gui * + * * + * netctl-gui is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * netctl-gui is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with netctl-gui. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + +#ifndef NETCTLAUTOWINDOW_H +#define NETCTLAUTOWINDOW_H + +#include +#include + + +class Netctl; + +namespace Ui { +class NetctlAutoWindow; +} + +class NetctlAutoWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit NetctlAutoWindow(QWidget *parent = 0, + const bool debugCmd = false, + const QMap settings = QMap()); + ~NetctlAutoWindow(); + +public slots: + void showWindow(); + +private slots: + void appendActiveProfiles(); + void appendAvailableProfiles(); + void clear(); + +private: + Netctl *netctlCommand; + Ui::NetctlAutoWindow *ui; + bool debug; + void createActions(); + // ESC pressed event + void keyPressEvent(QKeyEvent *pressedKey); +}; + + +#endif /* NETCTLAUTOWINDOW_H */ diff --git a/sources/gui/src/netctlautowindow.ui b/sources/gui/src/netctlautowindow.ui new file mode 100644 index 0000000..40c5f9a --- /dev/null +++ b/sources/gui/src/netctlautowindow.ui @@ -0,0 +1,197 @@ + + + NetctlAutoWindow + + + + 0 + 0 + 585 + 343 + + + + MainWindow + + + + + + + + + + + Available profiles + + + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + true + + + + + + + + + + + + true + + + + + + + + + + + + true + + + + + + + + + + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Active profiles + + + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset + + + + + + + + + 0 + 0 + 585 + 22 + + + + + Menu + + + + + + + + + + + + + + + Enable profile + + + + + + + + + + Switch to profile + + + + + + + + + + Close + + + + + + diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts index 10d1e1b..2edad6e 100644 --- a/sources/resources/translations/en.ts +++ b/sources/resources/translations/en.ts @@ -539,19 +539,19 @@ Disable - Disable + Disable Enable - Enable + Enable Save profile as... - Save profile as... + Save profile as... Profile (*) - Profile (*) + Profile (*) Netctl GUI @@ -589,7 +589,7 @@ netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help] - netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help] + netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help] @@ -671,7 +671,7 @@ Browse - Browse + Browse Clear @@ -679,7 +679,7 @@ Load - Load + Load Save @@ -719,7 +719,74 @@ Remove - Remove + Remove + + + Stop profile + + + + Start profile + + + + Disable profile + + + + Enable profile + + + + Stop WiFi + + + + Start WiFi + + + + Restart profile + + + + Edit profile + + + + Remove profile + + + + netctl-gui [ --default ] [ -d | --debug ] [ -t NUM | --tab NUM ] [ -h | --help] + + + + + + -d --debug - print debug information + + + + + Load profile + + + + Save profile + + + + Start Wi-Fi + + + + netctl-auto + + + + Actions + @@ -841,6 +908,37 @@ Browse + + NetctlAutoWindow + + MainWindow + + + + Enable profile + + + + Switch to profile + + + + Close + + + + Available profiles + + + + Active profiles + + + + Menu + Menu + + PasswdWidget diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts new file mode 100644 index 0000000..25e7e4d --- /dev/null +++ b/sources/resources/translations/netctl-gui.ts @@ -0,0 +1,1997 @@ + + + + + BridgeWidget + + + Form + + + + + Bridge settings + + + + + Skip (R)STP and immediately activate all bridge members + + + + + Skip forwarding delay + + + + + ErrorWindow + + + Error + + + + + Error text + + + + + Ok + + + + + Could not find components + + + + + Does not support yet + + + + + Profile name is not set + + + + + Bind interfaces are not set + + + + + Description is not set + + + + + Ip settings are not set + + + + + Configuration file does not exist + + + + + Key is not set + + + + + Wireless settings are not set + + + + + Configuration file is not set + + + + + ESSID is not set + + + + + MAC address is incorrect + + + + + Session ID is not set + + + + + + APN is not set + + + + + Empty user/group name + + + + + Unknown error + + + + + EthernetWidget + + + Form + + + + + Ethernet options + + + + + + Hide advanced + + + + + <html><head/><body><p>Whether or not the absence of a carrier is acceptable</p></body></html> + + + + + Skip no carrier + + + + + Set to ‘yes’ to use 802.1x authentication + + + + + 802.1x authentication + + + + + WPA config file + + + + + Path to a wpa_supplicant configuration file + + + + + Browse + + + + + WPA driver + + + + + The wpa_supplicant driver to use for 802.1x authentication + + + + + wired + + + + + nl80211 + + + + + wext + + + + + Timeout carrier + + + + + Maximum time, in seconds, to wait for a carrier + + + + + Timeout WPA + + + + + Maximum time, in seconds, to wait for 802.1x authentication to succeed + + + + + + Select wpa configuration file + + + + + + Configuration files (*.conf) + + + + + Show advanced + + + + + GeneralWidget + + + Form + + + + + General + + + + + Description + + + + + <html><head/><body><p>A description of the profile</p></body></html> + + + + + Connection + + + + + The connection type used by the profile + + + + + Interface + + + + + The name of the associated network interface + + + + + Binds to interfaces + + + + + + Add + + + + + An array of physical network interfaces that this profile needs before it can be started + + + + + + Hide advanced + + + + + After + + + + + An array of profile names that should be started before this profile is started + + + + + Command after starting + + + + + A command that is executed after a connection is established + + + + + Command before stoping + + + + + A command that is executed before a connection is brought down + + + + + Set to ‘yes’ to force connecting even if the interface is up + + + + + Force connect + + + + + Debug mode + + + + + Show advanced + + + + + IpWidget + + + Form + + + + + IP options + + + + + IP + + + + + + dhcp + + + + + + static + + + + + Address + + + + + + + + + + + Add + + + + + An array of IP addresses suffixed with ‘/<netmask>’ + + + + + Gateway + + + + + An IP routing gateway address + + + + + IP6 + + + + + dhcp-noaddr + + + + + stateless + + + + + Address6 + + + + + An array of IPv6 addresses + + + + + Gateway6 + + + + + An IPv6 routing gateway address + + + + + + Hide advanced + + + + + Routes + + + + + + via + + + + + + An array of custom routes + + + + + Routes6 + + + + + Custom + + + + + An array of argument lines to pass to ip + + + + + Hostname + + + + + A system hostname + + + + + Timeout DAD + + + + + Maximum time, in seconds, to wait for IPv6’s Duplicate Address Detection to succeed + + + + + DHCP client + + + + + The name of the preferred DHCP client + + + + + dhcpcd + + + + + dhclient + + + + + dhcpcd options + + + + + + + Additional options to be passed to the DHCP client + + + + + dhclient options + + + + + dhclient options (6) + + + + + Timeout DHCP + + + + + Maximum time, in seconds, to wait for DHCP to be successful + + + + + Set to ‘yes’ to release the DHCP lease when the profile is stopped + + + + + DHCP release on stop + + + + + DNS + + + + + An array of DNS nameservers + + + + + DNS domain + + + + + A ‘domain’ line for /etc/resolv.conf + + + + + DNS search + + + + + A ‘search’ line for /etc/resolv.conf + + + + + DNS options + + + + + An array of ‘options’ lines for /etc/resolv.conf + + + + + Show advanced + + + + + MacvlanWidget + + + Form + + + + + macvlan settings + + + + + Mode + + + + + MAC address + + + + + Optional static MAC address + + + + + MainWindow + + + Netctl GUI + + + + + Connect to profile + + + + + + Name + + + + + Description + + + + + + Status + + + + + + + + + + Refresh + + + + + + Ctrl+R + + + + + Restart + + + + + + + + + Start + + + + + Create a new profile + + + + + Profile + + + + + + Clear + + + + + Save + + + + + Connect to Wi-Fi + + + + + Please install 'wpa_supplicant' before using it + + + + + Signal + + + + + Security + + + + + Menu + + + + + Actions + + + + + Settings + + + + + Ctrl+S + + + + + Quit + + + + + Ctrl+Q + + + + + + + + Start profile + + + + + + Restart profile + + + + + + + + Enable profile + + + + + + Edit profile + + + + + + + Remove profile + + + + + Load profile + + + + + Save profile + + + + + Start Wi-Fi + + + + + netctl-auto + + + + + Netctl GUI + + + + + + Version : %1 License : GPLv3 + + + + + + Evgeniy Alekseev aka arcanis + + + + + + E-mail : esalexeev@gmail.com + + + + + + + Usage: + + + + + + netctl-gui [ --default ] [ -d | --debug ] [ -t NUM | --tab NUM ] [ -h | --help] + + + + + + + Parametrs: + + + + + + --default - start with default settings + + + + + + -d --debug - print debug information + + + + + + -t NUM --tab NUM - open a tab with number NUM + + + + + + -h --help - show this help and exit + + + + + + Ready + + + + + Name Description Status + + + + + + + Updated + + + + + + Stop profile + + + + + + Disable profile + + + + + Name Status Signal Security + + + + + + Stop WiFi + + + + + + + + + Start WiFi + + + + + + + + + + + + + + + Done + + + + + + + + + + + + + + + Error + + + + + + Stop + + + + + MobileWidget + + + Form + + + + + Mobile PPP settings + + + + + Username + + + + + + The username and password to connect with + + + + + Password + + + + + Access point name + + + + + The access point (apn) to connect on + + + + + PIN + + + + + If your modem requires a PIN to unlock, use this option + + + + + Mode + + + + + This option is used to specify the connection mode + + + + + None + + + + + 3Gpref + + + + + 3Gonly + + + + + GPRSpref + + + + + GPRSonly + + + + + + Show advanced + + + + + Max fail + + + + + The number of consecutive failed connection attempts to tolerate + + + + + Use the default route provided by the peer + + + + + Default route + + + + + Use the DNS provided by the peer + + + + + Use peer DNS + + + + + Options file + + + + + A file to read additional pppd options from + + + + + Browse + + + + + Select options file + + + + + Configuration files (*.conf) + + + + + Hide advanced + + + + + NetctlAutoWindow + + + MainWindow + + + + + Available profiles + + + + + Active profiles + + + + + Menu + + + + + Enable profile + + + + + Switch to profile + + + + + Close + + + + + PasswdWidget + + + Form + + + + + + Password + + + + + ESSID + + + + + PppoeWidget + + + Form + + + + + PPPoE settings + + + + + Username + + + + + + The username and password to connect with + + + + + Password + + + + + Connection mode + + + + + This option specifies how a connection should be established + + + + + persist + + + + + demand + + + + + Idle timeout + + + + + This option specifies the idle time (in seconds) after which ‘pppd’ should disconnect + + + + + + Show advanced + + + + + Max fail + + + + + The number of consecutive failed connection attempts to tolerate + + + + + Use the default route provided by the peer + + + + + Default route + + + + + Use the DNS provided by the peer + + + + + Use peer DNS + + + + + PPP unit + + + + + Set the ppp unit number in the interface name (ppp0, ppp1, etc.) + + + + + LCP echo interval + + + + + + These options override default LCP parameters from ‘/etc/ppp/options’ + + + + + LCP echo failure + + + + + Options file + + + + + A file to read additional pppd options from + + + + + Browse + + + + + PPPoE service + + + + + This option specifies the PPPoE service name + + + + + PPPoE AC + + + + + This option specifies the PPPoE access concentrator name + + + + + PPPoE session + + + + + This option specifies an existing session to attach to, MAC address + + + + + PPPoE MAC + + + + + Only connect to specified MAC address + + + + + Enable IPv6 support + + + + + PPPoE IPv6 + + + + + Select options file + + + + + Configuration files (*.conf) + + + + + Hide advanced + + + + + SettingsWindow + + + Settings + + + + + General + + + + + Language + + + + + Select a language + + + + + You will need to restart the application + + + + + netctl + + + + + netctl path + + + + + Path to netctl + + + + + + + + + + + Browse + + + + + Profile path + + + + + Path to profile directory + + + + + sudo + + + + + sudo path + + + + + Path to sudo + + + + + wpa_supplicant + + + + + wpa_supplicant path + + + + + Path to wpa_supplicant + + + + + wpa_cli path + + + + + Path to wpa_cli + + + + + PID file + + + + + wpa_supplicant PID file + + + + + wpa_supplicant drivers + + + + + wpa_supplicant drivers comma separated + + + + + ctrl_interface directory + + + + + Path to control directory + + + + + ctrl_interface group + + + + + Group of control directory + + + + + Other + + + + + Path to interface list + + + + + Path to directory which contains network devices + + + + + Path to rfkill device list + + + + + Path to directory which contains rfkill devices + + + + + + Prefered wireless interface + + + + + Select path to directory with interfaces + + + + + Select netctl command + + + + + + + + All files (*) + + + + + Select path to profile directory + + + + + Select path to directory with rfkill devices + + + + + Select sudo command + + + + + Select wpa_cli command + + + + + Select wpa_supplicant command + + + + + TunnelWidget + + + Form + + + + + Tunnel settings + + + + + Mode + + + + + The tunnel type + + + + + ipip + + + + + gre + + + + + sit + + + + + isatap + + + + + ip6ip6 + + + + + ipip6 + + + + + ip6gre + + + + + any + + + + + Local + + + + + The address of the local end of the tunnel + + + + + Remote + + + + + The address of the remote end of the tunnel + + + + + TuntapWidget + + + Form + + + + + Tuntap settings + + + + + Mode + + + + + Either ‘tun’, or ‘tap’ + + + + + tun + + + + + tap + + + + + User + + + + + The owning user of the tun/tap interface + + + + + Group + + + + + The owning group of the tun/tap interface + + + + + VlanWidget + + + Form + + + + + vlan settings + + + + + vlan ID + + + + + vlan identifier + + + + + WirelessWidget + + + Form + + + + + Wireless options + + + + + Security + + + + + none + + + + + wep + + + + + wpa + + + + + wpa-configsection + + + + + wpa-config + + + + + ESSID + + + + + The name of the network to connect to + + + + + Wpa config section + + + + + + + Add + + + + + Array of lines that form a network block for wpa_supplicant + + + + + Wpa config file + + + + + Path to a wpa_supplicant configuration file + + + + + Browse + + + + + Key + + + + + The secret key to a WEP, or WPA encrypted network + + + + + Whether or not the specified network is a hidden network + + + + + Hidden + + + + + Whether or not to use ad-hoc mode + + + + + Ad-hoc + + + + + + Show advanced + + + + + Scan frequencies + + + + + A space-separated list of frequencies in MHz to scan when searching for the network + + + + + Frequency + + + + + + Priority group for the network + + + + + Priority + + + + + Country + + + + + The country for which frequency regulations will be enforced + + + + + WPA group + + + + + Group that has the authority to configure wpa_supplicant via its control interface + + + + + Drivers + + + + + west + + + + + nl80211 + + + + + wired + + + + + The wpa_supplicant driver to use + + + + + RFkill device + + + + + The name of an rfkill device + + + + + Timeout WPA + + + + + Maximum time, in seconds, to wait for steps in the association and authentication to succeed + + + + + Whether or not to exclude this profile from automatic profile selection + + + + + Exclude auto + + + + + Hide advanced + + + + diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts index 3e8a1e5..ac8aaae 100644 --- a/sources/resources/translations/ru.ts +++ b/sources/resources/translations/ru.ts @@ -539,19 +539,19 @@ Disable - Отключить + Отключить Enable - Включить + Включить Save profile as... - Сохранить профиль как... + Сохранить профиль как... Profile (*) - Профиль (*) + Профиль (*) Netctl GUI @@ -589,7 +589,7 @@ netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help] - netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help] + netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help] @@ -671,7 +671,7 @@ Browse - Обзор + Обзор Clear @@ -679,7 +679,7 @@ Load - Загрузить + Загрузить Save @@ -719,7 +719,74 @@ Remove - Удалить + Удалить + + + Stop profile + + + + Start profile + + + + Disable profile + + + + Enable profile + + + + Stop WiFi + + + + Start WiFi + + + + Restart profile + + + + Edit profile + + + + Remove profile + + + + netctl-gui [ --default ] [ -d | --debug ] [ -t NUM | --tab NUM ] [ -h | --help] + + + + + + -d --debug - print debug information + + + + + Load profile + + + + Save profile + + + + Start Wi-Fi + + + + netctl-auto + + + + Actions + @@ -841,6 +908,37 @@ Обзор + + NetctlAutoWindow + + MainWindow + + + + Enable profile + + + + Switch to profile + + + + Close + + + + Available profiles + + + + Active profiles + + + + Menu + Меню + + PasswdWidget