Merge remote-tracking branch 'origin/master'

2 files changed, 75 insertions, 69 deletions

diff --git a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ja.ts b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ja.ts
index ecdd9a4c..82738657 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ja.ts
+++ b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_ja.ts
@@ -201,7 +201,7 @@
     <message>
         <location filename="../MainUI.cpp" line="306"></location>
         <source>Select an icon</source>
-        <translation>アイコンを選択:</translation>
+        <translation>アイコンを選択</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="306"></location>
diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ja.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ja.ts
index 2c223e58..34fc21ec 100644
--- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ja.ts
+++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ja.ts
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ja">
 <context>
     <name>ColorDialog</name>
     <message>
-        <location filename="../ColorDialog.ui" line="14"/>
+        <location filename="../ColorDialog.ui" line="14"></location>
         <source>Customize Colors</source>
         <translation>色付けの変更</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="24"/>
+        <location filename="../ColorDialog.ui" line="24"></location>
         <source>Item Type</source>
         <translation>アイテムの種類</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="29"/>
+        <location filename="../ColorDialog.ui" line="29"></location>
         <source>Color</source>
         <translation>色</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="34"/>
+        <location filename="../ColorDialog.ui" line="34"></location>
         <source>Sample</source>
         <translation>サンプル</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="44"/>
-        <location filename="../ColorDialog.cpp" line="55"/>
+        <location filename="../ColorDialog.ui" line="44"></location>
+        <location filename="../ColorDialog.cpp" line="55"></location>
         <source>Select Color</source>
         <translation>色を選択</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="64"/>
+        <location filename="../ColorDialog.ui" line="64"></location>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="71"/>
+        <location filename="../ColorDialog.ui" line="71"></location>
         <source>Apply</source>
         <translation>適用</translation>
     </message>
@@ -43,254 +43,260 @@
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../MainUI.ui" line="14"></location>
         <source>MainWindow</source>
         <translation>メインウィンドウ</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="46"/>
+        <location filename="../MainUI.ui" line="46"></location>
         <source>Tab 1</source>
         <translation>タブ 1</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="81"/>
+        <location filename="../MainUI.ui" line="81"></location>
         <source>Find the previous match</source>
         <translation>前を検索</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="84"/>
-        <location filename="../MainUI.ui" line="97"/>
-        <location filename="../MainUI.ui" line="148"/>
-        <location filename="../MainUI.ui" line="161"/>
-        <location filename="../MainUI.ui" line="173"/>
+        <location filename="../MainUI.ui" line="84"></location>
+        <location filename="../MainUI.ui" line="97"></location>
+        <location filename="../MainUI.ui" line="148"></location>
+        <location filename="../MainUI.ui" line="161"></location>
+        <location filename="../MainUI.ui" line="173"></location>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="183"/>
+        <location filename="../MainUI.ui" line="183"></location>
         <source>Find:</source>
         <translation>検索:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="94"/>
+        <location filename="../MainUI.ui" line="94"></location>
         <source>Find the next match</source>
         <translation>次を検索</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="104"/>
+        <location filename="../MainUI.ui" line="104"></location>
         <source>Replace:</source>
         <translation>置換:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="123"/>
+        <location filename="../MainUI.ui" line="123"></location>
         <source>Match case</source>
         <translation>大文字と小文字を区別する</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="145"/>
+        <location filename="../MainUI.ui" line="145"></location>
         <source>Replace next match</source>
         <translation>次に一致した文字列を置換する</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="158"/>
+        <location filename="../MainUI.ui" line="158"></location>
         <source>Replace all matches (to end of document)</source>
         <translation>すべて置換(ドキュメントの末尾まで)</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="170"/>
+        <location filename="../MainUI.ui" line="170"></location>
         <source>Hide the find/replace options</source>
-        <translation type="unfinished"></translation>
+        <translation>検索/置換オプションを隠す</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="208"/>
+        <location filename="../MainUI.ui" line="208"></location>
         <source>File</source>
         <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="221"/>
+        <location filename="../MainUI.ui" line="221"></location>
         <source>View</source>
         <translation>表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="225"/>
+        <location filename="../MainUI.ui" line="225"></location>
         <source>Syntax Highlighting</source>
         <translation>構文強調表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="238"/>
+        <location filename="../MainUI.ui" line="238"></location>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="253"/>
+        <location filename="../MainUI.ui" line="253"></location>
         <source>toolBar</source>
         <translation>ツールバー</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="279"/>
+        <location filename="../MainUI.ui" line="279"></location>
         <source>Show Line Numbers</source>
         <translation>行番号を表示する</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="284"/>
+        <location filename="../MainUI.ui" line="284"></location>
         <source>None</source>
         <translation>なし</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="289"/>
-        <location filename="../MainUI.cpp" line="147"/>
+        <location filename="../MainUI.ui" line="289"></location>
+        <location filename="../MainUI.cpp" line="147"></location>
         <source>New File</source>
         <translatorcomment>これ、メニューだけじゃなくて、新しいファイル作ったときのタブ名にもなる。</translatorcomment>
         <translation>新しいファイル</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="292"/>
+        <location filename="../MainUI.ui" line="292"></location>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="300"/>
+        <location filename="../MainUI.ui" line="300"></location>
         <source>Open File</source>
         <translation>ファイルを開く</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="303"/>
+        <location filename="../MainUI.ui" line="303"></location>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="311"/>
+        <location filename="../MainUI.ui" line="311"></location>
         <source>Save File</source>
         <translation>ファイルを保存</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="314"/>
+        <location filename="../MainUI.ui" line="314"></location>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="322"/>
+        <location filename="../MainUI.ui" line="322"></location>
         <source>Save File As</source>
-        <translatorcomment>ダイアログが必ず開かれるため、&quot;...&quot;を追加。</translatorcomment>
+        <translatorcomment>ダイアログが必ず開かれるため、"..."を追加。</translatorcomment>
         <translation>名前を付けて保存...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="327"/>
+        <location filename="../MainUI.ui" line="327"></location>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="330"/>
+        <location filename="../MainUI.ui" line="330"></location>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="338"/>
+        <location filename="../MainUI.ui" line="338"></location>
         <source>Close File</source>
         <translation>ファイルを閉じる</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="341"/>
+        <location filename="../MainUI.ui" line="341"></location>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="349"/>
+        <location filename="../MainUI.ui" line="349"></location>
         <source>Customize Colors</source>
         <translation>色付けの変更</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="360"/>
+        <location filename="../MainUI.ui" line="360"></location>
         <source>Wrap Lines</source>
         <translation>行を折り返す</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="365"/>
+        <location filename="../MainUI.ui" line="365"></location>
         <source>Find</source>
         <translation>検索</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="368"/>
+        <location filename="../MainUI.ui" line="368"></location>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="376"/>
+        <location filename="../MainUI.ui" line="376"></location>
         <source>Replace</source>
         <translation>置換</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="379"/>
+        <location filename="../MainUI.ui" line="379"></location>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="40"/>
+        <location filename="../MainUI.cpp" line="40"></location>
         <source>Text Editor</source>
         <translation>テキストエディター</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="154"/>
+        <location filename="../MainUI.cpp" line="154"></location>
         <source>Open File(s)</source>
         <translation>ファイルを開く</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="154"/>
+        <location filename="../MainUI.cpp" line="154"></location>
         <source>Text Files (*)</source>
         <translation>テキストファイル (*)</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="283"/>
-        <location filename="../MainUI.cpp" line="380"/>
+        <location filename="../MainUI.cpp" line="283"></location>
+        <location filename="../MainUI.cpp" line="380"></location>
         <source>Lose Unsaved Changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>保存されていない変更を削除しますか?</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="283"/>
+        <location filename="../MainUI.cpp" line="283"></location>
         <source>This file has unsaved changes.
 Do you want to close it anyway?
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>保存されていない変更があります。
+それでも閉じますか?
+
+%1</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="380"/>
+        <location filename="../MainUI.cpp" line="380"></location>
         <source>There are unsaved changes.
 Do you want to close the editor anyway?
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>保存されていない変更があります。
+それでもエディターを閉じますか?
+
+%1</translation>
     </message>
 </context>
 <context>
     <name>PlainTextEditor</name>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="94"/>
+        <location filename="../PlainTextEditor.cpp" line="94"></location>
         <source>Save File</source>
         <translation>ファイルを保存</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="94"/>
+        <location filename="../PlainTextEditor.cpp" line="94"></location>
         <source>Text File (*)</source>
         <translation>テキストファイル (*)</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="289"/>
+        <location filename="../PlainTextEditor.cpp" line="289"></location>
         <source>Row Number: %1, Column Number: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 行目、%2 文字目</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="298"/>
+        <location filename="../PlainTextEditor.cpp" line="298"></location>
         <source>The following file has been changed by some other utility. Do you want to re-load it?</source>
         <translation>以下のファイルは他のユーティリティーで変更されています。再度読み込みますか?</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="300"/>
+        <location filename="../PlainTextEditor.cpp" line="300"></location>
         <source>(Note: You will lose all currently-unsaved changes)</source>
         <translation>(注意: 保存されていない変更は失われます)</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="304"/>
+        <location filename="../PlainTextEditor.cpp" line="304"></location>
         <source>File Modified</source>
         <translation>ファイルが変更されています</translation>
     </message>