Merge remote-tracking branch 'origin/master'

1 files changed, 42 insertions, 16 deletions

diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts
index 55ab6645..0179804f 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts
@@ -86,17 +86,17 @@
         <translation type="unfinished">削除</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/>
         <source>Select Application</source>
         <translation>アプリケーションを選択してください</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/>
         <source>New Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -668,12 +668,12 @@
 <context>
     <name>LBattery</name>
     <message>
-        <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/>
+        <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/>
         <source>%1 % (Charging)</source>
         <translation>%1 % (充電中)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/>
+        <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/>
         <source>%1 % (%2 Remaining)</source>
         <translation>%1 % (残り %2 %)</translation>
     </message>
@@ -681,12 +681,12 @@
 <context>
     <name>LClock</name>
     <message>
-        <location filename="../panel-plugins/clock/LClock.cpp" line="137"/>
+        <location filename="../panel-plugins/clock/LClock.cpp" line="139"/>
         <source>Time Zone (%1)</source>
         <translation>タイムゾーン (%1)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/clock/LClock.cpp" line="159"/>
+        <location filename="../panel-plugins/clock/LClock.cpp" line="161"/>
         <source>Use System Time</source>
         <translation>システムの時刻を使用する</translation>
     </message>
@@ -856,7 +856,7 @@
     <name>LSession</name>
     <message>
         <location filename="../LSession.cpp" line="163"/>
-        <location filename="../LSession.cpp" line="342"/>
+        <location filename="../LSession.cpp" line="346"/>
         <source>Desktop</source>
         <translatorcomment>これ、ファイルパスなので、「デスクトップ」と訳したらまずい</translatorcomment>
         <translation>Desktop</translation>
@@ -1466,34 +1466,49 @@
         <translation>戻る</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/>
         <source>Apply Updates?</source>
         <translation>更新を行いますか?</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/>
         <source>You have system updates waiting to be applied! Do you wish to install them now?</source>
         <translation>適用されていないシステムアップデートがあります。インストールしますか?</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/>
+        <source>Cancel</source>
+        <translation type="unfinished">キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/>
         <source>%1% (Plugged In)</source>
         <translation>%1% (電源接続中)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/>
         <source>%1% (%2 Estimated)</source>
         <translation>%1% (推定残り時間: %2)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/>
         <source>%1% Remaining</source>
         <translation>残り %1%</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/>
         <source>Workspace %1/%2</source>
         <translation>ワークスペース %1/%2</translation>
     </message>
@@ -1522,6 +1537,7 @@
     </message>
     <message>
         <location filename="../SystemWindow.ui" line="127"/>
+        <location filename="../SystemWindow.cpp" line="60"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -1545,6 +1561,16 @@
         <source>You have system updates waiting to be applied! Do you wish to install them now?</source>
         <translation>システムが適用されるのを待っている更新があります！ 今それらをインストールしますか？</translation>
     </message>
+    <message>
+        <location filename="../SystemWindow.cpp" line="58"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../SystemWindow.cpp" line="59"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UserItemWidget</name>