diff --git a/CHANGELOG b/CHANGELOG index 29aba6f..402e239 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ Ver.1.2.0: + [gui] added workaround for wireless-wep example + [lib] detached backend from frontend + [lib] added error checking ++ [lib] added doxygen documentation + [plasmoid] added dataengine configuration + [plasmoid] added about window * [all] changes in the project architecture diff --git a/PKGBUILD b/PKGBUILD index 573a096..617d4f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=netctl-gui pkgname=('netctl-gui' 'netctl-gui-qt4' 'kdeplasma-applets-netctl-gui') -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('kdebase-runtime: sudo support' 'wpa_supplicant: wifi support') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz") install="${pkgbase}.install" -md5sums=('229e11efda0a94bed44ea79b3deabf7c') +md5sums=('4d52513623e2501d8dd9a531327c01a7') prepare() { rm -rf "${srcdir}/"{build-plasmoid,build-qt4,build-qt5} diff --git a/create_archive.sh b/create_archive.sh index fb50347..72a6ebe 100755 --- a/create_archive.sh +++ b/create_archive.sh @@ -17,9 +17,5 @@ tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}" rm -rf "${ARCHIVE}" # update md5sum MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}') -sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD-qt4 -sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD-qt4 -sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD-qt5 -sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD-qt5 -sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD-widget -sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD-widget +sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD +sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD diff --git a/sources/gui/netctl-gui.1 b/sources/gui/netctl-gui.1 index 22f60f2..c5a5c71 100644 --- a/sources/gui/netctl-gui.1 +++ b/sources/gui/netctl-gui.1 @@ -6,8 +6,8 @@ netctl-gui is a graphical interface for netctl [ --about ] [ --netctl-auto ] [ --settings ] [ -e ESSID | --essid ESSID ] [ -o PROFILE | --open PROFILE ] [ -s PROFILE | --select PROFILE ] - [ -d | --debug ] [ --default ] [ --set-opts OPTIONS ] - [ -t NUM | --tab NUM ] + [ --config FILE ] [ -d | --debug ] [ --default ] + [ --set-opts OPTIONS ] [ -t NUM | --tab NUM ] [ -v | --version ] [ -i | --info ] [ -h | --help] .SH DESCRIPTION Graphical user interface for netctl written on C++ using Qt toolkit. Provides shared library for interaction with netctl and Plasmoid and DataEngine for KDE. @@ -31,6 +31,9 @@ open profile PROFILE. This option will set tab to 2 automatically -s, --select PROFILE select profile PROFILE. This option will set tab to 1 automatically .TP +--config FILE +read configuration from file FILE +.TP -d, --debug print debug information .TP diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index f2d0cc1..d9b413f 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -102,6 +102,11 @@ int main(int argc, char *argv[]) i++; } // additional functions + // config path + else if (QString(argv[i]) == QString("--config")) { + configPath = QString(argv[i+1]); + i++; + } // debug else if ((QString(argv[i]) == QString("-d")) || (QString(argv[i]) == QString("--debug"))) { debug = true; @@ -157,8 +162,8 @@ int main(int argc, char *argv[]) helpMessage += QString("netctl-gui [ --about ] [ --netctl-auto ] [ --settings ]\n"); helpMessage += QString(" [ -e ESSID | --essid ESSID ] [ -o PROFILE | --open PROFILE ]\n"); helpMessage += QString(" [ -s PROFILE | --select PROFILE ]\n"); - helpMessage += QString(" [ -d | --debug ] [ --default ] [ --set-opts OPTIONS ]\n"); - helpMessage += QString(" [ -t NUM | --tab NUM ]\n"); + helpMessage += QString(" [ --config FILE ] [ -d | --debug ] [ --default ]\n"); + helpMessage += QString(" [ --set-opts OPTIONS ] [ -t NUM | --tab NUM ]\n"); helpMessage += QString(" [ -v | --version ] [ -i | --info ] [ -h | --help]\n\n"); helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Parametrs:")); // windows @@ -254,7 +259,7 @@ int main(int argc, char *argv[]) MainWindow w(0, showAbout, showNetctlAuto, showSettings, selectEssid, openProfile, selectProfile, - debug, defaultSettings, options, tabNumber); + configPath, debug, defaultSettings, options, tabNumber); w.show(); return a.exec(); } diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 278406a..6744046 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -52,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent, const QString selectEssid, const QString openProfile, const QString selectProfile, + const QString configPath, const bool debugCmd, const bool defaultSettings, const QString options, @@ -72,8 +73,6 @@ MainWindow::MainWindow(QWidget *parent, if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "tabNum" << tabNum; // reading configuration - QString configPath = QDir::homePath() + QDir::separator() + QString(".config") + - QDir::separator() + QString("netctl-gui.conf"); settingsWin = new SettingsWindow(this, debug, configPath); if (defaultSettings) settingsWin->setDefault(); @@ -403,8 +402,11 @@ void MainWindow::updateMainTab() ui->tableWidget_main->setRowCount(profiles.count()); // create header - ui->tableWidget_main->setHorizontalHeaderLabels(QApplication::translate("MainWindow", "Name==Description==Status") - .split(QString("=="))); + QStringList headerList; + headerList.append(QApplication::translate("MainWindow", "Name")); + headerList.append(QApplication::translate("MainWindow", "Description")); + headerList.append(QApplication::translate("MainWindow", "Status")); + ui->tableWidget_main->setHorizontalHeaderLabels(headerList); // create items for (int i=0; itableWidget_wifi->setRowCount(scanResults.count()); // create header - ui->tableWidget_wifi->setHorizontalHeaderLabels(QApplication::translate("MainWindow", "Name==Status==Signal==Security") - .split(QString("=="))); + QStringList headerList; + headerList.append(QApplication::translate("MainWindow", "Name")); + headerList.append(QApplication::translate("MainWindow", "Status")); + headerList.append(QApplication::translate("MainWindow", "Signal")); + headerList.append(QApplication::translate("MainWindow", "Security")); + ui->tableWidget_wifi->setHorizontalHeaderLabels(headerList); // create items for (int i=0; itableWidget->setRowCount(profiles.count()); // create header - ui->tableWidget->setHorizontalHeaderLabels(QApplication::translate("NetctlAutoWindow", "Name==Description==Active==Disabled") - .split(QString("=="))); + QStringList headerList; + headerList.append(QApplication::translate("NetctlAutoWindow", "Name")); + headerList.append(QApplication::translate("NetctlAutoWindow", "Description")); + headerList.append(QApplication::translate("NetctlAutoWindow", "Active")); + headerList.append(QApplication::translate("NetctlAutoWindow", "Disabled")); + ui->tableWidget->setHorizontalHeaderLabels(headerList); // create items for (int i=0; i - MainWindow + netctl-auto @@ -78,7 +78,9 @@ Refresh - + + + @@ -114,7 +116,9 @@ Switch - + + + @@ -187,7 +191,9 @@ - + + + Enable all profiles @@ -195,7 +201,9 @@ - + + + Disable all profiles @@ -218,7 +226,9 @@ - + + + Refresh diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts index 2edad6e..dc06ff9 100644 --- a/sources/resources/translations/en.ts +++ b/sources/resources/translations/en.ts @@ -1,6 +1,51 @@ + + AboutWindow + + Version %1 +(build date %2) + Version %1 +(build date %2) + + + Qt-based graphical interface for netctl. + Qt-based graphical interface for netctl. + + + Links: + Links: + + + Homepage + Homepage + + + Repository + Repository + + + Bugtracker + Bugtracker + + + Translation issue + Translation issue + + + AUR packages + AUR packages + + + This software is licensed under %1 + This software is licensed under %1 + + + About + About + + BridgeWidget @@ -88,15 +133,31 @@ Error - Error + Error Error text - Error text + Error text Ok - Ok + Ok + + + Error! + Error! + + + Could not find profile + Could not find profile + + + Could not find ESSID + Could not find ESSID + + + Sender : %1 + Sender : %1 @@ -556,33 +617,33 @@ Netctl GUI - Netctl GUI + Netctl GUI Version : %1 License : GPLv3 - Version : %1 License : GPLv3 + Version : %1 License : GPLv3 Evgeniy Alekseev aka arcanis - Evgeniy Alekseev aka arcanis + Evgeniy Alekseev aka arcanis E-mail : esalexeev@gmail.com - E-mail : esalexeev@gmail.com + E-mail : esalexeev@gmail.com Usage: - Usage: + Usage: @@ -596,25 +657,25 @@ Parametrs: - Parametrs: + Parametrs: --default - start with default settings - --default - start with default settings + --default - start with default settings -t NUM --tab NUM - open a tab with number NUM - -t NUM --tab NUM - open a tab with number NUM + -t NUM --tab NUM - open a tab with number NUM -h --help - show this help and exit - -h --help - show this help and exit + -h --help - show this help and exit @@ -711,11 +772,11 @@ Name Status Signal Security - Name Status Signal Security + Name Status Signal Security Name Description Status - Name Description Status + Name Description Status Remove @@ -723,70 +784,191 @@ Stop profile - + Stop profile Start profile - + Start profile Disable profile - + Disable profile Enable profile - + Enable profile Stop WiFi - + Stop WiFi Start WiFi - + Start WiFi Restart profile - + Restart profile Edit profile - + Edit profile Remove profile - - - - netctl-gui [ --default ] [ -d | --debug ] [ -t NUM | --tab NUM ] [ -h | --help] - - - - - - -d --debug - print debug information - - + Remove profile Load profile - + Load profile Save profile - + Save profile Start Wi-Fi - + Start Wi-Fi netctl-auto - + netctl-auto Actions - + Actions + + + Name==Description==Status + Name==Description==Status + + + Name==Status==Signal==Security + Name==Status==Signal==Security + + + Unknown flag + + Unknown flag + + + + Usage: + Usage: + + + Parametrs: + Parametrs: + + + Open window: + Open window: + + + show about window + show about window + + + show netctl-auto window + show netctl-auto window + + + show settings window + show settings window + + + Functions: + Functions: + + + select ESSID %1 + select ESSID %1 + + + open profile %1 + open profile %1 + + + select profile %1 + select profile %1 + + + Additional flags: + Additional flags: + + + print debug information + print debug information + + + start with default settings + start with default settings + + + set options for this run, comma separated + set options for this run, comma separated + + + open a tab with number %1 + open a tab with number %1 + + + Show messages: + Show messages: + + + show version and exit + show version and exit + + + show build information and exit + show build information and exit + + + show this help and exit + show this help and exit + + + Build date: %1 + Build date: %1 + + + cmake flags: + cmake flags: + + + Version : %1 + + Version : %1 + + + + Author : %1 + + Author : %1 + + + + License : %1 + + License : %1 + + + + About + About + + + netctl-auto is running + netctl-auto is running + + + Show + Show + + + Help + Help @@ -912,31 +1094,127 @@ NetctlAutoWindow MainWindow - + MainWindow Enable profile - + Enable profile Switch to profile - + Switch to profile Close - - - - Available profiles - - - - Active profiles - + Close Menu - Menu + Menu + + + Ready + Ready + + + Disable service + Disable service + + + Enable service + Enable service + + + netctl-auto is running + netctl-auto is running + + + Stop service + Stop service + + + Start service + Start service + + + netctl-auto is not running + netctl-auto is not running + + + Name==Description==Active==Disabled + Name==Description==Active==Disabled + + + yes + yes + + + Updated + Updated + + + Enable all profiles + Enable all profiles + + + Disable all profiles + Disable all profiles + + + Enable + Enable + + + Disable + Disable + + + Done + Done + + + Error + Error + + + Disable profile + Disable profile + + + Esc + Esc + + + Restart service + Restart service + + + Refresh + Refresh + + + Name + Name + + + Description + Description + + + Active + Active + + + Disabled + Disabled + + + Switch + Switch + + + netctl-auto + netctl-auto @@ -1279,6 +1557,50 @@ Other Other + + Select netctl-auto command + Select netctl-auto command + + + Select systemctl command + Select systemctl command + + + Select wpa_actiond command + Select wpa_actiond command + + + systemctl path + systemctl path + + + Path to systemctl + Path to systemctl + + + netctl-auto path + netctl-auto path + + + Path to netctl-auto + Path to netctl-auto + + + netctl-auto service + netctl-auto service + + + Name of netctl-auto systemd service + Name of netctl-auto systemd service + + + wpa_actiond path + wpa_actiond path + + + Path to wpa_actiond + Path to wpa_actiond + TunnelWidget diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts index 25e7e4d..be9e522 100644 --- a/sources/resources/translations/netctl-gui.ts +++ b/sources/resources/translations/netctl-gui.ts @@ -1,25 +1,79 @@ - + + + AboutWindow + + + Version %1 +(build date %2) + + + + + Qt-based graphical interface for netctl. + + + + + Links: + + + + + Homepage + + + + + Repository + + + + + Bugtracker + + + + + Translation issue + + + + + AUR packages + + + + + This software is licensed under %1 + + + + + About + + + BridgeWidget - + Form - + Bridge settings - + Skip (R)STP and immediately activate all bridge members - + Skip forwarding delay @@ -27,27 +81,35 @@ ErrorWindow - - Error + + + + + + + + + + + + + + + + + + + + Error! - - Error text - - - - - Ok - - - - + Could not find components - + Does not support yet @@ -57,179 +119,194 @@ - + 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 - + + Could not find profile + + + + + Could not find ESSID + + + + Unknown error + + + Sender : %1 + + 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) @@ -242,109 +319,109 @@ 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 @@ -357,255 +434,255 @@ 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 @@ -618,27 +695,27 @@ MacvlanWidget - + Form - + macvlan settings - + Mode - + MAC address - + Optional static MAC address @@ -646,473 +723,551 @@ 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 - + + About + + + + + netctl-auto is running + + + + + Show + + + + + Signal - + + Security - + Menu - + Actions - + + Help + + + + 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 + + + Unknown flag + + + + + + Usage: + + + + + Parametrs: + + + + + Open window: + + + + + show about window + + + + + show netctl-auto window + + + + + show settings window + + + + + Functions: + + + + + select ESSID %1 + + + + + open profile %1 + + + + + select profile %1 + + + + + Additional flags: + + + + + print debug information + + + + + start with default settings + + + + + set options for this run, comma separated + + + + + open a tab with number %1 + + + + + Show messages: + + + + + show version and exit + + + + + show build information and exit + + + + + show this help and exit + + + + + Build date: %1 + + + + + cmake flags: + + + + + Version : %1 + + + + + + Author : %1 + + + + + + License : %1 + + + 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 @@ -1135,37 +1290,175 @@ NetctlAutoWindow - - MainWindow + + netctl-auto - - Available profiles + + Esc - - Active profiles + + Restart service - + + + Refresh + + + + + + Name + + + + + + Description + + + + + + Active + + + + + + Disabled + + + + + Switch + + + + Menu - + + Ready + + + + + Disable service + + + + + + Enable service + + + + + netctl-auto is running + + + + + Stop service + + + + + + Start service + + + + + netctl-auto is not running + + + + + + yes + + + + + Updated + + + + + + Enable profile - + + + Enable all profiles + + + + + + Disable all profiles + + + + + + + Enable + + + + + + Disable + + + + + + + + + + + Done + + + + + + + + + + + Error + + + + + Disable profile + + + + + Switch to profile - + Close @@ -1173,13 +1466,13 @@ PasswdWidget - + Form - + Password @@ -1192,185 +1485,185 @@ 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 @@ -1393,217 +1686,278 @@ 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 - + + systemctl path + + + + + Path to systemctl + + + + + netctl-auto path + + + + + Path to netctl-auto + + + + + netctl-auto service + + + + + Name of netctl-auto systemd service + + + + wpa_supplicant path - + Path to wpa_supplicant - + wpa_cli path - + Path to wpa_cli - + + wpa_actiond path + + + + + Path to wpa_actiond + + + + 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 netctl-auto command + + + + Select path to profile directory - + Select path to directory with rfkill devices - + Select sudo command - + + Select systemctl command + + + + + Select wpa_actiond command + + + + Select wpa_cli command - + Select wpa_supplicant command @@ -1611,82 +1965,82 @@ 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 @@ -1694,52 +2048,52 @@ 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 @@ -1747,22 +2101,22 @@ VlanWidget - + Form - + vlan settings - + vlan ID - + vlan identifier @@ -1770,221 +2124,221 @@ 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 diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts index ac8aaae..aa9fbf7 100644 --- a/sources/resources/translations/ru.ts +++ b/sources/resources/translations/ru.ts @@ -1,6 +1,51 @@ + + AboutWindow + + Version %1 +(build date %2) + Версия: %1 +(дата сборки %2) + + + Qt-based graphical interface for netctl. + Графический интерфейс для netctl, использующий Qt. + + + Links: + Ссылки: + + + Homepage + Домашняя страница + + + Repository + Репозиторий + + + Bugtracker + Багтрекер + + + Translation issue + Тикет перевода + + + AUR packages + Пакеты в AUR + + + This software is licensed under %1 + Данной программное обеспечение лицензировано под %1 + + + About + О программе + + BridgeWidget @@ -88,15 +133,31 @@ Error - Ошибка + Ошибка Error text - Error text + Error text Ok - Ok + Ok + + + Error! + Ошибка! + + + Could not find profile + Не могу найти профиль + + + Could not find ESSID + Не могу найти ESSID + + + Sender : %1 + Отправитель : %1 @@ -556,33 +617,33 @@ Netctl GUI - Netctl GUI + Netctl GUI Version : %1 License : GPLv3 - Версия : %1 Лицензия : GPLv3 + Версия : %1 Лицензия : GPLv3 Evgeniy Alekseev aka arcanis - Евгений Алексеев aka arcanis + Евгений Алексеев aka arcanis E-mail : esalexeev@gmail.com - E-mail : esalexeev@gmail.com + E-mail : esalexeev@gmail.com Usage: - Использование: + Использование: @@ -596,25 +657,25 @@ Parametrs: - Параметры: + Параметры: --default - start with default settings - --default - запустить со стандартными настройками + --default - запустить со стандартными настройками -t NUM --tab NUM - open a tab with number NUM - -t NUM --tab NUM - открыть вкладку с номером NUM + -t NUM --tab NUM - открыть вкладку с номером NUM -h --help - show this help and exit - -h --help - показать эту справку и выход + -h --help - показать эту справку и выход @@ -711,11 +772,11 @@ Name Status Signal Security - Имя Статус Сигнал Безопасность + Имя Статус Сигнал Безопасность Name Description Status - Имя Описание Статус + Имя Описание Статус Remove @@ -723,70 +784,190 @@ Stop profile - + Остановить профиль Start profile - + Запустить профиль Disable profile - + Отключить профиль Enable profile - + Включить профиль Stop WiFi - + Остановить WiFi Start WiFi - + Подключить 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 - + Подключить WiFi netctl-auto - + netctl-auto Actions - + Действия + + + Name==Description==Status + Имя==Описание==Статус + + + Name==Status==Signal==Security + Имя==Статус==Сигнал==Безопасность + + + Unknown flag + + Неизвестный флаг + + + Usage: + Использование: + + + Parametrs: + Параметры: + + + Open window: + Открыть окно: + + + show about window + показать окно "О программе" + + + show netctl-auto window + показать окно netctl-auto + + + show settings window + показать окно настроек + + + Functions: + Функции: + + + select ESSID %1 + выбрать ESSID %1 + + + open profile %1 + открыть профиль %1 + + + select profile %1 + выбрать профиль %1 + + + Additional flags: + Дополнительные флаги: + + + print debug information + показать отладочную информацию + + + start with default settings + запустить со стандартными настройками + + + set options for this run, comma separated + установить опции для данного запуска, разделенные запятыми + + + open a tab with number %1 + открыть вкладку с номером %1 + + + Show messages: + Показать сообщения: + + + show version and exit + показать версию и выход + + + show build information and exit + показать информацию о сборке и выход + + + show this help and exit + показать справку и выход + + + Build date: %1 + Дата сборки: %1 + + + cmake flags: + Флаги cmake: + + + Version : %1 + + Версия : %1 + + + + Author : %1 + + Автор : %1 + + + + License : %1 + + Лицензия : %1 + + + + About + О программе + + + netctl-auto is running + netctl-auto запущен + + + Show + Показать + + + Help + Справка @@ -912,31 +1093,127 @@ NetctlAutoWindow MainWindow - + MainWindow Enable profile - + Включить профиль Switch to profile - + Переключиться на профиль Close - - - - Available profiles - - - - Active profiles - + Закрыть Menu - Меню + Меню + + + Ready + Готов + + + Disable service + Отключить сервис + + + Enable service + Включить сервис + + + netctl-auto is running + netctl-auto запущен + + + Stop service + Остановить сервис + + + Start service + Запустить сервис + + + netctl-auto is not running + netctl-auto не запущен + + + Name==Description==Active==Disabled + Имя==Описание==Активен==Отключен + + + yes + да + + + Updated + Обновлено + + + Enable all profiles + Включить все профили + + + Disable all profiles + Отключить все профили + + + Enable + Включить + + + Disable + Отключить + + + Done + Выполнено + + + Error + Ошибка + + + Disable profile + Отключить профиль + + + Esc + Esc + + + Restart service + Перезапустить сервис + + + Refresh + Обновить + + + Name + Имя + + + Description + Описание + + + Active + Активен + + + Disabled + Отключен + + + Switch + Переключить + + + netctl-auto + netctl-auto @@ -1279,6 +1556,50 @@ Other Прочее + + Select netctl-auto command + Путь к команде netctl-auto + + + Select systemctl command + Путь к команде systemctl + + + Select wpa_actiond command + Путь к команде wpa_actiond + + + systemctl path + Путь к systemctl + + + Path to systemctl + Путь к systemctl + + + netctl-auto path + Путь к netctl-auto + + + Path to netctl-auto + Путь к netctl-auto + + + netctl-auto service + Имя сервиса netctl-auto + + + Name of netctl-auto systemd service + Имя сервиса systemd для netctl-auto + + + wpa_actiond path + Путь к wpa_actiond + + + Path to wpa_actiond + Путь к wpa_actiond + TunnelWidget