Updated japanese translations.

Use default protocol version if the saved one is less than current version number.
Updated gitignore.

.gitignore

@@ -1,3 +1,4 @@
 qcma.pro.user*
+*.o
 *.qm
 org.qcma.*.xml

README.md

@@ -54,7 +54,11 @@ dbus-monitor "type='signal',sender='org.qcma.HeadlessManager',member='databaseUp
 
 * [VitaMTP fork](https://github.com/codestation/VitaMTP)
 
-* [FFmpeg](hhttp://www.ffmpeg.org/)
+* [FFmpeg](http://www.ffmpeg.org/)
+
+* [libnotify](http://library.gnome.org/devel/notification-spec/)
+
+* [libappindicator](https://launchpad.net/libappindicator)
 
 
 #### Where do I get the source code?
@@ -69,6 +73,8 @@ the reference implementation of OpenCMA.
 
 [Xian Nox] (https://github.com/xiannox) - for the Wiki and various contributions.
 
+[173210] (https://github.com/173210) - japanese translations.
+
 #### License
 GPL v3: since some parts of QCMA are based on the reference implementation of
 OpenCMA.

src/capability.cpp

@@ -21,6 +21,7 @@
 
 #include <QDebug>
 #include <QHostInfo>
+#include <QSettings>
 
 DeviceCapability::DeviceCapability() :
     vita_info()
@@ -40,7 +41,9 @@ bool DeviceCapability::exchangeInfo(vita_device_t *device)
     }
 
     QString hostname = QHostInfo::localHostName();
-    const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), VITAMTP_PROTOCOL_MAX_VERSION);
+    int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
+    protocol_version = qMax(protocol_version, VITAMTP_PROTOCOL_MAX_VERSION);
+    const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), protocol_version);
 
     // Next, we send the client's (this program) info (discard the const here)
     if(VitaMTP_SendInitiatorInfo(device, (initiator_info_t *)pc_info) != PTP_RC_OK) {

src/forms/backupitem.ui

@@ -37,7 +37,7 @@
         </size>
        </property>
        <property name="text">
-        <string/>
+        <string notr="true"/>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -55,7 +55,7 @@
        <item>
         <widget class="QLabel" name="gameLabel">
          <property name="text">
-          <string>&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Game Name&lt;/span&gt;&lt;/p&gt;</string>
+          <string notr="true">&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Game Name&lt;/span&gt;&lt;/p&gt;</string>
          </property>
         </widget>
        </item>
@@ -76,7 +76,7 @@
             </size>
            </property>
            <property name="text">
-            <string>&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;0.00 GiB&lt;/span&gt;&lt;/p&gt;</string>
+            <string notr="true">&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;0.00 GiB&lt;/span&gt;&lt;/p&gt;</string>
            </property>
           </widget>
          </item>
@@ -89,7 +89,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;[APP] [SAVE] [UPDATE] [DLC]&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;[APP] [SAVE] [UPDATE] [DLC]&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

src/forms/configwidget.cpp

@@ -100,7 +100,10 @@ void ConfigWidget::setDefaultData()
     ui->videoSkipCheck->setChecked(settings.value("videoSkip", false).toBool());
     ui->musicSkipCheck->setChecked(settings.value("musicSkip", false).toBool());
 
-    ui->protocolEdit->setText(settings.value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toString());
+    int protocol_version = settings.value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
+    protocol_version = qMax(protocol_version, VITAMTP_PROTOCOL_MAX_VERSION);
+
+    ui->protocolEdit->setText(QString::number(protocol_version));
 }
 
 ConfigWidget::~ConfigWidget()

src/forms/configwidget.ui

@@ -19,7 +19,7 @@
      <item>
       <widget class="QTabWidget" name="tabWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="tab">
         <attribute name="title">
@@ -361,7 +361,7 @@
              <item>
               <widget class="QLineEdit" name="protocolEdit">
                <property name="inputMask">
-                <string>9999999</string>
+                <string notr="true">9999999</string>
                </property>
               </widget>
              </item>

src/gui/mainwidget.cpp

@@ -222,7 +222,7 @@ TrayIndicator *MainWidget::createTrayObject(QWidget *parent)
     if(desktop.toLower() == "kde")
     {
         // KDENotifier
-        QLibrary library("/usr/share/qcma/qcma_kdenotifier.so");
+        QLibrary library("/usr/lib/qcma/qcma_kdenotifier.so");
         if(library.load())
             create_tray = reinterpret_cast<TrayFunctionPointer>(library.resolve("createTrayIndicator"));
         else
@@ -233,7 +233,7 @@ TrayIndicator *MainWidget::createTrayObject(QWidget *parent)
     // if(desktop.toLower() == "unity")
     {
         // AppIndicator
-        QLibrary library("/usr/share/qcma/qcma_appindicator.so");
+        QLibrary library("/usr/lib/qcma/qcma_appindicator.so");
         if(library.load())
             create_tray = reinterpret_cast<TrayFunctionPointer>(library.resolve("createTrayIndicator"));
         else