remove merge fragments from hu.po + ru.po

[quassel.git] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index 27162ca..ffb8e8d 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,22 +1,25 @@
-# Japanese translation for quassel
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the quassel package.
-# 
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-# Daniel E. Moctezuma <shinsen27@gmail.com>, 2010.
+# Japanese Translation for Quassel
+# by Daniel E. Moctezuma
+#
+# Copyright (c) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Quassel package.
+#
+#
+# Daniel E. Moctezuma <democtezuma@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: quassel\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 16:12+0000\n"
-"PO-Revision-Date: 2010-05-03 00:46-0700\n"
-"Last-Translator: Daniel E. Moctezuma <shinsen27@gmail.com>\n"
-"Language-Team: Japanese <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2010-05-05 02:45+0000\n"
+"PO-Revision-Date: 2010-07-31 22:06-0700\n"
+"Last-Translator: Daniel E. Moctezuma <democtezuma@gmail.com>\n"
+"Language-Team: 日本語 <Kdeveloper@kde.gr.jp>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-03 07:28+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2010-06-07 22:20+0000\n"
 "X-Generator: Lokalize 1.0\n"
 
 #. ts-context AboutDlg
@@ -45,7 +48,7 @@ msgstr ""
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:115
 msgid "&About"
-msgstr ""
+msgstr "について(&A)"
 
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:135
@@ -60,7 +63,7 @@ msgstr "貢献者(&C)"
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:175
 msgid "&Thanks To"
-msgstr ""
+msgstr "&Thanks To"
 
 #. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:32
@@ -74,8 +77,9 @@ msgstr ""
 
 #. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:62
+#, fuzzy
 msgid "Quassel IRC is mainly developed by:"
-msgstr ""
+msgstr "Quassel IRC の開発者："
 
 #. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:77
@@ -88,12 +92,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr ""
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr ""
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "更新に失敗しました..."
 
@@ -162,6 +166,8 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -187,6 +193,7 @@ msgstr ""
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -239,12 +246,12 @@ msgstr "別名"
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgid "Client style:"
-msgstr ""
+msgstr "クライアントスタイル："
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
-msgstr ""
+msgstr "アップリケージョンスタイルを設定"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:36
@@ -254,7 +261,7 @@ msgstr "言語："
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
-msgstr ""
+msgstr "アップリケージョン言語を設定（再起動が必要です）。"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:47
@@ -270,7 +277,7 @@ msgstr "＜システムデフォルト＞"
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:75
 msgid "Use custom stylesheet"
-msgstr ""
+msgstr "カスタムスタイルシートを使用"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:109
@@ -299,33 +306,33 @@ msgstr "パス名："
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -341,7 +348,8 @@ msgstr "パス名："
 #: ../src/qtui/settingspages/networkssettingspage.ui:281
 #: ../src/qtui/settingspages/networkssettingspage.ui:295
 #: ../src/qtui/ui/simplenetworkeditor.ui:168
-#: ../src/qtui/ui/simplenetworkeditor.ui:182 ../src/qtui/ui/topicwidget.ui:79
+#: ../src/qtui/ui/simplenetworkeditor.ui:182
+#: ../src/qtui/ui/topicwidget.ui:79
 msgid "..."
 msgstr "..."
 
@@ -353,17 +361,17 @@ msgstr "システムトレイアイコンを表示"
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:184
 msgid "Hide to tray on close button"
-msgstr ""
+msgstr "閉じるボタンでトレイに隠す"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:216
 msgid "Enable animations"
-msgstr "アニメーションを有効"
+msgstr "アニメーションを有効にする"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:231
 msgid "Message Redirection"
-msgstr ""
+msgstr "メッセージのリダイレクト"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:237
@@ -378,7 +386,7 @@ msgstr "サーバの通知："
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:294
 msgid "Default Target"
-msgstr ""
+msgstr "デフォルトのターゲット"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:301
@@ -388,12 +396,12 @@ msgstr "ステータスウィンドウ"
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:308
 msgid "Current Chat"
-msgstr ""
+msgstr "現在のチャット"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:315
 msgid "Errors:"
-msgstr ""
+msgstr "エラー："
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context AppearanceSettingsPage
@@ -414,24 +422,27 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "インターフェース"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
-msgstr ""
+msgstr "スタイルシートのファイルを選択してください"
 
 #. ts-context AwayLogView
 #: ../src/qtui/awaylogview.cpp:33
@@ -442,7 +453,8 @@ msgstr ""
 #. ts-context AwayLogView
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ChatMonitorView
-#: ../src/qtui/awaylogview.cpp:44 ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/chatmonitorview.cpp:59
 msgid "Show Network Name"
 msgstr "ネットワーク名を表示"
 
@@ -450,9 +462,10 @@ msgstr "ネットワーク名を表示"
 #. ts-context AwayLogView
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ChatMonitorView
-#: ../src/qtui/awaylogview.cpp:49 ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/chatmonitorview.cpp:64
 msgid "Show Buffer Name"
-msgstr "バッファー名を表示"
+msgstr "バッファ名を表示"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:22
@@ -477,12 +490,12 @@ msgstr ""
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:88
 msgid "Unread messages per chat"
-msgstr ""
+msgstr "各チャットの未読メッセージ"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:93
 msgid "Globally unread messages"
-msgstr ""
+msgstr "すべての未読メッセージ"
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:123
@@ -544,8 +557,9 @@ msgstr ""
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
 #: ../src/qtui/settingspages/backlogsettingspage.ui:385
+#, fuzzy
 msgid "Additional Messages:"
-msgstr ""
+msgstr "追加のメッセージ："
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:324
@@ -569,14 +583,14 @@ msgid "Backlog Fetching"
 msgstr ""
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
 #. ts-context BufferView
 #: ../src/uisupport/bufferview.cpp:248
 msgid "Merge buffers permanently?"
-msgstr ""
+msgstr "完全にバッファをマージしますか？"
 
 #. ts-context BufferView
 #: ../src/uisupport/bufferview.cpp:249
@@ -610,7 +624,7 @@ msgstr "チャットリストを追加"
 #. ts-context BufferViewFilter
 #: ../src/uisupport/bufferviewfilter.cpp:52
 msgid "Show / Hide Chats"
-msgstr ""
+msgstr "チャットを表示・隠す"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewSettingsPage
@@ -622,7 +636,7 @@ msgstr ""
 #: ../src/qtui/settingspages/identityeditwidget.ui:139
 #: ../src/qtui/settingspages/networkssettingspage.ui:48
 msgid "Re&name..."
-msgstr ""
+msgstr "名前変更(&N)..."
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context BufferViewSettingsPage
@@ -683,7 +697,7 @@ msgstr ""
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
 msgid "Show status window"
-msgstr ""
+msgstr "ステータスウィンドウを表示"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
@@ -698,7 +712,7 @@ msgstr "クエリを表示"
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
 msgid "Hide inactive chats"
-msgstr ""
+msgstr "非アクティブなチャットを隠す"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
@@ -713,17 +727,17 @@ msgstr "アルファベット順"
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
 msgid "Minimum Activity:"
-msgstr ""
+msgstr "最小限の活動："
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
 msgid "No Activity"
-msgstr ""
+msgstr "活動なし"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
 msgid "Other Activity"
-msgstr ""
+msgstr "他の活動"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
@@ -741,7 +755,7 @@ msgstr "新しいメッセージ"
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
 msgid "Highlight"
-msgstr ""
+msgstr "強調"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
@@ -751,65 +765,78 @@ msgstr "プレビュー："
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 msgid "Custom Chat Lists"
-msgstr ""
+msgstr "カスタムチャットリスト"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
 msgid "Delete Chat List?"
-msgstr ""
+msgstr "チャットリストを削除してもよろしいですか？"
 
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
 msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr ""
+msgstr "本当に\" %1 \"のチャットリストを削除しますか？"
 
 #. ts-context BufferViewWidget
 #: ../src/qtui/ui/bufferviewwidget.ui:26
 msgid "BufferView"
-msgstr ""
+msgstr "バッファビュー"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "拡大"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "縮小"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "実際サイズ"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+#, fuzzy
+msgid "Set Marker Line"
+msgstr "しおり："
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "しおり："
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>チャンネル %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>ユーザ：</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>モード：</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>トピック：</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
+#, fuzzy
 msgid "Not active <br /> Double-click to join"
-msgstr ""
+msgstr "非アクティブ<br />ダブルクリックをして入室"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -821,7 +848,7 @@ msgstr "チャンネルリスト"
 #. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:38
 msgid "Search Pattern:"
-msgstr ""
+msgstr "検索パターン:"
 
 #. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:48
@@ -843,7 +870,7 @@ msgstr "フィルター："
 #. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:98
 msgid "Errors Occured:"
-msgstr ""
+msgstr "発生したエラー："
 
 #. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:132
@@ -859,7 +886,7 @@ msgstr ""
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
 msgid "Operation Mode:"
-msgstr ""
+msgstr "オペレーションモード："
 
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
@@ -881,12 +908,12 @@ msgstr "利用可能："
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
 msgid "Move selected buffers to the left"
-msgstr ""
+msgstr "選択してるバッファを左に動く"
 
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
 msgid "Move selected buffers to the right"
-msgstr ""
+msgstr "選択してるバッファを右に動く"
 
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
@@ -902,19 +929,19 @@ msgstr ""
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
 msgid "Always show highlighted messages"
-msgstr ""
+msgstr "常に強調してるメッセージを表示"
 
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
 msgid "Show own messages"
-msgstr ""
+msgstr "自分のメッセージを表示"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context ChatMonitorSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:584
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "チャットモニター"
 
@@ -936,7 +963,7 @@ msgstr "無視："
 #. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:52
 msgid "Show Own Messages"
-msgstr ""
+msgstr "自分のメッセージを表示"
 
 #. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:71
@@ -944,9 +971,9 @@ msgid "Configure..."
 msgstr "設定..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
-msgstr ""
+msgstr "セレクションをコピー"
 
 #. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:55
@@ -956,12 +983,12 @@ msgstr "大小文字を区別"
 #. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:62
 msgid "search nick"
-msgstr ""
+msgstr "ニックを検索"
 
 #. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:69
 msgid "search message"
-msgstr ""
+msgstr "メッセージを検索"
 
 #. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:82
@@ -981,91 +1008,111 @@ msgstr "[hh:mm:ss]"
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:59
 msgid "Custom chat window font:"
-msgstr ""
+msgstr "カスタムチャットウィンドウのフォント："
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "カスタム色"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "操作："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "タイムスタンプ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "チャンネルメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "強調表示の前景色："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "コマンドメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "強調表示の背景色："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "サーバメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
-msgstr ""
+msgstr "しおり："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "エラーメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "背景:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
-msgstr ""
+msgstr "自分のメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
+msgstr "チャットビュー"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
 msgstr ""
 
 #. ts-context Client
@@ -1073,14 +1120,24 @@ msgstr ""
 msgid "Identity already exists in client!"
 msgstr ""
 
-#. ts-context Client
-#: ../src/client/client.cpp:371
+#. ts-context ClientBacklogManager
+#: ../src/client/clientbacklogmanager.cpp:161
+msgid "Processed %1 messages in %2 seconds."
+msgstr ""
+
+#. ts-context ClientBufferViewManager
+#: ../src/client/clientbufferviewmanager.cpp:52
 msgid "All Chats"
 msgstr "すべてのチャット"
 
-#. ts-context ClientBacklogManager
-#: ../src/client/clientbacklogmanager.cpp:153
-msgid "Processed %1 messages in %2 seconds."
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
 msgstr ""
 
 #. ts-context ConnectionSettingsPage
@@ -1111,7 +1168,7 @@ msgstr ""
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
 #: ../src/qtui/taskbarnotificationbackend.cpp:79
 msgid " seconds"
-msgstr ""
+msgstr " 秒"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:80
@@ -1145,8 +1202,9 @@ msgstr ""
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:184
+#, fuzzy
 msgid " users"
-msgstr ""
+msgstr "人のユーザ"
 
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:206
@@ -1154,7 +1212,7 @@ msgid "Minimum delay between requests:"
 msgstr ""
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "リンクアドレスをコピー"
 
@@ -1197,12 +1255,13 @@ msgstr ""
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgid "Delete Chat(s)..."
-msgstr ""
+msgstr "チャットを削除..."
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:44
+#, fuzzy
 msgid "Go to Chat"
-msgstr ""
+msgstr "チャットへ"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:46
@@ -1222,32 +1281,32 @@ msgstr ""
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgid "Nick Changes"
-msgstr ""
+msgstr "ニックの変更"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgid "Mode Changes"
-msgstr ""
+msgstr "モードの変更"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgid "Day Changes"
-msgstr ""
+msgstr "日付の変更"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgid "Topic Changes"
-msgstr ""
+msgstr "トピックの変更"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgid "Set as Default..."
-msgstr ""
+msgstr "既定として適当"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgid "Use Defaults..."
-msgstr ""
+msgstr "既定を使用..."
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:56
@@ -1271,7 +1330,7 @@ msgstr "クエリを表示"
 #: ../src/uisupport/contextmenuactionprovider.cpp:60
 #: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Whois"
-msgstr ""
+msgstr "ユーザ情報"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:62
@@ -1290,8 +1349,9 @@ msgstr ""
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr ""
+#, fuzzy
+msgid "Client info"
+msgstr "クライアント"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1336,12 +1396,12 @@ msgstr ""
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgid "Hide Chat(s) Temporarily"
-msgstr ""
+msgstr "一時的にチャットを隠す"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgid "Hide Chat(s) Permanently"
-msgstr ""
+msgstr "完全にチャットを隠しますか？"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:88
@@ -1370,12 +1430,12 @@ msgstr "CTCP"
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:122
 msgid "Actions"
-msgstr ""
+msgstr "操作"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:126
 msgid "Ignore"
-msgstr ""
+msgstr "無視する"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:131
@@ -1384,8 +1444,9 @@ msgstr ""
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:132
+#, fuzzy
 msgid "Existing Rules"
-msgstr ""
+msgstr "存在してる規則"
 
 #. ts-context Core
 #: ../src/core/core.cpp:182
@@ -1479,10 +1540,12 @@ msgstr ""
 #. ts-context Core
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreSession
-#: ../src/core/core.cpp:518 ../src/core/core.cpp:608 ../src/core/core.cpp:632
+#: ../src/core/core.cpp:518
+#: ../src/core/core.cpp:608
+#: ../src/core/core.cpp:632
 #: ../src/core/coresession.cpp:195
 msgid "Client"
-msgstr ""
+msgstr "クライアント"
 
 #. ts-context Core
 #: ../src/core/core.cpp:518
@@ -1543,15 +1606,16 @@ msgstr ""
 #. ts-context CoreAccount
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountModel
-#: ../src/client/coreaccount.h:39 ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccountmodel.cpp:64
 msgid "Internal Core"
-msgstr ""
+msgstr "内部コア"
 
 #. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
 msgid "Edit Core Account"
-msgstr ""
+msgstr "コアアカウントを編集"
 
 #. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
@@ -1566,7 +1630,7 @@ msgstr "アカウント名："
 #. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
 msgid "Local Core"
-msgstr ""
+msgstr "ローカルコア"
 
 #. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
@@ -1631,7 +1695,7 @@ msgstr "パスワード："
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
 #, fuzzy
 msgid "Remember"
-msgstr "保存"
+msgstr "記憶する"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
@@ -1640,7 +1704,7 @@ msgstr "保存"
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 #: ../src/qtui/settingspages/servereditdlg.ui:171
 msgid "Use a Proxy"
-msgstr ""
+msgstr "Proxy を使用"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
@@ -1649,7 +1713,7 @@ msgstr ""
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
 #: ../src/qtui/settingspages/servereditdlg.ui:188
 msgid "Proxy Type:"
-msgstr ""
+msgstr "Proxy タイプ"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
@@ -1658,7 +1722,7 @@ msgstr ""
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
 #: ../src/qtui/settingspages/servereditdlg.ui:196
 msgid "Socks 5"
-msgstr ""
+msgstr "Socks 5"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountEditDlg
@@ -1667,27 +1731,27 @@ msgstr ""
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
 #: ../src/qtui/settingspages/servereditdlg.ui:201
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
 #. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
 msgid "Add Core Account"
-msgstr ""
+msgstr "コアアカウントを追加"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
 msgid "Connect to Quassel Core"
-msgstr ""
+msgstr "Quassel Core に接続"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
 msgid "Core Accounts"
-msgstr ""
+msgstr "コアアカウント"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
 msgid "Edit..."
-msgstr ""
+msgstr "編集..."
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreAccountSettingsPage
@@ -1696,17 +1760,17 @@ msgstr ""
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
 #: ../src/qtui/settingspages/identitiessettingspage.ui:54
 msgid "Add..."
-msgstr ""
+msgstr "追加..."
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
 msgid "Automatically connect on startup"
-msgstr ""
+msgstr "起動時に自動的に接続"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
 msgid "Connect to last account used"
-msgstr ""
+msgstr "最後使用したアカウントで接続"
 
 #. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
@@ -1720,17 +1784,17 @@ msgstr ""
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
 msgid "Remote Cores"
-msgstr ""
+msgstr "リモートコア"
 
 #. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:69
 msgid "Core Configuration Wizard"
-msgstr ""
+msgstr "コアの設定ウイザード"
 
 #. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:97
 msgid "Your core has been successfully configured. Logging you in..."
-msgstr ""
+msgstr "コアの設定に成功しました。ログイン中..."
 
 #. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:104
@@ -1749,12 +1813,12 @@ msgstr ""
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
 #: ../src/qtui/ui/coreconnectauthdlg.ui:49
 msgid "Username:"
-msgstr ""
+msgstr "ユーザ名："
 
 #. ts-context CoreConfigWizardAdminUserPage
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
 msgid "Repeat password:"
-msgstr ""
+msgstr "パスワードを再入力："
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreConfigWizardAdminUserPage
@@ -1763,7 +1827,7 @@ msgstr ""
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
 #: ../src/qtui/ui/coreconnectauthdlg.ui:58
 msgid "Remember password"
-msgstr ""
+msgstr "パスワードを保存"
 
 #. ts-context CoreConfigWizardAdminUserPage
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
@@ -1780,7 +1844,7 @@ msgstr ""
 #. ts-context CoreConfigWizardPages::AdminUserPage
 #: ../src/qtui/coreconfigwizard.cpp:150
 msgid "Create Admin User"
-msgstr ""
+msgstr "管理ユーザを作成"
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
 #: ../src/qtui/coreconfigwizard.cpp:151
@@ -1795,7 +1859,7 @@ msgstr ""
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
 #: ../src/qtui/coreconfigwizard.cpp:182
 msgid "Select Storage Backend"
-msgstr ""
+msgstr "保存バックエンドを選択"
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
 #: ../src/qtui/coreconfigwizard.cpp:183
@@ -1805,12 +1869,12 @@ msgstr ""
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
 #: ../src/qtui/coreconfigwizard.cpp:277
 msgid "Connection Properties"
-msgstr ""
+msgstr "接続の設定"
 
 #. ts-context CoreConfigWizardPages::SyncPage
 #: ../src/qtui/coreconfigwizard.cpp:317
 msgid "Storing Your Settings"
-msgstr ""
+msgstr "設定を保存"
 
 #. ts-context CoreConfigWizardPages::SyncPage
 #: ../src/qtui/coreconfigwizard.cpp:318
@@ -1824,17 +1888,17 @@ msgstr ""
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
 msgid "Storage Backend:"
-msgstr ""
+msgstr "保存バックエンド："
 
 #. ts-context CoreConfigWizardStorageSelectionPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. ts-context CoreConfigWizardStorageSelectionPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
 msgid "Foobar"
-msgstr ""
+msgstr "Foobar"
 
 #. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
@@ -1844,17 +1908,17 @@ msgstr ""
 #. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
 msgid "Admin User:"
-msgstr ""
+msgstr "管理ユーザ："
 
 #. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
 msgid "foo"
-msgstr ""
+msgstr "foo"
 
 #. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
 msgid "bar"
-msgstr ""
+msgstr "bar"
 
 #. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
@@ -1869,7 +1933,7 @@ msgstr ""
 #. ts-context CoreConnectAuthDlg
 #: ../src/qtui/ui/coreconnectauthdlg.ui:20
 msgid "Please enter your account data:"
-msgstr ""
+msgstr "アカウントデータを入力："
 
 #. ts-context CoreConnectAuthDlg
 #: ../src/qtui/coreconnectdlg.cpp:75
@@ -1879,103 +1943,108 @@ msgstr ""
 #. ts-context CoreConnectDlg
 #: ../src/qtui/coreconnectdlg.cpp:40
 msgid "Connect to Core"
-msgstr ""
+msgstr "コアに接続"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
+#, fuzzy
 msgid "Network is down"
-msgstr ""
+msgstr "ネットワークはダウンしています"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200 ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
-msgstr ""
+msgstr "切断しました"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206 ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
-msgstr ""
+msgstr "%1 に接続中..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209 ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
-msgstr ""
+msgstr "%1 に接続しました"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
-msgstr ""
+msgstr "%1 から切断中..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
-msgstr ""
+msgstr "コアから切断しました。"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420 ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
-msgstr ""
+msgstr "ログイン中..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
-msgstr ""
+msgstr "ログインがキャンセルしました"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr ""
 
 #. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
 msgid "Network Status Detection"
-msgstr ""
+msgstr "ネットワークの状態の検出"
 
 #. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
@@ -2026,7 +2095,7 @@ msgstr ""
 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
 #: ../src/qtui/settingspages/networkssettingspage.ui:374
 msgid "Connection"
-msgstr ""
+msgstr "接続"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context CoreConnectionStatusWidget
@@ -2035,13 +2104,13 @@ msgstr ""
 #: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
 msgid "Message"
-msgstr ""
+msgstr "メッセージ"
 
 #. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:61
 msgctxt "seconds"
 msgid "s"
-msgstr ""
+msgstr "秒"
 
 #. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:61
@@ -2067,17 +2136,17 @@ msgstr ""
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:13
 msgid "Core Information"
-msgstr ""
+msgstr "コアの情報"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:21
 msgid "Version:"
-msgstr ""
+msgstr "バージョン："
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:28
 msgid "<core version>"
-msgstr ""
+msgstr "＜コアのバージョン＞"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:35
@@ -2092,7 +2161,7 @@ msgstr ""
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:49
 msgid "<connected clients>"
-msgstr ""
+msgstr "＜接続してるクライアント＞"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:56
@@ -2101,8 +2170,9 @@ msgstr ""
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:63
+#, fuzzy
 msgid "Build date:"
-msgstr ""
+msgstr "ビルドの日付:"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:70
@@ -2113,20 +2183,22 @@ msgstr ""
 #. ts-context CoreInfoDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context DebugLogWidget
-#: ../src/qtui/ui/coreinfodlg.ui:81 ../src/qtui/ui/debuglogwidget.ui:43
+#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/ui/debuglogwidget.ui:43
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/coreinfodlg.cpp:53
+#, fuzzy
 msgid "%n Day(s)"
 msgid_plural "%n Day(s)"
-msgstr[0] ""
+msgstr[0] "%n 日"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/coreinfodlg.cpp:54
 msgid " %1:%2:%3 (since %4)"
-msgstr ""
+msgstr " %1:%2:%3 （%4 から）"
 
 #. ts-context CoreNetwork
 #: ../src/core/corenetwork.cpp:153
@@ -2134,29 +2206,31 @@ msgid "Connection failed. Cycling to next Server"
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:161 ../src/core/corenetwork.cpp:162
+#: ../src/core/corenetwork.cpp:161
+#: ../src/core/corenetwork.cpp:162
 msgid "Connecting to %1:%2..."
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:211
+#: ../src/core/corenetwork.cpp:210
 msgid "Disconnecting. (%1)"
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:211
+#: ../src/core/corenetwork.cpp:210
+#, fuzzy
 msgid "Core Shutdown"
-msgstr ""
+msgstr "コアをシャットダウン"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:307
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:309
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
-msgstr ""
+msgstr "接続に失敗しました：%1"
 
 #. ts-context CoreSession
 #: ../src/core/coresession.cpp:195
@@ -2174,24 +2248,64 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr ""
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
-msgstr ""
+msgstr "退席中"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+msgid "No key has been set for %1."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
-msgstr ""
+msgstr "新規の個人情報を作成"
 
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:25
 msgid "Identity name:"
-msgstr ""
+msgstr "個人情報名："
 
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:37
@@ -2201,45 +2315,55 @@ msgstr ""
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:49
 msgid "Duplicate:"
+msgstr "個人情報を複製："
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:197
+msgid "Received CTCP CLIENTINFO request from %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:194
+#: ../src/core/ctcphandler.cpp:200
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:199
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:212
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:226
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:238
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:240
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr ""
 
@@ -2251,37 +2375,37 @@ msgstr ""
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:26
 msgid "Overlay View"
-msgstr ""
+msgstr "オーバーレイの表示"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:39
 msgid "Overlay Properties"
-msgstr ""
+msgstr "オーバーレイのプロパティ"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:50
 msgid "BufferViews:"
-msgstr ""
+msgstr "バッファービュ："
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:51
 msgid "All Networks:"
-msgstr ""
+msgstr "すべてのネットワーク："
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:52
 msgid "Networks:"
-msgstr ""
+msgstr "ネットワーク："
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:53
 msgid "Buffers:"
-msgstr ""
+msgstr "バッファ:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:54
 msgid "Removed buffers:"
-msgstr ""
+msgstr "削除したバッファ："
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:55
@@ -2290,43 +2414,33 @@ msgstr ""
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:57
-msgid "Add Buffers Automatically:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:58
-msgid "Hide inactive buffers:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:59
 msgid "Allowed buffer types:"
-msgstr ""
+msgstr "許可してるバッファタイプ："
 
 #. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:60
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
 msgid "Minimum activity:"
-msgstr ""
+msgstr "最小限の活動"
 
 #. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:62
+#: ../src/qtui/debugbufferviewoverlay.cpp:60
 msgid "Is initialized:"
 msgstr ""
 
 #. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:14
 msgid "Debug Console"
-msgstr ""
+msgstr "デバグコンソール"
 
 #. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:44
 msgid "local"
-msgstr ""
+msgstr "ローカル"
 
 #. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:54
 msgid "core"
-msgstr ""
+msgstr "コア"
 
 #. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:82
@@ -2336,7 +2450,7 @@ msgstr ""
 #. ts-context DebugLogWidget
 #: ../src/qtui/ui/debuglogwidget.ui:13
 msgid "Debug Log"
-msgstr ""
+msgstr "デバグログ"
 
 #. ts-context ExecWrapper
 #: ../src/client/execwrapper.cpp:45
@@ -2371,32 +2485,32 @@ msgstr ""
 #. ts-context FontSelector
 #: ../src/uisupport/fontselector.cpp:31
 msgid "Choose..."
-msgstr ""
+msgstr "選択..."
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:19
 msgid "Custom Highlights"
-msgstr ""
+msgstr "カスタムの強調"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:37
 msgid "RegEx"
-msgstr ""
+msgstr "RegEx"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:42
 msgid "CS"
-msgstr ""
+msgstr "CS"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:47
 msgid "Enable"
-msgstr ""
+msgstr "有効"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:55
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
@@ -2405,12 +2519,12 @@ msgstr ""
 #: ../src/qtui/settingspages/highlightsettingspage.ui:62
 #: ../src/qtui/settingspages/identityeditwidget.ui:119
 msgid "Remove"
-msgstr ""
+msgstr "削除"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:85
 msgid "Highlight Nicks"
-msgstr ""
+msgstr "ニックを強調"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:91
@@ -2420,27 +2534,34 @@ msgstr ""
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:98
 msgid "Current nick"
-msgstr ""
+msgstr "現在のニック"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
-msgstr ""
+msgstr "なし"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:115
 msgid "Case sensitive"
-msgstr ""
+msgstr "大文字小文字を区別"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#, fuzzy
 msgid "this shouldn't be empty"
-msgstr ""
+msgstr "これは空にしないでください"
 
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.h:45
 msgid "highlight rule"
-msgstr ""
+msgstr "強調の規則"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentitiesSettingsPage
@@ -2450,22 +2571,22 @@ msgstr ""
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:322
 #: ../src/qtui/settingspages/identityeditwidget.ui:136
 msgid "Rename Identity"
-msgstr ""
+msgstr "個人情報名を変更"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.ui:51
 msgid "Add Identity"
-msgstr ""
+msgstr "個人情報を追加"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.ui:74
 msgid "Remove Identity"
-msgstr ""
+msgstr "個人情報を削除"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 msgid "Identities"
-msgstr ""
+msgstr "個人情報"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentitiesSettingsPage
@@ -2513,7 +2634,7 @@ msgstr ""
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:310
 msgid "Delete Identity?"
-msgstr ""
+msgstr "個人情報を削除してもよろしいですか？"
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:311
@@ -2528,13 +2649,12 @@ msgstr ""
 #. ts-context Identity
 #: ../src/common/identity.cpp:134
 msgid "Quassel IRC User"
-msgstr ""
+msgstr "Quassel IRC ユーザ"
 
 #. ts-context Identity
 #: ../src/common/identity.cpp:162
-#, fuzzy
 msgid "<empty>"
-msgstr "<empty>"
+msgstr "＜空＞"
 
 #. ts-context Identity
 #: ../src/common/identity.cpp:168
@@ -2557,19 +2677,24 @@ msgid "Kindergarten is elsewhere!"
 msgstr ""
 
 #. ts-context Identity
-#: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180
+#: ../src/common/identity.cpp:179
+#: ../src/common/identity.cpp:180
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr ""
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr ""
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:38
 msgid "Real Name:"
-msgstr ""
+msgstr "本名："
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:45
@@ -2579,7 +2704,7 @@ msgstr ""
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:54
 msgid "Nicknames"
-msgstr ""
+msgstr "ニックネーム"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
@@ -2588,12 +2713,12 @@ msgstr ""
 #: ../src/qtui/settingspages/identityeditwidget.ui:90
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:420
 msgid "Add Nickname"
-msgstr ""
+msgstr "ニックネームを追加"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:116
 msgid "Remove Nickname"
-msgstr ""
+msgstr "ニックネームを削除"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
@@ -2622,7 +2747,7 @@ msgstr ""
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgid "A&way"
-msgstr ""
+msgstr "退席中(&A)"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:233
@@ -2642,14 +2767,15 @@ msgstr ""
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:261
 msgid "Away Nick:"
-msgstr ""
+msgstr "退席中ニックネーム："
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:268
 #: ../src/qtui/settingspages/identityeditwidget.ui:297
 #: ../src/qtui/settingspages/identityeditwidget.ui:366
+#, fuzzy
 msgid "Away Reason:"
-msgstr ""
+msgstr "退席中の理由："
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:280
@@ -2668,8 +2794,9 @@ msgstr ""
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:318
+#, fuzzy
 msgid "Away On Idle"
-msgstr ""
+msgstr "アイドル時に退席中になる"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:332
@@ -2689,7 +2816,7 @@ msgstr ""
 #: ../src/qtui/settingspages/identityeditwidget.cpp:219
 #: ../src/qtui/settingspages/servereditdlg.ui:119
 msgid "Advanced"
-msgstr ""
+msgstr "詳細"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:407
@@ -2704,7 +2831,7 @@ msgstr ""
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:431
@@ -2713,8 +2840,9 @@ msgstr ""
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:444
+#, fuzzy
 msgid "Quit Reason:"
-msgstr ""
+msgstr "終了の理由："
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:454
@@ -2738,19 +2866,21 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:864
+#: ../src/qtui/mainwin.cpp:1044
+#, fuzzy
 msgid "Continue"
-msgstr ""
+msgstr "続く"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:584
 msgid "Use SSL Key"
-msgstr ""
+msgstr "SSL キーを使う"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:598
+#, fuzzy
 msgid "Key Type:"
-msgstr ""
+msgstr "キータイプ："
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
@@ -2765,7 +2895,7 @@ msgstr ""
 #: ../src/qtui/settingspages/identityeditwidget.cpp:318
 #: ../src/qtui/settingspages/identityeditwidget.cpp:365
 msgid "Load"
-msgstr ""
+msgstr "ロード"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:637
@@ -2798,18 +2928,18 @@ msgstr ""
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:322
 msgid "RSA"
-msgstr ""
+msgstr "RSA"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:325
 msgid "DSA"
-msgstr ""
+msgstr "DSA"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:330
 #: ../src/qtui/settingspages/identityeditwidget.cpp:369
 msgid "Clear"
-msgstr ""
+msgstr "クリア"
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:340
@@ -2819,12 +2949,12 @@ msgstr ""
 #. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:107
 msgid "Setup Identity"
-msgstr ""
+msgstr "個人情報を設定"
 
 #. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:112
 msgid "Default Identity"
-msgstr ""
+msgstr "デフォルトの個人情報"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
@@ -2850,12 +2980,12 @@ msgstr ""
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
 msgid "Dynamic"
-msgstr ""
+msgstr "ダイナミック"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
 msgid "Permanent"
-msgstr ""
+msgstr "永久"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
@@ -2935,12 +3065,12 @@ msgstr ""
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
 msgid "Scope"
-msgstr ""
+msgstr "スコープ"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
 msgid "Global"
-msgstr ""
+msgstr "グローバル"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IgnoreListEditDlg
@@ -2949,7 +3079,7 @@ msgstr ""
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
 msgid "Network"
-msgstr ""
+msgstr "ネットワーク"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IgnoreListEditDlg
@@ -2958,7 +3088,7 @@ msgstr ""
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
 #: ../src/client/irclistmodel.cpp:59
 msgid "Channel"
-msgstr ""
+msgstr "チャンネル"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
@@ -3014,12 +3144,12 @@ msgstr ""
 #. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:194
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
 msgid "&Edit"
-msgstr ""
+msgstr "編集(&E)"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
@@ -3050,92 +3180,97 @@ msgid "Show messages in application indicator"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
-msgstr ""
+msgstr "白色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
-msgstr ""
+msgstr "黒色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
-msgstr ""
+msgstr "濃青色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
-msgstr ""
+msgstr "濃緑色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
-msgstr ""
+msgstr "赤色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
-msgstr ""
+msgstr "暗紅色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
-msgstr ""
+msgstr "暗紫色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
-msgstr ""
+msgstr "オレンジ色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
-msgstr ""
+msgstr "黄色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
-msgstr ""
+msgstr "緑色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+#, fuzzy
 msgid "Dark cyan"
-msgstr ""
+msgstr "暗シアン"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+#, fuzzy
 msgid "Cyan"
-msgstr ""
+msgstr "シアン"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
-msgstr ""
+msgstr "青色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
-msgstr ""
+msgstr "紫色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+#, fuzzy
 msgid "Dark gray"
-msgstr ""
+msgstr "濃グレー"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+#, fuzzy
 msgid "Light gray"
-msgstr ""
+msgstr "ライトグレー"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:86 ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr ""
 
@@ -3149,7 +3284,7 @@ msgstr ""
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:22
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
 msgid "Custom font:"
-msgstr ""
+msgstr "カスタムフォント："
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
@@ -3164,7 +3299,7 @@ msgstr ""
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
 msgid "Show nick selector"
-msgstr ""
+msgstr "ニックセレクタを表示"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
@@ -3173,43 +3308,54 @@ msgstr ""
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
-msgid "Multi-Line Editing"
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+msgid "Multi-Line Editing"
+msgstr "複数行の編集"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
-msgstr ""
+msgstr "行"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
-msgstr ""
+msgstr "スクロールバーを有効"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#, fuzzy
 msgid "Input Widget"
-msgstr ""
+msgstr "入力のウィジェット"
 
 #. ts-context IrcConnectionWizard
 #: ../src/qtui/ircconnectionwizard.cpp:51
@@ -3219,7 +3365,7 @@ msgstr ""
 #. ts-context IrcListModel
 #: ../src/client/irclistmodel.cpp:60
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcListModel
@@ -3227,23 +3373,29 @@ msgstr ""
 #. ts-context MainWin
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
-#: ../src/client/irclistmodel.cpp:61 ../src/qtui/mainwin.cpp:622
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/irclistmodel.cpp:61
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
+msgstr "トピック"
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:553
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:603
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:611
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr ""
 
@@ -3261,153 +3413,177 @@ msgstr ""
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:628 ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642 ../src/core/ircserverhandler.cpp:649
-#: ../src/uisupport/uistyle.cpp:574 ../src/uisupport/uistyle.cpp:577
-#: ../src/uisupport/uistyle.cpp:617 ../src/uisupport/uistyle.cpp:620
-#: ../src/uisupport/uistyle.cpp:623 ../src/uisupport/uistyle.cpp:630
-#: ../src/uisupport/uistyle.cpp:731
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
-msgstr ""
+msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:684
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:690 ../src/core/ircserverhandler.cpp:695
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:739 ../src/core/ircserverhandler.cpp:753
-#: ../src/core/ircserverhandler.cpp:787 ../src/core/ircserverhandler.cpp:803
-#: ../src/core/ircserverhandler.cpp:864 ../src/core/ircserverhandler.cpp:896
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:768 ../src/core/ircserverhandler.cpp:770
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:785
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:789 ../src/core/ircserverhandler.cpp:1067
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:815
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:829
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:849
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:851
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:854
-msgid "[Whois] idle message: %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:890
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:918
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:927
+#: ../src/core/ircserverhandler.cpp:969
+#, fuzzy
 msgid "End of channel list"
-msgstr ""
+msgstr "チャンネルリストの終わり"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:945
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:963
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:977
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:992
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1003
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1026
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1085
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1096
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1113
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1206
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr ""
 
+#. ts-context IrcUserItem
+#: ../src/client/networkmodel.cpp:806
+#, fuzzy
+msgid " is away"
+msgstr "退席中"
+
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816 ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr ""
 
@@ -3415,7 +3591,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819 ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr ""
 
@@ -3423,19 +3600,20 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822 ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
-msgstr ""
+msgstr "サーバ：%1"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:50
 msgid "Show icons"
-msgstr ""
+msgstr "アイコンを表示"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:66
 msgid "Chat List"
-msgstr ""
+msgstr "チャットリスト"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:72
@@ -3450,7 +3628,7 @@ msgstr ""
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:101
 msgid "Use Custom Colors"
-msgstr ""
+msgstr "カスタム色を使う"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:118
@@ -3460,17 +3638,17 @@ msgstr ""
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:142
 msgid "Inactive:"
-msgstr ""
+msgstr "非アクティブ："
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:166
 msgid "Unread messages:"
-msgstr ""
+msgstr "未読メッセージ："
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:190
 msgid "Highlight:"
-msgstr ""
+msgstr "強調："
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:214
@@ -3480,7 +3658,7 @@ msgstr ""
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:272
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
@@ -3489,23 +3667,24 @@ msgstr ""
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#, fuzzy
 msgid "Online:"
-msgstr ""
+msgstr "オンライン："
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:338
 msgid "Away:"
-msgstr ""
+msgstr "退席中："
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 msgid "Chat & Nick Lists"
-msgstr ""
+msgstr "チャット＆ニックネームリスト"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
 msgid "Inactive"
-msgstr ""
+msgstr "非アクティブ"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
@@ -3515,7 +3694,7 @@ msgstr ""
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
 msgid "Unread messages"
-msgstr ""
+msgstr "未読のメッセージ"
 
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
@@ -3527,256 +3706,488 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SystrayNotificationBackend
 #: ../src/qtui/knotificationbackend.cpp:115
-#: ../src/qtui/systraynotificationbackend.cpp:124
+#: ../src/qtui/systraynotificationbackend.cpp:125
 msgid "%n pending highlights"
 msgid_plural "%n pending highlights"
 msgstr[0] ""
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "すべて"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "なし"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:308
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
-msgstr ""
+msgstr "コアに接続(&C)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:310
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
-msgstr ""
+msgstr "コアに切断(&D)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:312
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
-msgstr ""
+msgstr "コア情報(&I)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:314
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
-msgstr ""
+msgstr "ネットワークを設定(&N)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
-msgstr ""
+msgstr "閉じる(&Q)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:321
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
-msgstr ""
+msgstr "チャットリストを設定(&C)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
-msgstr ""
+msgstr "検索バーを表示(&S)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:330
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:332
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
-msgstr ""
+msgstr "メニューバーを表示(&M)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
+msgstr "ステータスバーを表示(&B)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "ネットワークを設定(&N)..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
-msgstr ""
+msgstr "Quassel を設定(&C)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
-msgstr ""
+msgstr "Quassel について(&A)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:345
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
-msgstr ""
+msgstr "Qt について(&Q)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:347
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:349
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:351
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:353
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
-msgstr ""
+msgstr "デバグログ(&L)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:357
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
-msgstr ""
+msgstr "スタイルシートを再読み込む"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:361
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "通知"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:368
-msgid "&File"
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:381
-msgid "&Networks"
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:387
-msgid "&View"
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:388
-msgid "&Chat Lists"
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
-msgid "&Toolbars"
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:404
-msgid "&Settings"
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:411
-msgid "&Help"
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:419
-msgid "Debug"
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
-msgid "Nicks"
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:573
-msgid "Show Nick List"
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:596
-msgid "Show Chat Monitor"
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "チャットリストを削除してもよろしいですか？"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "チャットへ"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "チャットへ"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
+msgid "&File"
+msgstr "ファイル(&F)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:454
+msgid "&Networks"
+msgstr "ネットワーク(&N)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:460
+msgid "&View"
+msgstr "表示(&V)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:461
+msgid "&Chat Lists"
+msgstr "チャットリスト(&C)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:463
+msgid "&Toolbars"
+msgstr "ツールバー（&T）"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:477
+msgid "&Settings"
+msgstr "設定(&S)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:486
+msgid "&Help"
+msgstr "ヘルプ(&H)"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:494
+msgid "Debug"
+msgstr "デバグ"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:723
+msgid "Nicks"
+msgstr "ニック"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:732
+msgid "Show Nick List"
+msgstr "ニックリストを表示"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:755
+msgid "Show Chat Monitor"
+msgstr "チャットモニタを表示"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:609
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:634
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:707
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
-msgstr ""
+msgstr "メインツールバー"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:746
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:821
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:835 ../src/qtui/mainwin.cpp:843
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:837 ../src/qtui/mainwin.cpp:845
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:843
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:860 ../src/qtui/mainwin.cpp:880
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:861
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:865
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:881
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:884
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:893
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr ""
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+msgid "&Normal mode"
+msgstr ""
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3788,13 +4199,13 @@ msgid "Receiving Backlog"
 msgstr ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr ""
 
@@ -3829,7 +4240,7 @@ msgstr ""
 #: ../src/qtui/settingspages/networkadddlg.ui:75
 #: ../src/qtui/ui/simplenetworkeditor.ui:28
 msgid "Network name:"
-msgstr ""
+msgstr "ネットワーク名："
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkAddDlg
@@ -3838,51 +4249,53 @@ msgstr ""
 #: ../src/qtui/settingspages/networkadddlg.ui:85
 #: ../src/qtui/settingspages/servereditdlg.ui:38
 msgid "Server address:"
-msgstr ""
+msgstr "サーバアドレス："
 
 #. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:115
 msgid "Server password:"
-msgstr ""
+msgstr "サーバパスワード："
 
 #. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgid "Use secure connection"
-msgstr ""
+msgstr "安全な接続を使う"
 
 #. ts-context NetworkEditDlg
 #: ../src/qtui/settingspages/networkeditdlg.ui:21
 msgid "Please enter a network name:"
-msgstr ""
+msgstr "ネットワーク名を入力してください："
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
-msgstr ""
+msgstr "サーバ：%1"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196 ../src/qtui/topicwidget.cpp:106
+#: ../src/client/networkmodel.cpp:197
+#: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
-msgstr ""
+msgstr "ユーザ：%1"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199 ../src/qtui/topicwidget.cpp:107
+#: ../src/client/networkmodel.cpp:200
+#: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr ""
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
-msgstr ""
+msgstr "チャット"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr ""
 
@@ -3910,32 +4323,32 @@ msgstr ""
 #. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:172
 msgid "Remove buffers permanently?"
-msgstr ""
+msgstr "完全にバッファを削除しますか？"
 
 #. ts-context NetworkModelController::JoinDlg
 #: ../src/uisupport/networkmodelcontroller.cpp:484
 msgid "Join Channel"
-msgstr ""
+msgstr "チャンネルに入室"
 
 #. ts-context NetworkModelController::JoinDlg
 #: ../src/uisupport/networkmodelcontroller.cpp:489
 msgid "Channel:"
-msgstr ""
+msgstr "チャンネル："
 
 #. ts-context NetworkPage
 #: ../src/qtui/ircconnectionwizard.cpp:148
 msgid "Setup Network Connection"
-msgstr ""
+msgstr "ネットワーク接続を設定"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgid "Network Details"
-msgstr ""
+msgstr "ネットワーク詳細"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:132
 msgid "Identity:"
-msgstr ""
+msgstr "個人情報："
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworksSettingsPage
@@ -3944,7 +4357,7 @@ msgstr ""
 #: ../src/qtui/settingspages/networkssettingspage.ui:190
 #: ../src/qtui/ui/simplenetworkeditor.ui:63
 msgid "Servers"
-msgstr ""
+msgstr "サーバ"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:193
@@ -3958,12 +4371,12 @@ msgstr ""
 #: ../src/qtui/settingspages/networkssettingspage.ui:217
 #: ../src/qtui/ui/simplenetworkeditor.ui:99
 msgid "&Edit..."
-msgstr ""
+msgstr "編集(&E)..."
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:337
 msgid "Commands"
-msgstr ""
+msgstr "コマンド"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:340
@@ -4015,7 +4428,7 @@ msgstr ""
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:489
 msgid "Rejoin all channels after reconnect"
-msgstr ""
+msgstr "再接続の後で、すべてのチャンネルに再入室"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:516
@@ -4026,12 +4439,12 @@ msgstr ""
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:540
 msgid "NickServ"
-msgstr ""
+msgstr "NickServ"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:557
 msgid "Service:"
-msgstr ""
+msgstr "サービス："
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:580
@@ -4041,12 +4454,12 @@ msgstr ""
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:625
 msgid "Account:"
-msgstr ""
+msgstr "アカウント："
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:649
 msgid "Encodings"
-msgstr ""
+msgstr "エンコーディング："
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:652
@@ -4100,12 +4513,12 @@ msgstr ""
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:741
 msgid "Server encoding:"
-msgstr ""
+msgstr "サーバエンコーディング："
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:37
 msgid "Networks"
-msgstr ""
+msgstr "ネットワーク"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:168
@@ -4120,7 +4533,7 @@ msgstr ""
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:542
 msgid "Delete Network?"
-msgstr ""
+msgstr "ネットワークを削除してもよろしいですか？"
 
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:543
@@ -4130,12 +4543,13 @@ msgstr ""
 #. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgid "Edit Nickname"
-msgstr ""
+msgstr "ニックネームを編集"
 
 #. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:19
+#, fuzzy
 msgid "Please enter a valid nickname:"
-msgstr ""
+msgstr "有効なニックネームを入力："
 
 #. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:32
@@ -4145,17 +4559,17 @@ msgstr ""
 #. ts-context NotificationsSettingsPage
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
 msgid "Notifications"
-msgstr ""
+msgstr "通知"
 
 #. ts-context PhononNotificationBackend::ConfigWidget
 #: ../src/qtui/phononnotificationbackend.cpp:143
 msgid "Select Audio File"
-msgstr ""
+msgstr "オーディオファイルを選択"
 
 #. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
 msgid "Play a sound"
-msgstr ""
+msgstr "サウンドを再生"
 
 #. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
@@ -4191,7 +4605,7 @@ msgstr ""
 #. ts-context QObject
 #: ../src/qtui/ircconnectionwizard.cpp:56
 msgid "Welcome to Quassel IRC"
-msgstr ""
+msgstr "Quassel IRC へようこそ"
 
 #. ts-context QObject
 #: ../src/qtui/ircconnectionwizard.cpp:58
@@ -4199,8 +4613,9 @@ msgid "This wizard will help you to set up your default identity and your IRC ne
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:121
+#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
@@ -4220,144 +4635,146 @@ msgid "Invalid subelement name in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456 ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465 ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
-msgstr ""
+msgstr "年"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
-msgstr ""
+msgstr "日"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
-msgstr ""
+msgstr "時"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
-msgstr ""
+msgstr "分"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
-msgstr ""
+msgstr "秒"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr ""
 
@@ -4379,17 +4796,17 @@ msgstr ""
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgid "Server Info"
-msgstr ""
+msgstr "サーバ情報"
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgid "Use SSL"
-msgstr ""
+msgstr "SSL を使う"
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:140
 msgid "SSL Version:"
-msgstr ""
+msgstr "SSL バージョン："
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:147
@@ -4399,54 +4816,57 @@ msgstr ""
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:151
 msgid "SSLv3 (default)"
-msgstr ""
+msgstr "SSLv3（デフォルト）"
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:156
 msgid "SSLv2"
-msgstr ""
+msgstr "SSLv2"
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:161
 msgid "TLSv1"
-msgstr ""
+msgstr "TLSv1"
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:213
 msgid "Proxy Host:"
-msgstr ""
+msgstr "Proxy ホスト："
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:251
 msgid "Proxy Username:"
-msgstr ""
+msgstr "Proxy ユーザ名："
 
 #. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:261
 msgid "Proxy Password:"
-msgstr ""
+msgstr "Proxy パスワード："
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/ui/settingsdlg.ui:14 ../src/qtui/ui/settingspagedlg.ui:14
+#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/ui/settingspagedlg.ui:14
 msgid "Configure Quassel"
-msgstr ""
+msgstr "Quassel を設定"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:99 ../src/qtui/ui/settingspagedlg.ui:30
+#: ../src/qtui/ui/settingsdlg.ui:35
+#: ../src/qtui/ui/settingsdlg.ui:50
+#: ../src/qtui/settingsdlg.cpp:99
+#: ../src/qtui/ui/settingspagedlg.ui:30
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
 #. ts-context SettingsDlg
 #: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
-msgstr ""
+msgstr "変更を保存"
 
 #. ts-context SettingsDlg
 #: ../src/qtui/settingsdlg.cpp:110
@@ -4457,24 +4877,27 @@ msgstr ""
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
+#: ../src/qtui/settingsdlg.cpp:122
+#: ../src/qtui/settingsdlg.cpp:126
 #: ../src/qtui/settingspagedlg.cpp:36
 msgid "Configure %1"
-msgstr ""
+msgstr "%1 を設定"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:193 ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingspagedlg.cpp:104
 msgid "Reload Settings"
-msgstr ""
+msgstr "設定を再読み込む"
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:193 ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingspagedlg.cpp:104
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 
@@ -4482,7 +4905,8 @@ msgstr ""
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingspagedlg.cpp:113
 msgid "Restore Defaults"
 msgstr ""
 
@@ -4490,10 +4914,50 @@ msgstr ""
 #. ts-context SettingsDlg
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingspagedlg.cpp:113
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "操作："
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+#, fuzzy
+msgid "Search:"
+msgstr "検索パターン:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+#, fuzzy
+msgid "Default:"
+msgstr "デフォルトのターゲット"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "カスタム..."
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4517,7 +4981,7 @@ msgstr ""
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:1050
 msgid "Disconnecting"
-msgstr ""
+msgstr "切断中"
 
 #. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:35
@@ -4537,7 +5001,7 @@ msgstr ""
 #. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:116
 msgid "Add another IRC server"
-msgstr ""
+msgstr "他の IRC サーバを追加"
 
 #. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:136
@@ -4547,7 +5011,7 @@ msgstr ""
 #. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:226
 msgid "Join Channels Automatically"
-msgstr ""
+msgstr "自動的にチャンネルに入室"
 
 #. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:250
@@ -4555,14 +5019,14 @@ msgid "A list of IRC channels you will join automatically after connecting to th
 msgstr ""
 
 #. ts-context SqliteStorage
-#: ../src/core/sqlitestorage.cpp:49
+#: ../src/core/sqlitestorage.cpp:52
 msgid "SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core."
 msgstr ""
 
 #. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:14
 msgid "Security Information"
-msgstr ""
+msgstr "セキュリティ情報"
 
 #. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:22
@@ -4577,7 +5041,7 @@ msgstr "<b>IP アドレス：</b>"
 #. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:56
 msgid "<b>Encryption:</b>"
-msgstr ""
+msgstr "<b>暗号：</b>"
 
 #. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:73
@@ -4595,33 +5059,38 @@ msgid "Subject"
 msgstr ""
 
 #. ts-context SslInfoDlg
-#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
-#, fuzzy
+#: ../src/qtui/ui/sslinfodlg.ui:126
+#: ../src/qtui/ui/sslinfodlg.ui:248
 msgid "<b>Common name:</b>"
-msgstr "<b>共通名：</b>"
+msgstr ""
 
 #. ts-context SslInfoDlg
-#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+#: ../src/qtui/ui/sslinfodlg.ui:143
+#: ../src/qtui/ui/sslinfodlg.ui:265
 msgid "<b>Organization:</b>"
 msgstr ""
 
 #. ts-context SslInfoDlg
-#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+#: ../src/qtui/ui/sslinfodlg.ui:160
+#: ../src/qtui/ui/sslinfodlg.ui:282
 msgid "<b>Organizational unit:</b>"
 msgstr ""
 
 #. ts-context SslInfoDlg
-#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+#: ../src/qtui/ui/sslinfodlg.ui:177
+#: ../src/qtui/ui/sslinfodlg.ui:299
 msgid "<b>Country:</b>"
 msgstr "<b>国：</b>"
 
 #. ts-context SslInfoDlg
-#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+#: ../src/qtui/ui/sslinfodlg.ui:194
+#: ../src/qtui/ui/sslinfodlg.ui:316
 msgid "<b>State or province:</b>"
 msgstr ""
 
 #. ts-context SslInfoDlg
-#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+#: ../src/qtui/ui/sslinfodlg.ui:231
+#: ../src/qtui/ui/sslinfodlg.ui:353
 msgid "<b>Locality:</b>"
 msgstr ""
 
@@ -4652,13 +5121,15 @@ msgstr ""
 
 #. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:69
+#, fuzzy
 msgid "Yes"
-msgstr ""
+msgstr "はい"
 
 #. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:71
+#, fuzzy
 msgid "No, for the following reasons:<ul>"
-msgstr ""
+msgstr "いいえ。理由：<ul>"
 
 #. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:78
@@ -4668,22 +5139,23 @@ msgstr ""
 #. ts-context StatusBufferItem
 #: ../src/client/networkmodel.h:144
 msgid "Status Buffer"
-msgstr ""
+msgstr "ステータスバッファ"
 
 #. ts-context SystemTray
-#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+#: ../src/qtui/systemtray.cpp:61
+#: ../src/qtui/systemtray.cpp:92
 msgid "&Minimize"
-msgstr ""
+msgstr "最小化"
 
 #. ts-context SystemTray
 #: ../src/qtui/systemtray.cpp:94
 msgid "&Restore"
-msgstr ""
+msgstr "復元(&R)"
 
 #. ts-context SystrayNotificationBackend::ConfigWidget
-#: ../src/qtui/systraynotificationbackend.cpp:134
+#: ../src/qtui/systraynotificationbackend.cpp:135
 msgid "Show a message in a popup"
-msgstr ""
+msgstr "メッセージをポップアップで表示"
 
 #. ts-context TaskbarNotificationBackend::ConfigWidget
 #: ../src/qtui/taskbarnotificationbackend.cpp:68
@@ -4698,12 +5170,12 @@ msgstr ""
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:31
 msgid "Connect to IRC"
-msgstr ""
+msgstr "IRC へ接続"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect from IRC"
-msgstr ""
+msgstr "IRC から切断"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:34
@@ -4713,12 +5185,12 @@ msgstr ""
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:35
 msgid "Join a channel"
-msgstr ""
+msgstr "チャンネルに入室"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Query"
-msgstr ""
+msgstr "クエリ"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
@@ -4773,7 +5245,7 @@ msgstr ""
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Kick"
-msgstr ""
+msgstr "追い出す (Kick)"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:44
@@ -4793,7 +5265,7 @@ msgstr ""
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Kick/Ban"
-msgstr ""
+msgstr "追放 (Kick / Ban)"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
@@ -4803,12 +5275,12 @@ msgstr ""
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:51
 msgid "Connect to all"
-msgstr ""
+msgstr "すべてに接続"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:58
 msgid "Disconnect from all"
-msgstr ""
+msgstr "すべてから切断"
 
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
@@ -4822,181 +5294,198 @@ msgstr ""
 
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#, fuzzy
 msgid "Topic Widget"
-msgstr ""
+msgstr "トピックウィジェット"
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
-msgstr ""
+msgstr "%DN%1%DN %2"
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:584
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:589
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
-msgstr ""
+msgstr "ユーザモード：%DM%1%DM"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:594
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:597
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:602
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:609
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:638
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:642 ../src/uisupport/uistyle.cpp:657
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:652
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:661 ../src/uisupport/uistyle.cpp:699
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
-msgstr ""
+msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:697
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:701
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
-msgstr ""
+msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:705
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
-msgstr ""
+msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:707
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
-msgstr ""
+msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:709 ../src/uisupport/uistyle.cpp:711
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:713
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr "<-x"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:717 ../src/uisupport/uistyle.cpp:719
-#: ../src/uisupport/uistyle.cpp:721 ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
-msgstr ""
+msgstr "=>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:729
-#, fuzzy
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr "<="
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
-msgstr[0] ""
+msgstr[0] "%n 所有者"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
-msgstr[0] ""
+msgstr[0] "%n 管理者"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
-msgstr[0] ""
+msgstr[0] "%n オペレータ"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
-msgstr[0] ""
+msgstr[0] "%n サブオペレータ"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
-msgstr[0] ""
+msgstr[0] "%n 発言権所持者"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
-msgstr[0] ""
+msgstr[0] "%n ユーザ"
+
+#~ msgid "Add Buffers Automatically:"
+#~ msgstr "バッファを自動的に追加："
+
+#~ msgid "Hide inactive buffers:"
+#~ msgstr "非アクティブなバッファを隠す："