diff --git a/CHANGELOG b/CHANGELOG index 25e297d..d215bac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ Ver.1.3.0 * more correct actions into SettingsWindow * update to library changes * rewrite tables to use toolTip + * edit about window * helper: + create daemon DBus system interface org.netctlgui.helper to the library: self control slots, netctl control slots and netctl information slots @@ -49,6 +50,7 @@ Ver.1.3.0 * change all running processes to detached (see #7) * rewrite text label to use tags * update to dataengine changes + * edit about window *** diff --git a/sources/gui/docs/netctl-gui-security-notes.html b/sources/gui/docs/netctl-gui-security-notes.html index 71de6f8..36f1d38 100644 --- a/sources/gui/docs/netctl-gui-security-notes.html +++ b/sources/gui/docs/netctl-gui-security-notes.html @@ -47,7 +47,7 @@

If library will be initialized with FORCE_SUDO=true than it will use sudo command (which can be transferred to the library by SUDO_PATH option). Otherwise it will try to set UID of children processes to 0. Please note that sudo command and UID setting will be used only for those commands which require it.

Helper

-

First of all the helper does not interact with netctl directly, it uses the library to do it. So all library security notes are applicable here. To start the helper and to create DBus services user must be in netcwork group by default (or must be root). But you may change it by editing $DBUS_SYSTEMCONF_PATH/org.netctlgui.helper.conf policy file (/etc/dbus-1/system.d/org.netctlgui.helper.conf by default). Please refer to DBus documentation to do it.

+

First of all the helper does not interact with netctl directly, it uses the library to do it. So all library security notes are applicable here. To start the helper and to create DBus services user must be in network group by default (or must be root). But you may change it by editing $DBUS_SYSTEMCONF_PATH/org.netctlgui.helper.conf policy file (/etc/dbus-1/system.d/org.netctlgui.helper.conf by default). Please refer to DBus documentation to do it.

There are two binaries netctgui-helper and netctlgui-helper-suid. They are the same, but the second one has SUID bit, so it can be running by normal user without any password. Please note that it is dangerous and recommended way is to use systemd daemon. In this case you may not install netctlgui-helper-suid binary.

@@ -71,6 +71,7 @@
  • netctl restart <profile>
  • netctl start <profile>
  • netctl stop <profile>
    • +
  • netctl stop-all
  • netctl switch-to <profile>
  • netctl-auto switch-to <profile>
    • diff --git a/sources/gui/src/about.ui b/sources/gui/src/about.ui index f1f0b87..a350df8 100644 --- a/sources/gui/src/about.ui +++ b/sources/gui/src/about.ui @@ -6,116 +6,185 @@ 0 0 - 452 - 361 + 450 + 359 - - - true + + + 0 - - - - 0 - 0 - 436 - 324 - - - + + + About + + - - - - - - Qt::AlignCenter - - + + true - - Qt::TextBrowserInteraction - + + + + 0 + 0 + 418 + 284 + + + + + + + + + + Qt::AlignCenter + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + Qt::AlignCenter + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + Qt::AlignJustify|Qt::AlignVCenter + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + Qt::RichText + + + true + + + true + + + Qt::TextBrowserInteraction + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Acknowledgement + + - - - - - - Qt::AlignCenter - - + + true - - Qt::TextBrowserInteraction - + + + + 0 + 0 + 418 + 284 + + + + + + + + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + true + + + Qt::TextBrowserInteraction + + + + + + + Qt::Vertical + + + + 20 + 229 + + + + + + - - - - - - - Qt::AlignJustify|Qt::AlignVCenter - - - true - - - Qt::TextBrowserInteraction - - - - - - - - - - true - - - - - - - - - - Qt::RichText - - - true - - - true - - - Qt::TextBrowserInteraction - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - diff --git a/sources/gui/src/aboutwindow.cpp b/sources/gui/src/aboutwindow.cpp index 6178b01..a474e34 100644 --- a/sources/gui/src/aboutwindow.cpp +++ b/sources/gui/src/aboutwindow.cpp @@ -50,26 +50,35 @@ void AboutWindow::createText() { if (debug) qDebug() << PDEBUG; + // 1st tab + 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))); + uiAbout->label_description->setText(QApplication::translate("AboutWindow", "Qt-based graphical interface for netctl.")); + uiAbout->label_links->setText(QApplication::translate("AboutWindow", "Links:") + QString("
    ") + + QString("%2
    ").arg(QString(HOMEPAGE)) + .arg(QApplication::translate("AboutWindow", "Homepage")) + + QString("%2
    ").arg(QString(REPOSITORY)) + .arg(QApplication::translate("AboutWindow", "Repository")) + + QString("%2
    ").arg(QString(BUGTRACKER)) + .arg(QApplication::translate("AboutWindow", "Bugtracker")) + + 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("    ")); + // 2nd tab 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))); - uiAbout->label_description->setText(QApplication::translate("AboutWindow", "Qt-based graphical interface for netctl.")); uiAbout->label_translators->setText(QApplication::translate("AboutWindow", "Translators: %1").arg(QString(TRANSLATORS))); - uiAbout->label_links->setText(QApplication::translate("AboutWindow", "Links:") + QString("
    ") + - QString("%2
    ").arg(QString(HOMEPAGE)).arg(QApplication::translate("AboutWindow", "Homepage")) + - QString("%2
    ").arg(QString(REPOSITORY)).arg(QApplication::translate("AboutWindow", "Repository")) + - QString("%2
    ").arg(QString(BUGTRACKER)).arg(QApplication::translate("AboutWindow", "Bugtracker")) + - 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 uses: %1").arg(trdPartyList.join(QString(", "))) + QString("    ")); + uiAbout->label_trdparty->setText(QApplication::translate("AboutWindow", "This software uses: %1").arg(trdPartyList.join(QString(", ")))); } diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index 8284a90..dcceea4 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -792,16 +792,10 @@ 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]); + // 1st tab 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.")); - uiAboutConfig.label_translators->setText(i18n("Translators: %1", QString(TRANSLATORS))); uiAboutConfig.label_links->setText(i18n("Links:") + QString("
    ") + QString("%2
    ").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) + QString("%2
    ").arg(QString(REPOSITORY)).arg(i18n("Repository")) + @@ -809,8 +803,16 @@ 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 uses: %1", trdPartyList.join(QString(", "))) + QString("    ")); + i18n("This software is licensed under %1", QString(LICENSE)) + QString("")); + // 2nd tab + 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_translators->setText(i18n("Translators: %1", QString(TRANSLATORS))); + uiAboutConfig.label_trdparty->setText(i18n("This software uses: %1", trdPartyList.join(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 573d8a4..60fa807 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: https://github.com/arcan1s/netctl-gui/issues\n" -"POT-Creation-Date: 2014-08-18 21:17+0400\n" -"PO-Revision-Date: 2014-08-18 21:17+0400\n" +"POT-Creation-Date: 2014-08-20 11:59+0400\n" +"PO-Revision-Date: 2014-08-20 12:00+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -110,7 +110,7 @@ msgstr "Network is up" msgid "Network is down" msgstr "Network is down" -#: netctl.cpp:802 +#: netctl.cpp:797 msgid "" "Version %1\n" "(build date %2)" @@ -118,65 +118,73 @@ msgstr "" "Version %1\n" "(build date %2)" -#: netctl.cpp:803 +#: netctl.cpp:798 msgid "KDE widget which interacts with netctl." msgstr "KDE widget which interacts with netctl." -#: netctl.cpp:804 -msgid "Translators: %1" -msgstr "Translators: %1" - -#: netctl.cpp:805 +#: netctl.cpp:799 msgid "Links:" msgstr "Links:" -#: netctl.cpp:806 +#: netctl.cpp:800 msgid "Homepage" msgstr "Homepage" -#: netctl.cpp:807 +#: netctl.cpp:801 msgid "Repository" msgstr "Repository" -#: netctl.cpp:808 +#: netctl.cpp:802 msgid "Bugtracker" msgstr "Bugtracker" -#: netctl.cpp:809 +#: netctl.cpp:803 msgid "Translation issue" msgstr "Translation issue" -#: netctl.cpp:810 +#: netctl.cpp:804 msgid "AUR packages" msgstr "AUR packages" -#: netctl.cpp:812 +#: netctl.cpp:806 msgid "This software is licensed under %1" msgstr "This software is licensed under %1" -#: netctl.cpp:813 +#: netctl.cpp:814 +msgid "Translators: %1" +msgstr "Translators: %1" + +#: netctl.cpp:815 msgid "This software uses: %1" msgstr "This software uses: %1" -#: netctl.cpp:815 +#: netctl.cpp:817 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:816 +#: netctl.cpp:818 msgid "Appearance" msgstr "Appearance" -#: netctl.cpp:817 +#: netctl.cpp:819 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:818 +#. i18n: file: about.ui:21 +#. i18n: ectx: attribute (title), widget (QWidget, tab_About) +#: netctl.cpp:820 po/rc.cpp:3 rc.cpp:3 msgid "About" msgstr "About" +#. i18n: file: about.ui:127 +#. i18n: ectx: attribute (title), widget (QWidget, tab_ackn) +#: po/rc.cpp:6 rc.cpp:6 +msgid "Acknowledgement" +msgstr "Acknowledgement" + #. i18n: file: appearance.ui:47 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon) -#: po/rc.cpp:3 rc.cpp:3 +#: po/rc.cpp:9 rc.cpp:9 msgid "Inactive icon" msgstr "Inactive icon" @@ -228,89 +236,89 @@ msgstr "Inactive icon" #. i18n: ectx: property (text), widget (QPushButton, pushButton_sudo) #. i18n: file: widget.ui:282 #. i18n: ectx: property (text), widget (QPushButton, pushButton_wifi) -#: po/rc.cpp:6 po/rc.cpp:42 po/rc.cpp:54 po/rc.cpp:60 po/rc.cpp:66 -#: po/rc.cpp:72 po/rc.cpp:81 po/rc.cpp:87 po/rc.cpp:93 po/rc.cpp:99 -#: po/rc.cpp:105 po/rc.cpp:111 rc.cpp:6 rc.cpp:42 rc.cpp:54 rc.cpp:60 -#: rc.cpp:66 rc.cpp:72 rc.cpp:81 rc.cpp:87 rc.cpp:93 rc.cpp:99 rc.cpp:105 -#: rc.cpp:111 +#: po/rc.cpp:12 po/rc.cpp:48 po/rc.cpp:60 po/rc.cpp:66 po/rc.cpp:72 +#: po/rc.cpp:78 po/rc.cpp:87 po/rc.cpp:93 po/rc.cpp:99 po/rc.cpp:105 +#: po/rc.cpp:111 po/rc.cpp:117 rc.cpp:12 rc.cpp:48 rc.cpp:60 rc.cpp:66 +#: rc.cpp:72 rc.cpp:78 rc.cpp:87 rc.cpp:93 rc.cpp:99 rc.cpp:105 rc.cpp:111 +#: rc.cpp:117 msgid "Browse" msgstr "Browse" #. i18n: file: appearance.ui:80 #. i18n: ectx: property (text), widget (QLabel, label_fontColor) -#: po/rc.cpp:9 rc.cpp:9 +#: po/rc.cpp:15 rc.cpp:15 msgid "Font color" msgstr "Font color" #. i18n: file: appearance.ui:112 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor) -#: po/rc.cpp:12 rc.cpp:12 +#: po/rc.cpp:18 rc.cpp:18 msgid "Set font color" msgstr "Set font color" #. i18n: file: appearance.ui:142 #. i18n: ectx: property (text), widget (QLabel, label_fontSize) -#: po/rc.cpp:15 rc.cpp:15 +#: po/rc.cpp:21 rc.cpp:21 msgid "Font size" msgstr "Font size" #. i18n: file: appearance.ui:174 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize) -#: po/rc.cpp:18 rc.cpp:18 +#: po/rc.cpp:24 rc.cpp:24 msgid "Set font size" msgstr "Set font size" #. i18n: file: appearance.ui:203 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight) -#: po/rc.cpp:21 rc.cpp:21 +#: po/rc.cpp:27 rc.cpp:27 msgid "Font weight" msgstr "Font weight" #. i18n: file: appearance.ui:235 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight) -#: po/rc.cpp:24 rc.cpp:24 +#: po/rc.cpp:30 rc.cpp:30 msgid "Set font weight" msgstr "Set font weight" #. i18n: file: appearance.ui:267 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle) -#: po/rc.cpp:27 rc.cpp:27 +#: po/rc.cpp:33 rc.cpp:33 msgid "Font style" msgstr "Font style" #. i18n: file: appearance.ui:299 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle) -#: po/rc.cpp:30 rc.cpp:30 +#: po/rc.cpp:36 rc.cpp:36 msgid "Set font style" msgstr "Set font style" #. i18n: file: appearance.ui:326 #. i18n: ectx: property (text), widget (QLabel, label_font) -#: po/rc.cpp:33 rc.cpp:33 +#: po/rc.cpp:39 rc.cpp:39 msgid "Font" msgstr "Font" #. i18n: file: appearance.ui:358 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font) -#: po/rc.cpp:36 rc.cpp:36 +#: po/rc.cpp:42 rc.cpp:42 msgid "Set font family" msgstr "Set font family" #. i18n: file: appearance.ui:375 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon) -#: po/rc.cpp:39 rc.cpp:39 +#: po/rc.cpp:45 rc.cpp:45 msgid "Active icon" msgstr "Active icon" #. i18n: file: appearance.ui:408 #. i18n: ectx: property (text), widget (QLabel, label_textAlign) -#: po/rc.cpp:45 rc.cpp:45 +#: po/rc.cpp:51 rc.cpp:51 msgid "Text align" msgstr "Text align" #. i18n: file: appearance.ui:440 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_textAlign) -#: po/rc.cpp:48 rc.cpp:48 +#: po/rc.cpp:54 rc.cpp:54 msgid "Set text align" msgstr "Set text align" @@ -322,7 +330,7 @@ msgstr "Set text align" #. i18n: ectx: property (text), widget (QLabel, label_netctl) #. i18n: file: widget.ui:161 #. i18n: ectx: property (text), widget (QLabel, label_netctl) -#: po/rc.cpp:51 po/rc.cpp:90 rc.cpp:51 rc.cpp:90 +#: po/rc.cpp:57 po/rc.cpp:96 rc.cpp:57 rc.cpp:96 msgid "Path to netctl" msgstr "Path to netctl" @@ -334,61 +342,61 @@ msgstr "Path to netctl" #. i18n: ectx: property (text), widget (QLabel, label_netctlAuto) #. i18n: file: widget.ui:194 #. i18n: ectx: property (text), widget (QLabel, label_netctlAuto) -#: po/rc.cpp:57 po/rc.cpp:96 rc.cpp:57 rc.cpp:96 +#: po/rc.cpp:63 po/rc.cpp:102 rc.cpp:63 rc.cpp:102 msgid "Path to netctl-auto" msgstr "Path to netctl-auto" #. i18n: file: dataengine.ui:100 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_extIp4) -#: po/rc.cpp:63 rc.cpp:63 +#: po/rc.cpp:69 rc.cpp:69 msgid "Check external IPv4" msgstr "Check external IPv4" #. i18n: file: dataengine.ui:136 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_extIp6) -#: po/rc.cpp:69 rc.cpp:69 +#: po/rc.cpp:75 rc.cpp:75 msgid "Check external IPv6" msgstr "Check external IPv6" #. i18n: file: widget.ui:34 #. i18n: ectx: property (text), widget (QLabel, label_autoUpdate) -#: po/rc.cpp:75 rc.cpp:75 +#: po/rc.cpp:81 rc.cpp:81 msgid "Auto update interval, msec" msgstr "Auto update interval, msec" #. i18n: file: widget.ui:92 #. i18n: ectx: property (text), widget (QLabel, label_gui) -#: po/rc.cpp:78 rc.cpp:78 +#: po/rc.cpp:84 rc.cpp:84 msgid "Path to GUI" msgstr "Path to GUI" #. i18n: file: widget.ui:125 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_helper) -#: po/rc.cpp:84 rc.cpp:84 +#: po/rc.cpp:90 rc.cpp:90 msgid "Use helper" msgstr "Use helper" #. i18n: file: widget.ui:227 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo) -#: po/rc.cpp:102 rc.cpp:102 +#: po/rc.cpp:108 rc.cpp:108 msgid "Use sudo for netctl" msgstr "Use sudo for netctl" #. i18n: file: widget.ui:263 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_wifi) -#: po/rc.cpp:108 rc.cpp:108 +#: po/rc.cpp:114 rc.cpp:114 msgid "Show 'Start WiFi menu'" msgstr "Show 'Start WiFi menu'" #. i18n: file: widget.ui:291 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface) -#: po/rc.cpp:114 rc.cpp:114 +#: po/rc.cpp:120 rc.cpp:120 msgid "Show more detailed interface" msgstr "Show more detailed interface" #. i18n: file: widget.ui:309 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) -#: po/rc.cpp:117 rc.cpp:117 +#: po/rc.cpp:123 rc.cpp:123 msgid "" "$info - active profile information\n" "$current - current profile name\n" @@ -410,12 +418,12 @@ msgstr "" "$profiles - list of the netctl profiles\n" "$status - current profile status (static/enabled)" -#: po/rc.cpp:126 rc.cpp:126 +#: po/rc.cpp:132 rc.cpp:132 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: po/rc.cpp:127 rc.cpp:127 +#: po/rc.cpp:133 rc.cpp:133 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 706b5d7..53bdc1d 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: https://github.com/arcan1s/netctl-gui/issues\n" -"POT-Creation-Date: 2014-08-18 21:17+0400\n" +"POT-Creation-Date: 2014-08-20 11:59+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -109,71 +109,79 @@ msgstr "" msgid "Network is down" msgstr "" -#: netctl.cpp:802 +#: netctl.cpp:797 msgid "" "Version %1\n" "(build date %2)" msgstr "" -#: netctl.cpp:803 +#: netctl.cpp:798 msgid "KDE widget which interacts with netctl." msgstr "" -#: netctl.cpp:804 -msgid "Translators: %1" -msgstr "" - -#: netctl.cpp:805 +#: netctl.cpp:799 msgid "Links:" msgstr "" -#: netctl.cpp:806 +#: netctl.cpp:800 msgid "Homepage" msgstr "" -#: netctl.cpp:807 +#: netctl.cpp:801 msgid "Repository" msgstr "" -#: netctl.cpp:808 +#: netctl.cpp:802 msgid "Bugtracker" msgstr "" -#: netctl.cpp:809 +#: netctl.cpp:803 msgid "Translation issue" msgstr "" -#: netctl.cpp:810 +#: netctl.cpp:804 msgid "AUR packages" msgstr "" -#: netctl.cpp:812 +#: netctl.cpp:806 msgid "This software is licensed under %1" msgstr "" -#: netctl.cpp:813 -msgid "This software uses: %1" +#: netctl.cpp:814 +msgid "Translators: %1" msgstr "" #: netctl.cpp:815 -msgid "Netctl plasmoid" -msgstr "" - -#: netctl.cpp:816 -msgid "Appearance" +msgid "This software uses: %1" msgstr "" #: netctl.cpp:817 -msgid "DataEngine" +msgid "Netctl plasmoid" msgstr "" #: netctl.cpp:818 +msgid "Appearance" +msgstr "" + +#: netctl.cpp:819 +msgid "DataEngine" +msgstr "" + +#. i18n: file: about.ui:21 +#. i18n: ectx: attribute (title), widget (QWidget, tab_About) +#: netctl.cpp:820 po/rc.cpp:3 rc.cpp:3 msgid "About" msgstr "" +#. i18n: file: about.ui:127 +#. i18n: ectx: attribute (title), widget (QWidget, tab_ackn) +#: po/rc.cpp:6 rc.cpp:6 +msgid "Acknowledgement" +msgstr "" + #. i18n: file: appearance.ui:47 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon) -#: po/rc.cpp:3 rc.cpp:3 +#: po/rc.cpp:9 rc.cpp:9 msgid "Inactive icon" msgstr "" @@ -225,89 +233,89 @@ msgstr "" #. i18n: ectx: property (text), widget (QPushButton, pushButton_sudo) #. i18n: file: widget.ui:282 #. i18n: ectx: property (text), widget (QPushButton, pushButton_wifi) -#: po/rc.cpp:6 po/rc.cpp:42 po/rc.cpp:54 po/rc.cpp:60 po/rc.cpp:66 -#: po/rc.cpp:72 po/rc.cpp:81 po/rc.cpp:87 po/rc.cpp:93 po/rc.cpp:99 -#: po/rc.cpp:105 po/rc.cpp:111 rc.cpp:6 rc.cpp:42 rc.cpp:54 rc.cpp:60 -#: rc.cpp:66 rc.cpp:72 rc.cpp:81 rc.cpp:87 rc.cpp:93 rc.cpp:99 rc.cpp:105 -#: rc.cpp:111 +#: po/rc.cpp:12 po/rc.cpp:48 po/rc.cpp:60 po/rc.cpp:66 po/rc.cpp:72 +#: po/rc.cpp:78 po/rc.cpp:87 po/rc.cpp:93 po/rc.cpp:99 po/rc.cpp:105 +#: po/rc.cpp:111 po/rc.cpp:117 rc.cpp:12 rc.cpp:48 rc.cpp:60 rc.cpp:66 +#: rc.cpp:72 rc.cpp:78 rc.cpp:87 rc.cpp:93 rc.cpp:99 rc.cpp:105 rc.cpp:111 +#: rc.cpp:117 msgid "Browse" msgstr "" #. i18n: file: appearance.ui:80 #. i18n: ectx: property (text), widget (QLabel, label_fontColor) -#: po/rc.cpp:9 rc.cpp:9 +#: po/rc.cpp:15 rc.cpp:15 msgid "Font color" msgstr "" #. i18n: file: appearance.ui:112 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor) -#: po/rc.cpp:12 rc.cpp:12 +#: po/rc.cpp:18 rc.cpp:18 msgid "Set font color" msgstr "" #. i18n: file: appearance.ui:142 #. i18n: ectx: property (text), widget (QLabel, label_fontSize) -#: po/rc.cpp:15 rc.cpp:15 +#: po/rc.cpp:21 rc.cpp:21 msgid "Font size" msgstr "" #. i18n: file: appearance.ui:174 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize) -#: po/rc.cpp:18 rc.cpp:18 +#: po/rc.cpp:24 rc.cpp:24 msgid "Set font size" msgstr "" #. i18n: file: appearance.ui:203 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight) -#: po/rc.cpp:21 rc.cpp:21 +#: po/rc.cpp:27 rc.cpp:27 msgid "Font weight" msgstr "" #. i18n: file: appearance.ui:235 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight) -#: po/rc.cpp:24 rc.cpp:24 +#: po/rc.cpp:30 rc.cpp:30 msgid "Set font weight" msgstr "" #. i18n: file: appearance.ui:267 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle) -#: po/rc.cpp:27 rc.cpp:27 +#: po/rc.cpp:33 rc.cpp:33 msgid "Font style" msgstr "" #. i18n: file: appearance.ui:299 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle) -#: po/rc.cpp:30 rc.cpp:30 +#: po/rc.cpp:36 rc.cpp:36 msgid "Set font style" msgstr "" #. i18n: file: appearance.ui:326 #. i18n: ectx: property (text), widget (QLabel, label_font) -#: po/rc.cpp:33 rc.cpp:33 +#: po/rc.cpp:39 rc.cpp:39 msgid "Font" msgstr "" #. i18n: file: appearance.ui:358 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font) -#: po/rc.cpp:36 rc.cpp:36 +#: po/rc.cpp:42 rc.cpp:42 msgid "Set font family" msgstr "" #. i18n: file: appearance.ui:375 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon) -#: po/rc.cpp:39 rc.cpp:39 +#: po/rc.cpp:45 rc.cpp:45 msgid "Active icon" msgstr "" #. i18n: file: appearance.ui:408 #. i18n: ectx: property (text), widget (QLabel, label_textAlign) -#: po/rc.cpp:45 rc.cpp:45 +#: po/rc.cpp:51 rc.cpp:51 msgid "Text align" msgstr "" #. i18n: file: appearance.ui:440 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_textAlign) -#: po/rc.cpp:48 rc.cpp:48 +#: po/rc.cpp:54 rc.cpp:54 msgid "Set text align" msgstr "" @@ -319,7 +327,7 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, label_netctl) #. i18n: file: widget.ui:161 #. i18n: ectx: property (text), widget (QLabel, label_netctl) -#: po/rc.cpp:51 po/rc.cpp:90 rc.cpp:51 rc.cpp:90 +#: po/rc.cpp:57 po/rc.cpp:96 rc.cpp:57 rc.cpp:96 msgid "Path to netctl" msgstr "" @@ -331,61 +339,61 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, label_netctlAuto) #. i18n: file: widget.ui:194 #. i18n: ectx: property (text), widget (QLabel, label_netctlAuto) -#: po/rc.cpp:57 po/rc.cpp:96 rc.cpp:57 rc.cpp:96 +#: po/rc.cpp:63 po/rc.cpp:102 rc.cpp:63 rc.cpp:102 msgid "Path to netctl-auto" msgstr "" #. i18n: file: dataengine.ui:100 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_extIp4) -#: po/rc.cpp:63 rc.cpp:63 +#: po/rc.cpp:69 rc.cpp:69 msgid "Check external IPv4" msgstr "" #. i18n: file: dataengine.ui:136 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_extIp6) -#: po/rc.cpp:69 rc.cpp:69 +#: po/rc.cpp:75 rc.cpp:75 msgid "Check external IPv6" msgstr "" #. i18n: file: widget.ui:34 #. i18n: ectx: property (text), widget (QLabel, label_autoUpdate) -#: po/rc.cpp:75 rc.cpp:75 +#: po/rc.cpp:81 rc.cpp:81 msgid "Auto update interval, msec" msgstr "" #. i18n: file: widget.ui:92 #. i18n: ectx: property (text), widget (QLabel, label_gui) -#: po/rc.cpp:78 rc.cpp:78 +#: po/rc.cpp:84 rc.cpp:84 msgid "Path to GUI" msgstr "" #. i18n: file: widget.ui:125 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_helper) -#: po/rc.cpp:84 rc.cpp:84 +#: po/rc.cpp:90 rc.cpp:90 msgid "Use helper" msgstr "" #. i18n: file: widget.ui:227 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo) -#: po/rc.cpp:102 rc.cpp:102 +#: po/rc.cpp:108 rc.cpp:108 msgid "Use sudo for netctl" msgstr "" #. i18n: file: widget.ui:263 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_wifi) -#: po/rc.cpp:108 rc.cpp:108 +#: po/rc.cpp:114 rc.cpp:114 msgid "Show 'Start WiFi menu'" msgstr "" #. i18n: file: widget.ui:291 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface) -#: po/rc.cpp:114 rc.cpp:114 +#: po/rc.cpp:120 rc.cpp:120 msgid "Show more detailed interface" msgstr "" #. i18n: file: widget.ui:309 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) -#: po/rc.cpp:117 rc.cpp:117 +#: po/rc.cpp:123 rc.cpp:123 msgid "" "$info - active profile information\n" "$current - current profile name\n" @@ -398,12 +406,12 @@ msgid "" "$status - current profile status (static/enabled)" msgstr "" -#: po/rc.cpp:126 rc.cpp:126 +#: po/rc.cpp:132 rc.cpp:132 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "" -#: po/rc.cpp:127 rc.cpp:127 +#: po/rc.cpp:133 rc.cpp:133 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "" diff --git a/sources/plasmoid/po/ru.po b/sources/plasmoid/po/ru.po index 2faf3cf..64a8753 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: https://github.com/arcan1s/netctl-gui/issues\n" -"POT-Creation-Date: 2014-08-18 21:17+0400\n" -"PO-Revision-Date: 2014-08-18 21:17+0400\n" +"POT-Creation-Date: 2014-08-20 11:59+0400\n" +"PO-Revision-Date: 2014-08-20 12:00+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -110,7 +110,7 @@ msgstr "Сеть работает" msgid "Network is down" msgstr "Сеть не работает" -#: netctl.cpp:802 +#: netctl.cpp:797 msgid "" "Version %1\n" "(build date %2)" @@ -118,65 +118,73 @@ msgstr "" "Версия %1\n" "(дата сборки %2)" -#: netctl.cpp:803 +#: netctl.cpp:798 msgid "KDE widget which interacts with netctl." msgstr "Виджет KDE, который взаимодействует с netctl." -#: netctl.cpp:804 -msgid "Translators: %1" -msgstr "Переводчики: %1" - -#: netctl.cpp:805 +#: netctl.cpp:799 msgid "Links:" msgstr "Ссылки:" -#: netctl.cpp:806 +#: netctl.cpp:800 msgid "Homepage" msgstr "Домашняя страница" -#: netctl.cpp:807 +#: netctl.cpp:801 msgid "Repository" msgstr "Репозиторий" -#: netctl.cpp:808 +#: netctl.cpp:802 msgid "Bugtracker" msgstr "Багтрекер" -#: netctl.cpp:809 +#: netctl.cpp:803 msgid "Translation issue" msgstr "Тикет перевода" -#: netctl.cpp:810 +#: netctl.cpp:804 msgid "AUR packages" msgstr "Пакеты в AUR" -#: netctl.cpp:812 +#: netctl.cpp:806 msgid "This software is licensed under %1" msgstr "Данное приложение лицензировано под %1" -#: netctl.cpp:813 +#: netctl.cpp:814 +msgid "Translators: %1" +msgstr "Переводчики: %1" + +#: netctl.cpp:815 msgid "This software uses: %1" msgstr "Данное приложение использует: %1" -#: netctl.cpp:815 +#: netctl.cpp:817 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:816 +#: netctl.cpp:818 msgid "Appearance" msgstr "Внешний вид" -#: netctl.cpp:817 +#: netctl.cpp:819 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:818 +#. i18n: file: about.ui:21 +#. i18n: ectx: attribute (title), widget (QWidget, tab_About) +#: netctl.cpp:820 po/rc.cpp:3 rc.cpp:3 msgid "About" msgstr "О программе" +#. i18n: file: about.ui:127 +#. i18n: ectx: attribute (title), widget (QWidget, tab_ackn) +#: po/rc.cpp:6 rc.cpp:6 +msgid "Acknowledgement" +msgstr "Благодарности" + #. i18n: file: appearance.ui:47 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon) -#: po/rc.cpp:3 rc.cpp:3 +#: po/rc.cpp:9 rc.cpp:9 msgid "Inactive icon" msgstr "Иконка неактивного подключения" @@ -228,89 +236,89 @@ msgstr "Иконка неактивного подключения" #. i18n: ectx: property (text), widget (QPushButton, pushButton_sudo) #. i18n: file: widget.ui:282 #. i18n: ectx: property (text), widget (QPushButton, pushButton_wifi) -#: po/rc.cpp:6 po/rc.cpp:42 po/rc.cpp:54 po/rc.cpp:60 po/rc.cpp:66 -#: po/rc.cpp:72 po/rc.cpp:81 po/rc.cpp:87 po/rc.cpp:93 po/rc.cpp:99 -#: po/rc.cpp:105 po/rc.cpp:111 rc.cpp:6 rc.cpp:42 rc.cpp:54 rc.cpp:60 -#: rc.cpp:66 rc.cpp:72 rc.cpp:81 rc.cpp:87 rc.cpp:93 rc.cpp:99 rc.cpp:105 -#: rc.cpp:111 +#: po/rc.cpp:12 po/rc.cpp:48 po/rc.cpp:60 po/rc.cpp:66 po/rc.cpp:72 +#: po/rc.cpp:78 po/rc.cpp:87 po/rc.cpp:93 po/rc.cpp:99 po/rc.cpp:105 +#: po/rc.cpp:111 po/rc.cpp:117 rc.cpp:12 rc.cpp:48 rc.cpp:60 rc.cpp:66 +#: rc.cpp:72 rc.cpp:78 rc.cpp:87 rc.cpp:93 rc.cpp:99 rc.cpp:105 rc.cpp:111 +#: rc.cpp:117 msgid "Browse" msgstr "Обзор" #. i18n: file: appearance.ui:80 #. i18n: ectx: property (text), widget (QLabel, label_fontColor) -#: po/rc.cpp:9 rc.cpp:9 +#: po/rc.cpp:15 rc.cpp:15 msgid "Font color" msgstr "Цвет шрифта" #. i18n: file: appearance.ui:112 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor) -#: po/rc.cpp:12 rc.cpp:12 +#: po/rc.cpp:18 rc.cpp:18 msgid "Set font color" msgstr "Укажите цвет шрифта" #. i18n: file: appearance.ui:142 #. i18n: ectx: property (text), widget (QLabel, label_fontSize) -#: po/rc.cpp:15 rc.cpp:15 +#: po/rc.cpp:21 rc.cpp:21 msgid "Font size" msgstr "Размер шрифта" #. i18n: file: appearance.ui:174 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize) -#: po/rc.cpp:18 rc.cpp:18 +#: po/rc.cpp:24 rc.cpp:24 msgid "Set font size" msgstr "Укажите размер шрифта" #. i18n: file: appearance.ui:203 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight) -#: po/rc.cpp:21 rc.cpp:21 +#: po/rc.cpp:27 rc.cpp:27 msgid "Font weight" msgstr "Толщина шрифта" #. i18n: file: appearance.ui:235 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight) -#: po/rc.cpp:24 rc.cpp:24 +#: po/rc.cpp:30 rc.cpp:30 msgid "Set font weight" msgstr "Укажите ширину шрифта" #. i18n: file: appearance.ui:267 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle) -#: po/rc.cpp:27 rc.cpp:27 +#: po/rc.cpp:33 rc.cpp:33 msgid "Font style" msgstr "Стиль шрифта" #. i18n: file: appearance.ui:299 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle) -#: po/rc.cpp:30 rc.cpp:30 +#: po/rc.cpp:36 rc.cpp:36 msgid "Set font style" msgstr "Укажите стиль шрифта" #. i18n: file: appearance.ui:326 #. i18n: ectx: property (text), widget (QLabel, label_font) -#: po/rc.cpp:33 rc.cpp:33 +#: po/rc.cpp:39 rc.cpp:39 msgid "Font" msgstr "Шрифт" #. i18n: file: appearance.ui:358 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font) -#: po/rc.cpp:36 rc.cpp:36 +#: po/rc.cpp:42 rc.cpp:42 msgid "Set font family" msgstr "Укажите шрифт" #. i18n: file: appearance.ui:375 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon) -#: po/rc.cpp:39 rc.cpp:39 +#: po/rc.cpp:45 rc.cpp:45 msgid "Active icon" msgstr "Иконка активного подключения" #. i18n: file: appearance.ui:408 #. i18n: ectx: property (text), widget (QLabel, label_textAlign) -#: po/rc.cpp:45 rc.cpp:45 +#: po/rc.cpp:51 rc.cpp:51 msgid "Text align" msgstr "Выравнивание текста" #. i18n: file: appearance.ui:440 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_textAlign) -#: po/rc.cpp:48 rc.cpp:48 +#: po/rc.cpp:54 rc.cpp:54 msgid "Set text align" msgstr "Установите выравнивание текста" @@ -322,7 +330,7 @@ msgstr "Установите выравнивание текста" #. i18n: ectx: property (text), widget (QLabel, label_netctl) #. i18n: file: widget.ui:161 #. i18n: ectx: property (text), widget (QLabel, label_netctl) -#: po/rc.cpp:51 po/rc.cpp:90 rc.cpp:51 rc.cpp:90 +#: po/rc.cpp:57 po/rc.cpp:96 rc.cpp:57 rc.cpp:96 msgid "Path to netctl" msgstr "Путь к netctl" @@ -334,61 +342,61 @@ msgstr "Путь к netctl" #. i18n: ectx: property (text), widget (QLabel, label_netctlAuto) #. i18n: file: widget.ui:194 #. i18n: ectx: property (text), widget (QLabel, label_netctlAuto) -#: po/rc.cpp:57 po/rc.cpp:96 rc.cpp:57 rc.cpp:96 +#: po/rc.cpp:63 po/rc.cpp:102 rc.cpp:63 rc.cpp:102 msgid "Path to netctl-auto" msgstr "Путь к netctl-auto" #. i18n: file: dataengine.ui:100 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_extIp4) -#: po/rc.cpp:63 rc.cpp:63 +#: po/rc.cpp:69 rc.cpp:69 msgid "Check external IPv4" msgstr "Проверять внешний IPv4" #. i18n: file: dataengine.ui:136 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_extIp6) -#: po/rc.cpp:69 rc.cpp:69 +#: po/rc.cpp:75 rc.cpp:75 msgid "Check external IPv6" msgstr "Проверять внешний IPv6" #. i18n: file: widget.ui:34 #. i18n: ectx: property (text), widget (QLabel, label_autoUpdate) -#: po/rc.cpp:75 rc.cpp:75 +#: po/rc.cpp:81 rc.cpp:81 msgid "Auto update interval, msec" msgstr "Интервал автообновления, мсек" #. i18n: file: widget.ui:92 #. i18n: ectx: property (text), widget (QLabel, label_gui) -#: po/rc.cpp:78 rc.cpp:78 +#: po/rc.cpp:84 rc.cpp:84 msgid "Path to GUI" msgstr "Путь к GUI" #. i18n: file: widget.ui:125 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_helper) -#: po/rc.cpp:84 rc.cpp:84 +#: po/rc.cpp:90 rc.cpp:90 msgid "Use helper" msgstr "Использовать хелпер" #. i18n: file: widget.ui:227 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo) -#: po/rc.cpp:102 rc.cpp:102 +#: po/rc.cpp:108 rc.cpp:108 msgid "Use sudo for netctl" msgstr "Использовать sudo для netctl" #. i18n: file: widget.ui:263 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_wifi) -#: po/rc.cpp:108 rc.cpp:108 +#: po/rc.cpp:114 rc.cpp:114 msgid "Show 'Start WiFi menu'" msgstr "Показать 'Запустить WiFi-menu'" #. i18n: file: widget.ui:291 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface) -#: po/rc.cpp:114 rc.cpp:114 +#: po/rc.cpp:120 rc.cpp:120 msgid "Show more detailed interface" msgstr "Показать более детальный интерфейс" #. i18n: file: widget.ui:309 #. i18n: ectx: property (toolTip), widget (QPlainTextEdit, textEdit) -#: po/rc.cpp:117 rc.cpp:117 +#: po/rc.cpp:123 rc.cpp:123 msgid "" "$info - active profile information\n" "$current - current profile name\n" @@ -410,12 +418,12 @@ msgstr "" "$profiles - список профилей netctl\n" "$status - статус текущего профиля (static/enabled)" -#: po/rc.cpp:126 rc.cpp:126 +#: po/rc.cpp:132 rc.cpp:132 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: po/rc.cpp:127 rc.cpp:127 +#: po/rc.cpp:133 rc.cpp:133 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts index 6da392e..df291ab 100644 --- a/sources/resources/translations/en.ts +++ b/sources/resources/translations/en.ts @@ -1,6 +1,17 @@ + + About + + About + About + + + Acknowledgement + Acknowledgement + + AboutWindow @@ -1044,7 +1055,7 @@ start as daemon - start as daemon + start as daemon start minimized to tray @@ -1106,6 +1117,26 @@ Stop all profiles Stop all profiles + + start detached from console + start detached from console + + + Connection is successfully. + Connection is successfully. + + + Connection failed. + Connection failed. + + + Do you want to save profile %1? + Do you want to save profile %1? + + + WiFi menu + WiFi menu + MobileWidget diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts index 7a70ff0..eeada97 100644 --- a/sources/resources/translations/netctl-gui.ts +++ b/sources/resources/translations/netctl-gui.ts @@ -1,51 +1,64 @@ + + About + + + About + + + + + Acknowledgement + + + AboutWindow - + Version %1 (build date %2) - + Qt-based graphical interface for netctl. - + Translators: %1 - + Links: - + Homepage - + Repository - + Bugtracker - + Translation issue - + AUR packages @@ -55,7 +68,7 @@ - + This software uses: %1 @@ -972,17 +985,17 @@ - + Ready - + yes - + no @@ -1077,7 +1090,7 @@ - + Error @@ -1094,165 +1107,185 @@ - + Usage: - + Open window: - + + start detached from console + + + + start maximized - + show about window - + show netctl-auto window - + show settings window - + Functions: - + Options: - - start as daemon - - - - + start minimized to tray - + select this ESSID - + open this profile - + select this profile - + Additional flags: - + read configuration from this file - + print debug information - + start with default settings - + set options for this run, comma separated - + open a tab with this number - + Show messages: - + show version and exit - + show build information and exit - + show this help and exit - + Build date: %1 - + cmake flags - + DBus configuration - + Documentation - + Version - + Author - + License - + Restore existing session. - + Close existing session. + + + Connection is successfully. + + + + + Connection failed. + + + + + Do you want to save profile %1? + + + + + WiFi menu + + MobileWidget @@ -2180,101 +2213,101 @@ - + (netctl-auto) - + Start another profile - + Stop %1 - + Restart %1 - + Disable %1 - + Enable %1 - - + + Start profile - + Stop profile - + Stop all profiles - + Switch to profile - + Restart profile - + Enable profile - + Quit - - + + Show - + static - + enabled - + Show netctl-auto - + Status - + Hide diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts index 38b7233..f7ba1e0 100644 --- a/sources/resources/translations/ru.ts +++ b/sources/resources/translations/ru.ts @@ -1,6 +1,17 @@ + + About + + About + О программе + + + Acknowledgement + Благодарности + + AboutWindow @@ -1043,7 +1054,7 @@ start as daemon - запустить, как демон + запустить, как демон start minimized to tray @@ -1105,6 +1116,26 @@ Stop all profiles Остановить все профили + + start detached from console + запустить открепленным от консоли + + + Connection is successfully. + Соединение установлено. + + + Connection failed. + Соединение не установлено. + + + Do you want to save profile %1? + Вы хотите сохранить профиль %1? + + + WiFi menu + WiFi меню + MobileWidget