Merge remote-tracking branch 'origin/master'

3 files changed, 322 insertions, 292 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ja.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ja.ts
index 2666eacf..32198a3a 100644
--- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ja.ts
+++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ja.ts
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ja">
 <context>
     <name>BMMDialog</name>
     <message>
-        <location filename="../BMMDialog.ui" line="14"/>
+        <location filename="../BMMDialog.ui" line="14"></location>
         <source>Manage Bookmarks</source>
         <translation>ブックマークの管理</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.ui" line="35"/>
+        <location filename="../BMMDialog.ui" line="35"></location>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.ui" line="40"/>
+        <location filename="../BMMDialog.ui" line="40"></location>
         <source>Path</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.ui" line="52"/>
+        <location filename="../BMMDialog.ui" line="52"></location>
         <source>Remove Bookmark</source>
-        <translatorcomment>&quot;Remove&quot;ボタンのツールチップ</translatorcomment>
+        <translatorcomment>"Remove"ボタンのツールチップ</translatorcomment>
         <translation>ブックマークを削除します</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.ui" line="65"/>
+        <location filename="../BMMDialog.ui" line="65"></location>
         <source>Rename BookMark</source>
-        <translatorcomment>&quot;Rename&quot;ボタンのツールチップ</translatorcomment>
+        <translatorcomment>"Rename"ボタンのツールチップ</translatorcomment>
         <translation>ブックマークの名前を変更します</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.ui" line="91"/>
+        <location filename="../BMMDialog.ui" line="91"></location>
         <source>Finished</source>
         <translation>完了</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.cpp" line="58"/>
+        <location filename="../BMMDialog.cpp" line="58"></location>
         <source>Rename Bookmark</source>
         <translatorcomment>ダイアログのタイトル</translatorcomment>
         <translation>ブックマーク名の変更</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.cpp" line="58"/>
+        <location filename="../BMMDialog.cpp" line="58"></location>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.cpp" line="64"/>
+        <location filename="../BMMDialog.cpp" line="64"></location>
         <source>Invalid Name</source>
         <translation>名前が無効です</translation>
     </message>
     <message>
-        <location filename="../BMMDialog.cpp" line="64"/>
+        <location filename="../BMMDialog.cpp" line="64"></location>
         <source>This bookmark name already exists. Please choose another.</source>
         <translation>このブックマーク名はすでに使用されています。別の名前を選択してください。</translation>
     </message>
@@ -60,317 +60,317 @@
 <context>
     <name>DirWidget</name>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="20"/>
+        <location filename="../widgets/DirWidget.ui" line="20"></location>
         <source>Form</source>
         <translation>フォーム</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="246"/>
-        <location filename="../widgets/DirWidget.ui" line="249"/>
+        <location filename="../widgets/DirWidget.ui" line="246"></location>
+        <location filename="../widgets/DirWidget.ui" line="249"></location>
         <source>Open item</source>
         <translation>選択したアイテムを開く</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="271"/>
-        <location filename="../widgets/DirWidget.ui" line="274"/>
+        <location filename="../widgets/DirWidget.ui" line="271"></location>
+        <location filename="../widgets/DirWidget.ui" line="274"></location>
         <source>Open item (select application)</source>
         <translation>選択したアイテムを指定したアプリケーションで開く</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="300"/>
-        <location filename="../widgets/DirWidget.ui" line="303"/>
+        <location filename="../widgets/DirWidget.ui" line="300"></location>
+        <location filename="../widgets/DirWidget.ui" line="303"></location>
         <source>Add item to personal favorites</source>
         <translation>個人用お気に入りにアイテムを追加する</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="322"/>
-        <location filename="../widgets/DirWidget.ui" line="325"/>
+        <location filename="../widgets/DirWidget.ui" line="322"></location>
+        <location filename="../widgets/DirWidget.ui" line="325"></location>
         <source>Rename item</source>
         <translation>アイテム名を変更</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="351"/>
+        <location filename="../widgets/DirWidget.ui" line="351"></location>
         <source>Cut items</source>
         <translation>アイテムの切り取り</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="354"/>
+        <location filename="../widgets/DirWidget.ui" line="354"></location>
         <source>Cut items (add to the clipboard)</source>
         <translation>アイテムを切り取ってクリップボードに追加します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="373"/>
+        <location filename="../widgets/DirWidget.ui" line="373"></location>
         <source>Copy items</source>
         <translation>アイテムをコピー</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="376"/>
+        <location filename="../widgets/DirWidget.ui" line="376"></location>
         <source>Copy items to the clipboard</source>
         <translatorcomment>ツールチップ</translatorcomment>
         <translation>アイテムをクリップボードにコピーします</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="395"/>
-        <location filename="../widgets/DirWidget.ui" line="398"/>
+        <location filename="../widgets/DirWidget.ui" line="395"></location>
+        <location filename="../widgets/DirWidget.ui" line="398"></location>
         <source>Paste items from clipboard</source>
         <translation>クリップボードからアイテムを貼り付けます</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="424"/>
-        <location filename="../widgets/DirWidget.ui" line="427"/>
+        <location filename="../widgets/DirWidget.ui" line="424"></location>
+        <location filename="../widgets/DirWidget.ui" line="427"></location>
         <source>Delete Items</source>
         <translation>アイテムを削除します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="507"/>
+        <location filename="../widgets/DirWidget.ui" line="507"></location>
         <source>Stop loading the directory</source>
         <translatorcomment>ツールチップ</translatorcomment>
         <translation>ディレクトリーの読み込みを中止します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="90"/>
+        <location filename="../widgets/DirWidget.ui" line="90"></location>
         <source>Add selected images to slideshow</source>
         <translation>選択した画像ファイルをスライドショーとして表示します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="77"/>
+        <location filename="../widgets/DirWidget.ui" line="77"></location>
         <source>Create a new directory</source>
         <translatorcomment>ツールチップ</translatorcomment>
         <translation>新しいディレクトリーを作成します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="80"/>
+        <location filename="../widgets/DirWidget.ui" line="80"></location>
         <source>New Dir</source>
         <translation>新しいディレクトリー</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="64"/>
+        <location filename="../widgets/DirWidget.ui" line="64"></location>
         <source>Create a new file</source>
         <translation>新しいファイルを作成します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="67"/>
+        <location filename="../widgets/DirWidget.ui" line="67"></location>
         <source>New File</source>
         <translation>新しいファイル</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="93"/>
+        <location filename="../widgets/DirWidget.ui" line="93"></location>
         <source>Slideshow</source>
         <translation>スライドショー</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="109"/>
+        <location filename="../widgets/DirWidget.ui" line="109"></location>
         <source>Enqueue selection in multimedia player</source>
         <translation>選択したアイテムをマルチメディアプレイヤーのプレイリストに入れる</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="112"/>
+        <location filename="../widgets/DirWidget.ui" line="112"></location>
         <source>Play</source>
         <translation>再生</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="465"/>
+        <location filename="../widgets/DirWidget.ui" line="465"></location>
         <source>Back</source>
         <translation>戻る</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="468"/>
-        <location filename="../widgets/DirWidget.ui" line="471"/>
+        <location filename="../widgets/DirWidget.ui" line="468"></location>
+        <location filename="../widgets/DirWidget.ui" line="471"></location>
         <source>Go back to previous directory</source>
         <translation>前のディレクトリーに戻る</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="479"/>
+        <location filename="../widgets/DirWidget.ui" line="479"></location>
         <source>Up</source>
         <translation>上へ</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="482"/>
-        <location filename="../widgets/DirWidget.ui" line="485"/>
+        <location filename="../widgets/DirWidget.ui" line="482"></location>
+        <location filename="../widgets/DirWidget.ui" line="485"></location>
         <source>Go to parent directory</source>
         <translation>親ディレクトリーへ移動します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="493"/>
+        <location filename="../widgets/DirWidget.ui" line="493"></location>
         <source>Home</source>
         <translation>ホーム</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="496"/>
-        <location filename="../widgets/DirWidget.ui" line="499"/>
+        <location filename="../widgets/DirWidget.ui" line="496"></location>
+        <location filename="../widgets/DirWidget.ui" line="499"></location>
         <source>Go to home directory</source>
         <translation>ホームディレクトリーへ移動します</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.ui" line="518"/>
-        <location filename="../widgets/DirWidget.ui" line="521"/>
+        <location filename="../widgets/DirWidget.ui" line="518"></location>
+        <location filename="../widgets/DirWidget.ui" line="521"></location>
         <source>Close this browser</source>
         <translatorcomment>ファイルマネージャーの「タブ」と「ウィンドウ」を閉じて、もしウィンドウが無いなら $HOME を開くという動作。</translatorcomment>
         <translation>このブラウザーを閉じる</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="136"/>
+        <location filename="../widgets/DirWidget.cpp" line="136"></location>
         <source>Name</source>
         <translatorcomment>ファイル名</translatorcomment>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="140"/>
+        <location filename="../widgets/DirWidget.cpp" line="140"></location>
         <source>Size</source>
         <translatorcomment>ファイルサイズ</translatorcomment>
         <translation>サイズ</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="143"/>
+        <location filename="../widgets/DirWidget.cpp" line="143"></location>
         <source>Type</source>
         <translatorcomment>ファイルの種類</translatorcomment>
         <translation>種類</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="147"/>
+        <location filename="../widgets/DirWidget.cpp" line="147"></location>
         <source>Date Modified</source>
         <translation>変更日時</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="150"/>
+        <location filename="../widgets/DirWidget.cpp" line="150"></location>
         <source>Date Created</source>
         <translation>作成日時</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="207"/>
-        <location filename="../widgets/DirWidget.cpp" line="484"/>
+        <location filename="../widgets/DirWidget.cpp" line="207"></location>
+        <location filename="../widgets/DirWidget.cpp" line="484"></location>
         <source>(Limited Access) </source>
         <translation>(アクセス制限あり) </translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="469"/>
+        <location filename="../widgets/DirWidget.cpp" line="469"></location>
         <source>Capacity: %1</source>
         <translation>使用済み容量: %1</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="474"/>
+        <location filename="../widgets/DirWidget.cpp" line="474"></location>
         <source>Files: %1 (%2)</source>
         <translation>ファイル数: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="479"/>
+        <location filename="../widgets/DirWidget.cpp" line="479"></location>
         <source>Dirs: %1</source>
         <translation>ディレクトリー: %1</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="781"/>
+        <location filename="../widgets/DirWidget.cpp" line="781"></location>
         <source>New Document</source>
         <translation>新しいドキュメント</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="781"/>
-        <location filename="../widgets/DirWidget.cpp" line="802"/>
+        <location filename="../widgets/DirWidget.cpp" line="781"></location>
+        <location filename="../widgets/DirWidget.cpp" line="802"></location>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="792"/>
+        <location filename="../widgets/DirWidget.cpp" line="792"></location>
         <source>Error Creating Document</source>
         <translation>ドキュメントの作成中にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="792"/>
+        <location filename="../widgets/DirWidget.cpp" line="792"></location>
         <source>The document could not be created. Please ensure that you have the proper permissions.</source>
         <translation>ドキュメントを作成できません。パーミッション設定を確認してください。</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="802"/>
+        <location filename="../widgets/DirWidget.cpp" line="802"></location>
         <source>New Directory</source>
         <translation>新しいディレクトリー</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="812"/>
+        <location filename="../widgets/DirWidget.cpp" line="812"></location>
         <source>Invalid Name</source>
         <translation>名前が無効です</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="812"/>
+        <location filename="../widgets/DirWidget.cpp" line="812"></location>
         <source>A file or directory with that name already exists! Please pick a different name.</source>
         <translation>同名のファイルまたはディレクトリーが存在します。別の名前にしてください。</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="816"/>
+        <location filename="../widgets/DirWidget.cpp" line="816"></location>
         <source>Error Creating Directory</source>
         <translation>ディレクトリーの作成時にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="816"/>
+        <location filename="../widgets/DirWidget.cpp" line="816"></location>
         <source>The directory could not be created. Please ensure that you have the proper permissions to modify the current directory.</source>
         <translation>ディレクトリーを作成できません。現在作業中のディレクトリーの書き込みパーミッション設定を確認してください。</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="839"/>
+        <location filename="../widgets/DirWidget.cpp" line="839"></location>
         <source>Current</source>
         <translatorcomment>スナップショットが存在する場合にはスナップショット名が入る</translatorcomment>
         <translation>現行版</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="949"/>
+        <location filename="../widgets/DirWidget.cpp" line="949"></location>
         <source>File Checksums:</source>
-        <translation>ファイルのチェックサム</translation>
+        <translation>ファイルのチェックサム:</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="966"/>
+        <location filename="../widgets/DirWidget.cpp" line="966"></location>
         <source>Missing Utility</source>
         <translation>ユーティリティーがありません</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="966"/>
-        <source>The &quot;lumina-fileinfo&quot; utility could not be found on the system. Please install it first.</source>
-        <translation>&quot;lumina-fileinfo&quot; ユーティリティーはシステムに存在しません。先にインストールしてください。</translation>
+        <location filename="../widgets/DirWidget.cpp" line="966"></location>
+        <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source>
+        <translation>"lumina-fileinfo" ユーティリティーはシステムに存在しません。先にインストールしてください。</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="984"/>
+        <location filename="../widgets/DirWidget.cpp" line="984"></location>
         <source>Open</source>
         <translation>開く</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="985"/>
+        <location filename="../widgets/DirWidget.cpp" line="985"></location>
         <source>Open With...</source>
         <translation>アプリケーションで開く...</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="987"/>
+        <location filename="../widgets/DirWidget.cpp" line="987"></location>
         <source>Rename...</source>
         <translation>名前の変更...</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="988"/>
+        <location filename="../widgets/DirWidget.cpp" line="988"></location>
         <source>View Checksums...</source>
         <translation>チェックサムを確認...</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="999"/>
+        <location filename="../widgets/DirWidget.cpp" line="999"></location>
         <source>File Properties...</source>
         <translation>ファイルのプロパティー...</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="992"/>
+        <location filename="../widgets/DirWidget.cpp" line="992"></location>
         <source>Cut Selection</source>
         <translation>選択したアイテムを切り取る</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="993"/>
+        <location filename="../widgets/DirWidget.cpp" line="993"></location>
         <source>Copy Selection</source>
         <translation>選択したアイテムをコピー</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="994"/>
+        <location filename="../widgets/DirWidget.cpp" line="994"></location>
         <source>Paste</source>
         <translation>貼り付け</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="996"/>
+        <location filename="../widgets/DirWidget.cpp" line="996"></location>
         <source>Delete Selection</source>
         <translation>選択したアイテムを削除</translation>
     </message>
     <message>
-        <location filename="../widgets/DirWidget.cpp" line="1002"/>
+        <location filename="../widgets/DirWidget.cpp" line="1002"></location>
         <source>Open Terminal here</source>
         <translation>ここで端末を開く</translation>
     </message>
@@ -378,82 +378,82 @@
 <context>
     <name>FODialog</name>
     <message>
-        <location filename="../FODialog.ui" line="14"/>
+        <location filename="../FODialog.ui" line="14"></location>
         <source>Performing File Operations</source>
         <translation>ファイル操作を実行しています</translation>
     </message>
     <message>
-        <location filename="../FODialog.ui" line="39"/>
+        <location filename="../FODialog.ui" line="39"></location>
         <source>%v/%m</source>
         <translation>%v/%m</translation>
     </message>
     <message>
-        <location filename="../FODialog.ui" line="74"/>
+        <location filename="../FODialog.ui" line="74"></location>
         <source>Stop</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="19"/>
+        <location filename="../FODialog.cpp" line="19"></location>
         <source>Calculating</source>
         <translation>計算中</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="131"/>
+        <location filename="../FODialog.cpp" line="131"></location>
         <source>Overwrite Files?</source>
         <translation>ファイルを上書きしますか?</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="131"/>
+        <location filename="../FODialog.cpp" line="131"></location>
         <source>Do you want to overwrite the existing files?</source>
         <translation>既存のファイルを上書きしますか?</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="131"/>
+        <location filename="../FODialog.cpp" line="131"></location>
         <source>Note: It will just add a number to the filename otherwise.</source>
         <translation>注意: 上書きしない場合にはファイル名に番号を追加します。</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="148"/>
+        <location filename="../FODialog.cpp" line="148"></location>
         <source>Removing: %1</source>
         <translation>削除中: %1</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="149"/>
+        <location filename="../FODialog.cpp" line="149"></location>
         <source>Copying: %1 to %2</source>
         <translation>%1 を %2 にコピーしています</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="150"/>
+        <location filename="../FODialog.cpp" line="150"></location>
         <source>Restoring: %1 as %2</source>
         <translation>%1 を %2 に戻しています</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="151"/>
+        <location filename="../FODialog.cpp" line="151"></location>
         <source>Moving: %1 to %2</source>
         <translation>%1 を %2 に移動しています</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="164"/>
+        <location filename="../FODialog.cpp" line="164"></location>
         <source>Could not remove these files:</source>
         <translation>これらのファイルを削除できません:</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="165"/>
+        <location filename="../FODialog.cpp" line="165"></location>
         <source>Could not copy these files:</source>
         <translation>これらのファイルをコピーできません:</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="166"/>
+        <location filename="../FODialog.cpp" line="166"></location>
         <source>Could not restore these files:</source>
         <translation>これらのファイルを元に戻せません:</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="167"/>
+        <location filename="../FODialog.cpp" line="167"></location>
         <source>Could not move these files:</source>
         <translation>これらのファイルを移動できません:</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="169"/>
+        <location filename="../FODialog.cpp" line="169"></location>
         <source>File Errors</source>
         <translatorcomment>ダイアログのタイトル設定用UI</translatorcomment>
         <translation>ファイルエラー</translation>
@@ -462,13 +462,13 @@
 <context>
     <name>FOWorker</name>
     <message>
-        <location filename="../FODialog.cpp" line="320"/>
+        <location filename="../FODialog.cpp" line="320"></location>
         <source>Invalid Move</source>
         <translatorcomment>ダイアログのタイトル</translatorcomment>
         <translation>無理な移動</translation>
     </message>
     <message>
-        <location filename="../FODialog.cpp" line="320"/>
+        <location filename="../FODialog.cpp" line="320"></location>
         <source>It is not possible to move a directory into itself. Please make a copy of the directory instead.
 
 Old Location: %1
@@ -482,508 +482,508 @@ New Location: %2</source>
 <context>
     <name>GitWizard</name>
     <message>
-        <location filename="../gitWizard.ui" line="14"/>
+        <location filename="../gitWizard.ui" line="14"></location>
         <source>Clone a Git Repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Git リポジトリーをクローン</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="24"/>
+        <location filename="../gitWizard.ui" line="24"></location>
         <source>Welcome!</source>
-        <translation type="unfinished"></translation>
+        <translation>ようこそ!</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="27"/>
+        <location filename="../gitWizard.ui" line="27"></location>
         <source>This wizard will guide you through the process of downloading a GIT repository from the internet.</source>
-        <translation type="unfinished"></translation>
+        <translation>このウィザードではインターネットから Git リポジトリーをダウンロードするプロセスを案内します。</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="46"/>
+        <location filename="../gitWizard.ui" line="46"></location>
         <source>GitHub Repository Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>GitHub リポジトリーの設定</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="55"/>
+        <location filename="../gitWizard.ui" line="55"></location>
         <source>Organization/User</source>
-        <translation type="unfinished"></translation>
+        <translation>組織/ユーザー名</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="65"/>
+        <location filename="../gitWizard.ui" line="65"></location>
         <source>Repository Name</source>
-        <translation type="unfinished"></translation>
+        <translation>リポジトリー名</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="75"/>
+        <location filename="../gitWizard.ui" line="75"></location>
         <source>Is Private Repository</source>
-        <translation type="unfinished"></translation>
+        <translation>これは非公開リポジトリーです</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="89"/>
+        <location filename="../gitWizard.ui" line="89"></location>
         <source>Type of Access</source>
-        <translation type="unfinished"></translation>
+        <translation>アクセスの種類</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="95"/>
+        <location filename="../gitWizard.ui" line="95"></location>
         <source>Use my SSH Key</source>
-        <translation type="unfinished"></translation>
+        <translation>自分の SSH キーを使用する</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="105"/>
+        <location filename="../gitWizard.ui" line="105"></location>
         <source>Login to server</source>
-        <translation type="unfinished"></translation>
+        <translation>サーバーにログインする</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="114"/>
+        <location filename="../gitWizard.ui" line="114"></location>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>ユーザー名</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="124"/>
+        <location filename="../gitWizard.ui" line="124"></location>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="133"/>
+        <location filename="../gitWizard.ui" line="133"></location>
         <source>Anonymous (public repositories only)</source>
-        <translation type="unfinished"></translation>
+        <translation>匿名(公開リポジトリーのみ)</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="143"/>
+        <location filename="../gitWizard.ui" line="143"></location>
         <source>Optional SSH Password</source>
-        <translation type="unfinished"></translation>
+        <translation>オプションの SSH パスワード</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="153"/>
+        <location filename="../gitWizard.ui" line="153"></location>
         <source>Advanced Options</source>
-        <translation type="unfinished"></translation>
+        <translation>詳細オプション</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="159"/>
+        <location filename="../gitWizard.ui" line="159"></location>
         <source>Custom Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>depth (取得する履歴の数)の調整</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="166"/>
+        <location filename="../gitWizard.ui" line="166"></location>
         <source>Single Branch</source>
-        <translation type="unfinished"></translation>
+        <translation>単一のブランチ</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="175"/>
+        <location filename="../gitWizard.ui" line="175"></location>
         <source>branch name</source>
-        <translation type="unfinished"></translation>
+        <translation>ブランチ名</translation>
     </message>
     <message>
-        <location filename="../gitWizard.ui" line="232"/>
-        <source>Click &quot;Next&quot; to start downloading the repository</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gitWizard.ui" line="232"></location>
+        <source>Click "Next" to start downloading the repository</source>
+        <translation>「次へ」をクリックするとリポジトリーのダウンロードを開始します</translation>
     </message>
     <message>
-        <location filename="../gitWizard.h" line="57"/>
+        <location filename="../gitWizard.h" line="57"></location>
         <source>Stop Download?</source>
-        <translation type="unfinished"></translation>
+        <translation>ダウンロードを停止しますか?</translation>
     </message>
     <message>
-        <location filename="../gitWizard.h" line="57"/>
+        <location filename="../gitWizard.h" line="57"></location>
         <source>Kill the current download?</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のダウンロードを中止しますか?</translation>
     </message>
 </context>
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../MainUI.ui" line="14"></location>
         <source>Insight</source>
         <translatorcomment>ソフトウァの名前</translatorcomment>
         <translation>Insight</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="98"/>
+        <location filename="../MainUI.cpp" line="98"></location>
         <source>Shift+Left</source>
         <translation>Shift+Left</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="99"/>
+        <location filename="../MainUI.cpp" line="99"></location>
         <source>Shift+Right</source>
         <translation>Shift+Right</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="114"/>
+        <location filename="../MainUI.ui" line="114"></location>
         <source>File</source>
         <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="126"/>
+        <location filename="../MainUI.ui" line="126"></location>
         <source>View</source>
         <translation>表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="130"/>
+        <location filename="../MainUI.ui" line="130"></location>
         <source>View Mode</source>
         <translation>表示モード</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="136"/>
+        <location filename="../MainUI.ui" line="136"></location>
         <source>Group Mode</source>
         <translation>グループ表示モード</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="154"/>
+        <location filename="../MainUI.ui" line="154"></location>
         <source>Bookmarks</source>
         <translation>ブックマーク</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="162"/>
+        <location filename="../MainUI.ui" line="162"></location>
         <source>External Devices</source>
         <translation>外部デバイス</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="169"/>
+        <location filename="../MainUI.ui" line="169"></location>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="181"/>
+        <location filename="../MainUI.ui" line="181"></location>
         <source>Git</source>
-        <translation type="unfinished"></translation>
+        <translation>Git</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="196"/>
-        <location filename="../MainUI.ui" line="199"/>
+        <location filename="../MainUI.ui" line="196"></location>
+        <location filename="../MainUI.ui" line="199"></location>
         <source>New Browser</source>
         <translation>新しいブラウザー</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="275"/>
+        <location filename="../MainUI.ui" line="275"></location>
         <source>Search Directory...</source>
         <translation>ディレクトリー内を検索...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="308"/>
+        <location filename="../MainUI.ui" line="308"></location>
         <source>Increase Icon Size</source>
         <translation>アイコンを大きくする</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="313"/>
+        <location filename="../MainUI.ui" line="313"></location>
         <source>Decrease Icon Size</source>
         <translation>アイコンを小さくする</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="318"/>
+        <location filename="../MainUI.ui" line="318"></location>
         <source>Larger Icons</source>
         <translation>大きいアイコン</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="321"/>
+        <location filename="../MainUI.ui" line="321"></location>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="329"/>
+        <location filename="../MainUI.ui" line="329"></location>
         <source>Smaller Icons</source>
         <translation>小さいアイコン</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="332"/>
+        <location filename="../MainUI.ui" line="332"></location>
         <source>Ctrl+-</source>
         <translation>Ctrl+-</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="340"/>
+        <location filename="../MainUI.ui" line="340"></location>
         <source>New Window</source>
         <translation>新しいウィンドウ</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="343"/>
+        <location filename="../MainUI.ui" line="343"></location>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="351"/>
+        <location filename="../MainUI.ui" line="351"></location>
         <source>Add Bookmark</source>
         <translation>ブックマークへ追加</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="354"/>
+        <location filename="../MainUI.ui" line="354"></location>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="406"/>
+        <location filename="../MainUI.ui" line="406"></location>
         <source>Delete Selection</source>
         <translation>選択したアイテムを削除</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="409"/>
+        <location filename="../MainUI.ui" line="409"></location>
         <source>Del</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="417"/>
+        <location filename="../MainUI.ui" line="417"></location>
         <source>Refresh</source>
         <translation>再読み込み</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="428"/>
+        <location filename="../MainUI.ui" line="428"></location>
         <source>Close Browser</source>
         <translation>ブラウザーを閉じる</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="439"/>
+        <location filename="../MainUI.ui" line="439"></location>
         <source>Repo Status</source>
-        <translation type="unfinished"></translation>
+        <translation>リポジトリーの状態</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="444"/>
+        <location filename="../MainUI.ui" line="444"></location>
         <source>Clone Repository</source>
-        <translation type="unfinished"></translation>
+        <translation>リポジトリーのクローン...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="202"/>
+        <location filename="../MainUI.ui" line="202"></location>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="210"/>
+        <location filename="../MainUI.ui" line="210"></location>
         <source>Exit</source>
         <translation>終了</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="213"/>
+        <location filename="../MainUI.ui" line="213"></location>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="221"/>
+        <location filename="../MainUI.ui" line="221"></location>
         <source>&amp;Preferences</source>
         <translation>設定(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="232"/>
+        <location filename="../MainUI.ui" line="232"></location>
         <source>Show Hidden Files</source>
         <translatorcomment>チェックボックスのキャプション</translatorcomment>
         <translation>隠しファイルを表示する</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="237"/>
+        <location filename="../MainUI.ui" line="237"></location>
         <source>Scan for Devices</source>
         <translation>デバイスをスキャンする</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="245"/>
+        <location filename="../MainUI.ui" line="245"></location>
         <source>Manage Bookmarks</source>
         <translation>ブックマークの管理</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="259"/>
+        <location filename="../MainUI.ui" line="259"></location>
         <source>Show Action Buttons</source>
         <translation>アクションボタンを表示する</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="270"/>
+        <location filename="../MainUI.ui" line="270"></location>
         <source>Load Thumbnails</source>
         <translatorcomment>チェックボックスのキャプション</translatorcomment>
         <translation>サムネイルを表示する</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="278"/>
+        <location filename="../MainUI.ui" line="278"></location>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="69"/>
+        <location filename="../MainUI.cpp" line="69"></location>
         <source>Detailed List</source>
         <translatorcomment>ラジオボタンの選択肢</translatorcomment>
         <translation>詳細な一覧表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="70"/>
+        <location filename="../MainUI.cpp" line="70"></location>
         <source>Basic List</source>
         <translation>シンプルな一覧表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="431"/>
+        <location filename="../MainUI.ui" line="431"></location>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="71"/>
+        <location filename="../MainUI.cpp" line="71"></location>
         <source>Prefer Tabs</source>
-        <translatorcomment>&quot;New Browser&quot;で複数のファイルリストをひとつのウィンドウで表示するモードの選択肢</translatorcomment>
+        <translatorcomment>"New Browser"で複数のファイルリストをひとつのウィンドウで表示するモードの選択肢</translatorcomment>
         <translation>タブ表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="72"/>
+        <location filename="../MainUI.cpp" line="72"></location>
         <source>Prefer Columns</source>
-        <translatorcomment>&quot;New Browser&quot;で複数のファイルリストをひとつのウィンドウで表示するモードの選択肢</translatorcomment>
+        <translatorcomment>"New Browser"で複数のファイルリストをひとつのウィンドウで表示するモードの選択肢</translatorcomment>
         <translation>カラム表示</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="420"/>
+        <location filename="../MainUI.ui" line="420"></location>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="387"/>
+        <location filename="../MainUI.ui" line="387"></location>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="362"/>
+        <location filename="../MainUI.ui" line="362"></location>
         <source>Rename...</source>
         <translation>名前の変更...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="365"/>
+        <location filename="../MainUI.ui" line="365"></location>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="373"/>
+        <location filename="../MainUI.ui" line="373"></location>
         <source>Cut Selection</source>
         <translation>選択したアイテムを切り取る</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="384"/>
+        <location filename="../MainUI.ui" line="384"></location>
         <source>Copy Selection</source>
         <translation>選択したアイテムをコピー</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="395"/>
+        <location filename="../MainUI.ui" line="395"></location>
         <source>Paste</source>
         <translation>貼り付け</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="398"/>
+        <location filename="../MainUI.ui" line="398"></location>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="376"/>
+        <location filename="../MainUI.ui" line="376"></location>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="199"/>
+        <location filename="../MainUI.cpp" line="199"></location>
         <source>Invalid Directories</source>
         <translation>無効なディレクトリー</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="199"/>
+        <location filename="../MainUI.cpp" line="199"></location>
         <source>The following directories are invalid and could not be opened:</source>
         <translation>このディレクトリーは無効なので、開くことはできません:</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="342"/>
+        <location filename="../MainUI.cpp" line="342"></location>
         <source>Root</source>
         <translation>ルート</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="348"/>
+        <location filename="../MainUI.cpp" line="348"></location>
         <source>%1 (Type: %2)</source>
         <translatorcomment>%1: ディレクトリー名 %2: ファイルシステム名</translatorcomment>
         <translation>%1 (種類: %2)</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="352"/>
+        <location filename="../MainUI.cpp" line="352"></location>
         <source>Filesystem: %1</source>
         <translation>ファイルシステム: %1</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="573"/>
+        <location filename="../MainUI.cpp" line="573"></location>
         <source>Browser</source>
         <translation>ブラウザー</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="600"/>
+        <location filename="../MainUI.cpp" line="600"></location>
         <source>New Bookmark</source>
         <translation>新しいブックマーク</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="600"/>
+        <location filename="../MainUI.cpp" line="600"></location>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="605"/>
+        <location filename="../MainUI.cpp" line="605"></location>
         <source>Invalid Name</source>
         <translation>名前が無効です</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="605"/>
+        <location filename="../MainUI.cpp" line="605"></location>
         <source>This bookmark name already exists. Please choose another.</source>
         <translation>このブックマーク名はすでに使用されています。別の名前を選択してください。</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="626"/>
+        <location filename="../MainUI.cpp" line="626"></location>
         <source>Git Repository Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Git リポジトリーの状態</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="732"/>
+        <location filename="../MainUI.cpp" line="732"></location>
         <source>Multimedia</source>
         <translation>マルチメディア</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="750"/>
+        <location filename="../MainUI.cpp" line="750"></location>
         <source>Slideshow</source>
         <translation>スライドショー</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="927"/>
+        <location filename="../MainUI.cpp" line="927"></location>
         <source>Items to be removed:</source>
         <translation>これらのアイテムが削除されます:</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="429"/>
+        <location filename="../MainUI.cpp" line="429"></location>
         <source>Verify Quit</source>
         <translation>終了の確認</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="100"/>
+        <location filename="../MainUI.cpp" line="100"></location>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="101"/>
+        <location filename="../MainUI.cpp" line="101"></location>
         <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="429"/>
+        <location filename="../MainUI.cpp" line="429"></location>
         <source>You have multiple tabs open. Are you sure you want to quit?</source>
         <translation>複数のタブを開いています。終了しますか?</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="926"/>
+        <location filename="../MainUI.cpp" line="926"></location>
         <source>Verify Removal</source>
         <translation>削除の確認</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="926"/>
+        <location filename="../MainUI.cpp" line="926"></location>
         <source>WARNING: This will permanently delete the file(s) from the system!</source>
         <translation>警告: これらのファイルはシステムから永久に削除されます!</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="926"/>
+        <location filename="../MainUI.cpp" line="926"></location>
         <source>Are you sure you want to continue?</source>
         <translation>本当に続けますか?</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="887"/>
+        <location filename="../MainUI.cpp" line="887"></location>
         <source>Rename File</source>
         <translation>ファイル名の変更</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="887"/>
+        <location filename="../MainUI.cpp" line="887"></location>
         <source>New Name:</source>
         <translation>新しい名前:</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="901"/>
+        <location filename="../MainUI.cpp" line="901"></location>
         <source>Overwrite File?</source>
         <translation>ファイルを上書きしますか?</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="901"/>
+        <location filename="../MainUI.cpp" line="901"></location>
         <source>An existing file with the same name will be replaced. Are you sure you want to proceed?</source>
         <translation>既にある同名のフィアルに上書きされます。本当に続けますか?</translation>
     </message>
@@ -991,38 +991,38 @@ New Location: %2</source>
 <context>
     <name>MultimediaWidget</name>
     <message>
-        <location filename="../widgets/MultimediaWidget.ui" line="14"/>
+        <location filename="../widgets/MultimediaWidget.ui" line="14"></location>
         <source>Form</source>
         <translation>フォーム</translation>
     </message>
     <message>
-        <location filename="../widgets/MultimediaWidget.ui" line="28"/>
+        <location filename="../widgets/MultimediaWidget.ui" line="28"></location>
         <source>Go To Next</source>
         <translatorcomment>チェックボックスのキャプション</translatorcomment>
         <translation>次のファイルを再生する</translation>
     </message>
     <message>
-        <location filename="../widgets/MultimediaWidget.ui" line="107"/>
+        <location filename="../widgets/MultimediaWidget.ui" line="107"></location>
         <source>(No Running Video)</source>
         <translation>(再生中の動画はありません)</translation>
     </message>
     <message>
-        <location filename="../widgets/MultimediaWidget.cpp" line="124"/>
+        <location filename="../widgets/MultimediaWidget.cpp" line="124"></location>
         <source>Playing:</source>
         <translation>再生中:</translation>
     </message>
     <message>
-        <location filename="../widgets/MultimediaWidget.cpp" line="130"/>
+        <location filename="../widgets/MultimediaWidget.cpp" line="130"></location>
         <source>Stopped</source>
         <translation>停止</translation>
     </message>
     <message>
-        <location filename="../widgets/MultimediaWidget.cpp" line="157"/>
+        <location filename="../widgets/MultimediaWidget.cpp" line="157"></location>
         <source>Error Playing File: %1</source>
         <translation>ファイルの再生に失敗しました: %1</translation>
     </message>
     <message>
-        <location filename="../widgets/MultimediaWidget.cpp" line="168"/>
+        <location filename="../widgets/MultimediaWidget.cpp" line="168"></location>
         <source>Finished</source>
         <translation>終了</translation>
     </message>
@@ -1030,108 +1030,108 @@ New Location: %2</source>
 <context>
     <name>SlideshowWidget</name>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="14"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="14"></location>
         <source>Form</source>
         <translation>フォーム</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="36"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="36"></location>
         <source>Delete this image file</source>
-        <translatorcomment>&quot;...&quot;ボタンのツールチップ</translatorcomment>
+        <translatorcomment>"..."ボタンのツールチップ</translatorcomment>
         <translation>この画像ファイルを削除します</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="56"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="56"></location>
         <source>Rotate this image file counter-clockwise</source>
-        <translatorcomment>&quot;...&quot;ボタンのツールチップ</translatorcomment>
+        <translatorcomment>"..."ボタンのツールチップ</translatorcomment>
         <translation>反時計回りに画像ファイルを回転させます</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="69"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="69"></location>
         <source>Rotate this image file clockwise</source>
-        <translation>時計回りに画像ファイルを回転させます </translation>
+        <translation>時計回りに画像ファイルを回転させます</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="89"/>
-        <location filename="../widgets/SlideshowWidget.ui" line="92"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="89"></location>
+        <location filename="../widgets/SlideshowWidget.ui" line="92"></location>
         <source>Zoom in</source>
         <translation>拡大</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="105"/>
-        <location filename="../widgets/SlideshowWidget.ui" line="108"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="105"></location>
+        <location filename="../widgets/SlideshowWidget.ui" line="108"></location>
         <source>Zoom out</source>
         <translation>縮小</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="212"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="212"></location>
         <source>Go to Beginning</source>
         <translatorcomment>キャプション</translatorcomment>
         <translation>先頭に移動します</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="215"/>
-        <location filename="../widgets/SlideshowWidget.ui" line="231"/>
-        <location filename="../widgets/SlideshowWidget.ui" line="304"/>
-        <location filename="../widgets/SlideshowWidget.ui" line="320"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="215"></location>
+        <location filename="../widgets/SlideshowWidget.ui" line="231"></location>
+        <location filename="../widgets/SlideshowWidget.ui" line="304"></location>
+        <location filename="../widgets/SlideshowWidget.ui" line="320"></location>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="218"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="218"></location>
         <source>Shift+Left</source>
         <translation>Shift+Left</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="228"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="228"></location>
         <source>Go to Previous</source>
         <translatorcomment>キャプション</translatorcomment>
         <translation>前に戻ります</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="234"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="234"></location>
         <source>Left</source>
         <translatorcomment>キーボードショートカットなので、訳してはいけない!</translatorcomment>
         <translation>Left</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="267"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="267"></location>
         <source>File Name</source>
         <translation>ファイル名</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="301"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="301"></location>
         <source>Go to Next</source>
         <translation>次に移動します</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="307"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="307"></location>
         <source>Right</source>
         <translatorcomment>キーボードショートカットなので、訳してはいけない!</translatorcomment>
         <translation>Right</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="317"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="317"></location>
         <source>Go to End</source>
         <translation>末尾に移動します</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.ui" line="323"/>
+        <location filename="../widgets/SlideshowWidget.ui" line="323"></location>
         <source>Shift+Right</source>
         <translation>Shift+Right</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.cpp" line="125"/>
+        <location filename="../widgets/SlideshowWidget.cpp" line="125"></location>
         <source>Verify Removal</source>
         <translation>削除の確認</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.cpp" line="125"/>
+        <location filename="../widgets/SlideshowWidget.cpp" line="125"></location>
         <source>WARNING: This will permanently delete the file from the system!</source>
         <translation>警告: この操作を実行するとファイルがシステムから永久に削除されます!</translation>
     </message>
     <message>
-        <location filename="../widgets/SlideshowWidget.cpp" line="125"/>
+        <location filename="../widgets/SlideshowWidget.cpp" line="125"></location>
         <source>Are you sure you want to continue?</source>
         <translation>本当に続けますか?</translation>
     </message>
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index cc608b92..f1037896 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -66,6 +66,7 @@ DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new U
 
   UpdateIcons();
   UpdateText();	
+  createShortcuts();
   createMenus();
 }
 
@@ -188,34 +189,67 @@ void DirWidget::UpdateText(){
 // =================
 //       PRIVATE
 // =================
+void DirWidget::createShortcuts(){
+kZoomIn= new QShortcut(QKeySequence(QKeySequence::ZoomIn),this);
+kZoomOut= new QShortcut(QKeySequence(QKeySequence::ZoomOut),this);
+kNewFile= new QShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F),this);
+kNewDir= new QShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_N),this);
+kNewXDG= new QShortcut(QKeySequence(Qt::CTRL+Qt::Key_G),this);
+kCut= new QShortcut(QKeySequence(QKeySequence::Cut),this);
+kCopy= new QShortcut(QKeySequence(QKeySequence::Copy),this);
+kPaste= new QShortcut(QKeySequence(QKeySequence::Paste),this);
+kRename= new QShortcut(QKeySequence(Qt::Key_F2),this);
+kFav= new QShortcut(QKeySequence(Qt::Key_F3),this);
+kDel= new QShortcut(QKeySequence(QKeySequence::Delete),this);
+kOpSS= new QShortcut(QKeySequence(Qt::Key_F6),this);
+kOpMM= new QShortcut(QKeySequence(Qt::Key_F7),this);
+kOpTerm = new QShortcut(QKeySequence(Qt::Key_F1),this);
+
+connect(kZoomIn, SIGNAL(activated()), this, SLOT(on_tool_zoom_in_clicked()) );
+connect(kZoomOut, SIGNAL(activated()), this, SLOT(on_tool_zoom_out_clicked()) );
+connect(kNewFile, SIGNAL(activated()), this, SLOT(createNewFile()) );
+connect(kNewDir, SIGNAL(activated()), this, SLOT(createNewDir()) );
+connect(kNewXDG, SIGNAL(activated()), this, SLOT(createNewXDGEntry()) );
+connect(kCut, SIGNAL(activated()), this, SLOT(cutFiles()) );
+connect(kCopy, SIGNAL(activated()), this, SLOT(copyFiles()) );
+connect(kPaste, SIGNAL(activated()), this, SLOT(pasteFiles()) );
+connect(kRename, SIGNAL(activated()), this, SLOT(renameFiles()) );
+connect(kFav, SIGNAL(activated()), this, SLOT(favoriteFiles()) );
+connect(kDel, SIGNAL(activated()), this, SLOT(removeFiles()) );
+connect(kOpSS, SIGNAL(activated()), this, SLOT(openInSlideshow()) );
+connect(kOpMM, SIGNAL(activated()), this, SLOT(openMultimedia()) );
+connect(kOpTerm, SIGNAL(activated()), this, SLOT(openTerminal()) );
+
+}
+
 void DirWidget::createMenus(){
   //Note: contextMenu already created - this is just for the sub-items
   if(cNewMenu==0){ cNewMenu = new QMenu(this); }
   else{ cNewMenu->clear(); }
   cNewMenu->setTitle(tr("Create...") );
   cNewMenu->setIcon( LXDG::findIcon("list-add","") );
-  cNewMenu->addAction(LXDG::findIcon("document-new",""), tr("File"), this, SLOT(createNewFile()) );
-  cNewMenu->addAction(LXDG::findIcon("folder-new",""), tr("Directory"), this, SLOT(createNewDir()) );
-  if(LUtils::isValidBinary("lumina-fileinfo")){ cNewMenu->addAction(LXDG::findIcon("system-run",""), tr("Application Launcher"), this, SLOT(createNewXDGEntry()) ); }
+  cNewMenu->addAction(LXDG::findIcon("document-new",""), tr("File"), this, SLOT(createNewFile()), kNewFile->key() );
+  cNewMenu->addAction(LXDG::findIcon("folder-new",""), tr("Directory"), this, SLOT(createNewDir()), kNewDir->key() );
+  if(LUtils::isValidBinary("lumina-fileinfo")){ cNewMenu->addAction(LXDG::findIcon("system-run",""), tr("Application Launcher"), this, SLOT(createNewXDGEntry()), kNewXDG->key() ); }
 
   if(cOpenMenu==0){ cOpenMenu = new QMenu(this); }
   else{ cOpenMenu->clear(); }
   cOpenMenu->setTitle(tr("Launch..."));
   cOpenMenu->setIcon( LXDG::findIcon("quickopen","") );
-  cOpenMenu->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(openTerminal()));
-  cOpenMenu->addAction(LXDG::findIcon("view-preview",""), tr("SlideShow"), this, SLOT(openInSlideshow()));
-  cOpenMenu->addAction(LXDG::findIcon("view-media-lyrics","media-playback-start"), tr("Multimedia Player"), this, SLOT(openMultimedia()));
+  cOpenMenu->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(openTerminal()), kOpTerm->key());
+  cOpenMenu->addAction(LXDG::findIcon("view-preview",""), tr("SlideShow"), this, SLOT(openInSlideshow()), kOpSS->key());
+  cOpenMenu->addAction(LXDG::findIcon("view-media-lyrics","media-playback-start"), tr("Multimedia Player"), this, SLOT(openMultimedia()), kOpMM->key());
 
   if(cFModMenu==0){ cFModMenu = new QMenu(this); }
   else{ cFModMenu->clear(); }
   cFModMenu->setTitle(tr("Modify Files..."));
   cFModMenu->setIcon( LXDG::findIcon("document-edit","") );
-  cFModMenu->addAction(LXDG::findIcon("edit-cut",""), tr("Cut Selection"), this, SLOT(cutFiles()) );
-  cFModMenu->addAction(LXDG::findIcon("edit-copy",""), tr("Copy Selection"), this, SLOT(copyFiles()) );
+  cFModMenu->addAction(LXDG::findIcon("edit-cut",""), tr("Cut Selection"), this, SLOT(cutFiles()), kCut->key() );
+  cFModMenu->addAction(LXDG::findIcon("edit-copy",""), tr("Copy Selection"), this, SLOT(copyFiles()), kCopy->key() );
   cFModMenu->addSeparator();
-  cFModMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(renameFiles()) );
+  cFModMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(renameFiles()), kRename->key() );
   cFModMenu->addSeparator();
-  cFModMenu->addAction(LXDG::findIcon("edit-delete",""), tr("Delete Selection"), this, SLOT(removeFiles()) );
+  cFModMenu->addAction(LXDG::findIcon("edit-delete",""), tr("Delete Selection"), this, SLOT(removeFiles()), kDel->key() );
 
   if(cFViewMenu==0){ cFViewMenu = new QMenu(this); }
   else{ cFViewMenu->clear(); }
@@ -456,7 +490,7 @@ void DirWidget::UpdateContextMenu(){
     cFModMenu->setEnabled(!sel.isEmpty() && canmodify);
   contextMenu->addMenu(cFViewMenu);
     cFViewMenu->setEnabled(!sel.isEmpty());
-  contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(pasteFiles()) )->setEnabled(QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") && canmodify);
+  contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(pasteFiles()), QKeySequence(Qt::CTRL+Qt::Key_V) )->setEnabled(QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") && canmodify);
   //Now add the general selection options
   contextMenu->addSection(LXDG::findIcon("folder","inode/directory"), tr("Directory Operations"));
   if(canmodify){
@@ -578,7 +612,7 @@ void DirWidget::createNewXDGEntry(){
 // - Selected FILE operations
 void DirWidget::cutFiles(){
   QStringList sel = currentBrowser()->currentSelection();
-  if(sel.isEmpty()){ return; }
+  if(sel.isEmpty() || !canmodify){ return; }
   emit CutFiles(sel);	
 }
 
@@ -589,12 +623,13 @@ void DirWidget::copyFiles(){
 }
 
 void DirWidget::pasteFiles(){
+  if( !canmodify ){ return; }
   emit PasteFiles(currentBrowser()->currentDirectory(), QStringList() );	
 }
 
 void DirWidget::renameFiles(){
   QStringList sel = currentBrowser()->currentSelection();
-  if(sel.isEmpty()){ return; }
+  if(sel.isEmpty() || !canmodify){ return; }
   qDebug() << "Deleting selected Items:" << sel;
   emit RenameFiles(sel);	
 }
@@ -607,7 +642,7 @@ void DirWidget::favoriteFiles(){
 
 void DirWidget::removeFiles(){
   QStringList sel = currentBrowser()->currentSelection();
-  if(sel.isEmpty()){ return; }
+  if(sel.isEmpty() || !canmodify){ return; }
   qDebug() << "Deleting selected Items:" << sel;
   emit RemoveFiles(sel);	
 }
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
index 6a9bdf79..38e7a657 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
@@ -56,21 +56,11 @@ public slots:
 	
 	//Refresh options
 	void refresh(); //Refresh current directory
-	//void refreshButtons(); //Refresh action buttons only
 
 	//Theme change functions
 	void UpdateIcons();
 	void UpdateText();
-	
-	//Button updates
-	//void UpdateButtons();
 
-	//Keyboard Shortcuts triggered
-	/*void TryRenameSelection();
-	void TryCutSelection();
-	void TryCopySelection();
-	void TryPasteSelection();
-	void TryDeleteSelection();*/
 
 private:
 	Ui::DirWidget *ui;
@@ -87,7 +77,12 @@ private:
 	//The context menu and associated items
 	QMenu *contextMenu, *cNewMenu, *cOpenMenu, *cFModMenu, *cFViewMenu;
 
+	//The keyboard shortcuts for context menu items
+	QShortcut *kZoomIn, *kZoomOut, *kNewFile, *kNewDir, *kNewXDG, *kCut, *kCopy, *kPaste, *kRename, \
+		*kFav, *kDel, *kOpSS, *kOpMM, *kOpTerm;
+
 	//Functions for internal use
+	void createShortcuts(); //on init only
 	void createMenus(); //on init only
 
 	BrowserWidget* currentBrowser();