Merge branch 'master' of github.com:trueos/lumina

1 files changed, 37 insertions, 33 deletions

diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts
index 930f7989..1e8e0df1 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/lumina-screenshot_ja.ts
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ja">
 <context>
     <name>ImageEditor</name>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="14"/>
+        <location filename="../ImageEditor.cpp" line="14"/>
         <source>Zoom In</source>
         <translation>拡大表示</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/ImageEditor.cpp" line="15"/>
+        <location filename="../ImageEditor.cpp" line="15"/>
         <source>Zoom Out</source>
         <translation>縮小表示</translation>
     </message>
@@ -17,118 +17,122 @@
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="14"/>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="162"/>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="295"/>
+        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../MainUI.ui" line="162"/>
+        <location filename="../MainUI.ui" line="295"/>
         <source>Take Screenshot</source>
         <translatorcomment>アプリケーションの名前</translatorcomment>
         <translation>スクリーンショットの撮影</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="37"/>
+        <location filename="../MainUI.ui" line="37"/>
         <source>New Screenshot</source>
+        <translatorcomment>ウインドウのタイトル</translatorcomment>
         <translation>スクリーンショットの作成</translation>
-    <translatorcomment>ウインドウのタイトル</translatorcomment></message>
+    </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="43"/>
+        <location filename="../MainUI.ui" line="43"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="124"/>
+        <location filename="../MainUI.ui" line="124"/>
         <source>Include Borders</source>
         <translation>ウィンドウの境界線を含める</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="149"/>
+        <location filename="../MainUI.ui" line="149"/>
         <source> Seconds</source>
         <translatorcomment>Delay %d Seconds</translatorcomment>
         <translation> 秒後</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="152"/>
+        <location filename="../MainUI.ui" line="152"/>
         <source>Delay </source>
         <translation> </translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="172"/>
+        <location filename="../MainUI.ui" line="172"/>
         <source>View/Edit</source>
         <translation>表示/編集</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="212"/>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="306"/>
+        <location filename="../MainUI.ui" line="212"/>
+        <location filename="../MainUI.ui" line="306"/>
         <source>Save As</source>
+        <translatorcomment>ボタンのキャプション</translatorcomment>
         <translation>名前を付けて保存</translation>
-    <translatorcomment>ボタンのキャプション</translatorcomment></message>
+    </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="222"/>
+        <location filename="../MainUI.ui" line="222"/>
         <source>Launch Editor</source>
         <translation>編集ソフトを起動</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="245"/>
+        <location filename="../MainUI.ui" line="245"/>
         <source>Crop</source>
         <translation>切り抜き</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="255"/>
+        <location filename="../MainUI.ui" line="255"/>
         <source>Resize</source>
         <translation>サイズ変更</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="282"/>
+        <location filename="../MainUI.ui" line="282"/>
         <source>File</source>
         <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="298"/>
+        <location filename="../MainUI.ui" line="298"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="322"/>
+        <location filename="../MainUI.ui" line="322"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="325"/>
+        <location filename="../MainUI.ui" line="325"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="67"/>
+        <location filename="../MainUI.ui" line="67"/>
         <source>Entire Session</source>
+        <translatorcomment>X session のことではないか? &gt; 「画面全体」</translatorcomment>
         <translation>セッション全体</translation>
-    <translatorcomment>X session のことではないか? &gt; 「画面全体」</translatorcomment></message>
+    </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="81"/>
+        <location filename="../MainUI.ui" line="81"/>
         <source>Single Window</source>
         <translation>ひとつのウィンドウ</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="74"/>
+        <location filename="../MainUI.ui" line="74"/>
         <source>Single Screen</source>
         <translation>ひとつの画面</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <location filename="../MainUI.cpp" line="77"/>
         <source>Save Screenshot</source>
-        <translatorcomment>"Save"ボタンのツールチップ</translatorcomment>
+        <translatorcomment>&quot;Save&quot;ボタンのツールチップ</translatorcomment>
         <translation>スクリーンショットの保存</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="309"/>
+        <location filename="../MainUI.ui" line="309"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.ui" line="317"/>
+        <location filename="../MainUI.ui" line="317"/>
         <source>Quick Save</source>
+        <translatorcomment>「快速保存」(zh)も捨てがたいが、&quot;Save As&quot;との対比なら「保存」であるべきだろう。</translatorcomment>
         <translation>保存</translation>
-    <translatorcomment>「快速保存」(zh)も捨てがたいが、"Save As"との対比なら「保存」であるべきだろう。</translatorcomment></message>
+    </message>
     <message>
-        <location filename="../../lumina-git/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp" line="78"/>
+        <location filename="../MainUI.cpp" line="77"/>
         <source>PNG Files (*.png);;AllFiles (*)</source>
         <translation>PNG ファイル (*.png);;すべて (*)</translation>
     </message>