X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fja.po;h=883f0c6da7cd056ad8adc11e13bb71c22f287a15;hp=27162ca0acf7c4b1a9f491534c03eac69f71e8be;hb=12de4bc686cb6412a5018c157157c45e9fef67ca;hpb=5664dc467c0a2d819ff1fabfc626a7c81c15b07b

diff --git a/po/ja.po b/po/ja.po
index 27162ca0..883f0c6d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,31 +1,28 @@
-# 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.
+# Translators:
+# Daniel Albers <daniel@lbers.com>, 2011.
+# 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"
+"Project-Id-Version: Quassel IRC\n"
+"Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
+"PO-Revision-Date: 2012-01-23 18:06+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbers.com>\n"
+"Language-Team: \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-Generator: Lokalize 1.0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Qt-Contexts: true\n"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:17
+msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "Quassel ã«ã¤ãã¦"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:59
+msgctxt "AboutDlg|"
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
@@ -33,8 +30,8 @@ msgid ""
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
 msgstr ""
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:75
+msgctxt "AboutDlg|"
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
@@ -42,513 +39,374 @@ msgid ""
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Build &gt;= 474 (2008-02-08)</p></body></html>"
 msgstr ""
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:115
+msgctxt "AboutDlg|"
 msgid "&About"
-msgstr ""
+msgstr "ã«ã¤ãã¦(&A)"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:135
+msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "ä½è(&U)"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:155
+msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "è²¢ç®è(&C)"
 
-#. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:175
+msgctxt "AboutDlg|"
 msgid "&Thanks To"
-msgstr ""
+msgstr "&Thanks To"
 
-#. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:32
+#, qt-format
+msgctxt "AboutDlg|"
 msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
 msgstr ""
 
-#. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:46
-msgid "<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2010 by the Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> and used under the <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to report bugs."
+msgctxt "AboutDlg|"
+msgid ""
+"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2010 by the "
+"Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a"
+" href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
+"licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a>"
+" and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most "
+"icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen "
+"Team</a> and used under the <a "
+"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
+"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
+"report bugs."
 msgstr ""
 
-#. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:62
+msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
-msgstr ""
+msgstr "Quassel IRC ã®ä¸»è¦ãªéçºèï¼"
 
-#. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:77
-msgid "We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:"
+msgctxt "AboutDlg|"
+msgid ""
+"We would like to thank the following contributors (in alphabetical order) "
+"and everybody we forgot to mention here:"
 msgstr ""
 
-#. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:135
-msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for the original Quassel icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for creating all the artwork you see throughout Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software formerly known as Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s</dd>"
-msgstr ""
-
-#. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
-msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+msgctxt "AboutDlg|"
+msgid ""
+"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
+"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
+"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a"
+" href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
+"creating all the artwork you see throughout Quassel</dd><dt><img "
+"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
+"href=\"http://www.trolltech.com\">Qt Software formerly known as "
+"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
+"development of QuasselTopia with Greenphones and more</dd><dt><a "
+"href=\"http://www.nokia.com\"><img "
+"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
+"sponsoring development of Quassel Mobile with N810s</dd>"
+msgstr ""
+
+#: ../src/core/abstractsqlstorage.cpp:115
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+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
+msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "æ´æ°ã«å¤±æãã¾ãã..."
 
-#. ts-context AliasesModel
 #: ../src/qtui/settingspages/aliasesmodel.cpp:55
-msgid "<b>The shortcut for the alias</b><br />It can be used as a regular slash command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
+msgctxt "AliasesModel|"
+msgid ""
+"<b>The shortcut for the alias</b><br />It can be used as a regular slash "
+"command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr ""
 
-#. ts-context AliasesModel
 #: ../src/qtui/settingspages/aliasesmodel.cpp:59
-msgid "<b>The string the shortcut will be expanded to</b><br /><b>special variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - <b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br /> - <b>$i..</b> represents all parameters from i on separated by spaces.<br /> - <b>$i:hostname</b> represents the hostname of the user identified by the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of the selected channel<br /><br />Multiple commands can be separated with semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All 1 2 3\" when called like /test 1 2 3"
+msgctxt "AliasesModel|"
+msgid ""
+"<b>The string the shortcut will be expanded to</b><br /><b>special "
+"variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - "
+"<b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br "
+"/> - <b>$i..</b> represents all parameters from i on separated by spaces.<br"
+" /> - <b>$i:hostname</b> represents the hostname of the user identified by "
+"the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br"
+" /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of"
+" the selected channel<br /><br />Multiple commands can be separated with "
+"semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
+" be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
+"All 1 2 3\" when called like /test 1 2 3"
 msgstr ""
 
-#. ts-context AliasesModel
 #: ../src/qtui/settingspages/aliasesmodel.cpp:170
+msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "å¥å"
 
-#. ts-context AliasesModel
 #: ../src/qtui/settingspages/aliasesmodel.cpp:171
+msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AliasesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AppearanceSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BacklogSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatMonitorSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatViewSearchBar
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardAdminUserPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardIntroPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardStorageSelectionPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardSyncPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionStatusWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context HighlightSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IndicatorNotificationConfigWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context InputWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context InputWidgetSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context MsgProcessorStatusWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context PhononNotificationConfigWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TopicWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:13
-#: ../src/qtui/settingspages/appearancesettingspage.ui:14
-#: ../src/qtui/settingspages/backlogsettingspage.ui:14
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
-#: ../src/qtui/ui/chatviewsearchbar.ui:13
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:14
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
-#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:14
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
-#: ../src/qtui/settingspages/highlightsettingspage.ui:13
-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
-#: ../src/qtui/ui/inputwidget.ui:26
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:14
-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
-#: ../src/qtui/settingspages/networkssettingspage.ui:14
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
-#: ../src/qtui/ui/topicwidget.ui:32
-#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
+msgctxt "AliasesSettingsPage|"
 msgid "Form"
 msgstr "ãã©ã¼ã "
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AliasesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:27
-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
+msgctxt "AliasesSettingsPage|"
 msgid "New"
 msgstr "æ°è¦"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AliasesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:41
-#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42
+msgctxt "AliasesSettingsPage|"
 msgid "Delete"
 msgstr "åé¤"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AliasesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentitiesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "AliasesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgctxt "AliasesSettingsPage|"
 msgid "Aliases"
 msgstr "å¥å"
 
-#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:14
+msgctxt "AppearanceSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
+msgctxt "AppearanceSettingsPage|"
 msgid "Client style:"
-msgstr ""
+msgstr "ã¯ã©ã¤ã¢ã³ãã¹ã¿ã¤ã«ï¼"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:29
+msgctxt "AppearanceSettingsPage|"
 msgid "Set application style"
-msgstr ""
+msgstr "ã¢ãããªã±ã¼ã¸ã§ã³ã¹ã¿ã¤ã«ãè¨­å®"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:36
+msgctxt "AppearanceSettingsPage|"
 msgid "Language:"
 msgstr "è¨èªï¼"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:43
+msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
-msgstr ""
+msgstr "ã¢ãããªã±ã¼ã¸ã§ã³è¨èªãè¨­å®ï¼åèµ·åãå¿è¦ã§ãï¼ã"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:47
+msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "ï¼æªç¿»è¨³ï¼"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:52
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+msgctxt "AppearanceSettingsPage|"
 msgid "<System Default>"
 msgstr "ï¼ã·ã¹ãã ããã©ã«ãï¼"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:75
+msgctxt "AppearanceSettingsPage|"
 msgid "Use custom stylesheet"
-msgstr ""
+msgstr "ã«ã¹ã¿ã ã¹ã¿ã¤ã«ã·ã¼ããä½¿ç¨"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:109
+msgctxt "AppearanceSettingsPage|"
 msgid "Path:"
 msgstr "ãã¹åï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AppearanceSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatViewSearchBar
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentitiesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TopicWidget
 #: ../src/qtui/settingspages/appearancesettingspage.ui:141
-#: ../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/identitiessettingspage.ui:34
-#: ../src/qtui/settingspages/identitiessettingspage.ui:77
-#: ../src/qtui/settingspages/identityeditwidget.ui:168
-#: ../src/qtui/settingspages/identityeditwidget.ui:182
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:125
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:149
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:173
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:197
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:221
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:308
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:345
-#: ../src/qtui/settingspages/networkssettingspage.ui:149
-#: ../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
+msgctxt "AppearanceSettingsPage|"
 msgid "..."
 msgstr "..."
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:150
+msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "ã·ã¹ãã ãã¬ã¤ã¢ã¤ã³ã³ãè¡¨ç¤º"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:184
+msgctxt "AppearanceSettingsPage|"
 msgid "Hide to tray on close button"
-msgstr ""
+msgstr "éãããã¿ã³ã§ãã¬ã¤ã«é ã"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:216
+msgctxt "AppearanceSettingsPage|"
 msgid "Enable animations"
-msgstr "ã¢ãã¡ã¼ã·ã§ã³ãæå¹"
+msgstr "ã¢ãã¡ã¼ã·ã§ã³ãæå¹ã«ãã"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:231
+msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
-msgstr ""
+msgstr "ã¡ãã»ã¼ã¸ã®ãªãã¤ã¬ã¯ã"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:237
+msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "ã¦ã¼ã¶ã®éç¥ï¼"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:280
+msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "ãµã¼ãã®éç¥ï¼"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:294
+msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
-msgstr ""
+msgstr "ããã©ã«ãã®ã¿ã¼ã²ãã"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:301
+msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "ã¹ãã¼ã¿ã¹ã¦ã£ã³ãã¦"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:308
+msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
-msgstr ""
+msgstr "ç¾å¨ã®ãã£ãã"
 
-#. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:315
+msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
-msgstr ""
+msgstr "ã¨ã©ã¼ï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AppearanceSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BacklogSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatMonitorSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context HighlightSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context InputWidgetSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NotificationsSettingsPage
-#. #-#-#-#-#  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/highlightsettingspage.cpp:30
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
-#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
 
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
-msgstr ""
+msgstr "ã¹ã¿ã¤ã«ã·ã¼ãã®ãã¡ã¤ã«ãé¸æãã¦ãã ãã"
 
-#. ts-context AwayLogView
 #: ../src/qtui/awaylogview.cpp:33
+msgctxt "AwayLogView|"
 msgid "Away Log"
-msgstr ""
+msgstr "éå¸­ä¸­ï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AwayLogView
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatMonitorView
-#: ../src/qtui/awaylogview.cpp:44 ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/awaylogview.cpp:44
+msgctxt "AwayLogView|"
 msgid "Show Network Name"
 msgstr "ãããã¯ã¼ã¯åãè¡¨ç¤º"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context AwayLogView
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatMonitorView
-#: ../src/qtui/awaylogview.cpp:49 ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/awaylogview.cpp:49
+msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
-msgstr "ãããã¡ã¼åãè¡¨ç¤º"
+msgstr "ãããã¡åãè¡¨ç¤º"
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:14
+msgctxt "BacklogSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:22
-msgid "Number of messages to be requested from the core when using scrolling up in the buffer view."
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"Number of messages to be requested from the core when using scrolling up in "
+"the buffer view."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:25
+msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:75
+msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:83
+msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:88
+msgctxt "BacklogSettingsPage|"
 msgid "Unread messages per chat"
-msgstr ""
+msgstr "åãã£ããã®æªèª­ã¡ãã»ã¼ã¸"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:93
+msgctxt "BacklogSettingsPage|"
 msgid "Globally unread messages"
-msgstr ""
+msgstr "ãã¹ã¦ã®æªèª­ã¡ãã»ã¼ã¸"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:123
-msgid "The simplest requester. It fetches a fixed amount of lines for each chat window from the backlog."
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"The simplest requester. It fetches a fixed amount of lines for each chat "
+"window from the backlog."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
-msgid "amount of messages per buffer that are requested after the core connection has been established."
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"amount of messages per buffer that are requested after the core connection "
+"has been established."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
+msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:205
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
 "\n"
 "You can also choose to fetch additional older chatlines to provide a better context."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:222
 #: ../src/qtui/settingspages/backlogsettingspage.ui:232
 #: ../src/qtui/settingspages/backlogsettingspage.ui:354
+msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:225
 #: ../src/qtui/settingspages/backlogsettingspage.ui:347
+msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr "å¶éï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BacklogSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TaskbarNotificationBackend::ConfigWidget
 #: ../src/qtui/settingspages/backlogsettingspage.ui:235
 #: ../src/qtui/settingspages/backlogsettingspage.ui:357
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
-#: ../src/qtui/taskbarnotificationbackend.cpp:78
+msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
 msgstr "ç¡å¶é"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:260
 #: ../src/qtui/settingspages/backlogsettingspage.ui:270
 #: ../src/qtui/settingspages/backlogsettingspage.ui:382
 #: ../src/qtui/settingspages/backlogsettingspage.ui:392
-msgid "Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here."
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"Amount of messages to be fetched in addition to the unread messages. The "
+"Limit does not apply here."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
 #: ../src/qtui/settingspages/backlogsettingspage.ui:385
+msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
-msgstr ""
+msgstr "æªèª­ã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:324
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches all messages newer than the oldest unread message for all chats.\n"
 "\n"
@@ -558,295 +416,283 @@ msgid ""
 "You can also chose to fetch additional older chatlines to provide a better context."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:344
+msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 
-#. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgctxt "BacklogSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr ""
 
-#. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
+#, qt-format
+msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#. ts-context BufferView
 #: ../src/uisupport/bufferview.cpp:248
+msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
-msgstr ""
+msgstr "å®å¨ã«ãããã¡ããã¼ã¸ãã¾ããï¼"
 
-#. ts-context BufferView
 #: ../src/uisupport/bufferview.cpp:249
+#, qt-format
+msgctxt "BufferView|"
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
-#: ../src/qtui/settingspages/networkeditdlg.ui:13
-#: ../src/qtui/settingspages/servereditdlg.ui:14
+msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
 msgstr "ãã¤ã¢ã­ã°"
 
-#. ts-context BufferViewEditDlg
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:22
+msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯åãå¥åãã¦ãã ããï¼"
 
-#. ts-context BufferViewEditDlg
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
+msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "ãã£ãããªã¹ããè¿½å "
 
-#. ts-context BufferViewFilter
 #: ../src/uisupport/bufferviewfilter.cpp:52
+msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
-msgstr ""
+msgstr "ãã£ãããè¡¨ç¤ºã»é ã"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
+msgctxt "BufferViewSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:31
-#: ../src/qtui/settingspages/identityeditwidget.ui:139
-#: ../src/qtui/settingspages/networkssettingspage.ui:48
+msgctxt "BufferViewSettingsPage|"
 msgid "Re&name..."
-msgstr ""
+msgstr "ååå¤æ´(&N)..."
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:48
-#: ../src/qtui/settingspages/identityeditwidget.ui:93
-#: ../src/qtui/settingspages/networkssettingspage.ui:65
-#: ../src/qtui/settingspages/networkssettingspage.ui:235
-#: ../src/qtui/ui/simplenetworkeditor.ui:119
+msgctxt "BufferViewSettingsPage|"
 msgid "&Add..."
 msgstr "è¿½å (&A)..."
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:71
-#: ../src/qtui/settingspages/networkssettingspage.ui:88
-#: ../src/qtui/settingspages/networkssettingspage.ui:252
-#: ../src/qtui/ui/simplenetworkeditor.ui:139
+msgctxt "BufferViewSettingsPage|"
 msgid "De&lete"
 msgstr "åé¤(&L)"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
+msgctxt "BufferViewSettingsPage|"
 msgid "Chat List Settings"
 msgstr "ãã£ãããªã¹ãã®è¨­å®"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkModelController::JoinDlg
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:92
-#: ../src/uisupport/networkmodelcontroller.cpp:487
+msgctxt "BufferViewSettingsPage|"
 msgid "Network:"
 msgstr "ãããã¯ã¼ã¯ï¼"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "ãã¹ã¦"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
+msgctxt "BufferViewSettingsPage|"
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."
 msgstr ""
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
+msgctxt "BufferViewSettingsPage|"
 msgid "Show status window"
-msgstr ""
+msgstr "ã¹ãã¼ã¿ã¹ã¦ã£ã³ãã¦ãè¡¨ç¤º"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
+msgctxt "BufferViewSettingsPage|"
 msgid "Show channels"
 msgstr "ãã£ã³ãã«ãè¡¨ç¤º"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
+msgctxt "BufferViewSettingsPage|"
 msgid "Show queries"
 msgstr "ã¯ã¨ãªãè¡¨ç¤º"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
+msgctxt "BufferViewSettingsPage|"
 msgid "Hide inactive chats"
-msgstr ""
+msgstr "éã¢ã¯ãã£ããªãã£ãããé ã"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
+msgctxt "BufferViewSettingsPage|"
 msgid "Add new chats automatically"
 msgstr "èªåçã«æ°ãããã£ãããè¿½å "
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+msgctxt "BufferViewSettingsPage|"
 msgid "Sort alphabetically"
 msgstr "ã¢ã«ãã¡ãããé "
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
+msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
-msgstr ""
+msgstr "æå°éã®æ´»åï¼"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
-msgstr ""
+msgstr "æ´»åãªã"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
-msgstr ""
+msgstr "ä»ã®æ´»å"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "æ°ããã¡ãã»ã¼ã¸"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context BufferViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context HighlightSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
-#: ../src/qtui/settingspages/highlightsettingspage.ui:32
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
-msgstr ""
+msgstr "å¼·èª¿"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "ãã¬ãã¥ã¼ï¼"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgctxt "BufferViewSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
-msgstr ""
+msgstr "ã«ã¹ã¿ã ãã£ãããªã¹ã"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
-msgstr ""
+msgstr "ãã£ãããªã¹ããåé¤ãã¦ãããããã§ããï¼"
 
-#. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#, qt-format
+msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr ""
+msgstr "æ¬å½ã«\" %1 \"ã®ãã£ãããªã¹ããåé¤ãã¾ããï¼"
 
-#. ts-context BufferViewWidget
 #: ../src/qtui/ui/bufferviewwidget.ui:26
+msgctxt "BufferViewWidget|"
 msgid "BufferView"
-msgstr ""
+msgstr "ãããã¡ãã¥ã¼"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
+msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "æ¡å¤§"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
+msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "ç¸®å°"
 
-#. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
+msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "å®éãµã¤ãº"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/qtui/bufferwidget.cpp:94
+msgctxt "BufferWidget|"
+msgid "Set Marker Line"
+msgstr "ãããï¼"
+
+#: ../src/qtui/bufferwidget.cpp:98
+msgctxt "BufferWidget|"
+msgid "Go to Marker Line"
+msgstr "ãããï¼"
+
+#: ../src/client/networkmodel.cpp:503
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Channel %1</b>"
-msgstr "<b>ãã£ã³ãã« %1</b>"
+msgstr ""
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Users:</b> %1"
 msgstr "<b>ã¦ã¼ã¶ï¼</b> %1"
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Mode:</b> %1"
-msgstr "<b>ã¢ã¼ãï¼</b> %1"
+msgstr ""
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Topic:</b> %1"
-msgstr "<b>ãããã¯ï¼</b> %1"
+msgstr ""
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
+msgctxt "ChannelBufferItem|"
 msgid "Not active <br /> Double-click to join"
 msgstr ""
 
-#. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:14
+msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "ãã£ã³ãã«ãªã¹ã"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:38
+msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
-msgstr ""
+msgstr "æ¤ç´¢ãã¿ã¼ã³:"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:48
+msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows to pass search strings to the IRC Server."
 msgstr ""
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:62
+msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr "ãã£ã³ãã«ãè¡¨ç¤º"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:86
+msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr "ãã£ã«ã¿ã¼ï¼"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:98
+msgctxt "ChannelListDlg|"
 msgid "Errors Occured:"
-msgstr ""
+msgstr "çºçããã¨ã©ã¼ï¼"
 
-#. ts-context ChannelListDlg
 #: ../src/qtui/ui/channellistdlg.ui:132
+msgctxt "ChannelListDlg|"
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
@@ -856,13 +702,18 @@ msgid ""
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 msgstr ""
 
-#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Operation Mode:"
-msgstr ""
+msgstr "ãªãã¬ã¼ã·ã§ã³ã¢ã¼ãï¼"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
+msgctxt "ChatMonitorSettingsPage|"
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
@@ -873,1966 +724,2378 @@ msgid ""
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"
 msgstr ""
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Available:"
 msgstr "å©ç¨å¯è½ï¼"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Move selected buffers to the left"
-msgstr ""
+msgstr "é¸æãã¦ããããã¡ãå·¦ã«åã"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Move selected buffers to the right"
-msgstr ""
+msgstr "é¸æãã¦ããããã¡ãå³ã«åã"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "è¡¨ç¤ºï¼"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
-msgid "Show highlights in chatmonitor even if the originating buffer is ignored"
+msgctxt "ChatMonitorSettingsPage|"
+msgid ""
+"Show highlights in chatmonitor even if the originating buffer is ignored"
 msgstr ""
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Always show highlighted messages"
-msgstr ""
+msgstr "å¸¸ã«å¼·èª¿ãã¦ãã¡ãã»ã¼ã¸ãè¡¨ç¤º"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
-msgstr ""
+msgstr "èªåã®ã¡ãã»ã¼ã¸ãè¡¨ç¤º"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ChatMonitorSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:584
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "ãã£ããã¢ãã¿ã¼"
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr ""
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr ""
 
-#. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "ç¡è¦ï¼"
 
-#. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:52
+msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
-msgstr ""
+msgstr "èªåã®ã¡ãã»ã¼ã¸ãè¡¨ç¤º"
+
+#: ../src/qtui/chatmonitorview.cpp:59
+msgctxt "ChatMonitorView|"
+msgid "Show Network Name"
+msgstr "ãããã¯ã¼ã¯åãè¡¨ç¤º"
+
+#: ../src/qtui/chatmonitorview.cpp:64
+msgctxt "ChatMonitorView|"
+msgid "Show Buffer Name"
+msgstr "ãããã¡åãè¡¨ç¤º"
 
-#. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:71
+msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "è¨­å®..."
 
-#. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:743
+msgctxt "ChatScene|"
 msgid "Copy Selection"
-msgstr ""
+msgstr "ã»ã¬ã¯ã·ã§ã³ãã³ãã¼"
+
+#: ../src/qtui/ui/chatviewsearchbar.ui:13
+msgctxt "ChatViewSearchBar|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/ui/chatviewsearchbar.ui:19
+#: ../src/qtui/ui/chatviewsearchbar.ui:33
+#: ../src/qtui/ui/chatviewsearchbar.ui:44
+msgctxt "ChatViewSearchBar|"
+msgid "..."
+msgstr "..."
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:55
+msgctxt "ChatViewSearchBar|"
 msgid "case sensitive"
 msgstr "å¤§å°æå­ãåºå¥"
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:62
+msgctxt "ChatViewSearchBar|"
 msgid "search nick"
-msgstr ""
+msgstr "ããã¯ãæ¤ç´¢"
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:69
+msgctxt "ChatViewSearchBar|"
 msgid "search message"
-msgstr ""
+msgstr "ã¡ãã»ã¼ã¸ãæ¤ç´¢"
 
-#. ts-context ChatViewSearchBar
 #: ../src/qtui/ui/chatviewsearchbar.ui:82
+msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr ""
 
-#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:14
+msgctxt "ChatViewSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
+msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp format:"
 msgstr "ã¿ã¤ã ã¹ã¿ã³ãã®ãã©ã¼ãããï¼"
 
-#. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+msgctxt "ChatViewSettingsPage|"
 msgid "[hh:mm:ss]"
 msgstr "[hh:mm:ss]"
 
-#. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:59
+msgctxt "ChatViewSettingsPage|"
 msgid "Custom chat window font:"
-msgstr ""
+msgstr "ã«ã¹ã¿ã ãã£ããã¦ã£ã³ãã¦ã®ãã©ã³ãï¼"
 
-#. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
-msgid "Allow colored text (mIRC color codes)"
+msgctxt "ChatViewSettingsPage|"
+msgid "Show colored text in the chat window"
 msgstr ""
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
-msgid "Show a website preview window when hovering the mouse over a web address"
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
+msgctxt "ChatViewSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
 msgstr ""
 
-#. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"Show a website preview window when hovering the mouse over a web address"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"Set the marker line to the bottom of the current chat window when selecting "
+"another channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgctxt "ChatViewSettingsPage|"
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
+msgctxt "ChatViewSettingsPage|"
 msgid "Custom Colors"
 msgstr "ã«ã¹ã¿ã è²"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+msgctxt "ChatViewSettingsPage|"
 msgid "Action:"
 msgstr "æä½ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../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
+msgctxt "ChatViewSettingsPage|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp:"
 msgstr "ã¿ã¤ã ã¹ã¿ã³ãï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+msgctxt "ChatViewSettingsPage|"
 msgid "Channel message:"
 msgstr "ãã£ã³ãã«ã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+msgctxt "ChatViewSettingsPage|"
 msgid "Highlight foreground:"
 msgstr "å¼·èª¿è¡¨ç¤ºã®åæ¯è²ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+msgctxt "ChatViewSettingsPage|"
 msgid "Command message:"
 msgstr "ã³ãã³ãã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+msgctxt "ChatViewSettingsPage|"
 msgid "Highlight background:"
 msgstr "å¼·èª¿è¡¨ç¤ºã®èæ¯è²ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+msgctxt "ChatViewSettingsPage|"
 msgid "Server message:"
 msgstr "ãµã¼ãã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+msgctxt "ChatViewSettingsPage|"
 msgid "Marker line:"
-msgstr ""
+msgstr "ãããï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
+msgctxt "ChatViewSettingsPage|"
 msgid "Error message:"
 msgstr "ã¨ã©ã¼ã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
+msgctxt "ChatViewSettingsPage|"
 msgid "Background:"
 msgstr "èæ¯:"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
+msgctxt "ChatViewSettingsPage|"
 msgid "Use Sender Coloring"
 msgstr ""
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
+msgctxt "ChatViewSettingsPage|"
 msgid "Own messages:"
-msgstr ""
+msgstr "èªåã®ã¡ãã»ã¼ã¸ï¼"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
 
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
 msgid "Chat View"
+msgstr "ãã£ãããã¥ã¼"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgctxt "ChatViewSettingsPage|"
+msgid "You need at 0.6 quasselcore to use this feature"
 msgstr ""
 
-#. ts-context Client
 #: ../src/client/client.cpp:270
+msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr ""
 
-#. ts-context Client
-#: ../src/client/client.cpp:371
+#: ../src/client/clientbacklogmanager.cpp:161
+#, qt-format
+msgctxt "ClientBacklogManager|"
+msgid "Processed %1 messages in %2 seconds."
+msgstr ""
+
+#: ../src/client/clientbufferviewmanager.cpp:52
+msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "ãã¹ã¦ã®ãã£ãã"
 
-#. ts-context ClientBacklogManager
-#: ../src/client/clientbacklogmanager.cpp:153
-msgid "Processed %1 messages in %2 seconds."
+#: ../src/client/clientuserinputhandler.cpp:88
+msgctxt "ClientUserInputHandler|"
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#: ../src/client/clientuserinputhandler.cpp:98
+msgctxt "ClientUserInputHandler|"
+msgid "/QUERY expects at least a nick"
 msgstr ""
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
+msgctxt "ConnectionSettingsPage|"
 msgid "Configure the IRC Connection"
 msgstr "IRC ã®æ¥ç¶ãè¨­å®"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:20
+msgctxt "ConnectionSettingsPage|"
 msgid "Enable Ping Timeout Detection"
-msgstr ""
+msgstr "ã¢ãã¡ã¼ã·ã§ã³ãæå¹ã«ãã"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:37
+msgctxt "ConnectionSettingsPage|"
 msgid "Ping interval:"
-msgstr ""
+msgstr "æ´æ°ééï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TaskbarNotificationBackend::ConfigWidget
 #: ../src/qtui/settingspages/connectionsettingspage.ui:44
 #: ../src/qtui/settingspages/connectionsettingspage.ui:155
 #: ../src/qtui/settingspages/connectionsettingspage.ui:213
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
-#: ../src/qtui/taskbarnotificationbackend.cpp:79
+msgctxt "ConnectionSettingsPage|"
 msgid " seconds"
-msgstr ""
+msgstr " ç§"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:80
+msgctxt "ConnectionSettingsPage|"
 msgid "Disconnect after"
-msgstr ""
+msgstr "åæ­ãã¾ãã"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:103
+msgctxt "ConnectionSettingsPage|"
 msgid "missed pings"
 msgstr ""
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:128
-msgid "This enables periodic polling of user information using /WHO. This is mostly interesting for tracking users' away status."
+msgctxt "ConnectionSettingsPage|"
+msgid ""
+"This enables periodic polling of user information using /WHO. This is mostly"
+" interesting for tracking users' away status."
 msgstr ""
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:131
+msgctxt "ConnectionSettingsPage|"
 msgid "Enable Automatic User Information Lookup (/WHO)"
 msgstr ""
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:148
+msgctxt "ConnectionSettingsPage|"
 msgid "Update interval:"
 msgstr "æ´æ°ééï¼"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:177
+msgctxt "ConnectionSettingsPage|"
 msgid "Ignore channels with more than:"
 msgstr ""
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:184
+msgctxt "ConnectionSettingsPage|"
 msgid " users"
-msgstr ""
+msgstr "ã¦ã¼ã¶"
 
-#. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:206
+msgctxt "ConnectionSettingsPage|"
 msgid "Minimum delay between requests:"
 msgstr ""
 
-#. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+msgctxt "ConnectionSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/chatitem.cpp:683
+msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "ãªã³ã¯ã¢ãã¬ã¹ãã³ãã¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:38
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "æ¥ç¶"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:39
-#: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "åæ­"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:41
-#: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "å¥å®¤"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:42
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:43
+msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
-msgstr ""
+msgstr "ãã£ãããåé¤..."
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:44
+msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:46
+msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
-msgstr ""
+msgstr "å¥å®¤"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:47
+msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:48
+msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
-msgstr ""
+msgstr "éãã(&Q)"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:49
+msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
-msgstr ""
+msgstr "ããã¯ã®å¤æ´"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:50
+msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
-msgstr ""
+msgstr "ã¢ã¼ãã®å¤æ´"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:51
+msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
-msgstr ""
+msgstr "æ¥ä»ã®å¤æ´"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:52
+msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
-msgstr ""
+msgstr "ãããã¯ã®å¤æ´"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:53
+msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
-msgstr ""
+msgstr "æ¢å®ã¨ãã¦é©å½"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:54
+msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
-msgstr ""
+msgstr "æ¢å®ãä½¿ç¨..."
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:56
+msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "ãã£ã³ãã«ã«å¥å®¤..."
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:58
+msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
-msgstr ""
+msgstr "ã¯ã¨ãªãè¡¨ç¤º"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:59
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "ã¯ã¨ãªãè¡¨ç¤º"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:60
-#: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
-msgstr ""
+msgstr "ã¦ã¼ã¶æå ±"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:62
+msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "ãã¼ã¸ã§ã³"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:63
+msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:64
+msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr ""
+msgctxt "ContextMenuActionProvider|"
+msgid "Client info"
+msgstr "ã¯ã©ã¤ã¢ã³ãæå ±"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
+msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "ã«ã¹ã¿ã ..."
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:78
+msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:79
+msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:80
+msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "çºè¨æ¨©ãä¸ãã"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:81
+msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "çºè¨æ¨©ãå¥ªã"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:82
+msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
-msgstr ""
+msgstr "ãã£ã³ãã«ã«å¥å®¤"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:83
+msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
-msgstr ""
+msgstr "ãã£ã³ãã«ã«å¥å®¤"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:84
+msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
-msgstr ""
+msgstr "è¿½æ¾ (Kick / Ban)"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:86
+msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
-msgstr ""
+msgstr "ä¸æçã«ãã£ãããé ã"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:87
+msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
-msgstr ""
+msgstr "å®å¨ã«ãã£ãããé ãã¾ããï¼"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:88
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "ãã£ã³ãã«ãªã¹ããè¡¨ç¤º"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:89
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr "ç¡è¦ãªã¹ããè¡¨ç¤º"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:102
+msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr "ã¤ãã³ããé ã"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ContextMenuActionProvider
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
 #: ../src/uisupport/contextmenuactionprovider.cpp:110
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
+msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:122
+msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
-msgstr ""
+msgstr "æä½"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:126
+msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
-msgstr ""
+msgstr "ç¡è¦ãã"
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:131
+msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr ""
 
-#. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:132
+msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr ""
 
-#. ts-context Core
 #: ../src/core/core.cpp:182
+msgctxt "Core|"
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr ""
 
-#. ts-context Core
 #: ../src/core/core.cpp:183
+msgctxt "Core|"
 msgid ""
 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."
 msgstr ""
 
-#. ts-context Core
 #: ../src/core/core.cpp:232
+msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr ""
 
-#. ts-context Core
 #: ../src/core/core.cpp:273
+msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:277
+#: ../src/core/core.cpp:276
+msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:281
+#: ../src/core/core.cpp:280
+msgctxt "Core|"
 msgid "Creating admin user..."
-msgstr ""
+msgstr "ç®¡çã¦ã¼ã¶ãä½æ"
 
-#. ts-context Core
-#: ../src/core/core.cpp:394
+#: ../src/core/core.cpp:393
+#, qt-format
+msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:402
-msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-msgstr ""
-
-#. ts-context Core
-#: ../src/core/core.cpp:410
-msgid "Could not open IPv4 interface %1:%2: %3"
-msgstr ""
-
-#. ts-context Core
-#: ../src/core/core.cpp:418
+#: ../src/core/core.cpp:401
+#, qt-format
+msgctxt "Core|"
 msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:429
+#: ../src/core/core.cpp:409
+#, qt-format
+msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:437
-msgid "Invalid listen address %1, unknown network protocol"
+#: ../src/core/core.cpp:417
+#, qt-format
+msgctxt "Core|"
+msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr ""
+
+#: ../src/core/core.cpp:427
+#, qt-format
+msgctxt "Core|"
+msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:446
+#: ../src/core/core.cpp:435
+#, qt-format
+msgctxt "Core|"
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr ""
+
+#: ../src/core/core.cpp:444
+msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:480
+#: ../src/core/core.cpp:478
+msgctxt "Core|"
 msgid "Client connected from"
-msgstr ""
+msgstr "ã³ã¢ããåæ­ãã¾ããã"
 
-#. ts-context Core
-#: ../src/core/core.cpp:483
+#: ../src/core/core.cpp:481
+msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:502
+#: ../src/core/core.cpp:500
+msgctxt "Core|"
 msgid "Antique client trying to connect... refusing."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:514
-msgid "<b>Your Quassel Client is too old!</b><br>This core needs at least client/core protocol version %1.<br>Please consider upgrading your client."
+#: ../src/core/core.cpp:512
+#, qt-format
+msgctxt "Core|"
+msgid ""
+"<b>Your Quassel Client is too old!</b><br>This core needs at least "
+"client/core protocol version %1.<br>Please consider upgrading your client."
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. 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/coresession.cpp:195
+#: ../src/core/core.cpp:516 ../src/core/core.cpp:606 ../src/core/core.cpp:630
+msgctxt "Core|"
 msgid "Client"
-msgstr ""
+msgstr "ã¯ã©ã¤ã¢ã³ã"
 
-#. ts-context Core
-#: ../src/core/core.cpp:518
+#: ../src/core/core.cpp:516
+msgctxt "Core|"
 msgid "too old, rejecting."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:535
+#: ../src/core/core.cpp:533
+#, qt-format
+msgctxt "Core|"
 msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:588
+#: ../src/core/core.cpp:586
+msgctxt "Core|"
 msgid "Starting TLS for Client:"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:606
-msgid "<b>Client not initialized!</b><br>You need to send an init message before trying to login."
+#: ../src/core/core.cpp:604
+msgctxt "Core|"
+msgid ""
+"<b>Client not initialized!</b><br>You need to send an init message before "
+"trying to login."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:608
+#: ../src/core/core.cpp:606
+msgctxt "Core|"
 msgid "did not send an init message before trying to login, rejecting."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:626
-msgid "<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database."
+#: ../src/core/core.cpp:624
+msgctxt "Core|"
+msgid ""
+"<b>Invalid username or password!</b><br>The username/password combination "
+"you supplied could not be found in the database."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:632
+#: ../src/core/core.cpp:630
+#, qt-format
+msgctxt "Core|"
 msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:643
+#: ../src/core/core.cpp:641
+msgctxt "Core|"
 msgid "Non-authed client disconnected."
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:649
+#: ../src/core/core.cpp:647
+msgctxt "Core|"
 msgid "Non-authed client disconnected. (socket allready destroyed)"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:697
+#: ../src/core/core.cpp:695
+msgctxt "Core|"
 msgid "Could not initialize session for client:"
 msgstr ""
 
-#. ts-context Core
-#: ../src/core/core.cpp:719
+#: ../src/core/core.cpp:717
+msgctxt "Core|"
 msgid "Could not find a session for client:"
-msgstr ""
+msgstr "â%1âã®ã¹ã¯ãªãããè¦ã¤ããã¾ããã§ããã"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccount
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountModel
-#: ../src/client/coreaccount.h:39 ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccount.h:39
+msgctxt "CoreAccount|"
 msgid "Internal Core"
-msgstr ""
+msgstr "åé¨ã³ã¢"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
+msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
-msgstr ""
+msgstr "ã³ã¢ã¢ã«ã¦ã³ããç·¨é"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
+msgctxt "CoreAccountEditDlg|"
 msgid "Account Details"
 msgstr "ã¢ã«ã¦ã³ãã®è©³ç´°"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
+msgctxt "CoreAccountEditDlg|"
 msgid "Account Name:"
 msgstr "ã¢ã«ã¦ã³ãåï¼"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
+msgctxt "CoreAccountEditDlg|"
 msgid "Local Core"
-msgstr ""
+msgstr "ã­ã¼ã«ã«ã³ã¢"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "ãã¹ãåï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:47
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:180
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+msgctxt "CoreAccountEditDlg|"
 msgid "localhost"
 msgstr "localhost"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
-#: ../src/qtui/settingspages/networkadddlg.ui:95
-#: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "ãã¼ãï¼"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "ã¦ã¼ã¶ï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardAdminUserPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectAuthDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkModelController::JoinDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:103
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:236
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
-#: ../src/qtui/ui/coreconnectauthdlg.ui:35
-#: ../src/uisupport/networkmodelcontroller.cpp:491
-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
-#: ../src/qtui/settingspages/servereditdlg.ui:72
+msgctxt "CoreAccountEditDlg|"
 msgid "Password:"
 msgstr "ãã¹ã¯ã¼ãï¼"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
-#, fuzzy
+msgctxt "CoreAccountEditDlg|"
 msgid "Remember"
-msgstr "ä¿å­"
+msgstr "ãã¹ã¯ã¼ããä¿å­"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+msgctxt "CoreAccountEditDlg|"
 msgid "Use a Proxy"
-msgstr ""
+msgstr "Proxy ãä½¿ç¨"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
-msgstr ""
+msgstr "Proxy ã¿ã¤ã"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+msgctxt "CoreAccountEditDlg|"
 msgid "Socks 5"
-msgstr ""
+msgstr "Socks 5"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
-#: ../src/qtui/settingspages/servereditdlg.ui:201
+msgctxt "CoreAccountEditDlg|"
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
-#. ts-context CoreAccountEditDlg
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
-msgstr ""
+msgstr "ã³ã¢ã¢ã«ã¦ã³ããè¿½å "
+
+#: ../src/client/coreaccountmodel.cpp:64
+msgctxt "CoreAccountModel|"
+msgid "Internal Core"
+msgstr "åé¨ã³ã¢"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
+msgctxt "CoreAccountSettingsPage|"
 msgid "Connect to Quassel Core"
-msgstr ""
+msgstr "Quassel Core ã«æ¥ç¶"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
+msgctxt "CoreAccountSettingsPage|"
 msgid "Core Accounts"
-msgstr ""
+msgstr "ã³ã¢ã¢ã«ã¦ã³ã"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
+msgctxt "CoreAccountSettingsPage|"
 msgid "Edit..."
-msgstr ""
+msgstr "ç·¨é..."
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
-#: ../src/qtui/settingspages/identitiessettingspage.ui:54
+msgctxt "CoreAccountSettingsPage|"
 msgid "Add..."
-msgstr ""
+msgstr "è¿½å ..."
+
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
+msgctxt "CoreAccountSettingsPage|"
+msgid "Delete"
+msgstr "åé¤"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
+msgctxt "CoreAccountSettingsPage|"
 msgid "Automatically connect on startup"
-msgstr ""
+msgstr "èµ·åæã«èªåçã«æ¥ç¶"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
+msgctxt "CoreAccountSettingsPage|"
 msgid "Connect to last account used"
-msgstr ""
+msgstr "æå¾ä½¿ç¨ããã¢ã«ã¦ã³ãã§æ¥ç¶"
 
-#. ts-context CoreAccountSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
+msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreAccountSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
-#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
-msgstr ""
+msgstr "ãªã¢ã¼ãã³ã¢"
 
-#. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:69
+msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
-msgstr ""
+msgstr "ã³ã¢ã®è¨­å®ã¦ã¤ã¶ã¼ã"
 
-#. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:97
+msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
-msgstr ""
+msgstr "ã³ã¢ã®è¨­å®ã«æåãã¾ãããã­ã°ã¤ã³ä¸­..."
 
-#. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:104
-msgid "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
+#, qt-format
+msgctxt "CoreConfigWizard|"
+msgid ""
+"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start "
+"over."
 msgstr ""
 
-#. ts-context CoreConfigWizard
 #: ../src/qtui/coreconfigwizard.cpp:119
-msgid "Your are now logged into your freshly configured Quassel Core!<br>Please remember to configure your identities and networks now."
+msgctxt "CoreConfigWizard|"
+msgid ""
+"Your are now logged into your freshly configured Quassel Core!<br>Please "
+"remember to configure your identities and networks now."
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardAdminUserPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+msgctxt "CoreConfigWizardAdminUserPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
-#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
-msgstr ""
+msgstr "ã¦ã¼ã¶åï¼"
+
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+msgctxt "CoreConfigWizardAdminUserPage|"
+msgid "Password:"
+msgstr "ãã¹ã¯ã¼ãï¼"
 
-#. ts-context CoreConfigWizardAdminUserPage
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
-msgstr ""
+msgstr "ãã¹ã¯ã¼ããåå¥åï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardAdminUserPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectAuthDlg
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
-#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
-msgstr ""
+msgstr "ãã¹ã¯ã¼ããä¿å­"
 
-#. ts-context CoreConfigWizardAdminUserPage
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\n"
 "If you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."
 msgstr ""
 
-#. ts-context CoreConfigWizardIntroPage
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+msgctxt "CoreConfigWizardIntroPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:19
+msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr ""
 
-#. ts-context CoreConfigWizardPages::AdminUserPage
 #: ../src/qtui/coreconfigwizard.cpp:150
+msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
-msgstr ""
+msgstr "ç®¡çã¦ã¼ã¶ãä½æ"
 
-#. ts-context CoreConfigWizardPages::AdminUserPage
 #: ../src/qtui/coreconfigwizard.cpp:151
-msgid "First, we will create a user on the core. This first user will have administrator privileges."
+msgctxt "CoreConfigWizardPages::AdminUserPage|"
+msgid ""
+"First, we will create a user on the core. This first user will have "
+"administrator privileges."
 msgstr ""
 
-#. ts-context CoreConfigWizardPages::IntroPage
 #: ../src/qtui/coreconfigwizard.cpp:135
+msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr ""
 
-#. ts-context CoreConfigWizardPages::StorageSelectionPage
 #: ../src/qtui/coreconfigwizard.cpp:182
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
-msgstr ""
+msgstr "ä¿å­ããã¯ã¨ã³ããé¸æ"
 
-#. ts-context CoreConfigWizardPages::StorageSelectionPage
 #: ../src/qtui/coreconfigwizard.cpp:183
-msgid "Please select a database backend for the Quassel Core storage to store the backlog and other data in."
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
+msgid ""
+"Please select a database backend for the Quassel Core storage to store the "
+"backlog and other data in."
 msgstr ""
 
-#. ts-context CoreConfigWizardPages::StorageSelectionPage
 #: ../src/qtui/coreconfigwizard.cpp:277
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Connection Properties"
-msgstr ""
+msgstr "æ¥ç¶ã®è¨­å®"
 
-#. ts-context CoreConfigWizardPages::SyncPage
 #: ../src/qtui/coreconfigwizard.cpp:317
+msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
-msgstr ""
+msgstr "è¨­å®ãä¿å­"
 
-#. ts-context CoreConfigWizardPages::SyncPage
 #: ../src/qtui/coreconfigwizard.cpp:318
-msgid "Your settings are now stored in the core, and you will be logged in automatically."
+msgctxt "CoreConfigWizardPages::SyncPage|"
+msgid ""
+"Your settings are now stored in the core, and you will be logged in "
+"automatically."
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardStorageSelectionPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+msgctxt "CoreConfigWizardStorageSelectionPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
-msgstr ""
+msgstr "ä¿å­ããã¯ã¨ã³ãï¼"
 
-#. ts-context CoreConfigWizardStorageSelectionPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Description"
-msgstr ""
+msgstr "è©³ç´°"
 
-#. ts-context CoreConfigWizardStorageSelectionPage
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Foobar"
-msgstr ""
+msgstr "Foobar"
+
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+msgctxt "CoreConfigWizardSyncPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr ""
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
-msgstr ""
+msgstr "ç®¡çã¦ã¼ã¶ï¼"
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "foo"
-msgstr ""
+msgstr "foo"
+
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+msgctxt "CoreConfigWizardSyncPage|"
+msgid "Storage Backend:"
+msgstr "ä¿å­ããã¯ã¨ã³ãï¼"
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "bar"
-msgstr ""
+msgstr "bar"
 
-#. ts-context CoreConfigWizardSyncPage
 #: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 
-#. ts-context CoreConnectAuthDlg
 #: ../src/qtui/ui/coreconnectauthdlg.ui:14
+msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr ""
 
-#. ts-context CoreConnectAuthDlg
 #: ../src/qtui/ui/coreconnectauthdlg.ui:20
+msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
-msgstr ""
+msgstr "ã¢ã«ã¦ã³ããã¼ã¿ãå¥åï¼"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+msgctxt "CoreConnectAuthDlg|"
+msgid "Password:"
+msgstr "ãã¹ã¯ã¼ãï¼"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgctxt "CoreConnectAuthDlg|"
+msgid "Username:"
+msgstr "ã¦ã¼ã¶åï¼"
+
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgctxt "CoreConnectAuthDlg|"
+msgid "Remember password"
+msgstr "ãã¹ã¯ã¼ããä¿å­"
 
-#. ts-context CoreConnectAuthDlg
 #: ../src/qtui/coreconnectdlg.cpp:75
+#, qt-format
+msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your credentials for %1:"
 msgstr ""
 
-#. ts-context CoreConnectDlg
 #: ../src/qtui/coreconnectdlg.cpp:40
+msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
-msgstr ""
+msgstr "ã³ã¢ã«æ¥ç¶"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
+msgctxt "CoreConnection|"
 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
+msgctxt "CoreConnection|"
 msgid "Disconnected"
-msgstr ""
+msgstr "åæ­ãã¾ãã"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Looking up %1..."
-msgstr ""
+msgstr "%1 ã«æ¥ç¶ä¸­..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206 ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
+#, qt-format
+msgctxt "CoreConnection|"
 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
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Connected to %1"
-msgstr ""
+msgstr "%1 ã«æ¥ç¶ãã¾ãã"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Disconnecting from %1..."
-msgstr ""
+msgstr "%1 ããåæ­ä¸­..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
-msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
+#: ../src/client/coreconnection.cpp:272
+msgctxt "CoreConnection|"
+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
+msgctxt "CoreConnection|"
 msgid "Invalid data received from core"
 msgstr ""
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
+msgctxt "CoreConnection|"
 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
+msgctxt "CoreConnection|"
 msgid "Unencrypted connection canceled"
-msgstr ""
+msgstr "å®å¨ãªæ¥ç¶ãä½¿ã"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
+msgctxt "CoreConnection|"
 msgid "Synchronizing to core..."
-msgstr ""
+msgstr "ã³ã¢ã«æ¥ç¶(&C)..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
-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."
+#: ../src/client/coreconnection.cpp:478
+#, qt-format
+msgctxt "CoreConnection|"
+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
+msgctxt "CoreConnection|"
 msgid "Logging in..."
-msgstr ""
+msgstr "ã­ã°ã¤ã³ä¸­..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
+msgctxt "CoreConnection|"
 msgid "Login canceled"
-msgstr ""
+msgstr "ã­ã°ã¤ã³ãã­ã£ã³ã»ã«ãã¾ãã"
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
+msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr ""
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
-msgstr ""
+msgstr "%1 ã«æ¥ç¶ä¸­..."
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
+msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr ""
 
-#. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
-msgstr ""
+msgstr "%1 ã«æ¥ç¶ãã¾ãã"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:14
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Network Status Detection"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯ã®ç¶æã®æ¤åº"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
-msgid "Rely on KDE's hardware layer to detect if we're online. Recommended for most KDE users"
+msgctxt "CoreConnectionSettingsPage|"
+msgid ""
+"Rely on KDE's hardware layer to detect if we're online. Recommended for most"
+" KDE users"
 msgstr ""
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Use KDE's network status detection (via Solid)"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯ã®ç¶æã®æ¤åº"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
-msgid "Actively ping the remote core and disconnect if we didn't get a reply after a certain time"
+msgctxt "CoreConnectionSettingsPage|"
+msgid ""
+"Actively ping the remote core and disconnect if we didn't get a reply after "
+"a certain time"
 msgstr ""
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Ping timeout after"
 msgstr ""
 
-#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
+msgctxt "CoreConnectionSettingsPage|"
+msgid " seconds"
+msgstr " ç§"
+
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
-msgid "Only disconnect if the network socket gets closed by the operating system. This may take a long time after actually losing connectivity"
+msgctxt "CoreConnectionSettingsPage|"
+msgid ""
+"Only disconnect if the network socket gets closed by the operating system. "
+"This may take a long time after actually losing connectivity"
 msgstr ""
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Never time out actively"
 msgstr ""
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Automatically reconnect on network failures"
-msgstr ""
+msgstr "èµ·åæã«èªåçã«æ¥ç¶"
 
-#. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Retry every"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Remote Cores"
+msgstr "ãªã¢ã¼ãã³ã¢"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Connection"
-msgstr ""
+msgstr "æ¥ç¶"
+
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+msgctxt "CoreConnectionStatusWidget|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context CoreConnectionStatusWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
-msgstr ""
+msgstr "ã¡ãã»ã¼ã¸"
 
-#. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgctxt "seconds"
+msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
-msgstr ""
+msgstr "ç§"
 
-#. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgctxt "milliseconds"
+msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
-msgstr ""
+msgstr "ç§"
 
-#. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#, qt-format
+msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr ""
 
-#. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:75
+msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr ""
 
-#. ts-context CoreConnectionStatusWidget
 #: ../src/qtui/coreconnectionstatuswidget.cpp:78
+msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr ""
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:13
+msgctxt "CoreInfoDlg|"
 msgid "Core Information"
-msgstr ""
+msgstr "ã³ã¢ã®æå ±"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:21
+msgctxt "CoreInfoDlg|"
 msgid "Version:"
-msgstr ""
+msgstr "ãã¼ã¸ã§ã³ï¼"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:28
+msgctxt "CoreInfoDlg|"
 msgid "<core version>"
-msgstr ""
+msgstr "ï¼ã³ã¢ã®ãã¼ã¸ã§ã³ï¼"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:35
+msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr ""
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:42
+msgctxt "CoreInfoDlg|"
 msgid "Connected Clients:"
-msgstr ""
+msgstr "ï¼æ¥ç¶ãã¦ãã¯ã©ã¤ã¢ã³ãï¼"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:49
+msgctxt "CoreInfoDlg|"
 msgid "<connected clients>"
-msgstr ""
+msgstr "ï¼æ¥ç¶ãã¦ãã¯ã©ã¤ã¢ã³ãï¼"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:56
+msgctxt "CoreInfoDlg|"
 msgid "<core uptime>"
 msgstr ""
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:63
+msgctxt "CoreInfoDlg|"
 msgid "Build date:"
 msgstr ""
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:70
+msgctxt "CoreInfoDlg|"
 msgid "<build date>"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. 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
+msgctxt "CoreInfoDlg|"
 msgid "Close"
-msgstr ""
+msgstr "éãã"
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/coreinfodlg.cpp:53
+#, qt-format
+msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
 msgid_plural "%n Day(s)"
 msgstr[0] ""
 
-#. ts-context CoreInfoDlg
 #: ../src/qtui/coreinfodlg.cpp:54
+#, qt-format
+msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
-msgstr ""
+msgstr " %1:%2:%3 ï¼%4 ããï¼"
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:153
+#: ../src/core/corenetwork.cpp:148
+msgctxt "CoreNetwork|"
 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:156 ../src/core/corenetwork.cpp:157
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
 msgstr ""
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:211
+#: ../src/core/corenetwork.cpp:205
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr ""
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:211
+#: ../src/core/corenetwork.cpp:205
+msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr ""
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:307
+#: ../src/core/corenetwork.cpp:343
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
-#. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:309
+#: ../src/core/corenetwork.cpp:345
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
-msgstr ""
+msgstr "æ¥ç¶ã«å¤±æãã¾ããï¼%1"
+
+#: ../src/core/coresession.cpp:214
+msgctxt "CoreSession|"
+msgid "Client"
+msgstr "ã¯ã©ã¤ã¢ã³ã"
 
-#. ts-context CoreSession
-#: ../src/core/coresession.cpp:195
+#: ../src/core/coresession.cpp:214
+#, qt-format
+msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr ""
 
-#. ts-context CoreSession
-#: ../src/core/coresession.cpp:413
-msgid "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!"
+#: ../src/core/coresession.cpp:440
+#, qt-format
+msgctxt "CoreSession|"
+msgid ""
+"CoreSession::createNetwork(): Got invalid networkId from Core when trying to"
+" create network %1!"
 msgstr ""
 
-#. ts-context CoreSession
-#: ../src/core/coresession.cpp:444
-msgid "CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"
+#: ../src/core/coresession.cpp:472
+msgctxt "CoreSession|"
+msgid ""
+"CoreSession::createNetwork(): Trying to create a network that already "
+"exists, updating instead!"
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
-msgid "away"
+#: ../src/core/coresessioneventprocessor.cpp:65
+msgctxt "CoreSessionEventProcessor|"
+msgid ""
+"No free and valid nicks in nicklist found. use: /nick <othernick> to "
+"continue"
 msgstr ""
 
-#. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:81
+msgctxt "CoreUserInputHandler|"
+msgid "away"
+msgstr "éå¸­ä¸­"
+
+#: ../src/core/coreuserinputhandler.cpp:150
+#, qt-format
+msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
-#. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:17
-msgid "Create New Identity"
+#: ../src/core/coreuserinputhandler.cpp:177
+msgctxt "CoreUserInputHandler|"
+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 CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:25
-msgid "Identity name:"
+#: ../src/core/coreuserinputhandler.cpp:184
+#: ../src/core/coreuserinputhandler.cpp:517
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "No key has been set for %1."
 msgstr ""
 
-#. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:37
-msgid "Create blank identity"
+#: ../src/core/coreuserinputhandler.cpp:197
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been deleted."
 msgstr ""
 
-#. ts-context CreateIdentityDlg
-#: ../src/qtui/settingspages/createidentitydlg.ui:49
-msgid "Duplicate:"
+#: ../src/core/coreuserinputhandler.cpp:201
+#: ../src/core/coreuserinputhandler.cpp:525
+msgctxt "CoreUserInputHandler|"
+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 CtcpHandler
-#: ../src/core/ctcphandler.cpp:194
-msgid "Received CTCP PING request from %1"
+#: ../src/core/coreuserinputhandler.cpp:422
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
 msgstr ""
 
-#. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:199
-msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
+#: ../src/core/coreuserinputhandler.cpp:469
+msgctxt "CoreUserInputHandler|"
+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 CtcpHandler
-#: ../src/core/ctcphandler.cpp:212
-msgid "Received CTCP VERSION request by %1"
+#: ../src/core/coreuserinputhandler.cpp:484
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been set."
 msgstr ""
 
-#. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
-msgid "Received CTCP VERSION answer from %1: %2"
+#: ../src/core/coreuserinputhandler.cpp:487
+msgctxt "CoreUserInputHandler|"
+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 CtcpHandler
-#: ../src/core/ctcphandler.cpp:226
-msgid "Received CTCP TIME request by %1"
+#: ../src/core/coreuserinputhandler.cpp:509
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
+" or just /showkey when in a channel or query."
 msgstr ""
 
-#. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
-msgid "Received CTCP TIME answer from %1: %2"
+#: ../src/core/coreuserinputhandler.cpp:521
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 is %2"
 msgstr ""
 
-#. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:238
-msgid "Received unknown CTCP %1 by %2"
+#: ../src/core/coreuserinputhandler.cpp:633
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "[Error] Could not encrypt your message: %1"
 msgstr ""
 
-#. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:240
-msgid " with arguments: %1"
-msgstr ""
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
+msgctxt "CreateIdentityDlg|"
+msgid "Create New Identity"
+msgstr "æ°è¦ã®åäººæå ±ãä½æ"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
+msgctxt "CreateIdentityDlg|"
+msgid "Identity name:"
+msgstr "åäººæå ±åï¼"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
+msgctxt "CreateIdentityDlg|"
+msgid "Create blank identity"
+msgstr "æ°è¦ã®åäººæå ±ãä½æ"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
+msgctxt "CreateIdentityDlg|"
+msgid "Duplicate:"
+msgstr "åäººæå ±ãè¤è£½ï¼"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
 msgstr ""
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay View"
-msgstr ""
+msgstr "ãªã¼ãã¼ã¬ã¤ã®è¡¨ç¤º"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
-msgstr ""
+msgstr "ãªã¼ãã¼ã¬ã¤ã®ãã­ããã£"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:50
+msgctxt "DebugBufferViewOverlay|"
 msgid "BufferViews:"
-msgstr ""
+msgstr "ãããã¡ã¼ãã¥ï¼"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:51
+msgctxt "DebugBufferViewOverlay|"
 msgid "All Networks:"
-msgstr ""
+msgstr "ãã¹ã¦ã®ãããã¯ã¼ã¯ï¼"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:52
+msgctxt "DebugBufferViewOverlay|"
 msgid "Networks:"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯ï¼"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:53
+msgctxt "DebugBufferViewOverlay|"
 msgid "Buffers:"
-msgstr ""
+msgstr "ãããã¡:"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:54
+msgctxt "DebugBufferViewOverlay|"
 msgid "Removed buffers:"
-msgstr ""
+msgstr "åé¤ãããããã¡ï¼"
 
-#. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:55
+msgctxt "DebugBufferViewOverlay|"
 msgid "Temp. removed buffers:"
-msgstr ""
+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
+msgctxt "DebugBufferViewOverlay|"
 msgid "Allowed buffer types:"
-msgstr ""
+msgstr "è¨±å¯ãã¦ããããã¡ã¿ã¤ãï¼"
 
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:60
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
+msgctxt "DebugBufferViewOverlay|"
 msgid "Minimum activity:"
-msgstr ""
+msgstr "æå°éã®æ´»å"
 
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/debugbufferviewoverlay.cpp:62
+#: ../src/qtui/debugbufferviewoverlay.cpp:60
+msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr ""
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:14
+msgctxt "DebugConsole|"
 msgid "Debug Console"
-msgstr ""
+msgstr "ããã°ã³ã³ã½ã¼ã«"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:44
+msgctxt "DebugConsole|"
 msgid "local"
-msgstr ""
+msgstr "ã­ã¼ã«ã«"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:54
+msgctxt "DebugConsole|"
 msgid "core"
-msgstr ""
+msgstr "ã³ã¢"
 
-#. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:82
+msgctxt "DebugConsole|"
 msgid "Evaluate!"
 msgstr ""
 
-#. ts-context DebugLogWidget
 #: ../src/qtui/ui/debuglogwidget.ui:13
+msgctxt "DebugLogWidget|"
 msgid "Debug Log"
+msgstr "ããã°ã­ã°"
+
+#: ../src/qtui/ui/debuglogwidget.ui:43
+msgctxt "DebugLogWidget|"
+msgid "Close"
+msgstr "éãã"
+
+#: ../src/core/eventstringifier.cpp:133 ../src/core/eventstringifier.cpp:250
+msgctxt "EventStringifier|"
+msgid "[Whois] "
+msgstr "ã¦ã¼ã¶æå ±"
+
+#: ../src/core/eventstringifier.cpp:145
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 invited you to channel %2"
 msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:45
-msgid "Invalid command string for /exec: %1"
+#: ../src/core/eventstringifier.cpp:230
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:53
-msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
+#: ../src/core/eventstringifier.cpp:237
+msgctxt "EventStringifier|"
+msgid ""
+"Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
+"behavior!"
 msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:64
-msgid "Could not find script \"%1\""
+#: ../src/core/eventstringifier.cpp:263
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 is away: \"%2\""
 msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:82
-msgid "Script \"%1\" crashed with exit code %2."
+#: ../src/core/eventstringifier.cpp:268
+msgctxt "EventStringifier|"
+msgid "You are no longer marked as being away"
 msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:98
-msgid "Script \"%1\" could not start."
+#: ../src/core/eventstringifier.cpp:274
+msgctxt "EventStringifier|"
+msgid "You have been marked as being away"
 msgstr ""
 
-#. ts-context ExecWrapper
-#: ../src/client/execwrapper.cpp:100
-msgid "Script \"%1\" caused error %2."
+#: ../src/core/eventstringifier.cpp:294
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
-#. ts-context FontSelector
-#: ../src/uisupport/fontselector.cpp:31
-msgid "Choose..."
+#: ../src/core/eventstringifier.cpp:308
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is online via %2 (%3)"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:19
-msgid "Custom Highlights"
+#: ../src/core/eventstringifier.cpp:310
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:37
-msgid "RegEx"
+#: ../src/core/eventstringifier.cpp:318
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:42
-msgid "CS"
+#: ../src/core/eventstringifier.cpp:325
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:47
-msgid "Enable"
+#: ../src/core/eventstringifier.cpp:335
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:55
-msgid "Add"
+#: ../src/core/eventstringifier.cpp:337
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context HighlightSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/highlightsettingspage.ui:62
-#: ../src/qtui/settingspages/identityeditwidget.ui:119
-msgid "Remove"
+#: ../src/core/eventstringifier.cpp:344
+msgctxt "EventStringifier|"
+msgid "[Whois] End of /WHOIS list"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.ui:85
-msgid "Highlight Nicks"
+#: ../src/core/eventstringifier.cpp:365
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
+#: ../src/core/eventstringifier.cpp:367
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 has voice on channels: %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:369
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is an operator on channels: %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:388
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Channel %1 has %2 users. Topic is: \"%3\""
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:394
+msgctxt "EventStringifier|"
+msgid "End of channel list"
+msgstr "ãã£ã³ãã«ãªã¹ããè¡¨ç¤º"
+
+#: ../src/core/eventstringifier.cpp:408
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Homepage for %1 is %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:423
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Channel %1 created on %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:431
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is authed as %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:437
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "No topic is set for %1."
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:443
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Topic for %1 is \"%2\""
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:452
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Topic set by %1 on %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:462
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:468
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:473
+msgctxt "EventStringifier|"
+msgid "End of /WHOWAS"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:478
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick %1 contains illegal characters"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:483
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick already in use: %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:488
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick/channel is temporarily unavailable: %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:509
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "sending CTCP-%1 request to %2"
+msgstr ""
+
+#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
+#: ../src/core/eventstringifier.cpp:522
+msgctxt "EventStringifier|"
+msgid "unknown"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:523
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received %1CTCP-%2 request by %3"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:526
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-%1 answer from %2: %3"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:537
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:45
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Invalid command string for /exec: %1"
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:53
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:64
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Could not find script \"%1\""
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:82
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Script \"%1\" crashed with exit code %2."
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:98
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Script \"%1\" could not start."
+msgstr ""
+
+#: ../src/client/execwrapper.cpp:100
+#, qt-format
+msgctxt "ExecWrapper|"
+msgid "Script \"%1\" caused error %2."
+msgstr ""
+
+#: ../src/uisupport/fontselector.cpp:31
+msgctxt "FontSelector|"
+msgid "Choose..."
+msgstr "é¸æ..."
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:13
+msgctxt "HighlightSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:19
+msgctxt "HighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "ã«ã¹ã¿ã ã®å¼·èª¿"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:32
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+msgctxt "HighlightSettingsPage|"
+msgid "Highlight"
+msgstr "å¼·èª¿"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:37
+msgctxt "HighlightSettingsPage|"
+msgid "RegEx"
+msgstr "RegEx"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+msgctxt "HighlightSettingsPage|"
+msgid "CS"
+msgstr "CS"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:47
+msgctxt "HighlightSettingsPage|"
+msgid "Enable"
+msgstr "æå¹"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:55
+msgctxt "HighlightSettingsPage|"
+msgid "Add"
+msgstr "è¿½å "
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+msgctxt "HighlightSettingsPage|"
+msgid "Remove"
+msgstr "åé¤"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:85
+msgctxt "HighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr "ããã¯ãå¼·èª¿"
+
 #: ../src/qtui/settingspages/highlightsettingspage.ui:91
+msgctxt "HighlightSettingsPage|"
 msgid "All nicks from identity"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:98
+msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
-msgstr ""
+msgstr "ç¾å¨ã®ããã¯"
 
-#. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+msgctxt "HighlightSettingsPage|"
 msgid "None"
-msgstr ""
+msgstr "ãªã"
 
-#. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:115
+msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
-msgstr ""
+msgstr "å¤§æå­å°æå­ãåºå¥"
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+msgctxt "HighlightSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
 
-#. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr ""
 
-#. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.h:45
+msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
-msgstr ""
+msgstr "å¼·èª¿ã®è¦å"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentitiesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identitiessettingspage.ui:31
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:322
-#: ../src/qtui/settingspages/identityeditwidget.ui:136
+msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
-msgstr ""
+msgstr "åäººæå ±åãå¤æ´"
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+msgctxt "IdentitiesSettingsPage|"
+msgid "..."
+msgstr "..."
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.ui:51
+msgctxt "IdentitiesSettingsPage|"
 msgid "Add Identity"
-msgstr ""
+msgstr "åäººæå ±ãè¿½å "
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
+msgctxt "IdentitiesSettingsPage|"
+msgid "Add..."
+msgstr "è¿½å ..."
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.ui:74
+msgctxt "IdentitiesSettingsPage|"
 msgid "Remove Identity"
-msgstr ""
+msgstr "åäººæå ±ãåé¤"
+
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgctxt "IdentitiesSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
-msgstr ""
+msgstr "åäººæå ±"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentitiesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:178
-#: ../src/qtui/settingspages/networkssettingspage.cpp:167
-msgid "<b>The following problems need to be corrected before your changes can be applied:</b><ul>"
+msgctxt "IdentitiesSettingsPage|"
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
 msgstr ""
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:179
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr ""
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:180
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr ""
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:181
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr ""
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:182
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentitiesSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:183
-#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:184
+msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr ""
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:310
+msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
-msgstr ""
+msgstr "åäººæå ±ãåé¤ãã¦ãããããã§ããï¼"
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:311
+#, qt-format
+msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
-msgstr ""
+msgstr "æ¬å½ã«\" %1 \"ã®ãã£ãããªã¹ããåé¤ãã¾ããï¼"
 
-#. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:323
+#, qt-format
+msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:134
+msgctxt "Identity|"
 msgid "Quassel IRC User"
-msgstr ""
+msgstr "Quassel IRC ã¦ã¼ã¶"
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:162
-#, fuzzy
+msgctxt "Identity|"
 msgid "<empty>"
-msgstr "<empty>"
+msgstr "ï¼ç©ºï¼"
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:168
+msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr ""
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:172
+msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr ""
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:175
+msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr ""
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:178
+msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr ""
 
-#. ts-context Identity
 #: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180
+msgctxt "Identity|"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+msgctxt "IdentityEditWidget|"
 msgid "General"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:38
+msgctxt "IdentityEditWidget|"
 msgid "Real Name:"
-msgstr ""
+msgstr "æ¬åï¼"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:45
+msgctxt "IdentityEditWidget|"
 msgid "The \"Real Name\" is shown in /whois."
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:54
+msgctxt "IdentityEditWidget|"
 msgid "Nicknames"
-msgstr ""
+msgstr "ããã¯ãã¼ã "
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/identityeditwidget.ui:90
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+msgctxt "IdentityEditWidget|"
 msgid "Add Nickname"
-msgstr ""
+msgstr "ããã¯ãã¼ã ãè¿½å "
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:93
+msgctxt "IdentityEditWidget|"
+msgid "&Add..."
+msgstr "è¿½å (&A)..."
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:116
+msgctxt "IdentityEditWidget|"
 msgid "Remove Nickname"
-msgstr ""
+msgstr "ããã¯ãã¼ã ãåé¤"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
+msgctxt "IdentityEditWidget|"
+msgid "Remove"
+msgstr "åé¤"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:136
+msgctxt "IdentityEditWidget|"
+msgid "Rename Identity"
+msgstr "åäººæå ±åãå¤æ´"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:139
+msgctxt "IdentityEditWidget|"
+msgid "Re&name..."
+msgstr "ååå¤æ´(&N)..."
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/identityeditwidget.ui:165
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
-#: ../src/qtui/ui/simplenetworkeditor.ui:165
+msgctxt "IdentityEditWidget|"
 msgid "Move upwards in list"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/identityeditwidget.ui:168
+#: ../src/qtui/settingspages/identityeditwidget.ui:182
+msgctxt "IdentityEditWidget|"
+msgid "..."
+msgstr "..."
+
 #: ../src/qtui/settingspages/identityeditwidget.ui:179
-#: ../src/qtui/settingspages/networkssettingspage.ui:292
-#: ../src/qtui/ui/simplenetworkeditor.ui:179
+msgctxt "IdentityEditWidget|"
 msgid "Move downwards in list"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:227
+msgctxt "IdentityEditWidget|"
 msgid "A&way"
-msgstr ""
+msgstr "éå¸­ä¸­(&A)"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:233
+msgctxt "IdentityEditWidget|"
 msgid "Default Away Settings"
-msgstr ""
+msgstr "è¨­å®ãåèª­ã¿è¾¼ã"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:244
+msgctxt "IdentityEditWidget|"
 msgid "Nick to be used when being away"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:254
+msgctxt "IdentityEditWidget|"
 msgid "Default away reason"
-msgstr ""
+msgstr "ããã©ã«ãã®ã¿ã¼ã²ãã"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:261
+msgctxt "IdentityEditWidget|"
 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
+msgctxt "IdentityEditWidget|"
 msgid "Away Reason:"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:280
+msgctxt "IdentityEditWidget|"
 msgid "Set away when all clients have detached from the core"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:283
+msgctxt "IdentityEditWidget|"
 msgid "Away On Detach"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:315
+msgctxt "IdentityEditWidget|"
 msgid "Not implemented yet"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:318
+msgctxt "IdentityEditWidget|"
 msgid "Away On Idle"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:332
+msgctxt "IdentityEditWidget|"
 msgid "Set away after"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:342
+msgctxt "IdentityEditWidget|"
 msgid "minutes of being idle"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
 #: ../src/qtui/settingspages/identityeditwidget.cpp:219
-#: ../src/qtui/settingspages/servereditdlg.ui:119
+msgctxt "IdentityEditWidget|"
 msgid "Advanced"
-msgstr ""
+msgstr "è©³ç´°"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:407
+msgctxt "IdentityEditWidget|"
 msgid "Ident:"
-msgstr ""
+msgstr "åäººæå ±ï¼"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:414
-msgid "The \"ident\" is part of your hostmask and, together with your host, uniquely identifies you within the IRC network."
+msgctxt "IdentityEditWidget|"
+msgid ""
+"The \"ident\" is part of your hostmask and, together with your host, "
+"uniquely identifies you within the IRC network."
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:423
+msgctxt "IdentityEditWidget|"
 msgid "Messages"
-msgstr ""
+msgstr "ã¡ãã»ã¼ã¸"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:431
+msgctxt "IdentityEditWidget|"
 msgid "Part Reason:"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:444
+msgctxt "IdentityEditWidget|"
 msgid "Quit Reason:"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:454
+msgctxt "IdentityEditWidget|"
 msgid "Kick Reason:"
-msgstr ""
+msgstr "è¿½æ¾ (Kick / Ban)"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:488
-msgid "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:517
+msgctxt "IdentityEditWidget|"
 msgid ""
 "Warning: you are not connected with a secured connection to the Quassel Core!\n"
 "Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IdentityEditWidget
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:864
+msgctxt "IdentityEditWidget|"
 msgid "Continue"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:584
+msgctxt "IdentityEditWidget|"
 msgid "Use SSL Key"
-msgstr ""
+msgstr "SSL ã­ã¼ãä½¿ã"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:598
+msgctxt "IdentityEditWidget|"
 msgid "Key Type:"
-msgstr ""
+msgstr "Proxy ã¿ã¤ã"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
 #: ../src/qtui/settingspages/identityeditwidget.cpp:317
 #: ../src/qtui/settingspages/identityeditwidget.cpp:328
+msgctxt "IdentityEditWidget|"
 msgid "No Key loaded"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:625
 #: ../src/qtui/settingspages/identityeditwidget.ui:723
 #: ../src/qtui/settingspages/identityeditwidget.cpp:318
 #: ../src/qtui/settingspages/identityeditwidget.cpp:365
+msgctxt "IdentityEditWidget|"
 msgid "Load"
-msgstr ""
+msgstr "ã­ã¼ã"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:637
+msgctxt "IdentityEditWidget|"
 msgid "Use SSL Certificate"
-msgstr ""
+msgstr "SSL ã­ã¼ãä½¿ã"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:656
+msgctxt "IdentityEditWidget|"
 msgid "Organisation:"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697
 #: ../src/qtui/settingspages/identityeditwidget.cpp:363
 #: ../src/qtui/settingspages/identityeditwidget.cpp:364
+msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:690
+msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
-msgstr ""
+msgstr "ãã¹ãåï¼"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:290
+msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr ""
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:322
+msgctxt "IdentityEditWidget|"
 msgid "RSA"
-msgstr ""
+msgstr "RSA"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:325
+msgctxt "IdentityEditWidget|"
 msgid "DSA"
-msgstr ""
+msgstr "DSA"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:330
 #: ../src/qtui/settingspages/identityeditwidget.cpp:369
+msgctxt "IdentityEditWidget|"
 msgid "Clear"
-msgstr ""
+msgstr "ã¯ãªã¢"
 
-#. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.cpp:340
+msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr ""
 
-#. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:107
+msgctxt "IdentityPage|"
 msgid "Setup Identity"
-msgstr ""
+msgstr "åäººæå ±ãè¨­å®"
 
-#. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:112
+msgctxt "IdentityPage|"
 msgid "Default Identity"
-msgstr ""
+msgstr "ããã©ã«ãã®åäººæå ±"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
+msgctxt "IgnoreListEditDlg|"
 msgid "Configure Ignore Rule"
-msgstr ""
+msgstr "Quassel ãè¨­å®"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Strictness:</b></p>\n"
 "<p><u>Dynamic:</u></p>\n"
@@ -2842,23 +3105,23 @@ msgid ""
 "<p>Messages are filtered before they get stored in the database.</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
+msgctxt "IgnoreListEditDlg|"
 msgid "Strictness"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
+msgctxt "IgnoreListEditDlg|"
 msgid "Dynamic"
-msgstr ""
+msgstr "ãã¤ãããã¯"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
+msgctxt "IgnoreListEditDlg|"
 msgid "Permanent"
-msgstr ""
+msgstr "æ°¸ä¹"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Rule Type:</b></p>\n"
 "<p><u>Sender:</u></p>\n"
@@ -2868,18 +3131,28 @@ msgid ""
 "<p>The rule is matched against the actual message content</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
+msgctxt "IgnoreListEditDlg|"
 msgid "Rule Type"
-msgstr ""
+msgstr "ã¿ã¤ã"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
+msgctxt "IgnoreListEditDlg|"
 msgid "Sender"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgctxt "IgnoreListEditDlg|"
+msgid "Message"
+msgstr "ã¡ãã»ã¼ã¸"
+
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
+msgctxt "IgnoreListEditDlg|"
+msgid "CTCP"
+msgstr "CTCP"
+
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Ignore rule:</b></p>\n"
 "<p>Depending on the type of the rule, the text is matched against either:</p>\n"
@@ -2895,17 +3168,13 @@ msgid ""
 "- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+msgctxt "IgnoreListEditDlg|"
 msgid "Ignore Rule"
-msgstr ""
+msgstr "ç¡è¦ãã"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:123
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Use regular expressions:</b></p>\n"
 "<p>If enabled, rules follow regular expression syntax.</p>\n"
@@ -2915,13 +3184,13 @@ msgid ""
 "?: representing \"exactly one character\"</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
+msgctxt "IgnoreListEditDlg|"
 msgid "Regular expression"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
@@ -2932,36 +3201,28 @@ msgid ""
 "<p>The list below is interpreted as a list of channels for which the rule should match</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
+msgctxt "IgnoreListEditDlg|"
 msgid "Scope"
-msgstr ""
+msgstr "ã¹ã³ã¼ã"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
+msgctxt "IgnoreListEditDlg|"
 msgid "Global"
-msgstr ""
+msgstr "ã°ã­ã¼ãã«"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+msgctxt "IgnoreListEditDlg|"
 msgid "Network"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IgnoreListEditDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcListModel
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
-#: ../src/client/irclistmodel.cpp:59
+msgctxt "IgnoreListEditDlg|"
 msgid "Channel"
-msgstr ""
+msgstr "ãã£ã³ãã«"
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Scope rule:</b></p>\n"
 "<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
@@ -2972,8 +3233,8 @@ msgid ""
 "would match on #foobar and on any channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -2981,2022 +3242,2656 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 
-#. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr ""
 
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:69
-msgid "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For dynamic rules, disabling actually shows the filtered messages again"
+msgctxt "IgnoreListModel|"
+msgid ""
+"<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
+"dynamic rules, disabling actually shows the filtered messages again"
 msgstr ""
 
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:73
-msgid "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is matched against either:<br /><br />- <u>the message content:</u><br /><i>Example:<i><br />    \"*foobar*\" matches any text containing the word \"foobar\"<br /><br />- <u>the sender string <i>nick!ident@host.name<i></u><br /><i>Example:</i><br />    \"*@foobar.com\" matches any sender from host foobar.com<br />    \"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any host<br />"
+msgctxt "IgnoreListModel|"
+msgid ""
+"<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
+"matched against either:<br /><br />- <u>the message content:</u><br "
+"/><i>Example:<i><br />    \"*foobar*\" matches any text containing the word "
+"\"foobar\"<br /><br />- <u>the sender string "
+"<i>nick!ident@host.name<i></u><br /><i>Example:</i><br />    "
+"\"*@foobar.com\" matches any sender from host foobar.com<br />    "
+"\"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any "
+"host<br />"
 msgstr ""
 
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:89
+msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr ""
 
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+msgctxt "IgnoreListModel|"
 msgid "By Message"
-msgstr ""
+msgstr "ã¡ãã»ã¼ã¸"
 
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:193
+msgctxt "IgnoreListModel|"
 msgid "Enabled"
-msgstr ""
+msgstr "æå¹"
 
-#. ts-context IgnoreListModel
 #: ../src/qtui/settingspages/ignorelistmodel.cpp:194
+msgctxt "IgnoreListModel|"
 msgid "Type"
-msgstr ""
+msgstr "ã¿ã¤ã"
+
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+msgctxt "IgnoreListModel|"
+msgid "Ignore Rule"
+msgstr "ç¡è¦ãã"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14
+msgctxt "IgnoreListSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
+msgctxt "IgnoreListSettingsPage|"
+msgid "New"
+msgstr "æ°è¦"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42
+msgctxt "IgnoreListSettingsPage|"
+msgid "Delete"
+msgstr "åé¤"
 
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
-msgstr ""
+msgstr "ç·¨é(&E)"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+msgctxt "IgnoreListSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
 
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
-msgstr ""
+msgstr "ç¡è¦ãªã¹ããè¡¨ç¤º"
 
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr ""
 
-#. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#, qt-format
+msgctxt "IgnoreListSettingsPage|"
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
 "Please choose another rule."
 msgstr ""
 
-#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
+msgctxt "IndicatorNotificationConfigWidget|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
-msgid "This enables support for the Ayatana Project's application indicator (libindicate)."
+msgctxt "IndicatorNotificationConfigWidget|"
+msgid ""
+"This enables support for the Ayatana Project's application indicator "
+"(libindicate)."
 msgstr ""
 
-#. ts-context IndicatorNotificationConfigWidget
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
+msgctxt "IndicatorNotificationConfigWidget|"
 msgid "Show messages in application indicator"
-msgstr ""
+msgstr "ã¡ãã»ã¼ã¸ããããã¢ããã§è¡¨ç¤º"
+
+#: ../src/qtui/ui/inputwidget.ui:26
+msgctxt "InputWidget|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "White"
-msgstr ""
+msgstr "ç½è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Black"
-msgstr ""
+msgstr "é»è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark blue"
-msgstr ""
+msgstr "æ¿éè²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark green"
-msgstr ""
+msgstr "æ¿ç·è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Red"
-msgstr ""
+msgstr "èµ¤è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark red"
-msgstr ""
+msgstr "æç´è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark magenta"
-msgstr ""
+msgstr "æç´«è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Orange"
-msgstr ""
+msgstr "ãªã¬ã³ã¸è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Yellow"
-msgstr ""
+msgstr "é»è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Green"
-msgstr ""
+msgstr "ç·è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark cyan"
-msgstr ""
+msgstr "æç´«è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr ""
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Blue"
-msgstr ""
+msgstr "éè²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Magenta"
-msgstr ""
+msgstr "ç´«è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark gray"
-msgstr ""
+msgstr "æ¿ç·è²"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr ""
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:86 ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+msgctxt "InputWidget|"
 msgid "Clear Color"
-msgstr ""
+msgstr "ã¯ãªã¢"
 
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
+msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context InputWidgetSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ItemViewSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
+msgctxt "InputWidgetSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:22
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
-#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
+msgctxt "InputWidgetSettingsPage|"
 msgid "Custom font:"
-msgstr ""
+msgstr "ã«ã¹ã¿ã ãã©ã³ãï¼"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable spell check"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
-msgstr ""
+msgstr "ããã¯ã»ã¬ã¯ã¿ãè¡¨ç¤º"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
-msgstr ""
+msgstr "ã·ã¹ãã ãã¬ã¤ã¢ã¤ã³ã³ãè¡¨ç¤º"
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
-msgid "Multi-Line Editing"
+msgctxt "InputWidgetSettingsPage|"
+msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
-msgid "Show at most"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgctxt "InputWidgetSettingsPage|"
+msgid "Emacs key bindings"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+msgctxt "InputWidgetSettingsPage|"
+msgid "Multi-Line Editing"
+msgstr "è¤æ°è¡ã®ç·¨é"
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+msgctxt "InputWidgetSettingsPage|"
+msgid "Show at most"
+msgstr "ãã£ããã¢ãã¿ãè¡¨ç¤º"
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
-msgstr ""
+msgstr "è¡"
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
-msgstr ""
+msgstr "ã¹ã¯ã­ã¼ã«ãã¼ãæå¹"
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
-msgstr ""
+msgstr "ã»ã¬ã¯ã·ã§ã³ãã³ãã¼"
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+msgctxt "InputWidgetSettingsPage|"
 msgid ": "
+msgstr ": "
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+msgctxt "InputWidgetSettingsPage|"
+msgid "Add space after nick when completing mid-sentence"
 msgstr ""
 
-#. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+msgctxt "InputWidgetSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
-msgstr ""
+msgstr "ãããã¯ã¦ã£ã¸ã§ãã"
 
-#. ts-context IrcConnectionWizard
 #: ../src/qtui/ircconnectionwizard.cpp:51
+msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
-msgstr ""
+msgstr "æ¥ç¶"
+
+#: ../src/client/irclistmodel.cpp:59
+msgctxt "IrcListModel|"
+msgid "Channel"
+msgstr "ãã£ã³ãã«"
 
-#. ts-context IrcListModel
 #: ../src/client/irclistmodel.cpp:60
+msgctxt "IrcListModel|"
 msgid "Users"
-msgstr ""
+msgstr "ã¦ã¼ã¶"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcListModel
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. 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
+msgctxt "IrcListModel|"
 msgid "Topic"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:553
-msgid "%1 has changed topic for %2 to: \"%3\""
-msgstr ""
+msgstr "ãããã¯"
 
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:603
-msgid "Received RPL_ISUPPORT (005) without parameters!"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:611
-msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
-msgstr ""
-
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcServerHandler
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. Plain Message
-#. ----------
-#. Notice Message
-#. ----------
-#. Server Message
-#. ----------
-#. Info Message
-#. ----------
-#. Error Message
-#. ----------
-#. Topic 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
-msgid "%1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:684
-msgid "[Whois] %1 is away: \"%2\""
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:690 ../src/core/ircserverhandler.cpp:695
-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
-msgid "[Whois] %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:768 ../src/core/ircserverhandler.cpp:770
-msgid "[Whois] %1 is %2 (%3)"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:785
-msgid "%1 is online via %2 (%3)"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:789 ../src/core/ircserverhandler.cpp:1067
-msgid "[Whowas] %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:815
-msgid "[Whowas] %1 was %2 (%3)"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:829
-msgid "[Who] End of /WHO list for %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:849
-msgid "[Whois] %1 is logged in since %2"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:851
-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
-msgid "[Whois] %1 is a user on channels: %2"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:888
-msgid "[Whois] %1 has voice on channels: %2"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:890
-msgid "[Whois] %1 is an operator on channels: %2"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:918
-msgid "Channel %1 has %2 users. Topic is: %3"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:927
-msgid "End of channel list"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:945
-msgid "Homepage for %1 is %2"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:963
-msgid "Channel %1 created on %2"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:977
-msgid "No topic is set for %1."
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:992
-msgid "Topic for %1 is \"%2\""
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1003
-msgid "Topic set by %1 on %2"
-msgstr ""
+#: ../src/client/networkmodel.cpp:806
+msgctxt "IrcUserItem|"
+msgid " is away"
+msgstr "éå¸­ä¸­"
 
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1026
-msgid "[Who] %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1085
-msgid "Nick %1 contains illegal characters"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1096
-msgid "Nick already in use: %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1113
-msgid "Nick/channel is temporarily unavailable: %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1206
-msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
-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
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "idling since %1"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcUserItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819 ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "login time: %1"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context IrcUserItem
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822 ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "server: %1"
-msgstr ""
+msgstr "ãµã¼ãï¼%1"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:14
+msgctxt "ItemViewSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
+msgctxt "ItemViewSettingsPage|"
+msgid "Custom font:"
+msgstr "ã«ã¹ã¿ã ãã©ã³ãï¼"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:50
+msgctxt "ItemViewSettingsPage|"
 msgid "Show icons"
-msgstr ""
+msgstr "ã¢ã¤ã³ã³ãè¡¨ç¤º"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:66
+msgctxt "ItemViewSettingsPage|"
 msgid "Chat List"
-msgstr ""
+msgstr "ãã£ãããªã¹ã"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:72
+msgctxt "ItemViewSettingsPage|"
 msgid "Display topic in tooltip"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:85
+msgctxt "ItemViewSettingsPage|"
 msgid "Mouse wheel changes selected chat"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:101
+msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
-msgstr ""
+msgstr "ã«ã¹ã¿ã è²ãä½¿ã"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:125
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:149
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:173
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:197
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:221
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:308
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:345
+msgctxt "ItemViewSettingsPage|"
+msgid "..."
+msgstr "..."
+
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+msgctxt "ItemViewSettingsPage|"
 msgid "Inactive:"
-msgstr ""
+msgstr "éã¢ã¯ãã£ãï¼"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
-msgstr ""
+msgstr "æªèª­ã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
-msgstr ""
+msgstr "å¼·èª¿ï¼"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
-msgstr ""
+msgstr "ä»ã®æ´»å"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:272
+msgctxt "ItemViewSettingsPage|"
 msgid "1"
-msgstr ""
+msgstr "1"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
-msgstr ""
+msgstr "ã«ã¹ã¿ã è²"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
-msgstr ""
+msgstr "ãªã³ã©ã¤ã³ï¼"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
-msgstr ""
+msgstr "éå¸­ä¸­ï¼"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+msgctxt "ItemViewSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
-msgstr ""
+msgstr "ãã£ããï¼ããã¯ãã¼ã ãªã¹ã"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+msgctxt "ItemViewSettingsPage|"
+msgid "Network"
+msgstr "ãããã¯ã¼ã¯"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+msgctxt "ItemViewSettingsPage|"
 msgid "Inactive"
-msgstr ""
+msgstr "éã¢ã¯ãã£ã"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+msgctxt "ItemViewSettingsPage|"
 msgid "Normal"
 msgstr ""
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages"
-msgstr ""
+msgstr "æªèª­ã®ã¡ãã»ã¼ã¸"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+msgctxt "ItemViewSettingsPage|"
+msgid "Highlight"
+msgstr "å¼·èª¿"
 
-#. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
-msgstr ""
+msgstr "ä»ã®æ´»å"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context KNotificationBackend
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SystrayNotificationBackend
 #: ../src/qtui/knotificationbackend.cpp:115
-#: ../src/qtui/systraynotificationbackend.cpp:124
-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
+#, qt-format
+msgctxt "KNotificationBackend|"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:308
-msgid "&Connect to Core..."
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgctxt "KeySequenceButton|"
+msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:310
-msgid "&Disconnect from Core"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgctxt "KeySequenceButton|"
+msgid "Unsupported Key"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:312
-msgid "Core &Info..."
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgctxt "KeySequenceWidget|"
+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 MainWin
-#: ../src/qtui/mainwin.cpp:314
-msgid "Configure &Networks..."
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "KeySequenceWidget|Meta key"
+msgid "Meta"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
-msgid "&Quit"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "KeySequenceWidget|Ctrl key"
+msgid "Ctrl"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:321
-msgid "&Configure Chat Lists..."
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+msgctxt "KeySequenceWidget|Alt key"
+msgid "Alt"
+msgstr "ãã¹ã¦"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "KeySequenceWidget|Shift key"
+msgid "Shift"
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt ""
+"KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+msgctxt "KeySequenceWidget|No shortcut defined"
+msgid "None"
+msgstr "ãªã"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgctxt "KeySequenceWidget|"
+msgid "Shortcut Conflict"
+msgstr "ã·ã§ã¼ãã«ãã"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#, qt-format
+msgctxt "KeySequenceWidget|"
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+#, qt-format
+msgctxt "KeySequenceWidget|"
+msgid ""
+"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgctxt "KeySequenceWidget|"
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgctxt "KeySequenceWidget|"
+msgid "Reassign"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:313
+msgctxt "MainWin|"
+msgid "General"
 msgstr ""
 
-#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:315
+msgctxt "MainWin|"
+msgid "&Connect to Core..."
+msgstr "ã³ã¢ã«æ¥ç¶(&C)..."
+
+#: ../src/qtui/mainwin.cpp:317
+msgctxt "MainWin|"
+msgid "&Disconnect from Core"
+msgstr "ã³ã¢ã«åæ­(&D)..."
+
+#: ../src/qtui/mainwin.cpp:319
+msgctxt "MainWin|"
+msgid "Core &Info..."
+msgstr "ã³ã¢æå ±(&I)..."
+
+#: ../src/qtui/mainwin.cpp:321
+msgctxt "MainWin|"
+msgid "Configure &Networks..."
+msgstr "ãããã¯ã¼ã¯ãè¨­å®(&N)..."
+
 #: ../src/qtui/mainwin.cpp:324
+msgctxt "MainWin|"
+msgid "&Quit"
+msgstr "éãã(&Q)"
+
+#: ../src/qtui/mainwin.cpp:328
+msgctxt "MainWin|"
+msgid "&Configure Chat Lists..."
+msgstr "ãã£ãããªã¹ããè¨­å®(&C)..."
+
+#: ../src/qtui/mainwin.cpp:331
+msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:335
+msgctxt "MainWin|"
 msgid "Show &Search Bar"
-msgstr ""
+msgstr "æ¤ç´¢ãã¼ãè¡¨ç¤º(&S)"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:330
+#: ../src/qtui/mainwin.cpp:337
+msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:332
+#: ../src/qtui/mainwin.cpp:339
+msgctxt "MainWin|"
 msgid "Show &Menubar"
-msgstr ""
+msgstr "ã¡ãã¥ã¼ãã¼ãè¡¨ç¤º(&M)"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:342
+msgctxt "MainWin|"
 msgid "Show Status &Bar"
+msgstr "ã¹ãã¼ã¿ã¹ãã¼ãè¡¨ç¤º(&B)"
+
+#: ../src/qtui/mainwin.cpp:348
+msgctxt "MainWin|"
+msgid "&Full Screen Mode"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:355
+msgctxt "MainWin|"
+msgid "Configure &Shortcuts..."
+msgstr "ãããã¯ã¼ã¯ãè¨­å®(&N)..."
+
+#: ../src/qtui/mainwin.cpp:361 ../src/qtui/mainwin.cpp:365
+msgctxt "MainWin|"
 msgid "&Configure Quassel..."
-msgstr ""
+msgstr "Quassel ãè¨­å®(&C)..."
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:371
+msgctxt "MainWin|"
 msgid "&About Quassel"
-msgstr ""
+msgstr "Quassel ã«ã¤ãã¦(&A)"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:345
+#: ../src/qtui/mainwin.cpp:376
+msgctxt "MainWin|"
 msgid "About &Qt"
-msgstr ""
+msgstr "Qt ã«ã¤ãã¦(&Q)"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:347
+#: ../src/qtui/mainwin.cpp:380
+msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:349
+#: ../src/qtui/mainwin.cpp:382
+msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:351
+#: ../src/qtui/mainwin.cpp:384
+msgctxt "MainWin|"
 msgid "Debug &MessageModel"
-msgstr ""
+msgstr "æ°ããã¡ãã»ã¼ã¸"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:353
+#: ../src/qtui/mainwin.cpp:386
+msgctxt "MainWin|"
 msgid "Debug &HotList"
-msgstr ""
+msgstr "ããã°ã­ã°(&L)"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:388
+msgctxt "MainWin|"
 msgid "Debug &Log"
-msgstr ""
+msgstr "ããã°ã­ã°(&L)"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:357
+#: ../src/qtui/mainwin.cpp:390
+msgctxt "MainWin|"
 msgid "Reload Stylesheet"
-msgstr ""
+msgstr "ã¹ã¿ã¤ã«ã·ã¼ããåèª­ã¿è¾¼ã"
+
+#: ../src/qtui/mainwin.cpp:394
+msgctxt "MainWin|"
+msgid "Navigation"
+msgstr "éç¥"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:361
+#: ../src/qtui/mainwin.cpp:396
+msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:368
-msgid "&File"
+#: ../src/qtui/mainwin.cpp:408
+msgctxt "MainWin|"
+msgid "Set Quick Access #0"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:381
-msgid "&Networks"
+#: ../src/qtui/mainwin.cpp:410
+msgctxt "MainWin|"
+msgid "Set Quick Access #1"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:387
-msgid "&View"
+#: ../src/qtui/mainwin.cpp:412
+msgctxt "MainWin|"
+msgid "Set Quick Access #2"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:388
-msgid "&Chat Lists"
+#: ../src/qtui/mainwin.cpp:414
+msgctxt "MainWin|"
+msgid "Set Quick Access #3"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
-msgid "&Toolbars"
+#: ../src/qtui/mainwin.cpp:416
+msgctxt "MainWin|"
+msgid "Set Quick Access #4"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:404
-msgid "&Settings"
+#: ../src/qtui/mainwin.cpp:418
+msgctxt "MainWin|"
+msgid "Set Quick Access #5"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:411
-msgid "&Help"
+#: ../src/qtui/mainwin.cpp:420
+msgctxt "MainWin|"
+msgid "Set Quick Access #6"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:419
-msgid "Debug"
+#: ../src/qtui/mainwin.cpp:422
+msgctxt "MainWin|"
+msgid "Set Quick Access #7"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
-msgid "Nicks"
+#: ../src/qtui/mainwin.cpp:424
+msgctxt "MainWin|"
+msgid "Set Quick Access #8"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:573
-msgid "Show Nick List"
+#: ../src/qtui/mainwin.cpp:426
+msgctxt "MainWin|"
+msgid "Set Quick Access #9"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:596
-msgid "Show Chat Monitor"
+#: ../src/qtui/mainwin.cpp:429
+msgctxt "MainWin|"
+msgid "Quick Access #0"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
-msgid "Inputline"
+#: ../src/qtui/mainwin.cpp:431
+msgctxt "MainWin|"
+msgid "Quick Access #1"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:609
-msgid "Show Input Line"
+#: ../src/qtui/mainwin.cpp:433
+msgctxt "MainWin|"
+msgid "Quick Access #2"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:634
-msgid "Show Topic Line"
+#: ../src/qtui/mainwin.cpp:435
+msgctxt "MainWin|"
+msgid "Quick Access #3"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:707
-msgid "Main Toolbar"
+#: ../src/qtui/mainwin.cpp:437
+msgctxt "MainWin|"
+msgid "Quick Access #4"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:439
+msgctxt "MainWin|"
+msgid "Quick Access #5"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:441
+msgctxt "MainWin|"
+msgid "Quick Access #6"
 msgstr ""
 
-#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:443
+msgctxt "MainWin|"
+msgid "Quick Access #7"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:445
+msgctxt "MainWin|"
+msgid "Quick Access #8"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:447
+msgctxt "MainWin|"
+msgid "Quick Access #9"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:451
+msgctxt "MainWin|"
+msgid "Activate Next Chat List"
+msgstr "ãã£ãããªã¹ããåé¤ãã¦ãããããã§ããï¼"
+
+#: ../src/qtui/mainwin.cpp:453
+msgctxt "MainWin|"
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:455
+msgctxt "MainWin|"
+msgid "Go to Next Chat"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:457
+msgctxt "MainWin|"
+msgid "Go to Previous Chat"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:464
+msgctxt "MainWin|"
+msgid "&File"
+msgstr "ãã¡ã¤ã«(&F)"
+
+#: ../src/qtui/mainwin.cpp:477
+msgctxt "MainWin|"
+msgid "&Networks"
+msgstr "ãããã¯ã¼ã¯(&N)"
+
+#: ../src/qtui/mainwin.cpp:483
+msgctxt "MainWin|"
+msgid "&View"
+msgstr "è¡¨ç¤º(&V)"
+
+#: ../src/qtui/mainwin.cpp:484
+msgctxt "MainWin|"
+msgid "&Chat Lists"
+msgstr "ãã£ãããªã¹ã(&C)"
+
+#: ../src/qtui/mainwin.cpp:486
+msgctxt "MainWin|"
+msgid "&Toolbars"
+msgstr "ãã¼ã«ãã¼ï¼&Tï¼"
+
+#: ../src/qtui/mainwin.cpp:500
+msgctxt "MainWin|"
+msgid "&Settings"
+msgstr "è¨­å®(&S)"
+
+#: ../src/qtui/mainwin.cpp:509
+msgctxt "MainWin|"
+msgid "&Help"
+msgstr "ãã«ã(&H)"
+
+#: ../src/qtui/mainwin.cpp:517
+msgctxt "MainWin|"
+msgid "Debug"
+msgstr "ããã°"
+
 #: ../src/qtui/mainwin.cpp:746
+msgctxt "MainWin|"
+msgid "Nicks"
+msgstr "ããã¯"
+
+#: ../src/qtui/mainwin.cpp:755
+msgctxt "MainWin|"
+msgid "Show Nick List"
+msgstr "ããã¯ãªã¹ããè¡¨ç¤º"
+
+#: ../src/qtui/mainwin.cpp:766
+msgctxt "MainWin|"
+msgid "Chat Monitor"
+msgstr "ãã£ããã¢ãã¿ã¼"
+
+#: ../src/qtui/mainwin.cpp:778
+msgctxt "MainWin|"
+msgid "Show Chat Monitor"
+msgstr "ãã£ããã¢ãã¿ãè¡¨ç¤º"
+
+#: ../src/qtui/mainwin.cpp:782
+msgctxt "MainWin|"
+msgid "Inputline"
+msgstr "ãªã³ã©ã¤ã³ï¼"
+
+#: ../src/qtui/mainwin.cpp:791
+msgctxt "MainWin|"
+msgid "Show Input Line"
+msgstr "ç¡è¦ãªã¹ããè¡¨ç¤º"
+
+#: ../src/qtui/mainwin.cpp:804
+msgctxt "MainWin|"
+msgid "Topic"
+msgstr "ãããã¯"
+
+#: ../src/qtui/mainwin.cpp:816
+msgctxt "MainWin|"
+msgid "Show Topic Line"
+msgstr "ããã¯ãªã¹ããè¡¨ç¤º"
+
+#: ../src/qtui/mainwin.cpp:894
+msgctxt "MainWin|"
+msgid "Main Toolbar"
+msgstr "ã¡ã¤ã³ãã¼ã«ãã¼"
+
+#: ../src/qtui/mainwin.cpp:933
+msgctxt "MainWin|"
 msgid "Connected to core."
-msgstr ""
+msgstr "ã³ã¢ã«æ¥ç¶"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:821
+#: ../src/qtui/mainwin.cpp:1024
+msgctxt "MainWin|"
 msgid "Not connected to core."
-msgstr ""
+msgstr "ã³ã¢ããåæ­ãã¾ããã"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:835 ../src/qtui/mainwin.cpp:843
+#: ../src/qtui/mainwin.cpp:1038 ../src/qtui/mainwin.cpp:1046
+msgctxt "MainWin|"
 msgid "Unencrypted Connection"
-msgstr ""
+msgstr "å®å¨ãªæ¥ç¶ãä½¿ã"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1038
+msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:837 ../src/qtui/mainwin.cpp:845
-msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
+#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1048
+msgctxt "MainWin|"
+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:1046
+msgctxt "MainWin|"
 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:1063 ../src/qtui/mainwin.cpp:1083
+msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:861
-msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
+#: ../src/qtui/mainwin.cpp:1064
+#, qt-format
+msgctxt "MainWin|"
+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
-msgid "Show Certificate"
+#: ../src/qtui/mainwin.cpp:1067
+msgctxt "MainWin|"
+msgid "Continue"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:881
-msgid "Would you like to accept this certificate forever without being prompted?"
+#: ../src/qtui/mainwin.cpp:1068
+msgctxt "MainWin|"
+msgid "Show Certificate"
+msgstr "ã¯ã¨ãªãè¡¨ç¤º"
+
+#: ../src/qtui/mainwin.cpp:1084
+msgctxt "MainWin|"
+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:1086
+msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:884
+#: ../src/qtui/mainwin.cpp:1087
+msgctxt "MainWin|"
 msgid "Forever"
 msgstr ""
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:893
+#: ../src/qtui/mainwin.cpp:1096
+msgctxt "MainWin|"
 msgid "Core Connection Error"
-msgstr ""
+msgstr "æ¥ç¶ã®è¨­å®"
 
-#. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
+#, qt-format
+msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr ""
 
-#. ts-context MsgProcessorStatusWidget
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+msgctxt "MsgProcessorStatusWidget|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr ""
 
-#. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
+#, qt-format
+msgctxt "MultiLineEdit|"
 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
+msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkEditDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:14
-#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+msgctxt "NetworkAddDlg|"
 msgid "Add Network"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:22
+msgctxt "NetworkAddDlg|"
 msgid "Use preset:"
 msgstr ""
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:57
+msgctxt "NetworkAddDlg|"
 msgid "Manually specify network settings"
 msgstr ""
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:67
+msgctxt "NetworkAddDlg|"
 msgid "Manual Settings"
-msgstr ""
+msgstr "è¨­å®"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/networkadddlg.ui:75
-#: ../src/qtui/ui/simplenetworkeditor.ui:28
+msgctxt "NetworkAddDlg|"
 msgid "Network name:"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯åï¼"
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworkAddDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:85
-#: ../src/qtui/settingspages/servereditdlg.ui:38
+msgctxt "NetworkAddDlg|"
 msgid "Server address:"
-msgstr ""
+msgstr "ãµã¼ãã¢ãã¬ã¹ï¼"
+
+#: ../src/qtui/settingspages/networkadddlg.ui:95
+msgctxt "NetworkAddDlg|"
+msgid "Port:"
+msgstr "ãã¼ãï¼"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:115
+msgctxt "NetworkAddDlg|"
 msgid "Server password:"
-msgstr ""
+msgstr "ãµã¼ããã¹ã¯ã¼ãï¼"
 
-#. ts-context NetworkAddDlg
 #: ../src/qtui/settingspages/networkadddlg.ui:131
+msgctxt "NetworkAddDlg|"
 msgid "Use secure connection"
-msgstr ""
+msgstr "å®å¨ãªæ¥ç¶ãä½¿ã"
+
+#: ../src/qtui/settingspages/networkeditdlg.ui:13
+msgctxt "NetworkEditDlg|"
+msgid "Dialog"
+msgstr "ãã¤ã¢ã­ã°"
 
-#. ts-context NetworkEditDlg
 #: ../src/qtui/settingspages/networkeditdlg.ui:21
+msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯åãå¥åãã¦ãã ããï¼"
 
-#. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+msgctxt "NetworkEditDlg|"
+msgid "Add Network"
+msgstr "ãããã¯ã¼ã¯"
+
+#: ../src/client/networkmodel.cpp:196
+#, qt-format
+msgctxt "NetworkItem|"
 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
+#, qt-format
+msgctxt "NetworkItem|"
 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
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Lag: %1 msecs"
 msgstr ""
 
-#. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
+msgctxt "NetworkModel|"
 msgid "Chat"
-msgstr ""
+msgstr "ãã£ãã"
+
+#: ../src/client/networkmodel.cpp:852
+msgctxt "NetworkModel|"
+msgid "Topic"
+msgstr "ãããã¯"
 
-#. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
+msgctxt "NetworkModel|"
 msgid "Nick Count"
-msgstr ""
+msgstr "ããã¯ã®å¤æ´"
 
-#. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:154
+msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
 msgid_plural "Do you want to delete the following buffer(s) permanently?"
 msgstr[0] ""
 
-#. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:167
+#, qt-format
+msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr ""
 
-#. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:168
-msgid "<b>Note:</b> This will delete all related data, including all backlog data, from the core's database and cannot be undone."
+msgctxt "NetworkModelController|"
+msgid ""
+"<b>Note:</b> This will delete all related data, including all backlog data, "
+"from the core's database and cannot be undone."
 msgstr ""
 
-#. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:170
-msgid "<br>Active channel buffers cannot be deleted, please part the channel first."
+msgctxt "NetworkModelController|"
+msgid ""
+"<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 
-#. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:172
+msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
-msgstr ""
+msgstr "å®å¨ã«ãããã¡ãåé¤ãã¾ããï¼"
 
-#. ts-context NetworkModelController::JoinDlg
 #: ../src/uisupport/networkmodelcontroller.cpp:484
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
-msgstr ""
+msgstr "ãã£ã³ãã«ã«å¥å®¤"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:487
+msgctxt "NetworkModelController::JoinDlg|"
+msgid "Network:"
+msgstr "ãããã¯ã¼ã¯ï¼"
 
-#. ts-context NetworkModelController::JoinDlg
 #: ../src/uisupport/networkmodelcontroller.cpp:489
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
-msgstr ""
+msgstr "ãã£ã³ãã«ï¼"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:491
+msgctxt "NetworkModelController::JoinDlg|"
+msgid "Password:"
+msgstr "ãã¹ã¯ã¼ãï¼"
 
-#. ts-context NetworkPage
 #: ../src/qtui/ircconnectionwizard.cpp:148
+msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯æ¥ç¶ãè¨­å®"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:14
+msgctxt "NetworksSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:48
+msgctxt "NetworksSettingsPage|"
+msgid "Re&name..."
+msgstr "ååå¤æ´(&N)..."
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:65
+#: ../src/qtui/settingspages/networkssettingspage.ui:235
+msgctxt "NetworksSettingsPage|"
+msgid "&Add..."
+msgstr "è¿½å (&A)..."
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:88
+#: ../src/qtui/settingspages/networkssettingspage.ui:252
+msgctxt "NetworksSettingsPage|"
+msgid "De&lete"
+msgstr "åé¤(&L)"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:124
+msgctxt "NetworksSettingsPage|"
 msgid "Network Details"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯è©³ç´°"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:132
+msgctxt "NetworksSettingsPage|"
 msgid "Identity:"
-msgstr ""
+msgstr "åäººæå ±ï¼"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:149
+#: ../src/qtui/settingspages/networkssettingspage.ui:281
+#: ../src/qtui/settingspages/networkssettingspage.ui:295
+msgctxt "NetworksSettingsPage|"
+msgid "..."
+msgstr "..."
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/networkssettingspage.ui:190
-#: ../src/qtui/ui/simplenetworkeditor.ui:63
+msgctxt "NetworksSettingsPage|"
 msgid "Servers"
-msgstr ""
+msgstr "ãµã¼ã"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:193
+msgctxt "NetworksSettingsPage|"
 msgid "Manage servers for this network"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context NetworksSettingsPage
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/settingspages/networkssettingspage.ui:217
-#: ../src/qtui/ui/simplenetworkeditor.ui:99
+msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
+msgstr "ç·¨é(&E)..."
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:278
+msgctxt "NetworksSettingsPage|"
+msgid "Move upwards in list"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
+msgctxt "NetworksSettingsPage|"
+msgid "Move downwards in list"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:337
+msgctxt "NetworksSettingsPage|"
 msgid "Commands"
-msgstr ""
+msgstr "ã³ãã³ã"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:340
-msgid "Configure automatic identification or misc. commands to be executed after connecting to a server"
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Configure automatic identification or misc. commands to be executed after "
+"connecting to a server"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:346
+msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:362
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgctxt "NetworksSettingsPage|"
+msgid "Connection"
+msgstr "æ¥ç¶"
+
 #: ../src/qtui/settingspages/networkssettingspage.ui:383
+msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:386
+msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
-msgstr ""
+msgstr "èµ·åæã«èªåçã«æ¥ç¶"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:397
+msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:404
+msgctxt "NetworksSettingsPage|"
 msgid " s"
-msgstr ""
+msgstr "ç§"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:420
+msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:444
+msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:464
+msgctxt "NetworksSettingsPage|"
+msgid "Unlimited"
+msgstr "ç¡å¶é"
+
 #: ../src/qtui/settingspages/networkssettingspage.ui:489
+msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
-msgstr ""
+msgstr "åæ¥ç¶ã®å¾ã§ããã¹ã¦ã®ãã£ã³ãã«ã«åå¥å®¤"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:516
 #: ../src/qtui/settingspages/networkssettingspage.ui:525
+msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
-msgstr ""
+msgstr "åäººæå ±ãè¿½å "
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:540
+msgctxt "NetworksSettingsPage|"
 msgid "NickServ"
-msgstr ""
+msgstr "NickServ"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:557
+msgctxt "NetworksSettingsPage|"
 msgid "Service:"
-msgstr ""
+msgstr "ãµã¼ãã¹ï¼"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:567
+#: ../src/qtui/settingspages/networkssettingspage.ui:615
+msgctxt "NetworksSettingsPage|"
+msgid "Password:"
+msgstr "ãã¹ã¯ã¼ãï¼"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:580
+msgctxt "NetworksSettingsPage|"
 msgid "Use SASL Authentication"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:625
+msgctxt "NetworksSettingsPage|"
 msgid "Account:"
-msgstr ""
+msgstr "ã¢ã«ã¦ã³ãï¼"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:649
+msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
-msgstr ""
+msgstr "ã¨ã³ã³ã¼ãã£ã³ã°ï¼"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:652
-msgid "Configure advanced settings such as message encodings and automatic reconnect"
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Configure advanced settings such as message encodings and automatic "
+"reconnect"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:661
+msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:664
+msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
-msgstr ""
+msgstr "ã«ã¹ã¿ã è²ãä½¿ã"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:675
 #: ../src/qtui/settingspages/networkssettingspage.ui:695
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:679
+msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
-msgstr ""
+msgstr "èªåã®ã¡ãã»ã¼ã¸ï¼"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:706
 #: ../src/qtui/settingspages/networkssettingspage.ui:726
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Incoming messages encoded in Utf8 will always be treated as such.\n"
 "This setting defines the encoding for messages that are not Utf8."
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:710
+msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:737
 #: ../src/qtui/settingspages/networkssettingspage.ui:751
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "This specifies how control messages, nicks and servernames are encoded.\n"
 "Unless you *really* know what you do, leave this as ISO-8859-1!"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:741
+msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
-msgstr ""
+msgstr "ãµã¼ãã¨ã³ã³ã¼ãã£ã³ã°ï¼"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "NetworksSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "NetworksSettingsPage|"
 msgid "Networks"
+msgstr "ãããã¯ã¼ã¯"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:167
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:168
+msgctxt "NetworksSettingsPage|"
 msgid "<li>All networks need at least one server defined</li>"
 msgstr ""
 
-#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+msgctxt "NetworksSettingsPage|"
+msgid "</ul>"
+msgstr "</ul>"
+
 #: ../src/qtui/settingspages/networkssettingspage.cpp:170
+msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯è©³ç´°"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:542
+msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯ãåé¤ãã¦ãããããã§ããï¼"
 
-#. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:543
-msgid "Do you really want to delete the network \"%1\" and all related settings, including the backlog?"
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"
 msgstr ""
 
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
+msgctxt "NickEditDlg|"
 msgid "Edit Nickname"
-msgstr ""
+msgstr "ããã¯ãã¼ã ãç·¨é"
 
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:19
+msgctxt "NickEditDlg|"
 msgid "Please enter a valid nickname:"
-msgstr ""
+msgstr "ãããã¯ã¼ã¯åãå¥åãã¦ãã ããï¼"
 
-#. ts-context NickEditDlg
 #: ../src/qtui/settingspages/nickeditdlg.ui:32
-msgid "A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \\, |, `, ^, _ and -."
+msgctxt "NickEditDlg|"
+msgid ""
+"A valid nickname may contain letters from the English alphabet, digits, and "
+"the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr ""
 
-#. ts-context NotificationsSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+msgctxt "NickEditDlg|"
+msgid "Add Nickname"
+msgstr "ããã¯ãã¼ã ãè¿½å "
+
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+msgctxt "NotificationsSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
-msgstr ""
+msgstr "éç¥"
 
-#. ts-context PhononNotificationBackend::ConfigWidget
 #: ../src/qtui/phononnotificationbackend.cpp:143
+msgctxt "PhononNotificationBackend::ConfigWidget|"
 msgid "Select Audio File"
-msgstr ""
+msgstr "ãªã¼ãã£ãªãã¡ã¤ã«ãé¸æ"
+
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+msgctxt "PhononNotificationConfigWidget|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
 
-#. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Play a sound"
-msgstr ""
+msgstr "ãµã¦ã³ããåç"
 
-#. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Prelisten to the selected sound"
 msgstr ""
 
-#. ts-context PhononNotificationConfigWidget
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr ""
 
-#. ts-context PostgreSqlStorage
 #: ../src/core/postgresqlstorage.cpp:62
+msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 
-#. ts-context QObject
 #: ../src/client/backlogrequester.cpp:82
+#, qt-format
+msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr ""
 
-#. ts-context QObject
 #: ../src/client/backlogrequester.cpp:106
-msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
+#, qt-format
+msgctxt "QObject|"
+msgid ""
+"Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 
-#. ts-context QObject
 #: ../src/client/backlogrequester.cpp:123
+#, qt-format
+msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr ""
 
-#. ts-context QObject
 #: ../src/qtui/ircconnectionwizard.cpp:56
+msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
-msgstr ""
+msgstr "Quassel IRC ã¸ãããã"
 
-#. ts-context QObject
 #: ../src/qtui/ircconnectionwizard.cpp:58
-msgid "This wizard will help you to set up your default identity and your IRC network connection.<br>This only covers basic settings. You can cancel this wizard any time and use the settings dialog for more detailed changes."
+msgctxt "QObject|"
+msgid ""
+"This wizard will help you to set up your default identity and your IRC "
+"network connection.<br>This only covers basic settings. You can cancel this "
+"wizard any time and use the settings dialog for more detailed changes."
 msgstr ""
 
-#. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr ""
 
-#. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:140
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr ""
 
-#. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:156
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 
-#. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:192
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
+msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
+#, qt-format
+msgctxt "QssParser|"
 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
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
+#, qt-format
+msgctxt "QssParser|"
 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
+#, qt-format
+msgctxt "QssParser|"
 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
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
-#. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr ""
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
+msgctxt "Quassel::secondsToString()|"
 msgid "year"
-msgstr ""
+msgstr "å¹´"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
+msgctxt "Quassel::secondsToString()|"
 msgid "day"
-msgstr ""
+msgstr "æ¥"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
+msgctxt "Quassel::secondsToString()|"
 msgid "h"
-msgstr ""
+msgstr "æ"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
+msgctxt "Quassel::secondsToString()|"
 msgid "min"
-msgstr ""
+msgstr "å"
 
-#. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
+msgctxt "Quassel::secondsToString()|"
 msgid "sec"
-msgstr ""
+msgstr "ç§"
 
-#. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
+#, qt-format
+msgctxt "QueryBufferItem|"
 msgid "<b>Query with %1</b>"
 msgstr ""
 
-#. ts-context SaveIdentitiesDlg
+#: ../src/client/networkmodel.cpp:447
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "idling since %1"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:450
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "login time: %1"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:453
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "server: %1"
+msgstr "ãµã¼ãï¼%1"
+
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
+msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"
-msgstr ""
+msgstr "ã³ã¢ã«æ¥ç¶"
 
-#. ts-context SaveIdentitiesDlg
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:21
+msgctxt "SaveIdentitiesDlg|"
 msgid "Syncing data with core, please wait..."
 msgstr ""
 
-#. ts-context SaveIdentitiesDlg
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:81
+msgctxt "SaveIdentitiesDlg|"
 msgid "Abort"
-msgstr ""
+msgstr "ä¸­æ­¢"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:14
+msgctxt "ServerEditDlg|"
+msgid "Dialog"
+msgstr "ãã¤ã¢ã­ã°"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:30
+msgctxt "ServerEditDlg|"
 msgid "Server Info"
-msgstr ""
+msgstr "ãµã¼ãæå ±"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:38
+msgctxt "ServerEditDlg|"
+msgid "Server address:"
+msgstr "ãµã¼ãã¢ãã¬ã¹ï¼"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:45
+#: ../src/qtui/settingspages/servereditdlg.ui:227
+msgctxt "ServerEditDlg|"
+msgid "Port:"
+msgstr "ãã¼ãï¼"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:72
+msgctxt "ServerEditDlg|"
+msgid "Password:"
+msgstr "ãã¹ã¯ã¼ãï¼"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:94
+msgctxt "ServerEditDlg|"
 msgid "Use SSL"
-msgstr ""
+msgstr "SSL ãä½¿ã"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:119
+msgctxt "ServerEditDlg|"
+msgid "Advanced"
+msgstr "è©³ç´°"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:140
+msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
-msgstr ""
+msgstr "SSL ãã¼ã¸ã§ã³ï¼"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:147
-msgid "Do not change unless you're going to connect to a server not supporting SSLv3!"
+msgctxt "ServerEditDlg|"
+msgid ""
+"Do not change unless you're going to connect to a server not supporting "
+"SSLv3!"
 msgstr ""
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:151
+msgctxt "ServerEditDlg|"
 msgid "SSLv3 (default)"
-msgstr ""
+msgstr "SSLv3ï¼ããã©ã«ãï¼"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:156
+msgctxt "ServerEditDlg|"
 msgid "SSLv2"
-msgstr ""
+msgstr "SSLv2"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:161
+msgctxt "ServerEditDlg|"
 msgid "TLSv1"
-msgstr ""
+msgstr "TLSv1"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:171
+msgctxt "ServerEditDlg|"
+msgid "Use a Proxy"
+msgstr "Proxy ãä½¿ç¨"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:188
+msgctxt "ServerEditDlg|"
+msgid "Proxy Type:"
+msgstr "Proxy ã¿ã¤ã"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:196
+msgctxt "ServerEditDlg|"
+msgid "Socks 5"
+msgstr "Socks 5"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:201
+msgctxt "ServerEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:213
+msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
-msgstr ""
+msgstr "Proxy ãã¹ãï¼"
+
+#: ../src/qtui/settingspages/servereditdlg.ui:220
+msgctxt "ServerEditDlg|"
+msgid "localhost"
+msgstr "localhost"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:251
+msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
-msgstr ""
+msgstr "Proxy ã¦ã¼ã¶åï¼"
 
-#. ts-context ServerEditDlg
 #: ../src/qtui/settingspages/servereditdlg.ui:261
+msgctxt "ServerEditDlg|"
 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
+msgctxt "SettingsDlg|"
 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/settingsdlg.cpp:99
+msgctxt "SettingsDlg|"
 msgid "Settings"
-msgstr ""
+msgstr "è¨­å®"
 
-#. ts-context SettingsDlg
 #: ../src/qtui/settingsdlg.cpp:109
+msgctxt "SettingsDlg|"
 msgid "Save changes"
-msgstr ""
+msgstr "å¤æ´ãä¿å­"
 
-#. ts-context SettingsDlg
 #: ../src/qtui/settingsdlg.cpp:110
-msgid "There are unsaved changes on the current configuration page. Would you like to apply your changes now?"
+msgctxt "SettingsDlg|"
+msgid ""
+"There are unsaved changes on the current configuration page. Would you like "
+"to apply your changes now?"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsPageDlg
 #: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
-#: ../src/qtui/settingspagedlg.cpp:36
+#, qt-format
+msgctxt "SettingsDlg|"
 msgid "Configure %1"
 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
+msgctxt "SettingsDlg|"
 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
+msgctxt "SettingsDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingsdlg.cpp:202
+msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
+msgstr "æ¢å®ãä½¿ç¨..."
+
+#: ../src/qtui/settingsdlg.cpp:202
+msgctxt "SettingsDlg|"
+msgid "Do you like to restore the default values for this page?"
+msgstr ""
+
+#: ../src/qtui/ui/settingspagedlg.ui:14
+msgctxt "SettingsPageDlg|"
+msgid "Configure Quassel"
+msgstr "Quassel ãè¨­å®"
+
+#: ../src/qtui/ui/settingspagedlg.ui:30
+msgctxt "SettingsPageDlg|"
+msgid "Settings"
+msgstr "è¨­å®"
+
+#: ../src/qtui/settingspagedlg.cpp:36
+#, qt-format
+msgctxt "SettingsPageDlg|"
+msgid "Configure %1"
+msgstr ""
+
+#: ../src/qtui/settingspagedlg.cpp:104
+msgctxt "SettingsPageDlg|"
+msgid "Reload Settings"
+msgstr "è¨­å®ãåèª­ã¿è¾¼ã"
+
+#: ../src/qtui/settingspagedlg.cpp:104
+msgctxt "SettingsPageDlg|"
+msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsDlg
-#. #-#-#-#-#  quassel.po  #-#-#-#-#
-#. ts-context SettingsPageDlg
-#: ../src/qtui/settingsdlg.cpp:202 ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:113
+msgctxt "SettingsPageDlg|"
+msgid "Restore Defaults"
+msgstr "æ¢å®ãä½¿ç¨..."
+
+#: ../src/qtui/settingspagedlg.cpp:113
+msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
-#. ts-context SignalProxy
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+msgctxt "ShortcutsModel|"
+msgid "Action"
+msgstr "æä½"
+
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgctxt "ShortcutsModel|"
+msgid "Shortcut"
+msgstr "ã·ã§ã¼ãã«ãã"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
+msgctxt "ShortcutsSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgctxt "ShortcutsSettingsPage|"
+msgid "Search:"
+msgstr "æ¤ç´¢ï¼"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgctxt "ShortcutsSettingsPage|"
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgctxt "ShortcutsSettingsPage|"
+msgid "Default:"
+msgstr "ããã©ã«ãï¼"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
+msgctxt "ShortcutsSettingsPage|"
+msgid "None"
+msgstr "ãªã"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgctxt "ShortcutsSettingsPage|"
+msgid "Custom:"
+msgstr "ã«ã¹ã¿ã ï¼"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgctxt "ShortcutsSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgctxt "ShortcutsSettingsPage|"
+msgid "Shortcuts"
+msgstr "ã·ã§ã¼ãã«ãã"
+
 #: ../src/common/signalproxy.cpp:880
+msgctxt "SignalProxy|"
 msgid "Peer tried to send package larger than max package size!"
 msgstr ""
 
-#. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:885
+msgctxt "SignalProxy|"
 msgid "Peer tried to send 0 byte package!"
 msgstr ""
 
-#. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:902
+msgctxt "SignalProxy|"
 msgid "Peer sent corrupted compressed data!"
 msgstr ""
 
-#. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:917
+msgctxt "SignalProxy|"
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr ""
 
-#. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:1050
+msgctxt "SignalProxy|"
 msgid "Disconnecting"
-msgstr ""
+msgstr "åæ­ä¸­"
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:28
+msgctxt "SimpleNetworkEditor|"
+msgid "Network name:"
+msgstr "ãããã¯ã¼ã¯åï¼"
 
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:35
+msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr ""
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:63
+msgctxt "SimpleNetworkEditor|"
+msgid "Servers"
+msgstr "ãµã¼ã"
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:81
+msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr ""
 
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:96
+msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr ""
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:99
+msgctxt "SimpleNetworkEditor|"
+msgid "&Edit..."
+msgstr "ç·¨é(&E)..."
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:116
+msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
-msgstr ""
+msgstr "ä»ã® IRC ãµã¼ããè¿½å "
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:119
+msgctxt "SimpleNetworkEditor|"
+msgid "&Add..."
+msgstr "è¿½å (&A)..."
 
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:136
+msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr ""
 
-#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:139
+msgctxt "SimpleNetworkEditor|"
+msgid "De&lete"
+msgstr "åé¤(&L)"
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:165
+msgctxt "SimpleNetworkEditor|"
+msgid "Move upwards in list"
+msgstr ""
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:168
+#: ../src/qtui/ui/simplenetworkeditor.ui:182
+msgctxt "SimpleNetworkEditor|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/ui/simplenetworkeditor.ui:179
+msgctxt "SimpleNetworkEditor|"
+msgid "Move downwards in list"
+msgstr ""
+
 #: ../src/qtui/ui/simplenetworkeditor.ui:226
+msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
-msgstr ""
+msgstr "èªåçã«ãã£ã³ãã«ã«å¥å®¤"
 
-#. ts-context SimpleNetworkEditor
 #: ../src/qtui/ui/simplenetworkeditor.ui:250
-msgid "A list of IRC channels you will join automatically after connecting to the network"
+msgctxt "SimpleNetworkEditor|"
+msgid ""
+"A list of IRC channels you will join automatically after connecting to the "
+"network"
 msgstr ""
 
-#. ts-context SqliteStorage
-#: ../src/core/sqlitestorage.cpp:49
-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."
+#: ../src/core/sqlitestorage.cpp:52
+msgctxt "SqliteStorage|"
+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
+msgctxt "SslInfoDlg|"
 msgid "Security Information"
-msgstr ""
+msgstr "ã»ã­ã¥ãªãã£æå ±"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:22
+msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr "<b>ãã¹ãåï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:39
+msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr "<b>IP ã¢ãã¬ã¹ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:56
+msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
-msgstr ""
+msgstr "<b>æå·ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:73
+msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr "<b>ãã­ãã³ã«ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:90
+msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:120
+msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
-#, fuzzy
+msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
-msgstr "<b>å±éåï¼</b>"
+msgstr "<b>ãã¹ãåï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
-msgstr ""
+msgstr "<b>æå·ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr "<b>å½ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
-msgstr ""
+msgstr "<b>å½ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:242
+msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:367
+msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:384
+msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
-msgstr ""
+msgstr "<b>ã¢ã¼ãï¼</b> %1"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:401
+msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
-msgstr ""
+msgstr "<b>IP ã¢ãã¬ã¹ï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/ui/sslinfodlg.ui:431
+msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
-msgstr ""
+msgstr "<b>ãã¹ãåï¼</b>"
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:69
+msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:71
+msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr ""
 
-#. ts-context SslInfoDlg
 #: ../src/qtui/sslinfodlg.cpp:78
+#, qt-format
+msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 
-#. ts-context StatusBufferItem
 #: ../src/client/networkmodel.h:144
+msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
-msgstr ""
+msgstr "ã¹ãã¼ã¿ã¹ãããã¡"
 
-#. ts-context SystemTray
 #: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+msgctxt "SystemTray|"
 msgid "&Minimize"
-msgstr ""
+msgstr "æå°å"
 
-#. ts-context SystemTray
 #: ../src/qtui/systemtray.cpp:94
+msgctxt "SystemTray|"
 msgid "&Restore"
-msgstr ""
+msgstr "å¾©å(&R)"
+
+#: ../src/qtui/systraynotificationbackend.cpp:125
+#, qt-format
+msgctxt "SystrayNotificationBackend|"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
+msgstr[0] ""
 
-#. ts-context SystrayNotificationBackend::ConfigWidget
-#: ../src/qtui/systraynotificationbackend.cpp:134
+#: ../src/qtui/systraynotificationbackend.cpp:135
+msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
+msgstr "ã¡ãã»ã¼ã¸ããããã¢ããã§è¡¨ç¤º"
+
+#: ../src/uisupport/tabcompleter.cpp:52
+msgctxt "TabCompleter|"
+msgid "Tab completion"
 msgstr ""
 
-#. ts-context TaskbarNotificationBackend::ConfigWidget
 #: ../src/qtui/taskbarnotificationbackend.cpp:68
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr ""
 
-#. ts-context TaskbarNotificationBackend::ConfigWidget
 #: ../src/qtui/taskbarnotificationbackend.cpp:70
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
+#: ../src/qtui/taskbarnotificationbackend.cpp:78
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
+msgid "Unlimited"
+msgstr "ç¡å¶é"
+
+#: ../src/qtui/taskbarnotificationbackend.cpp:79
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
+msgid " seconds"
+msgstr " ç§"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ToolBarActionProvider|"
+msgid "Connect"
+msgstr "æ¥ç¶"
+
 #: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
-msgstr ""
+msgstr "IRC ã¸æ¥ç¶"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ToolBarActionProvider|"
+msgid "Disconnect"
+msgstr "åæ­"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
+msgstr "IRC ããåæ­"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
+msgid "Part"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ToolBarActionProvider|"
+msgid "Join"
+msgstr "å¥å®¤"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
-msgstr ""
+msgstr "ãã£ã³ãã«ã«å¥å®¤"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
+msgctxt "ToolBarActionProvider|"
 msgid "Query"
-msgstr ""
+msgstr "ã¯ã¨ãª"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:37
+msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ToolBarActionProvider|"
+msgid "Whois"
+msgstr "ã¦ã¼ã¶æå ±"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
-msgstr ""
+msgstr "ã»ã­ã¥ãªãã£æå ±"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:40
+msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:40
+msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:41
+msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:41
+msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:42
+msgctxt "ToolBarActionProvider|"
 msgid "Voice"
-msgstr ""
+msgstr "%n çºè¨æ¨©ææè"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:42
+msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
-msgstr ""
+msgstr "çºè¨æ¨©ãä¸ãã"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:43
+msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:43
+msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
-msgstr ""
+msgstr "çºè¨æ¨©ãå¥ªã"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:44
+msgctxt "ToolBarActionProvider|"
 msgid "Kick"
-msgstr ""
+msgstr "è¿½ãåºã (Kick)"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:44
+msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
-msgstr ""
+msgstr "å®å¨ã«ãããã¡ãåé¤ãã¾ããï¼"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:45
+msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:45
+msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr ""
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
+msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
-msgstr ""
+msgstr "è¿½æ¾ (Kick / Ban)"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:46
+msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
-msgstr ""
+msgstr "å®å¨ã«ãããã¡ãåé¤ãã¾ããï¼"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:51
+msgctxt "ToolBarActionProvider|"
 msgid "Connect to all"
-msgstr ""
+msgstr "ãã¹ã¦ã«æ¥ç¶"
 
-#. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:58
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from all"
+msgstr "ãã¹ã¦ããåæ­"
+
+#: ../src/qtui/ui/topicwidget.ui:32
+msgctxt "TopicWidget|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/ui/topicwidget.ui:79
+msgctxt "TopicWidget|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/topicwidget.cpp:106
+#, qt-format
+msgctxt "TopicWidget|"
+msgid "Users: %1"
+msgstr "ã¦ã¼ã¶ï¼%1"
+
+#: ../src/qtui/topicwidget.cpp:107
+#, qt-format
+msgctxt "TopicWidget|"
+msgid "Lag: %1 msecs"
 msgstr ""
 
-#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Form"
+msgstr "ãã©ã¼ã "
+
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Custom font:"
+msgstr "ã«ã¹ã¿ã ãã©ã³ãï¼"
+
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Resize dynamically to fit contents"
 msgstr ""
 
-#. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:84
+msgctxt "TopicWidgetSettingsPage|"
 msgid "On hover only"
 msgstr ""
 
-#. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Interface"
+msgstr "ã¤ã³ã¿ã¼ãã§ã¼ã¹"
+
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
+msgstr "ãããã¯ã¦ã£ã¸ã§ãã"
+
+#. Plain Message
+#. ----------
+#. Notice Message
+#. ----------
+#. Server Message
+#. ----------
+#. Info Message
+#. ----------
+#. Error Message
+#. ----------
+#. Topic Message
+#. ----------
+#. Invite Message
+#: ../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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
+msgid "%1"
 msgstr ""
 
 #. Action Message
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:583
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:588
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr ""
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:638
+#: ../src/uisupport/uistyle.cpp:641
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
-msgstr ""
+msgstr "%DN%1%DN %2"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:652
+#: ../src/uisupport/uistyle.cpp:655
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 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
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "[%1]"
-msgstr ""
+msgstr "[%1]"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:697
+#: ../src/uisupport/uistyle.cpp:703
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "<%1>"
 msgstr "<%1>"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:701
+#: ../src/uisupport/uistyle.cpp:707
+msgctxt "UiStyle::StyledMessage|"
 msgid "-*-"
-msgstr ""
+msgstr "-*-"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:709
+msgctxt "UiStyle::StyledMessage|"
 msgid "<->"
 msgstr "<->"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:705
+#: ../src/uisupport/uistyle.cpp:711
+msgctxt "UiStyle::StyledMessage|"
 msgid "***"
-msgstr ""
+msgstr "***"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:707
+#: ../src/uisupport/uistyle.cpp:713
+msgctxt "UiStyle::StyledMessage|"
 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
+msgctxt "UiStyle::StyledMessage|"
 msgid "<--"
 msgstr "<--"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:713
+#: ../src/uisupport/uistyle.cpp:719
+msgctxt "UiStyle::StyledMessage|"
 msgid "<-*"
 msgstr "<-*"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:721
+msgctxt "UiStyle::StyledMessage|"
 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
+msgctxt "UiStyle::StyledMessage|"
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:729
+msgctxt "UiStyle::StyledMessage|"
 msgid "-"
-msgstr ""
+msgstr "-"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:733
+msgctxt "UiStyle::StyledMessage|"
 msgid "=>"
-msgstr ""
+msgstr "=>"
 
-#. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:729
-#, fuzzy
+#: ../src/uisupport/uistyle.cpp:735
+msgctxt "UiStyle::StyledMessage|"
 msgid "<="
 msgstr "<="
 
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/uisupport/uistyle.cpp:737
+msgctxt "UiStyle::StyledMessage|"
+msgid "->"
+msgstr "->"
+
+#: ../src/client/networkmodel.cpp:697
+#, qt-format
+msgctxt "UserCategoryItem|"
 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
+#, qt-format
+msgctxt "UserCategoryItem|"
 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
+#, qt-format
+msgctxt "UserCategoryItem|"
 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
+#, qt-format
+msgctxt "UserCategoryItem|"
 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
+#, qt-format
+msgctxt "UserCategoryItem|"
 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
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
-msgstr[0] ""
+msgstr[0] "%n ã¦ã¼ã¶"
+
+
