release 1.3.3

fix #19

AUTHORS

@@ -1,2 +1,5 @@
 Current developers:
 Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
+
+Translators:
+@nosada (Japanese translation)

CHANGELOG

@@ -1,3 +1,20 @@
+Ver.1.3.3
+---------
+* all
+    * update Japanese translation
+* dataengine
+    - fix #19
+
+***
+
+
+Ver.1.3.2
+---------
+* all
+    + add Japanese translation (thanks to @nosada)
+
+***
+
 Ver.1.3.1
 ---------
 * gui:

arch/PKGBUILD

@@ -4,15 +4,15 @@ pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
          'libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
          'kdeplasma-applets-netctl-gui')
-pkgver=1.3.1
-pkgrel=1
+pkgver=1.3.3
+pkgrel=2
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
 url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('automoc4' 'cmake' 'kdelibs' 'qt5-base' 'qt5-tools')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('d57bf3773f6cd9ead91c2669a02360fb')
+md5sums=('9ba672ef33e9962ccc04fc4de75fad68')
 
 
 prepare() {
@@ -36,6 +36,7 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_DATAENGINE:BOOL=0 \
         -DBUILD_PLASMOID:BOOL=0 \
+        -DUSE_CAPABILITIES:BOOL=0 \
         -DUSE_QT5:BOOL=0 \
         "../${pkgbase}"
   make
@@ -45,6 +46,7 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_DATAENGINE:BOOL=0 \
         -DBUILD_PLASMOID:BOOL=0 \
+        -DUSE_CAPABILITIES:BOOL=0 \
         "../${pkgbase}"
   make
 }
@@ -84,7 +86,7 @@ package_netctlgui-helper() {
   depends=('libnetctlgui')
   provides=('netctlgui-helper-qt4')
   conflicts=('netctlgui-helper-qt4')
-  backup=('etc/netctlgui-helper.conf'
+  backup=('etc/netctl-gui.conf'
           'etc/dbus-1/system.d/org.netctlgui.helper.conf')
   install="netctlgui-helper.install"
 
@@ -104,6 +106,8 @@ package_netctl-gui() {
 
   cd "${srcdir}/build-qt5/gui"
   make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/build-qt5/resources"
+  make DESTDIR="${pkgdir}" install
 }
 
 
@@ -127,7 +131,7 @@ package_netctlgui-helper-qt4() {
   depends=('libnetctlgui-qt4')
   provides=('netctlgui-helper')
   conflicts=('netctlgui-helper')
-  backup=('etc/netctlgui-helper.conf'
+  backup=('etc/netctl-gui.conf'
           'etc/dbus-1/system.d/org.netctlgui.helper.conf')
   install="netctlgui-helper.install"
 
@@ -147,4 +151,6 @@ package_netctl-gui-qt4() {
 
   cd "${srcdir}/build-qt4/gui"
   make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/build-qt4/resources"
+  make DESTDIR="${pkgdir}" install
 }

arch/netctlgui-helper.install

@@ -1,5 +1,5 @@
 post_install() {
-  setcap cap_setuid=ep usr/bin/netctlgui-helper 2>/dev/null || chmod +s usr/bin/ping
+  setcap cap_setuid=ep usr/bin/netctlgui-helper 2>/dev/null || chmod +s usr/bin/netctlgui-helper
   cat << EOF
 Note: users should be in network group if you want to get them access to the system bus
 See http://arcanis.name/devs/netctl-gui-security-notes.html#helper

sources/CMakeLists.txt

@@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com")
 set (PROJECT_LICENSE "GPLv3")
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 3)
-set (PROJECT_VERSION_PATCH 1)
+set (PROJECT_VERSION_PATCH 3)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
 string (TIMESTAMP CURRENT_YEAR "%Y")

sources/dataengine/netctl.cpp

@@ -46,6 +46,7 @@ Netctl::Netctl(QObject *parent, const QVariantList &args)
 
     setMinimumPollingInterval(333);
     readConfiguration();
+    initSources();
 }
 
 
@@ -185,6 +186,8 @@ QString Netctl::getExtIp(const QString cmd)
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
 
+    // test network connection
+    if (!isNetworkActive()) return QString("N\\A");
     TaskResult process = runTask(cmd);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
     if (process.exitCode != 0)
@@ -317,6 +320,32 @@ QString Netctl::getStatus(const QString cmdNetctl, const QString cmdNetctlAuto)
 }
 
 
+void Netctl::initSources()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    QStringList sourcesList = sources();
+    for (int i=0; i<sourcesList.count(); i++)
+        setData(sourcesList[i], QString("value"), QString("N\\A"));
+}
+
+
+bool Netctl::isNetworkActive()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    QString cmd = QString("ping -c 1 google.com");
+    if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
+    TaskResult process = runTask(cmd);
+    if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
+
+    if (process.exitCode == 0)
+        return true;
+    else
+        return false;
+}
+
+
 bool Netctl::updateSourceEvent(const QString &source)
 {
     if (debug) qDebug() << PDEBUG;

sources/dataengine/netctl.h

@@ -37,6 +37,10 @@ public:
     QStringList getProfileList(const QString cmdNetctl, const QString cmdNetctlAuto);
     QStringList getProfileStringStatus(const QString cmdNetctl, const QString cmdNetctlAuto);
     QString getStatus(const QString cmdNetctl, const QString cmdNetctlAuto);
+    bool isNetworkActive();
+
+public slots:
+    void initSources();
 
 protected:
     bool sourceRequestEvent(const QString &name);

sources/gui/src/mainprivateslots.cpp

@@ -22,6 +22,7 @@
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QMenu>
 #include <QUrl>
 
 #include <pdebug/pdebug.h>
@@ -163,16 +164,16 @@ void MainWindow::updateToolBars()
 {
     if (debug) qDebug() << PDEBUG;
 
-    if (sender() == toolBarActions[QString("menu")]) {
+    if (sender() == ui->pushButton_menu) {
         mainToolBar->setHidden(false);
         actionToolBar->setHidden(true);
         helpToolBar->setHidden(true);
-    } else if (sender() == toolBarActions[QString("actions")]) {
+    } else if (sender() == ui->pushButton_action) {
         mainToolBar->setHidden(true);
         actionToolBar->setHidden(false);
         helpToolBar->setHidden(true);
         updateMenu();
-    } else if (sender() == toolBarActions[QString("help")]) {
+    } else if (sender() == ui->pushButton_help) {
         mainToolBar->setHidden(true);
         actionToolBar->setHidden(true);
         helpToolBar->setHidden(false);

sources/gui/src/mainpublicslots.cpp

@@ -361,6 +361,7 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
 
     createObjects();
     createActions();
+    createToolBars();
 
     // tray
     if ((QSystemTrayIcon::isSystemTrayAvailable()) &&

sources/gui/src/mainwindow.cpp

@@ -21,6 +21,7 @@
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDebug>
+#include <QMenu>
 
 #include <pdebug/pdebug.h>
 #include <task/taskadds.h>
@@ -345,6 +346,9 @@ void MainWindow::createActions()
     if (debug) qDebug() << PDEBUG;
 
     connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int)));
+    connect(ui->pushButton_menu, SIGNAL(clicked(bool)), this, SLOT(updateToolBars()));
+    connect(ui->pushButton_action, SIGNAL(clicked(bool)), this, SLOT(updateToolBars()));
+    connect(ui->pushButton_help, SIGNAL(clicked(bool)), this, SLOT(updateToolBars()));
 
     // main tab events
     connect(ui->pushButton_netctlAuto, SIGNAL(clicked(bool)), this, SLOT(showNetctlAutoWindow()));
@@ -437,8 +441,6 @@ void MainWindow::createObjects()
     ui->scrollAreaWidgetContents->layout()->addWidget(vlanWid);
     wirelessWid = new WirelessWidget(this, configuration);
     ui->scrollAreaWidgetContents->layout()->addWidget(wirelessWid);
-
-    createToolBars();
 }
 
 
@@ -446,13 +448,6 @@ void MainWindow::createToolBars()
 {
     if (debug) qDebug() << PDEBUG;
 
-    toolBarActions[QString("menu")] = ui->menuBar->addAction(QApplication::translate("MainWindow", "Menu"),
-                                                             this, SLOT(updateToolBars()));
-    toolBarActions[QString("actions")] = ui->menuBar->addAction(QApplication::translate("MainWindow", "Actions"),
-                                                                this, SLOT(updateToolBars()));
-    toolBarActions[QString("help")] = ui->menuBar->addAction(QApplication::translate("MainWindow", "Help"),
-                                                             this, SLOT(updateToolBars()));
-
     mainToolBar = new QToolBar(this);
     mainToolBar->setToolButtonStyle(Qt::ToolButtonFollowStyle);
     toolBarActions[QString("netctlAuto")] = mainToolBar->addAction(QApplication::translate("MainWindow", "netctl-auto"),
@@ -467,7 +462,7 @@ void MainWindow::createToolBars()
                                                              this, SLOT(closeMainWindow()));
     appShortcuts[QString("quitShortcut")] = new QShortcut(QKeySequence(QApplication::translate("MainWindow", "Ctrl+Q")),
                                                           this, SLOT(closeMainWindow()));
-    ui->centralLayout->insertWidget(0, mainToolBar);
+    ui->centralLayout->insertWidget(1, mainToolBar);
     mainToolBar->setHidden(true);
 
     actionToolBar = new QToolBar(this);
@@ -522,7 +517,7 @@ void MainWindow::createToolBars()
     toolBarActions[QString("profileRemove")] = actionToolBar->addAction(QIcon::fromTheme(QString("edit-delete")),
                                                                         QApplication::translate("MainWindow", "Remove"),
                                                                         this, SLOT(profileTabRemoveProfile()));
-    ui->centralLayout->insertWidget(0, actionToolBar);
+    ui->centralLayout->insertWidget(1, actionToolBar);
     actionToolBar->setHidden(true);
 
     helpToolBar = new QToolBar(this);
@@ -541,10 +536,10 @@ void MainWindow::createToolBars()
     toolBarActions[QString("about")] = helpToolBar->addAction(QIcon::fromTheme(QString("help-about")),
                                                               QApplication::translate("MainWindow", "About"),
                                                               this, SLOT(showAboutWindow()));
-    ui->centralLayout->insertWidget(0, helpToolBar);
+    ui->centralLayout->insertWidget(1, helpToolBar);
     helpToolBar->setHidden(true);
 
-    toolBarActions[QString("menu")]->trigger();
+    ui->pushButton_menu->click();
 }
 
 
@@ -593,10 +588,7 @@ void MainWindow::deleteObjects()
         delete appShortcuts[QString("quitShortcut")];
     }
     if (trayIcon != nullptr) delete trayIcon;
-    if (ui != nullptr) {
-        ui->menuBar->clear();
-        delete ui;
-    }
+    if (ui != nullptr) delete ui;
 }
 
 

sources/gui/src/mainwindow.ui

@@ -15,6 +15,40 @@
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="centralLayout">
+    <item>
+     <layout class="QHBoxLayout" name="layout_menus">
+      <item>
+       <widget class="QPushButton" name="pushButton_menu">
+        <property name="styleSheet">
+         <string notr="true">border: none;</string>
+        </property>
+        <property name="text">
+         <string>Menu</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_action">
+        <property name="styleSheet">
+         <string notr="true">border: none;</string>
+        </property>
+        <property name="text">
+         <string>Actions</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_help">
+        <property name="styleSheet">
+         <string notr="true">border: none;</string>
+        </property>
+        <property name="text">
+         <string>Help</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
@@ -157,7 +191,7 @@
              <x>0</x>
              <y>0</y>
              <width>437</width>
-             <height>371</height>
+             <height>368</height>
             </rect>
            </property>
            <property name="sizePolicy">
@@ -251,16 +285,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>469</width>
-     <height>22</height>
-    </rect>
-   </property>
-  </widget>
   <widget class="QStatusBar" name="statusBar"/>
  </widget>
  <tabstops>

sources/plasmoid/plasma_applet_netctl.notifyrc

@@ -1,5 +1,5 @@
 [Global]
-IconName=netctl-gui
+IconName=netctl-gui-widget
 Name=Netctl plasmoid
 Comment=Netctl plasmoid popups
 

sources/plasmoid/po/ja.po

@@ -0,0 +1,422 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# NOGISAKA Sadata <ngsksdt@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://github.com/arcan1s/netctl-gui/issues\n"
+"POT-Creation-Date: 2014-08-24 16:44+0400\n"
+"PO-Revision-Date: 2014-10-13 16:37+0900\n"
+"Last-Translator: NOGISAKA Sadata <ngsksdt@gmail.com>\n"
+"Language-Team: Japanese <kde-i18n-doc@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: netctl.cpp:270
+msgid "Set profile %1 disabled"
+msgstr "プロファイル %1 を無効にする"
+
+#: netctl.cpp:273
+msgid "Set profile %1 enabled"
+msgstr "プロファイル %1 を有効にする"
+
+#: netctl.cpp:294
+msgid "Restart profile %1"
+msgstr "プロファイル %1 の利用を再開"
+
+#: netctl.cpp:315
+msgid "Start profile %1"
+msgstr "プロファイル %1 の利用を開始"
+
+#: netctl.cpp:341
+msgid "Stop profile %1"
+msgstr "プロファイル %1 の利用を停止する"
+
+#: netctl.cpp:361 netctl.cpp:499
+msgid "Stop all profiles"
+msgstr "全てのプロファイルの利用を停止する"
+
+#: netctl.cpp:381
+msgid "Switch to profile %1"
+msgstr "プロファイルを %1 へ切り替える"
+
+#: netctl.cpp:454
+msgid "Start another profile"
+msgstr "他のプロファイルの利用を開始"
+
+#: netctl.cpp:455
+msgid "Stop %1"
+msgstr "%1 を停止"
+
+#: netctl.cpp:456
+msgid "Restart %1"
+msgstr "%1 を再開"
+
+#: netctl.cpp:458
+msgid "Disable %1"
+msgstr "%1 を無効にする"
+
+#: netctl.cpp:460
+msgid "Enable %1"
+msgstr "%1 を有効にする"
+
+#: netctl.cpp:463 netctl.cpp:486
+msgid "Start profile"
+msgstr "プロファイルの利用を開始"
+
+#: netctl.cpp:494
+msgid "Stop profile"
+msgstr "プロファイルの利用を停止する"
+
+#: netctl.cpp:504
+msgid "Switch to profile"
+msgstr "プロファイルを切り替える"
+
+#: netctl.cpp:512
+msgid "Restart profile"
+msgstr "プロファイルの利用を再開"
+
+#: netctl.cpp:517
+msgid "Enable profile"
+msgstr "プロファイルを有効にする"
+
+#: netctl.cpp:521
+msgid "Show netctl-gui"
+msgstr "netctl-gui を表示"
+
+#: netctl.cpp:526
+msgid "Show WiFi menu"
+msgstr "WiFi メニューを表示"
+
+#: netctl.cpp:553
+msgid "Start GUI"
+msgstr "GUI を開始"
+
+#: netctl.cpp:564
+msgid "Start WiFi menu"
+msgstr "WiFi メニューを開始"
+
+#: netctl.cpp:604
+msgid "Network is up"
+msgstr "ネットワークは有効です"
+
+#: netctl.cpp:608
+msgid "Network is down"
+msgstr "ネットワークは無効です"
+
+#: netctl.cpp:798
+msgid ""
+"Version %1\n"
+"(build date %2)"
+msgstr ""
+"バージョン：%1\n"
+"（ビルド日時：%2）"
+
+#: netctl.cpp:799
+msgid "KDE widget which interacts with netctl."
+msgstr "netctl と連携する KDE ウィジェット"
+
+#: netctl.cpp:800
+msgid "Links:"
+msgstr "リンク："
+
+#: netctl.cpp:801
+msgid "Homepage"
+msgstr "ホームページ"
+
+#: netctl.cpp:802
+msgid "Repository"
+msgstr "レポジトリ"
+
+#: netctl.cpp:803
+msgid "Bugtracker"
+msgstr "バグトラッカ"
+
+#: netctl.cpp:804
+msgid "Translation issue"
+msgstr "翻訳に関する issue"
+
+#: netctl.cpp:805
+msgid "AUR packages"
+msgstr "AUR パッケージ"
+
+#: netctl.cpp:807
+msgid "This software is licensed under %1"
+msgstr "このソフトウェアは %1 の下で許諾されます"
+
+#: netctl.cpp:815
+msgid "Translators: %1"
+msgstr "翻訳者：%1"
+
+#: netctl.cpp:816
+msgid "This software uses: %1"
+msgstr "このソフトウェアは次を利用しています：%1"
+
+#: netctl.cpp:818
+msgid "Netctl plasmoid"
+msgstr "Netctl plasmoid"
+
+#: netctl.cpp:819
+msgid "Appearance"
+msgstr "外観"
+
+#: netctl.cpp:820
+msgid "DataEngine"
+msgstr "DataEngine"
+
+#: netctl.cpp:821
+msgid "About"
+msgstr "概要"
+
+#. i18n: file: appearance.ui:47
+#. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
+#: po/rc.cpp:3 rc.cpp:3
+msgid "Inactive icon"
+msgstr "非アクティブ時のアイコン"
+
+#. i18n: file: appearance.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#. i18n: file: appearance.ui:391
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: dataengine.ui:50
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: dataengine.ui:83
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctlAuto)
+#. i18n: file: dataengine.ui:119
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_extIp4)
+#. i18n: file: dataengine.ui:155
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_extIp6)
+#. i18n: file: widget.ui:108
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: widget.ui:144
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_helper)
+#. i18n: file: widget.ui:177
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: widget.ui:210
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctlAuto)
+#. i18n: file: widget.ui:246
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_sudo)
+#. i18n: file: widget.ui:282
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_wifi)
+#. i18n: file: appearance.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
+#. i18n: file: appearance.ui:391
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
+#. i18n: file: dataengine.ui:50
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: dataengine.ui:83
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctlAuto)
+#. i18n: file: dataengine.ui:119
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_extIp4)
+#. i18n: file: dataengine.ui:155
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_extIp6)
+#. i18n: file: widget.ui:108
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
+#. i18n: file: widget.ui:144
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_helper)
+#. i18n: file: widget.ui:177
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
+#. i18n: file: widget.ui:210
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_netctlAuto)
+#. i18n: file: widget.ui:246
+#. 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
+msgid "Browse"
+msgstr "参照"
+
+#. i18n: file: appearance.ui:80
+#. i18n: ectx: property (text), widget (QLabel, label_fontColor)
+#: po/rc.cpp:9 rc.cpp:9
+msgid "Font color"
+msgstr "フォントの色"
+
+#. i18n: file: appearance.ui:112
+#. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
+#: po/rc.cpp:12 rc.cpp:12
+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
+msgid "Font size"
+msgstr "フォントの大きさ"
+
+#. i18n: file: appearance.ui:174
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
+#: po/rc.cpp:18 rc.cpp:18
+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
+msgid "Font weight"
+msgstr "フォントの太さ"
+
+#. i18n: file: appearance.ui:235
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
+#: po/rc.cpp:24 rc.cpp:24
+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
+msgid "Font style"
+msgstr "フォントの字形"
+
+#. i18n: file: appearance.ui:299
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
+#: po/rc.cpp:30 rc.cpp:30
+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
+msgid "Font"
+msgstr "フォント"
+
+#. i18n: file: appearance.ui:358
+#. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
+#: po/rc.cpp:36 rc.cpp:36
+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
+msgid "Active icon"
+msgstr "アクティブ時のアイコン"
+
+#. i18n: file: appearance.ui:408
+#. i18n: ectx: property (text), widget (QLabel, label_textAlign)
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Text align"
+msgstr "テキストの位置"
+
+#. i18n: file: appearance.ui:440
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_textAlign)
+#: po/rc.cpp:48 rc.cpp:48
+msgid "Set text align"
+msgstr "テキストの位置を設定する"
+
+#. i18n: file: dataengine.ui:34
+#. i18n: ectx: property (text), widget (QLabel, label_netctl)
+#. i18n: file: widget.ui:161
+#. i18n: ectx: property (text), widget (QLabel, label_netctl)
+#. i18n: file: dataengine.ui:34
+#. 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
+msgid "Path to netctl"
+msgstr "netctl へのパス"
+
+#. i18n: file: dataengine.ui:67
+#. i18n: ectx: property (text), widget (QLabel, label_netctlAuto)
+#. i18n: file: widget.ui:194
+#. i18n: ectx: property (text), widget (QLabel, label_netctlAuto)
+#. i18n: file: dataengine.ui:67
+#. 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
+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
+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
+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
+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
+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
+msgid "Use helper"
+msgstr "ヘルパを使用する"
+
+#. i18n: file: widget.ui:227
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
+#: po/rc.cpp:102 rc.cpp:102
+msgid "Use sudo for netctl"
+msgstr "netctl に対して sudo を使用する"
+
+#. i18n: file: widget.ui:263
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_wifi)
+#: po/rc.cpp:108 rc.cpp:108
+msgid "Show 'Start WiFi menu'"
+msgstr "「Wifi メニューの開始」を表示"
+
+#. i18n: file: widget.ui:291
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
+#: po/rc.cpp:114 rc.cpp:114
+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
+msgid ""
+"$info - active profile information\n"
+"$current - current profile name\n"
+"$extip4 - external IPv4\n"
+"$extip6 - external IPv6\n"
+"$interfaces - list of the network interfaces\n"
+"$intip4 - internal IPv4\n"
+"$intip6 - internal IPv6\n"
+"$profiles - list of the netctl profiles\n"
+"$status - current profile status (static/enabled)"
+msgstr ""
+"$info - アクティブなプロファイルの情報\n"
+"$current - 現在利用中プロファイルの情報\n"
+"$extip4 - 外部 IPv4 アドレス\n"
+"$extip6 - 外部 IPv6 アドレス\n"
+"$interfaces - ネットワークインターフェースの一覧\n"
+"$intip4 - 内部 IPv4 アドレス\n"
+"$intip6 - 内部 IPv6 アドレス\n"
+"$profiles - プロファイルの一覧\n"
+"$status - 現在のプロファイルの状態（静的/有効）"
+
+#: po/rc.cpp:126 rc.cpp:126
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "NOGISAKA Sadata"
+
+#: po/rc.cpp:127 rc.cpp:127
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "ngsksdt@gmail.com "
+
+

sources/resources/resources-helper.qrc

@@ -2,6 +2,7 @@
 <qresource>
 <!--     helper translations -->
     <file>translations-helper/en.qm</file>
+    <file>translations-helper/ja.qm</file>
     <file>translations-helper/ru.qm</file>
 <!--     pony <3 -->
     <file>pinkiepie</file>

sources/resources/resources.qrc

@@ -2,6 +2,7 @@
 <qresource>
 <!--     gui translations -->
     <file>translations/en.qm</file>
+    <file>translations/ja.qm</file>
     <file>translations/ru.qm</file>
 <!--     icons -->
     <file>icon.png</file>

sources/resources/translations-helper/ja.ts

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ja_JP">
+<context>
+    <name>NetctlHelper</name>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="28"/>
+        <source>Unknown flag
+</source>
+        <translation>不明なフラグです</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="54"/>
+        <source>Usage:</source>
+        <translation>使用法：</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="56"/>
+        <source>Options:</source>
+        <translation>オプション：</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="59"/>
+        <source>read configuration from this file</source>
+        <translation>このファイルから設定を読み込む</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="61"/>
+        <source>print debug information</source>
+        <translation>デバッグ情報を表示する</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="63"/>
+        <source>do not start as daemon</source>
+        <translation>デーモンとして実行しない</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="65"/>
+        <source>force replace the existing session</source>
+        <translation>既存のセッションを強制的に置き換える</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="67"/>
+        <source>force restore the existing session</source>
+        <translation>既存のセッションを強制的に復帰させる</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="69"/>
+        <source>do not read user configuration, system-wide only</source>
+        <translation>ユーザの設定ファイルではなくシステム全体の設定ファイルのみを読み込む</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="70"/>
+        <source>Show messages:</source>
+        <translation>メッセージの表示：</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="72"/>
+        <source>show version and exit</source>
+        <translation>バージョンを表示して終了</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="74"/>
+        <source>show build information and exit</source>
+        <translation>ビルド情報を表示して終了</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="76"/>
+        <source>show this help and exit</source>
+        <translation>このヘルプを表示して終了</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="86"/>
+        <source>Build date: %1</source>
+        <translation>ビルド日時：%1</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="89"/>
+        <source>cmake flags</source>
+        <translation>cmake のフラグ</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="91"/>
+        <source>cmake properties</source>
+        <translation>cmake のプロパティ</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="95"/>
+        <source>Components</source>
+        <translation>コンポーネント</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="102"/>
+        <source>Additional components</source>
+        <translation>追加のコンポーネント</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="106"/>
+        <source>Project properties</source>
+        <translation>プロジェクトのプロパティ</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="112"/>
+        <source>DBus configuration</source>
+        <translation>DBus 設定</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="121"/>
+        <source>Documentation</source>
+        <translation>ドキュメンテーション</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="133"/>
+        <source>Version</source>
+        <translation>バージョン</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="136"/>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/messages.cpp" line="139"/>
+        <source>License</source>
+        <translation>ライセンス</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/main.cpp" line="95"/>
+        <source>The helper is running with EUID %1. Some functions may not be available.</source>
+        <translation>このヘルパは EUID %1 として実行されています。いくつか利用できない機能が存在します。</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/main.cpp" line="97"/>
+        <source>See security notes for more details.</source>
+        <translation>詳細情報を得るにはセキュリティノートを参照して下さい。</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/main.cpp" line="136"/>
+        <location filename="../../helper/src/main.cpp" line="147"/>
+        <source>Replace existing session.</source>
+        <translation>既存のセッションを置き換える。</translation>
+    </message>
+    <message>
+        <location filename="../../helper/src/main.cpp" line="141"/>
+        <location filename="../../helper/src/main.cpp" line="153"/>
+        <source>Restore existing session.</source>
+        <translation>既存のセッションを復帰させる。</translation>
+    </message>
+</context>
+</TS>

sources/version.h.in

@@ -5,7 +5,7 @@
 #define NAME "Netctl Graphical Interface"
 #define VERSION "@PROJECT_VERSION@"
 #define AUTHOR "@PROJECT_AUTHOR@"
-#define TRANSLATORS ""
+#define TRANSLATORS "nosada (Japanese translation)"
 #define EMAIL "@PROJECT_CONTACT@"
 #define LICENSE "@PROJECT_LICENSE@"
 #define TRDPARTY_LICENSE "tasks,BSD,https://github.com/mhogomchungu/tasks;ponysay,GPLv3,http://erkin.co/ponysay"