Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/corelib/io/qfile.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp

1 files changed, 203 insertions, 192 deletions

diff --git a/translations/assistant_ja.ts b/translations/assistant_ja.ts
index 1853155..5e4d2c9 100644
--- a/translations/assistant_ja.ts
+++ b/translations/assistant_ja.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="ja_JP">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="+110"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation>閉じる(&amp;C)</translation>
     </message>
 </context>
 <context>
@@ -14,18 +14,19 @@
     <message>
         <location line="-14"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>警告</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Unable to launch external application.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>外部アプリケーションを起動できません。
+</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -37,42 +38,42 @@
         <location line="+24"/>
         <location line="+32"/>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマーク</translation>
     </message>
     <message>
         <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui"/>
         <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークの追加</translation>
     </message>
     <message>
         <location/>
         <source>Bookmark:</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマーク:</translation>
     </message>
     <message>
         <location/>
         <source>Add in Folder:</source>
-        <translation type="unfinished"></translation>
+        <translation>追加先フォルダ:</translation>
     </message>
     <message>
         <location/>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
         <location/>
         <source>New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいフォルダ</translation>
     </message>
     <message>
         <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="-69"/>
         <source>Delete Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>フォルダを削除</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rename Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>フォルダの名前変更</translation>
     </message>
 </context>
 <context>
@@ -80,23 +81,23 @@
     <message>
         <location line="+450"/>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマーク</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You are going to delete a Folder, this will also&lt;br&gt;remove it&apos;s content. Are you sure to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>フォルダを削除すると中身も削除されますが、続けてよろしいですか?</translation>
     </message>
     <message>
         <location line="+109"/>
         <location line="+9"/>
         <source>New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいフォルダ</translation>
     </message>
 </context>
 <context>
@@ -104,47 +105,47 @@
     <message>
         <location line="-391"/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location line="-78"/>
         <source>Delete Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>フォルダを削除</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rename Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>フォルダの名前変更</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークを開く</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show Bookmark in New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークを新しいタブで開く</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークを削除</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rename Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークの名前変更</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>追加</translation>
     </message>
 </context>
 <context>
@@ -152,48 +153,48 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+195"/>
         <source>Add new page</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいページの追加</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Close current page</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のページを閉じる</translation>
     </message>
     <message>
         <location line="+265"/>
         <source>Print Document</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントを印刷</translation>
     </message>
     <message>
         <location line="+147"/>
         <location line="+2"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>不明</translation>
     </message>
     <message>
         <location line="+96"/>
         <source>Add New Page</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいページの追加</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close This Page</source>
-        <translation type="unfinished"></translation>
+        <translation>このページを閉じる</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Close Other Pages</source>
-        <translation type="unfinished"></translation>
+        <translation>他のページを閉じる</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Add Bookmark for this Page...</source>
-        <translation type="unfinished"></translation>
+        <translation>このページをブックマークに追加...</translation>
     </message>
     <message>
         <location line="+257"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>検索</translation>
     </message>
 </context>
 <context>
@@ -201,12 +202,12 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="+155"/>
         <source>Open Link</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを開く</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを新しいタブで開く</translation>
     </message>
 </context>
 <context>
@@ -214,12 +215,12 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/filternamedialog.ui"/>
         <source>Add Filter Name</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ名を追加</translation>
     </message>
     <message>
         <location/>
         <source>Filter Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ名:</translation>
     </message>
 </context>
 <context>
@@ -227,27 +228,27 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-863"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>戻る</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>進む</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>大文字/小文字を区別する</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Whole words</source>
-        <translation type="unfinished"></translation>
+        <translation>単語単位で検索する</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;見つからなければ先頭から検索する</translation>
     </message>
 </context>
 <context>
@@ -255,27 +256,27 @@
     <message>
         <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>フォント</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&amp;Writing system</source>
-        <translation type="unfinished"></translation>
+        <translation>文字セット(&amp;W)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Family</source>
-        <translation type="unfinished"></translation>
+        <translation>フォント名(&amp;F)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Style</source>
-        <translation type="unfinished"></translation>
+        <translation>スタイル(&amp;S)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Point size</source>
-        <translation type="unfinished"></translation>
+        <translation>サイズ(&amp;P)</translation>
     </message>
 </context>
 <context>
@@ -283,38 +284,39 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+481"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location line="-62"/>
         <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;ページが見つかりませんでした&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location line="+125"/>
         <source>Copy &amp;Link Location</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクのURLをコピー(&amp;L)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Open Link in New Tab	Ctrl+LMB</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを新しいタブで開く	Ctrl+LMB</translation>
     </message>
     <message>
         <location line="-267"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを新しいタブで開く</translation>
     </message>
     <message>
         <location line="+201"/>
         <source>Unable to launch external application.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>外部アプリケーションを起動できません。
+</translation>
     </message>
 </context>
 <context>
@@ -322,17 +324,17 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="+66"/>
         <source>&amp;Look for:</source>
-        <translation type="unfinished"></translation>
+        <translation>検索文字列(&amp;L):</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>Open Link</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを開く</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを新しいタブで開く</translation>
     </message>
 </context>
 <context>
@@ -341,97 +343,98 @@
         <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+75"/>
         <location filename="../tools/assistant/tools/assistant/installdialog.ui"/>
         <source>Install Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントのインストール</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Downloading documentation info...</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメント情報をダウンロード中...</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Download canceled.</source>
-        <translation type="unfinished"></translation>
+        <translation>ダウンロードを中止しました。</translation>
     </message>
     <message>
         <location line="+26"/>
         <location line="+78"/>
         <location line="+27"/>
         <source>Done.</source>
-        <translation type="unfinished"></translation>
+        <translation>完了.</translation>
     </message>
     <message>
         <location line="-90"/>
         <source>The file %1 already exists. Do you want to overwrite it?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 は既に存在します。上書きしますか?</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Unable to save the file %1: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルを保存できません。%1: %2.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Downloading %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 をダウンロード中...</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+42"/>
         <location line="+38"/>
         <source>Download failed: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>ダウンロード失敗: %1.</translation>
     </message>
     <message>
         <location line="-70"/>
         <source>Documentation info file is corrupt!</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメント情報ファイルが不正です!</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Download failed: Downloaded file is corrupted.</source>
-        <translation type="unfinished"></translation>
+        <translation>ダウンロード失敗: ダウンロードしたファイルが不正です。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Installing documentation %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 のドキュメントをインストール中...</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Error while installing documentation:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントのインストール中にエラーが発生しました:
+%1 </translation>
     </message>
     <message>
         <location filename="../tools/assistant/tools/assistant/installdialog.ui"/>
         <source>Available Documentation:</source>
-        <translation type="unfinished"></translation>
+        <translation>使用可能なドキュメント:</translation>
     </message>
     <message>
         <location/>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>インストール</translation>
     </message>
     <message>
         <location/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>閉じる</translation>
     </message>
     <message>
         <location/>
         <source>Installation Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>インストール先のパス:</translation>
     </message>
     <message>
         <location/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -440,298 +443,298 @@
         <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+108"/>
         <location line="+350"/>
         <source>Index</source>
-        <translation type="unfinished"></translation>
+        <translation>インデックス</translation>
     </message>
     <message>
         <location line="-344"/>
         <location line="+342"/>
         <source>Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>コンテンツ</translation>
     </message>
     <message>
         <location line="-337"/>
         <location line="+341"/>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマーク</translation>
     </message>
     <message>
         <location line="-329"/>
         <location line="+331"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>検索</translation>
     </message>
     <message>
         <location line="-319"/>
         <location line="+192"/>
         <location line="+470"/>
         <source>Qt Assistant</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Assistant</translation>
     </message>
     <message>
         <location line="-501"/>
         <location line="+4"/>
         <source>Unfiltered</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタなし</translation>
     </message>
     <message>
         <location line="+84"/>
         <source>Page Set&amp;up...</source>
-        <translation type="unfinished"></translation>
+        <translation>ページ設定(&amp;U)...</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Print Preview...</source>
-        <translation type="unfinished"></translation>
+        <translation>印刷プレビュー...</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Print...</source>
-        <translation type="unfinished"></translation>
+        <translation>印刷(&amp;P)...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>New &amp;Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいタブ(&amp;T)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Close Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>タブを閉じる(&amp;C)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>終了(&amp;Q)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>CTRL+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>CTRL+Q</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Copy selected Text</source>
-        <translation type="unfinished"></translation>
+        <translation>選択中の文字をコピー(&amp;C)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&amp;Find in Text...</source>
-        <translation type="unfinished"></translation>
+        <translation>検索(&amp;F)...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Find &amp;Next</source>
-        <translation type="unfinished"></translation>
+        <translation>次を検索(&amp;N)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Find &amp;Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>前を検索(&amp;P)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Preferences...</source>
-        <translation type="unfinished"></translation>
+        <translation>設定...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Zoom &amp;in</source>
-        <translation type="unfinished"></translation>
+        <translation>拡大(&amp;I)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Zoom &amp;out</source>
-        <translation type="unfinished"></translation>
+        <translation>縮小(&amp;O)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Normal &amp;Size</source>
-        <translation type="unfinished"></translation>
+        <translation>普通の大きさ(&amp;S)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+0</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+0</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>ALT+C</source>
-        <translation type="unfinished"></translation>
+        <translation>ALT+C</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>ALT+I</source>
-        <translation type="unfinished"></translation>
+        <translation>ALT+I</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>ALT+S</source>
-        <translation type="unfinished"></translation>
+        <translation>ALT+S</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Home</source>
-        <translation type="unfinished"></translation>
+        <translation>ホーム(&amp;H)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Home</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Back</source>
-        <translation type="unfinished"></translation>
+        <translation>戻る(&amp;B)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>進む(&amp;F)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sync with Table of Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>内容と目次を同期する</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Next Page</source>
-        <translation type="unfinished"></translation>
+        <translation>次のページ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+Alt+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+Right</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Previous Page</source>
-        <translation type="unfinished"></translation>
+        <translation>前のページ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+Alt+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+Left</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Bookmark...</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマークの追加...</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>About...</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Assistant について...</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Navigation Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>ナビゲーション ツールバー</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>ツールバー</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Filter Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルター ツールバー</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Filtered by:</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ条件:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Address Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレス ツールバー</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレス:</translation>
     </message>
     <message>
         <location line="+110"/>
         <source>Could not find the associated content item.</source>
-        <translation type="unfinished"></translation>
+        <translation>関連付いた内容が見つかりません。</translation>
     </message>
     <message>
         <location line="+81"/>
         <source>About %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 について</translation>
     </message>
     <message>
         <location line="+115"/>
         <source>Updating search index</source>
-        <translation type="unfinished"></translation>
+        <translation>検索インデックスを更新中</translation>
     </message>
     <message>
         <location line="-597"/>
         <source>Looking for Qt Documentation...</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt ドキュメントを探しています...</translation>
     </message>
     <message>
         <location line="+195"/>
         <source>&amp;Window</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィンドウ(&amp;W)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Minimize</source>
-        <translation type="unfinished"></translation>
+        <translation>最小化</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ctrl+M</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
         <location line="-2"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>ズーム</translation>
     </message>
     <message>
         <location line="-136"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>編集(&amp;E)</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>表示(&amp;V)</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>&amp;Go</source>
-        <translation type="unfinished"></translation>
+        <translation>ジャンプ(&amp;G)</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>&amp;Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマーク(&amp;B)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
         <location line="-37"/>
         <source>ALT+O</source>
-        <translation type="unfinished"></translation>
+        <translation>ALT+O</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>CTRL+D</source>
-        <translation type="unfinished"></translation>
+        <translation>CTRL+D</translation>
     </message>
 </context>
 <context>
@@ -741,47 +744,47 @@
         <location line="+7"/>
         <location line="+6"/>
         <source>Add Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントの追加</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Qt Compressed Help Files (*.qch)</source>
-        <translation type="unfinished"></translation>
+        <translation>圧縮済み Qt ヘルプファイル (*.qch)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>The specified file is not a valid Qt Help File!</source>
-        <translation type="unfinished"></translation>
+        <translation>指定されたファイルは有効な Qt ヘルプ ファイルではありません!</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>The namespace %1 is already registered!</source>
-        <translation type="unfinished"></translation>
+        <translation>ネームスペース %1 は既に登録済みです!</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Remove Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントの除去</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source>
-        <translation type="unfinished"></translation>
+        <translation>除去しようとしているいくつかのドキュメントは Assistant 上で参照されています。除去すると、これらのドキュメントは閉じられます。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>キャンセル</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location line="+86"/>
         <source>Use custom settings</source>
-        <translation type="unfinished"></translation>
+        <translation>独自設定を使用する</translation>
     </message>
 </context>
 <context>
@@ -789,92 +792,92 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>設定</translation>
     </message>
     <message>
         <location/>
         <source>Fonts</source>
-        <translation type="unfinished"></translation>
+        <translation>フォント</translation>
     </message>
     <message>
         <location/>
         <source>Font settings:</source>
-        <translation type="unfinished"></translation>
+        <translation>フォント設定:</translation>
     </message>
     <message>
         <location/>
         <source>Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>ブラウザー</translation>
     </message>
     <message>
         <location/>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation>アプリケーション</translation>
     </message>
     <message>
         <location/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ:</translation>
     </message>
     <message>
         <location/>
         <source>Attributes:</source>
-        <translation type="unfinished"></translation>
+        <translation>属性:</translation>
     </message>
     <message>
         <location/>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <location/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>追加</translation>
     </message>
     <message>
         <location/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>削除</translation>
     </message>
     <message>
         <location/>
         <source>Documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメント</translation>
     </message>
     <message>
         <location/>
         <source>Registered Documentation:</source>
-        <translation type="unfinished"></translation>
+        <translation>登録済みドキュメント:</translation>
     </message>
     <message>
         <location/>
         <source>Add...</source>
-        <translation type="unfinished"></translation>
+        <translation>追加...</translation>
     </message>
     <message>
         <location/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>オプション</translation>
     </message>
     <message>
         <location/>
         <source>Current Page</source>
-        <translation type="unfinished"></translation>
+        <translation>現在のページ</translation>
     </message>
     <message>
         <location/>
         <source>Restore to default</source>
-        <translation type="unfinished"></translation>
+        <translation>デフォルト設定に戻す</translation>
     </message>
     <message>
         <location/>
         <source>Homepage</source>
-        <translation type="unfinished"></translation>
+        <translation>ホームページ</translation>
     </message>
 </context>
 <context>
@@ -882,64 +885,64 @@
     <message>
         <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+110"/>
         <source>The specified collection file does not exist!</source>
-        <translation type="unfinished"></translation>
+        <translation>指定されたコレクションファイルは存在しません!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Missing collection file!</source>
-        <translation type="unfinished"></translation>
+        <translation>コレクションファイルが見つかりません!</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid URL!</source>
-        <translation type="unfinished"></translation>
+        <translation>不正なURLです!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Missing URL!</source>
-        <translation type="unfinished"></translation>
+        <translation>URLが見つかりません!</translation>
     </message>
     <message>
         <location line="+17"/>
         <location line="+19"/>
         <location line="+19"/>
         <source>Unknown widget: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>不明なウィジェット: %1</translation>
     </message>
     <message>
         <location line="-34"/>
         <location line="+19"/>
         <location line="+19"/>
         <source>Missing widget!</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィジェットが見つかりません!</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+12"/>
         <source>The specified Qt help file does not exist!</source>
-        <translation type="unfinished"></translation>
+        <translation>指定された Qt ヘルプ ファイルが存在しません!</translation>
     </message>
     <message>
         <location line="-7"/>
         <location line="+12"/>
         <source>Missing help file!</source>
-        <translation type="unfinished"></translation>
+        <translation>ヘルプファイルが見つかりません!</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Missing filter argument!</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルタ引数が不足しています!</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Unknown option: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>不明なオプション: %1</translation>
     </message>
     <message>
         <location line="+30"/>
         <location line="+2"/>
         <source>Qt Assistant</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt Assistant</translation>
     </message>
     <message>
         <location filename="../tools/assistant/tools/assistant/main.cpp" line="+190"/>
@@ -948,12 +951,16 @@
 
 Reason:
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントファイルを登録できませんでした。
+%1
+
+原因:
+%2</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Documentation successfully registered.</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントの登録に成功しました。</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -962,28 +969,32 @@ Reason:
 
 Reason:
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントファイルを解除できませんでした。
+%1
+
+原因:
+%2</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Documentation successfully unregistered.</source>
-        <translation type="unfinished"></translation>
+        <translation>ドキュメントの解放に成功しました。</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Cannot load sqlite database driver!</source>
-        <translation type="unfinished"></translation>
+        <translation>SQLite データベース ドライバーをロードできません!</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>The specified collection file could not be read!</source>
-        <translation type="unfinished"></translation>
+        <translation>指定されたコレクションファイルは読み込めません!</translation>
     </message>
     <message>
         <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="+167"/>
         <location line="+1"/>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>ブックマーク</translation>
     </message>
 </context>
 <context>
@@ -991,12 +1002,12 @@ Reason:
     <message>
         <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="+157"/>
         <source>Debugging Remote Control</source>
-        <translation type="unfinished"></translation>
+        <translation>リモート コントロールをデバッグ中</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Received Command: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>受信したコマンド: %1 %2</translation>
     </message>
 </context>
 <context>
@@ -1004,28 +1015,28 @@ Reason:
     <message>
         <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+193"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>コピー(&amp;C)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Copy &amp;Link Location</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクのURLをコピー(&amp;L)</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+36"/>
         <source>Open Link in New Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを新しいタブで開く</translation>
     </message>
     <message>
         <location line="-29"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてを選択</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Open Link</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクを開く</translation>
     </message>
 </context>
 <context>
@@ -1033,27 +1044,27 @@ Reason:
     <message>
         <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="+54"/>
         <source>Choose a topic for &lt;b&gt;%1&lt;/b&gt;:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; の検索先トピックを選択してください:</translation>
     </message>
     <message>
         <location filename="../tools/assistant/tools/assistant/topicchooser.ui"/>
         <source>Choose Topic</source>
-        <translation type="unfinished"></translation>
+        <translation>トピックを選択</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Topics</source>
-        <translation type="unfinished"></translation>
+        <translation>トピック(&amp;T)</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Display</source>
-        <translation type="unfinished"></translation>
+        <translation>表示(&amp;D)</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation>閉じる(&amp;C)</translation>
     </message>
 </context>
 </TS>