From e21e7c7dd15515fc76de9af3ac14eba7a0041c28 Mon Sep 17 00:00:00 2001
From: Daniel Albers <daniel@lbers.com>
Date: Thu, 12 Aug 2010 00:23:50 +0200
Subject: [PATCH] merge launchpad translations from master

---
 po/cs.po | 1200 ++++++-----
 po/el.po | 1060 ++++++----
 po/es.po | 2419 +++++++----------------
 po/it.po | 1200 ++++++-----
 po/ja.po | 1029 +++++++---
 po/nl.po | 5602 ++++++++++++++++++++++++++++++----------------------
 po/oc.po | 5808 +++++++++++++++++++++++++++++++-----------------------
 po/ru.po | 1040 +++++++---
 po/tr.po | 1044 +++++++---
 9 files changed, 11643 insertions(+), 8759 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index f12b94b8..4f19e851 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -87,12 +87,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr "Zvláště bychom rádi poděkovali:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>Johnu \"nox\" Handovi</b></dt><dd>pro skvělý artwork a Quassel logo/ikonku</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-icons.org\">Oxygen Team</a></b></dt><dd>pro vytvoření většiny ostatních skvělých ikon, které můžete vidět všude možně v aplikaci</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software (dříve znám jako Trolltech)</a></b></dt><dd>za vytvoření Qt a Qtopia, a pro sponzorování vývoje QuasselTopia s Greenphones a dalších</dd><dt><b><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>pro udržování Qt naživu, a pro sponzorování vývoje Quassel Mobile N810</dd>"
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Instalované schéma (verze %1) není aktuální. aktualizuji na %2..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Aktualizace selhala..."
 
@@ -161,6 +161,8 @@ msgstr "Rozšířený výraz"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -186,6 +188,7 @@ msgstr "Rozšířený výraz"
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -298,33 +301,33 @@ msgstr "Cesta:"
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -414,22 +417,25 @@ msgstr "Chyby:"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "Rozhraní"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr "Prosím vyberte soubor stylu"
 
@@ -580,7 +586,7 @@ msgid "Backlog Fetching"
 msgstr "Stahování historie"
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -784,47 +790,58 @@ msgid "BufferView"
 msgstr "Pohled na záložky"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Přiblížit"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Oddálit"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Současná velikost"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+msgid "Set Marker Line"
+msgstr "Nastavit značící řádku"
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "Nastavit značící řádku"
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Kanál %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>uživatelé:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Mód:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Téma:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "Neaktivní <br /> Dvojklikem vstupte"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -942,7 +959,7 @@ msgstr "Zobrazovat vlastní zprávy"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "Monitor pokecu"
 
@@ -972,7 +989,7 @@ msgid "Configure..."
 msgstr "Nastavit..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Kopírovat označené"
 
@@ -1013,89 +1030,109 @@ msgstr "Vlastní font v okně rozhovoru:"
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr "Zobrazit barevný text v okně rozhovoru"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr "Povolit barevný text (mIRC kódy barev)"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr "Zobrazit náhledy WWW stránek při podržení myši nad URL"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr "Zobrazí náhledy WWW stránek při podržení myši nad URL"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr "Nastavit značící linku na konec současného okna rozhovoru při výběru jiného kanálu"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr "Nastavit značící linku automaticky při přepínání rozhovorů"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "Vlastní barvy"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "Akce:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Časová známka:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Zpráva kanálu:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "Popředí zvýrazněné:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Zprava příkazu:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "Pozadí zvýrazněné:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Zpráva serveru:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "Značící řádka:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Chybová zpráva:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Pozadí:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr "Používat barvy pro odesílatele"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Vlastní zprávy:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr "Okno rozhovoru"
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr "Pro tuto funkci potřebujete alespoň jádro quassel verze 0.6"
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1111,6 +1148,16 @@ msgstr "Zpracováno %1 zpráv v %2 vteřin."
 msgid "All Chats"
 msgstr "VÅ¡echny pokecy"
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr "/JOIN očekává kanál"
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr "/QUERY očekává alespoň přezdívku"
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1182,7 +1229,7 @@ msgid "Minimum delay between requests:"
 msgstr "Minimální přestávka mezi požadavky:"
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Kopírovat adresu odkazu"
 
@@ -1318,8 +1365,9 @@ msgstr "Ping"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr "Finger"
+#, fuzzy
+msgid "Client info"
+msgstr "Klient"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1917,97 +1965,97 @@ msgid "Connect to Core"
 msgstr "Připojit k jádru"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr "Síť je mimo provoz"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Odpojeno"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "Vyhledávám %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206
-#: ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "Připojuji se k %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Připojeno k %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "Odpojeno od %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr "Jádro Quasselu, ke kterému se snazíte připojit, je příliš staré! Prosíme zvažte jeho aktualizaci."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr "Přijata neplatná data od jádra"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "Odpojit od jádra."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr "Nešifrované spojení zrušeno"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr "Synchronizace s jádrem..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr "<b>Jádro Quasselu, ke kterému se snažíte připojit, je příliš staré!</b><br> Požadovaný je protokol verze %1 pro spojení."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Probíhá přihlášení..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "Přihlášení zrušeno"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr "Příjem stavu sezení"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr "Synchronizace s %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr "Příjem stavů sítí"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr "Synchronizováno s %1"
 
@@ -2192,12 +2240,12 @@ msgid "Core Shutdown"
 msgstr "Vypnutí jádra"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "Nemohu se spojit s %1 (%2)"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Chyba spojení: %1"
 
@@ -2217,15 +2265,56 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr "CoreSession::createNetwork(): Síť s daným názvem již existuje. Aktualizuji místo duplikace!"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "pryč"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr "posílám %2 požadavek CTCP-%1"
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "Pro %1 není nastaveno žádné téma."
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2248,41 +2337,53 @@ msgstr "Duplikovat:"
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+#, fuzzy
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr "Obdržen CTCP PING požadavek od %1"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+#, fuzzy
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr "Obdržena CTCP TIME odpověď od %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "Obdržen CTCP PING požadavek od %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "Obdržena CTCP PING odpověď od %1 s %2 vteřinovým odstupem"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "Obdržen CTCP VERSION požadavek od %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "Obdržena CTCP VERSION odpověď od %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr "Obdržen CTCP TIME požadavek od %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr "Obdržena CTCP TIME odpověď od %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Obdrženo neznáme CTCP %1 od %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr "s argumenty: %1"
 
@@ -2455,8 +2556,14 @@ msgstr "Všechny přezdívky z identity"
 msgid "Current nick"
 msgstr "Současnou"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Žádnou"
 
@@ -2594,8 +2701,12 @@ msgstr "Tady opravdu není školka!"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Pohodlné vykecávání. Odkudkoliv."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr "Obecné"
 
@@ -2773,7 +2884,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Pokračovat"
 
@@ -3136,93 +3247,93 @@ msgid "Show messages in application indicator"
 msgstr "Zobrazovat zprávy v indikátoru aplikace"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr "Bílá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr "Černá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr "Tmavě modrá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr "Tmavě zelená"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr "Červená"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr "Tmavě červená"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr "Tmavě fuchsová"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr "Orange"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr "Žlutá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr "Zelená"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr "Tmavě modrozelená"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr "Azurová"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr "Modrá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr "Purpurová"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr "Tmavě šedá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Light gray"
 msgstr "Světle šedá"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:86
-#: ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr "Smazat barvu"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Přepnout na vstupní řádku"
 
@@ -3260,36 +3371,46 @@ msgstr "Zobrazovat tlačítka stylu"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr "Povolí (omezené) klávesové zkratky Emacs ve vstupním poli"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr "Klávesové zkratky Emacs"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr "Víceřádková editace"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr "Ukázat nejvíce"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "řádků"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "Povolit rolovací proužek"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr "Doplňování tabulátorem"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Zakončení doplňování:"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
@@ -3315,23 +3436,28 @@ msgstr "Uživatelé"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Téma"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 změnil téma pro %2 na: \"%3\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Obdrženo RPL_ISUPPORT (005) bez parametrů!"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr "Obdržena RFC nekompatibilní RPL_ISUPPORT: což může vést k neočekávanému chování!"
 
@@ -3349,161 +3475,166 @@ msgstr "Obdržena RFC nekompatibilní RPL_ISUPPORT: což může vést k neoček
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 je pryč: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 je fuč: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 je %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 je online skrze %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr "[Whowas] %1 byl %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Konec /WHO seznamu pro %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 je přihlášen od %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr "[Whois] %1 je nečinný po %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] důvod nečinnosti: %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 je uživatelem kanálů: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 je mluvka na kanálech: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 je dozorce na kanálech: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "Kanál %1 má %2 uživatelů. Tématem je: %3"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Konec seznamu s kanály"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr "Domovská stránka pro %1 je %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr "Kanál %1 byl vytvořen %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "Pro %1 není nastaveno žádné téma."
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "Téma pro %1 je \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Téma nastavil %1 v %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "Přezdívka %1 obsahuje neplatné znaky"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Přezdívka se již používá: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr "Přezdívka/kanál je dočasně nedostupná: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr "Nebyla nalezena žádná volná a platná přezdívka ze seznamu přezdívek. Pro pokračování použijte: /nick <jiná_přezdívka>"
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 msgid " is away"
 msgstr " je fuč"
 
@@ -3511,8 +3642,8 @@ msgstr " je fuč"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr "nic nedělá od %1"
 
@@ -3520,8 +3651,8 @@ msgstr "nic nedělá od %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr "čas přihlášení: %1"
 
@@ -3529,8 +3660,8 @@ msgstr "čas přihlášení: %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "server: %1"
 
@@ -3642,254 +3773,484 @@ msgstr[0] "%n zbývající zvýraznění"
 msgstr[1] "%n zbývající zvýraznění"
 msgstr[2] "%n zbývajících zvýraznění"
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr "Právě stisknutá klávesa není podporována v Qt."
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr "Nepodporovaná klávesa"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+"Klikněte na tlačítko a poté zadejte zkratku, kterou byste rádi používali.\n"
+"Například pro Ctrl+a držte klávesu Ctrl a stiskněte a."
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr "Meta"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Alt"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr "Shift"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Vstup"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Žádná"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr "Konflikt zkratek"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+"Zkratka \"%1\" je již používána a tedy nemůže být nastavena.\n"
+"Prosím zvolte jinou."
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr "Zkratka \"%1\" má nejednoznačný význam spolu se zkratkou pro následujíc činnost:"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr "Přejete si přeřadit tuto zkratku k vybrané činnosti?"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr "Přeřadit"
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "Přip&ojit k jádru..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "O&dpojit od jádra"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "&Informace jádra..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "Nastavit &sítě..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "&Ukončit"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr "&Nastavit seznam pokeců..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "U&zamknout rozvržení"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Zobrazit vy&hledávání"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr "Zobrazit Log pro Pryč"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "Zobrazit Hlavní &nabídku"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "Zo&brazit stavový řádek"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+msgid "Configure &Shortcuts..."
+msgstr "Nastavit zk&ratky..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "&Nastavit Quassel..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "O progr&amu Quassel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "O &Qt"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "Ladění Sít&ového-Modelu"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr "Ladění vrstvy P&ohledu na záložky"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "Ladění &Modelu-Zpráv"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr "Ladění &Seznamů rozhovorů"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "Ladící &Log"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr "Pře-načíst styl"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+msgid "Navigation"
+msgstr "Navigace"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr "Přejít na další aktivní záložku"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr "Nastavit rychlý přístup #0"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr "Nastavit rychlý přístup #1"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr "Nastavit rychlý přístup #2"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr "Nastavit rychlý přístup #3"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr "Nastavit rychlý přístup #4"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr "Nastavit rychlý přístup 5"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr "Nastavit rychlý přístup #6"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr "Nastavit rychlý přístup #7"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr "Nastavit rychlý přístup #8"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr "Nastavit rychlý přístup #9"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr "Rychlý přístup #0"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr "Rychlý přístup #1"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr "Rychlý přístup #2"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr "Rychlý přístup #3"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr "Rychlý přístup #4"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr "Rychlý přístup #5"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr "Rychlý přístup #6"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr "Rychlý přístup #7"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr "Rychlý přístup #8"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr "Rychlý přístup #9"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "Smazat seznam rozhovorů?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "Přejít na rozhovor"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "Přejít na rozhovor"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "S&oubor"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Sítě"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Záložky"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "&Seznam pokeců"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "Liš&ty"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "Na&stavení"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "&Nápověda"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Debug"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Přezdívky"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Zobrazit seznam přezdívek"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Zobrazí monitor pokecu"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "Vstupní řádka"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Zobrazit řádku se vstupem"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Zobrazit řádek s tématem"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "Hlavní nástrojová lišta"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Připojen k jádru."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "Nepřipojen k jádru."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr "Nešifrované spojení"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Váš klient nepodporuje šifrování skrze SSL</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr "Citlivá data, například hesla, budou přenášena k jádru Quasselu bez použití šifrování."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Vaše jádro nepodporuje šifrování skrze SSL</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr "Nedůvěryhodný bezpečnostní certifikát"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr "<b>SSL certifikát poskytnutý jádrem %1 je nedůvěryhodný z následujících důvodů:</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr "Zobrazit certifikát"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr "Chcete tento certifikát přijmout na trvalo a vyhnout se opětovnému schvalování?"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr "Pouze současné sezení"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr "Navždy"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr "Chyba spojení s jádrem"
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+#, fuzzy
+msgid "&Normal mode"
+msgstr "Normální"
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3901,7 +4262,7 @@ msgid "Receiving Backlog"
 msgstr "Získávám historii"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] "Opravdu chcete vložit %n řádek?"
@@ -3909,7 +4270,7 @@ msgstr[1] "Opravdu chcete vložit %n řádky?"
 msgstr[2] "Opravdu chcete vložit %n řádků?"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "Ochrana proti náhodnému vložení"
 
@@ -3971,7 +4332,7 @@ msgid "Please enter a network name:"
 msgstr "Prosím zadejte název sítě:"
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Server: %1"
 
@@ -3979,7 +4340,7 @@ msgstr "Server: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Uživatelé: %1"
@@ -3988,18 +4349,18 @@ msgstr "Uživatelé: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Zpoždění: %1 msecs"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "Pokec"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Počet přezdívek"
 
@@ -4328,7 +4689,7 @@ msgstr "Tento průvodce vám pomůže nastavit výchozí identitu a spojení k I
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr "Neplatná deklarace bloku: %1"
 
@@ -4348,146 +4709,146 @@ msgid "Invalid subelement name in %1"
 msgstr "Neplatný název pod-elementu v %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr "Neplatný typ zprávy v %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr "Neplatný stav: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr "Neplatný popisek zprávy: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr "Neplatná specifikace hash odesílatele: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "Hash odesílatele může být maximálně \"0x0f\"!"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr "Neplatný název formátu: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Neplatná specifikace IRC barvy (musí být mezi 00 a 0f): %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr "Neobsloužený stav: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr "Neplatný seznam vlastností: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr "Neplatný typ položky seznamu rozhovorů: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr "Neplatný stav seznamu pokeců %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr "Neplatná deklarace vlastnosti: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr "Neplatná vlastnost písma: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr "Neznámá vlastnost ChatLine: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr "Neplatná specifikace role barevné palety: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr "Neznámá role barevné palety: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr "Neplatná deklarace gradientu: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr "Neplatný seznam zastavení gradientu: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr "Neplatná specifikace písma: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr "Neplatná specifikace stylu písma: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr "Neplatná specifikace proporcí písma: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr "Neplatná specifikace velikosti písma: %1"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "rok"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "den"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "h"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "min"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "sec"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Pokec s %1</b>"
 
@@ -4632,6 +4993,41 @@ msgstr "Obnovit výchozí"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Opravdu chcete obnovit výchozí nastavení pro tuto stránku?"
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+msgid "Action"
+msgstr "Činnost"
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr "Zkratka"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgid "Search:"
+msgstr "Hledat:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr "Zkratka pro vybranou činnost"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgid "Default:"
+msgstr "Výchozí:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgid "Custom:"
+msgstr "Vlastní:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr "Zkratky"
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4971,150 +5367,156 @@ msgstr "Rozhraní Tématu"
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr "%DN%1%DN %2"
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr "Nyní jste znám jako %DN%1%DN"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN je nyní znám jako %DN%2%DN"
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "Uživatelský režim: %DM%1%DM"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Režim %DM%1%DM od %DN%2%DN"
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH vlezl do %DC%4%DC"
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH opustil %DC%4%DC"
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH to zabalil"
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN vykopnul %DN%2%DN z %DC%3%DC"
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr "{Den: %1}"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr "Netsplit mezi %DH%1%DH a %DH%2%DH skončil. Vrátili se: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (%2 více)"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "Netsplit mezi %DH%1%DH a %DH%2%DH. Opustili nás: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr "<-x"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr "-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr "=>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr "<="
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] "%n Vlastník"
@@ -5122,7 +5524,7 @@ msgstr[1] "%n Vlastníci"
 msgstr[2] "%n Vlastníků"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] "%n Správce"
@@ -5130,7 +5532,7 @@ msgstr[1] "%n Správci"
 msgstr[2] "%n Správců"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] "%n Dozorce"
@@ -5138,7 +5540,7 @@ msgstr[1] "%n Dozorci"
 msgstr[2] "%n Dozorců"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n Bachař"
@@ -5146,7 +5548,7 @@ msgstr[1] "%n Bachaři"
 msgstr[2] "%n Bachařů"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] "%n Mluvka"
@@ -5154,182 +5556,18 @@ msgstr[1] "%n Mluvky"
 msgstr[2] "%n Mluvek"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] "%n Uživatel"
 msgstr[1] "%n Uživatelé"
 msgstr[2] "%n Uživatelů"
 
-#~ msgid "Set Marker Line"
-#~ msgstr "Nastavit značící řádku"
-
-#~ msgid "Show colored text in the chat window"
-#~ msgstr "Zobrazit barevný text v okně rozhovoru"
-
-#~ msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
-#~ msgstr "Nastavit značící linku na konec současného okna rozhovoru při výběru jiného kanálu"
-
-#~ msgid "Set marker line automatically when switching chats"
-#~ msgstr "Nastavit značící linku automaticky při přepínání rozhovorů"
-
-#~ msgid "You need at 0.6 quasselcore to use this feature"
-#~ msgstr "Pro tuto funkci potřebujete alespoň jádro quassel verze 0.6"
-
-#~ msgid "/JOIN expects a channel"
-#~ msgstr "/JOIN očekává kanál"
-
-#~ msgid "/QUERY expects at least a nick"
-#~ msgstr "/QUERY očekává alespoň přezdívku"
-
-#~ msgid "Enables (limited) Emacs key bindings in the input field."
-#~ msgstr "Povolí (omezené) klávesové zkratky Emacs ve vstupním poli"
-
-#~ msgid "Emacs key bindings"
-#~ msgstr "Klávesové zkratky Emacs"
-
-#~ msgid "The key you just pressed is not supported by Qt."
-#~ msgstr "Právě stisknutá klávesa není podporována v Qt."
-
-#~ msgid "Unsupported Key"
-#~ msgstr "Nepodporovaná klávesa"
-
-#~ 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 ""
-#~ "Klikněte na tlačítko a poté zadejte zkratku, kterou byste rádi používali.\n"
-#~ "Například pro Ctrl+a držte klávesu Ctrl a stiskněte a."
-
-#~ msgctxt "Meta key"
-#~ msgid "Meta"
-#~ msgstr "Meta"
-
-#~ msgctxt "Ctrl key"
-#~ msgid "Ctrl"
-#~ msgstr "Ctrl"
-
-#~ msgctxt "Alt key"
-#~ msgid "Alt"
-#~ msgstr "Alt"
-
-#~ msgctxt "Shift key"
-#~ msgid "Shift"
-#~ msgstr "Shift"
-
-#~ msgctxt "What the user inputs now will be taken as the new shortcut"
-#~ msgid "Input"
-#~ msgstr "Vstup"
-
-#~ msgctxt "No shortcut defined"
-#~ msgid "None"
-#~ msgstr "Žádná"
-
-#~ msgid "Shortcut Conflict"
-#~ msgstr "Konflikt zkratek"
-
-#~ msgid ""
-#~ "The \"%1\" shortcut is already in use, and cannot be configured.\n"
-#~ "Please choose another one."
-#~ msgstr ""
-#~ "Zkratka \"%1\" je již používána a tedy nemůže být nastavena.\n"
-#~ "Prosím zvolte jinou."
-
-#~ msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
-#~ msgstr "Zkratka \"%1\" má nejednoznačný význam spolu se zkratkou pro následujíc činnost:"
-
-#~ msgid "Do you want to reassign this shortcut to the selected action?"
-#~ msgstr "Přejete si přeřadit tuto zkratku k vybrané činnosti?"
-
-#~ msgid "Reassign"
-#~ msgstr "Přeřadit"
-
-#~ msgid "Configure &Shortcuts..."
-#~ msgstr "Nastavit zk&ratky..."
-
-#~ msgid "Navigation"
-#~ msgstr "Navigace"
-
-#~ msgid "Set Quick Access #0"
-#~ msgstr "Nastavit rychlý přístup #0"
-
-#~ msgid "Set Quick Access #1"
-#~ msgstr "Nastavit rychlý přístup #1"
-
-#~ msgid "Set Quick Access #2"
-#~ msgstr "Nastavit rychlý přístup #2"
-
-#~ msgid "Set Quick Access #3"
-#~ msgstr "Nastavit rychlý přístup #3"
-
-#~ msgid "Set Quick Access #4"
-#~ msgstr "Nastavit rychlý přístup #4"
-
-#~ msgid "Set Quick Access #5"
-#~ msgstr "Nastavit rychlý přístup 5"
-
-#~ msgid "Set Quick Access #6"
-#~ msgstr "Nastavit rychlý přístup #6"
-
-#~ msgid "Set Quick Access #7"
-#~ msgstr "Nastavit rychlý přístup #7"
-
-#~ msgid "Set Quick Access #8"
-#~ msgstr "Nastavit rychlý přístup #8"
-
-#~ msgid "Set Quick Access #9"
-#~ msgstr "Nastavit rychlý přístup #9"
-
-#~ msgid "Quick Access #0"
-#~ msgstr "Rychlý přístup #0"
-
-#~ msgid "Quick Access #1"
-#~ msgstr "Rychlý přístup #1"
-
-#~ msgid "Quick Access #2"
-#~ msgstr "Rychlý přístup #2"
-
-#~ msgid "Quick Access #3"
-#~ msgstr "Rychlý přístup #3"
-
-#~ msgid "Quick Access #4"
-#~ msgstr "Rychlý přístup #4"
-
-#~ msgid "Quick Access #5"
-#~ msgstr "Rychlý přístup #5"
-
-#~ msgid "Quick Access #6"
-#~ msgstr "Rychlý přístup #6"
-
-#~ msgid "Quick Access #7"
-#~ msgstr "Rychlý přístup #7"
-
-#~ msgid "Quick Access #8"
-#~ msgstr "Rychlý přístup #8"
-
-#~ msgid "Quick Access #9"
-#~ msgstr "Rychlý přístup #9"
-
-#~ msgid "Action"
-#~ msgstr "Činnost"
-
-#~ msgid "Shortcut"
-#~ msgstr "Zkratka"
-
-#~ msgid "Search:"
-#~ msgstr "Hledat:"
-
-#~ msgid "Shortcut for Selected Action"
-#~ msgstr "Zkratka pro vybranou činnost"
-
-#~ msgid "Default:"
-#~ msgstr "Výchozí:"
-
-#~ msgid "Custom:"
-#~ msgstr "Vlastní:"
+#~ msgid "Finger"
+#~ msgstr "Finger"
 
-#~ msgid "Shortcuts"
-#~ msgstr "Zkratky"
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] důvod nečinnosti: %1"
 
 #~ msgid "Add Buffers Automatically:"
 #~ msgstr "Přidávat záložky automaticky:"
diff --git a/po/el.po b/po/el.po
index af19ac2b..d2d254c7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,18 +6,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Quassel\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: Stefanos Michael Sofroniou <ssofroni@cytanet.com.cy>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-05 02:45+0000\n"
+"PO-Revision-Date: 2010-06-18 15:18+0000\n"
+"Last-Translator: Stefanos Michael Sofroniou <Unknown>\n"
 "Language-Team: Stefanos Michael Sofroniou <ssofroni@cytaney.com.cy>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2010-08-11 21:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: CYPRUS\n"
 "X-Virgin-Header: remove this line if you change anything in the header.\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Country: CYPRUS\n"
 
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:17
@@ -88,12 +92,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr "Ιδιαίτερες ευχαριστίες πηγαίνουν στους:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>για την γνήσια εικόνα του Quassel - 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>για την δεξιοτεχνική δουλειά που βλέπετε ολωσδιόλου του Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Το Qt πρόγραμμα παλαιώτερα γνωστό ως Trolltech</a></b></dt><dd> για την δημιουργία του Qt και του Qtopia, και για την επιχορήγηση ανάπτυξης του QuasselTopia με Greenphones και άλλα </dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd> που κρατούν το Qt ζωντανό, και που επιχορηγούν την ανάπτυξη του Quassel Mobile με N810s</dd>"
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Το εγκατεστημένο Schema (έκδοση %1) δεν είναι ανανεωμένο. Αναβαθμίζεται στην έκδοση version %2..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Αναβάθμιση απέτυχε..."
 
@@ -162,6 +166,8 @@ msgstr "Διαστολή"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -187,6 +193,7 @@ msgstr "Διαστολή"
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -228,9 +235,8 @@ msgstr "Διαγραφή"
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
 #: ../src/qtui/settingspages/networkssettingspage.cpp:37
-#, fuzzy
 msgid "IRC"
-msgstr "IRC"
+msgstr ""
 
 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.cpp:29
@@ -259,21 +265,19 @@ msgstr "Τοποθέτησε την γλώσσα εντύπου. Απαιτεί
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:47
-#, fuzzy
 msgid "<Untranslated>"
-msgstr "<Untranslated>"
+msgstr ""
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:52
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:74
-#, fuzzy
 msgid "<System Default>"
-msgstr "<System Default>"
+msgstr ""
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:75
 msgid "Use custom stylesheet"
-msgstr "Χρησιμοποίησε ειδικής κατασκευής φύλλο διαμόρφωσης "
+msgstr "Χρησιμοποίησε ειδικής κατασκευής φύλλο διαμόρφωσης"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:109
@@ -302,33 +306,33 @@ msgstr "Μονοπάτι:"
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -346,9 +350,8 @@ msgstr "Μονοπάτι:"
 #: ../src/qtui/ui/simplenetworkeditor.ui:168
 #: ../src/qtui/ui/simplenetworkeditor.ui:182
 #: ../src/qtui/ui/topicwidget.ui:79
-#, fuzzy
 msgid "..."
-msgstr "..."
+msgstr ""
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:150
@@ -358,7 +361,7 @@ msgstr "Δείξε την εικόνα του δίσκου συστήματος"
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:184
 msgid "Hide to tray on close button"
-msgstr "Απόκρυψε το δίσκο στο πάτημα του κουμπιού κλεισίματος "
+msgstr "Απόκρυψε το δίσκο στο πάτημα του κουμπιού κλεισίματος"
 
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:216
@@ -419,30 +422,32 @@ msgstr "Λάθοι:"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "Διεπιφάνεια"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr "Παρακαλώ διαλέξετε φύλλο διαμορφώσεως"
 
 #. ts-context AwayLogView
 #: ../src/qtui/awaylogview.cpp:33
-#, fuzzy
 msgid "Away Log"
-msgstr "Μακριά Log"
+msgstr ""
 
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context AwayLogView
@@ -499,27 +504,21 @@ msgstr "Ο απλούστερος αιτητής. Φέρνει ένα σταθε
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
-#, fuzzy
 msgid "amount of messages per buffer that are requested after the core connection has been established."
-msgstr "ποσό των μηνυμάτων ανά μνήμης που ζητούνται μετά από την βασική σύνδεση που έχει δημιουργηθεί."
+msgstr ""
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
-#, fuzzy
 msgid "Initial backlog amount:"
-msgstr "Αρχικό ποσό καθυστέρησης:"
+msgstr ""
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:205
-#, fuzzy
 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 ""
-"Αυτός ο αιτητής προσκομίζει μή-αναγνωσμένα μηνύματα για κάθε παράθυρο συνομιλίας ξεχωριστά. Το ποσό των γραμμών μπορεί να περιορίζεται ανά συνομιλία.\n"
-"\n"
-"Μπορείτε επίσης να επιλέξετε να προσκομίσετε επιπλέον παλαιότερες γραμμές συνομιλίας για την παροχή καλύτερου πλαισίου."
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:222
@@ -552,16 +551,14 @@ msgstr "Απεριόριστο"
 #: ../src/qtui/settingspages/backlogsettingspage.ui:270
 #: ../src/qtui/settingspages/backlogsettingspage.ui:382
 #: ../src/qtui/settingspages/backlogsettingspage.ui:392
-#, fuzzy
 msgid "Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here."
-msgstr "Το ποσό των μηνυμάτων που θα προσκομιστεί επιπρόσθετα από τα μή-αναγνωσμένα μηνύματα. Το Όριο δεν ισχύει εδώ."
+msgstr ""
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
 #: ../src/qtui/settingspages/backlogsettingspage.ui:385
-#, fuzzy
 msgid "Additional Messages:"
-msgstr "Επιπρόσθετα μηνύματα:"
+msgstr ""
 
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:324
@@ -585,7 +582,7 @@ msgid "Backlog Fetching"
 msgstr ""
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr ""
 
@@ -785,47 +782,57 @@ msgid "BufferView"
 msgstr ""
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr ""
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr ""
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr ""
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+msgid "Set Marker Line"
+msgstr ""
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+msgid "Go to Marker Line"
+msgstr ""
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr ""
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr ""
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr ""
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr ""
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr ""
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr ""
 
@@ -930,7 +937,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr ""
 
@@ -960,7 +967,7 @@ msgid "Configure..."
 msgstr ""
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr ""
 
@@ -1001,89 +1008,109 @@ msgstr ""
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr ""
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1099,6 +1126,16 @@ msgstr ""
 msgid "All Chats"
 msgstr ""
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1170,7 +1207,7 @@ msgid "Minimum delay between requests:"
 msgstr ""
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr ""
 
@@ -1306,7 +1343,7 @@ msgstr ""
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
+msgid "Client info"
 msgstr ""
 
 #. ts-context ContextMenuActionProvider
@@ -1900,97 +1937,97 @@ msgid "Connect to Core"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206
-#: ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr ""
 
@@ -2174,12 +2211,12 @@ msgid "Core Shutdown"
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr ""
 
@@ -2199,15 +2236,55 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr ""
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr ""
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+msgid "No key has been set for %1."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2230,41 +2307,51 @@ msgstr ""
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr ""
 
@@ -2437,8 +2524,14 @@ msgstr ""
 msgid "Current nick"
 msgstr ""
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr ""
 
@@ -2576,8 +2669,12 @@ msgstr ""
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr ""
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr ""
 
@@ -2753,7 +2850,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr ""
 
@@ -3065,93 +3162,93 @@ msgid "Show messages in application indicator"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 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
 msgid "Clear Color"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr ""
 
@@ -3189,36 +3286,46 @@ msgstr ""
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ""
 
@@ -3244,23 +3351,28 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr ""
 
@@ -3278,161 +3390,166 @@ msgstr ""
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr ""
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 msgid " is away"
 msgstr ""
 
@@ -3440,8 +3557,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr ""
 
@@ -3449,8 +3566,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr ""
 
@@ -3458,8 +3575,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr ""
 
@@ -3569,254 +3686,476 @@ msgid_plural "%n pending highlights"
 msgstr[0] ""
 msgstr[1] ""
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+msgctxt "Alt key"
+msgid "Alt"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+msgid "Configure &Shortcuts..."
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+msgid "Navigation"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+msgid "Activate Next Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+msgid "Go to Next Chat"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+msgid "Go to Previous Chat"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr ""
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+msgid "&Normal mode"
+msgstr ""
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3828,14 +4167,14 @@ msgid "Receiving Backlog"
 msgstr ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] ""
 msgstr[1] ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr ""
 
@@ -3897,7 +4236,7 @@ msgid "Please enter a network name:"
 msgstr ""
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr ""
 
@@ -3905,7 +4244,7 @@ msgstr ""
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr ""
@@ -3914,18 +4253,18 @@ msgstr ""
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr ""
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr ""
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr ""
 
@@ -4245,7 +4584,7 @@ msgstr ""
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
@@ -4265,146 +4604,146 @@ msgid "Invalid subelement name in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr ""
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr ""
 
@@ -4549,6 +4888,42 @@ msgstr ""
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+msgid "Action"
+msgstr ""
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgid "Search:"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+#, fuzzy
+msgid "Default:"
+msgstr "Στόχος εξ'ορισμού"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgid "Custom:"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4888,185 +5263,190 @@ msgstr ""
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr ""
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr ""
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+msgid "->"
+msgstr ""
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] ""
 msgstr[1] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] ""
diff --git a/po/es.po b/po/es.po
index a301dd72..15cde706 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 10:51+0200\n"
-"PO-Revision-Date: 2010-03-08 06:52+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
+"POT-Creation-Date: 2010-05-05 02:45+0000\n"
+"PO-Revision-Date: 2010-07-05 16:44+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: Español <kde-i18n-doc@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-03-10 14:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-11 21:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: es_ES\n"
 
@@ -78,7 +78,7 @@ msgstr "<b>Versión:</b> %1<br><b>Versión de protocolo:</b> %2<br><b>Compilaci
 #. 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."
-msgstr ""
+msgstr "<b>Un cliente distribuido moderno de IRC</b><br><br>&copy;2005-2010 por el Proyecto Quassel<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> en <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC está bajo doble licencia <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> y <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>la mayoría de los iconos son &copy; por el <a href=\"http://www.oxygen-icons.org\">Equipo Oxygen</a> y usados bajo la <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Por favor entre en <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> para informar de fallos."
 
 #. ts-context AboutDlg
 #: ../src/qtui/aboutdlg.cpp:62
@@ -96,12 +96,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr "Agradecimientos especiales para:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>por el icono original de Quassel - El ojo que todo lo ve</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-icons.org\">El Equipo de Oxygen</a></b></dt><dd>por crear el trabajo artístico que ve a lo largo de Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software, formalmente conocido como Trolltech</a></b></dt><dd>por crear Qt y Qtopia, y por apoyar el desarrollo de QuasselTopia con Greenphones y más</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>por mantener Qt vivo, y por apoyar el desarrollo de Quassel Mobile con N810s</dd>"
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "El esquema instalado (versión %1) no está actualizado. Actualizando a la versión %2..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Actualización fallida..."
 
@@ -170,6 +170,8 @@ msgstr "Expansión"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -195,6 +197,7 @@ msgstr "Expansión"
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -307,33 +310,33 @@ msgstr "Ruta:"
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -423,22 +426,25 @@ msgstr "Errores:"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "Interfaz"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr "Elija un archivo de estilo"
 
@@ -589,7 +595,7 @@ msgid "Backlog Fetching"
 msgstr "Obtención del registro"
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -793,47 +799,59 @@ msgid "BufferView"
 msgstr "Vista del área de conversación"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Acercar zum"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Alejar zum"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Tamaño actual"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+#, fuzzy
+msgid "Set Marker Line"
+msgstr "Línea marcadora:"
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "Línea marcadora:"
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Canal %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Usuarios:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Modo:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Tópico:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "No activo <br /> Doble click para unirse"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -953,7 +971,7 @@ msgstr "Mostrar mensajes propios"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "Monitor de conversación"
 
@@ -983,7 +1001,7 @@ msgid "Configure..."
 msgstr "Configurar..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Copiar seleccionado"
 
@@ -1024,89 +1042,109 @@ msgstr "Personalizar la tipografía de la ventana de conversación"
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr "Permitir texto en color (código de color mIRC)"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr "Previsualizar página web en una ventana al pasar el ratón sobre una dirección web"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr "Previsualizar páginas web encima de una URL"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "Colores personalizados"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "Acción:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Timestamp:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Mensaje del canal:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "Resaltar el primer plano:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Mensaje de comando:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "Resaltar el segundo plano:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Mensaje del servidor:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "Línea marcadora:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Mensaje de error:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Segundo plano:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr "Usar coloreado del emisor"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Mensajes propios:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr "Vista de conversación"
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1122,6 +1160,16 @@ msgstr "%1 mensajes procesados en %2 segundos."
 msgid "All Chats"
 msgstr "Todas las conversaciones"
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1193,7 +1241,7 @@ msgid "Minimum delay between requests:"
 msgstr "Tiempo mínimo entre peticiones:"
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Copiar la ruta del enlace"
 
@@ -1329,8 +1377,9 @@ msgstr "Ping"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr "Dedo"
+#, fuzzy
+msgid "Client info"
+msgstr "Cliente"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1927,97 +1976,97 @@ msgid "Connect to Core"
 msgstr "Conectar al núcleo"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr "La red está caída"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "Buscando %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206
-#: ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "Conectando a %1"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Conectado a %1"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "Desconectándose de %1"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr "¡El núcleo de Quassel al cual está tratando de conectar es demasiado viejo! Por favor considere el actualizarlo."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr "Información no válida recibida del núcleo"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "Desconectado del núcleo."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr "Conexión sin encriptar cancelada"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr "Sincronizando con el núcleo..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr "<b>¡El núcleo de Quassel al que está tratando de conectarse es demasiado viejo!</b><br>Al menos se necesita un protocolo v%1 de cliente/núcleo para conectarse."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Iniciando sesión"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "Inicio de sesión cancelado"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr "Recibiendo estado de la sesión"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr "Sincronizando a %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr "Recibiendo estados de red"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr "Sincronizado a %1"
 
@@ -2056,7 +2105,7 @@ msgstr "Sólo desconectar si la conexión de red se cierra por el sistema operat
 #. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
 msgid "Never time out actively"
-msgstr ""
+msgstr "Nunca expira el tiempo activamente"
 
 #. ts-context CoreConnectionSettingsPage
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
@@ -2169,11 +2218,10 @@ msgstr "Cerrar"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/coreinfodlg.cpp:53
-#, fuzzy
 msgid "%n Day(s)"
 msgid_plural "%n Day(s)"
-msgstr[0] "%n día(s)"
-msgstr[1] "%n día(s)"
+msgstr[0] "%n Día(s)"
+msgstr[1] "%n Días(s)"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/coreinfodlg.cpp:54
@@ -2202,12 +2250,12 @@ msgid "Core Shutdown"
 msgstr "Apagar núcleo"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "No se pudo conectar a %1 (%2)"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Fallo de conexión: %1"
 
@@ -2227,15 +2275,56 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr "CoreSession::createNetwork(): ¡Intentando crear una red que ya existe, actualizándola en lugar de crearla."
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "ausente"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr "enviando peticiones CTCP-%1 a %2"
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "No hay tema establecido para %1"
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2258,41 +2347,53 @@ msgstr "Duplicar:"
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+#, fuzzy
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr "Recibida petición de PING CTCP desde %1"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+#, fuzzy
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr "Se recibió respuesta CTCP TIME desde %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "Recibida petición de PING CTCP desde %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "Recibida respuesta de PING CTCP desde %1 con alrededor de %2 segundos de tiempo de viaje"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "Recibida petición de CTCP VERSION por %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "Recibida respuesta CTCP VERSION desde %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr "Recibiendo peticiones CTCP TIME de %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
-msgstr ""
+msgstr "Se recibió respuesta CTCP TIME desde %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Recibido CTCP desconocido %1 por %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr " con argumentos: %1"
 
@@ -2465,8 +2566,14 @@ msgstr "Todos los apodos de la identidad"
 msgid "Current nick"
 msgstr "Apodo actual"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Ninguno"
 
@@ -2604,8 +2711,12 @@ msgstr "¡El jardín de infancia es en otra parte!"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Chatee cómodamente donde sea."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr "General"
 
@@ -2783,7 +2894,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Continuar"
 
@@ -3146,93 +3257,93 @@ msgid "Show messages in application indicator"
 msgstr "Mostrar mensajes en el indicador de aplicaciones"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr "Blanco"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr "Negro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr "Azul oscuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr "Verde oscuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr "Rojo"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr "Rojo oscuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr "Magenta oscuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr "Naranja"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr "Amarillo"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr "Verde"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr "Cian oscuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr "Cian"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr "Azul"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr "Magenta"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr "Gris oscuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Light gray"
 msgstr "Gris claro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:86
-#: ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr "Limpiar color"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Enfocar a la línea de entrada de texto"
 
@@ -3270,36 +3381,46 @@ msgstr "Mostrar botones de estilo"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr "Edición multi-línea"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr "Mostrar por encima"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "Líneas"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "Activar barras de desplazamiento"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr "Autocompletar por Tabulador"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Sufijo para autocompletar:"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
@@ -3325,23 +3446,28 @@ msgstr "Usuarios"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Tema"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 ha cambiado el tema del canal de %2 a: \"%3\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "¡Recibido RPL_ISUPPORT (005) sin parámetros!"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr "¡Recibido RPL_ISUPPORT que no cumple con RFC: esto puede conducir a un comportamiento inesperado!"
 
@@ -3359,161 +3485,166 @@ msgstr "¡Recibido RPL_ISUPPORT que no cumple con RFC: esto puede conducir a un
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 está ausente: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 está ausente: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 está %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 está en línea vía %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr "[Whowas] %1 fue %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Fin de lista /WHO para %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 está conectado desde %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr "[Whois] %1 está inactivo durante %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] mesaje de inactivo: %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 es usuario de los canales: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 tiene soporte de voz en los canales: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 es operador de los canales: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "El canal %1 tiene %2 usuarios. El tema del canal es: %3"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Fin de la lista de canales"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr "La página principal de %1 es %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr "Canal %1 creado en %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "No hay tema establecido para %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "El tema para %1 es \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Tema establecido por %1 en %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "El apodo %1 contiene carácteres no admitidos."
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Este apodo ya está en uso: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
-msgstr ""
+msgstr "El Nick/Canal  no esta disponible temporalmente: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr "No hay apodos disponibles en la lista de apodos. Utilice: /nick <otroapodo> para seguir."
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 #, fuzzy
 msgid " is away"
 msgstr "%1 está ausente: \"%2\""
@@ -3522,8 +3653,8 @@ msgstr "%1 está ausente: \"%2\""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr "Inactivo desde %1"
 
@@ -3531,8 +3662,8 @@ msgstr "Inactivo desde %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr "Tiempo de entrada: %1"
 
@@ -3540,8 +3671,8 @@ msgstr "Tiempo de entrada: %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "servidor: %1"
 
@@ -3648,257 +3779,492 @@ msgstr "Otra actividad"
 #: ../src/qtui/systraynotificationbackend.cpp:125
 msgid "%n pending highlights"
 msgid_plural "%n pending highlights"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n resaltados pendientes"
+msgstr[1] "%n resaltados pendientes"
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Todo"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+#, fuzzy
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Línea de introducción de texto"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Ninguno"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#, fuzzy
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+"Ya existe una regla\n"
+"«%1»\n"
+"Escoja otra regla."
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "&Conectar al núcleo..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Desconectar del núcleo"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "&Información del núcleo..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "Co&nfigurar redes..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "&Salir"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr "&Configurar listas de canales"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "B&loquear la distribución de la pantalla"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Mostrar barra de bú&squeda"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr "Mostrar el registro de ausente"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "Mostrar la barra de &menú"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "Mostrar la &barra de estado"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "Co&nfigurar redes..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "&Configurar Quassel..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "Sobre Qu&assel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "Sobre &Qt"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "Depurar &NetworkModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr "Depurar &BufferViewOverlay"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "Depurar &MessageModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr "Depurar &HotList"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "Depurar &Log"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr "Recargar estilo de hoja"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "Organización"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr "Saltar a la charla siguiente"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "¿Eliminar lista de conversaciones?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "Ir a la conversación"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "Ir a la conversación"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "&Archivo"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Redes"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Ver"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "Listas de &Conversación"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "Barras de &Herramientas"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "Preferencia&s"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "A&yuda"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Depurar"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Apodos"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Mostrar lista de apodos"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Mostrar monitor de conversación"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "Línea de introducción de texto"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Mostrar línea de introducción de texto"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Mostrar línea del tema"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "Barra de herramientas principal"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Conectado al núcleo"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "No conectado al núcleo"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr "Conexión sin encriptar"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Su cliente no da soporte a la encriptación por SSL</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr "Información confidencial, como contraseñas, será transmitida sin encriptar a su núcleo Quassel."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Su núcleo no da soporte a la encriptación por SSL</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr "Certificado de seguridad no confiable"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr "<b>El certificado SSL proporcionado por el núcleo en %1 es inseguro por las razones siguientes:</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr "Ver certificado"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr "¿Le gustaría aceptar este certificado para siempre sin ser preguntado?"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr "Sólo sesión actual"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr "Para siempre"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr "Error de conexión de núcleo"
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+#, fuzzy
+msgid "&Normal mode"
+msgstr "Normal"
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3910,15 +4276,14 @@ msgid "Receiving Backlog"
 msgstr "Recibiendo registro"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
-#, fuzzy
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] "¿Realmente desea pegar %n líneas?"
 msgstr[1] "¿Realmente desea pegar %n líneas?"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "Protección contra pegado"
 
@@ -3980,7 +4345,7 @@ msgid "Please enter a network name:"
 msgstr "Por favor, introduzca un nombre de red:"
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Servidor: %1"
 
@@ -3988,7 +4353,7 @@ msgstr "Servidor: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Usuarios: %1"
@@ -3997,28 +4362,27 @@ msgstr "Usuarios: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Demora: %1 ms"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "Charla"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Recuento de apodos"
 
 #. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:154
-#, fuzzy
 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] "¿Desea borrar los siguientes búfres permanentemente?"
-msgstr[1] "¿Desea borrar los siguientes búfres permanentemente?"
+msgstr[0] "¿Desea borrar permanentemente los siguientes buffers?"
+msgstr[1] "¿Desea borrar permanentemente los siguientes buffers?"
 
 #. ts-context NetworkModelController
 #: ../src/uisupport/networkmodelcontroller.cpp:167
@@ -4337,7 +4701,7 @@ msgstr "Éste asistente le guiará para configurar su identidad predeterminada y
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr "Bloque declarado de forma no válida: %1"
 
@@ -4357,146 +4721,146 @@ msgid "Invalid subelement name in %1"
 msgstr "Nombre de subelemento no válido en %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr "Tipo de mensaje no válido en %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr "Condición no válida %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr "Etiqueta del mensaje no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr "Specificación de la marca identificadora del mesajero no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "¡La marca identificadora del mensajero puede ser como mucho \"0x0f\"!"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr "Formato de nombre no válido: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Especificación de colores IRC inadecuada (debe estar comprendida entre 00 y 0f): %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr "Condición no controlada: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
-msgstr ""
+msgstr "proplist %1 inválida"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr "Tipo de elemento de la lista de conversaciones no válido %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr "Estado de la lista de conversaciones no válido %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr "Declaración de propiedad no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr "Propiedad de fuente no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr "Propiedad de línea de charla desconocida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr "Specificación de paleta del modo de color no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr "Paleta de color desconocida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr "Declaración de gradiente no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr "Gradiente de lista de paradas no válido: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr "Especificación de fuente no valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr "Especificación de estilo de fuente no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr "Especificación de ancho de fuente no válida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr "Especificación de tamaño de fuente no válida: %"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "año"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "día"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "h"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "min"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "seg"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Duda con %1</b>"
 
@@ -4641,10 +5005,49 @@ msgstr "Restaurar valores por defecto"
 msgid "Do you like to restore the default values for this page?"
 msgstr "¿Le gustaría restaurar los valores por defecto para ésta página?"
 
-#. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:880
-msgid "Peer tried to send package larger than max package size!"
-msgstr "¡Se trató de recibir un paquete más grande que el máximo establecido!"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "Acción:"
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+#, fuzzy
+msgid "Search:"
+msgstr "Patrón de búsqueda:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+#, fuzzy
+msgid "Default:"
+msgstr "Objetivo predeterminado"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "Personalizar..."
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
+
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:880
+msgid "Peer tried to send package larger than max package size!"
+msgstr "¡Se trató de recibir un paquete más grande que el máximo establecido!"
 
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:885
@@ -4896,7 +5299,7 @@ msgstr "Dar al usuario privilegios de operador"
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:41
 msgid "Deop"
-msgstr ""
+msgstr "Deop"
 
 #. ts-context ToolBarActionProvider
 #: ../src/uisupport/toolbaractionprovider.cpp:41
@@ -4980,485 +5383,198 @@ msgstr "Componente del tema"
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr "%DN%1%DN %2"
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr "Ahora es usted conocido como %DN%1%DN"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN es ahora conocido como %DN%2%DN"
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "Modo de usuario: %DM%1%DM"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Modo %DM%1%DM por %DN%2%DN"
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH se ha unido a %DC%4%DC"
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH ha dejado %DC%4%DC"
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH ha salido"
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN ha sido expulsado %DN%2%DN de %DC%3%DC"
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr "{Día cambiado a %1}"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr "División entre %DH%1%DH y %DH%2%DH finalizada. Usuarios unidos: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (%2 más)"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "División entre %DH%1%DH y %DH%2%DH. Los usuarios salieron: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr "<-x"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr "-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr "=>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr "<="
 
-#. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
 #, fuzzy
+msgid "->"
+msgstr "<->"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
-msgstr[0] "%n Propietario(s)"
-msgstr[1] "%n Propietario(s)"
+msgstr[0] "%n dueño(s)"
+msgstr[1] "%n dueño(s)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
-#, fuzzy
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] "%n Administrador(es)"
 msgstr[1] "%n Administrador(es)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
-#, fuzzy
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] "%n Operador(es)"
-msgstr[1] "%n Operador(es)"
+msgstr[1] "%n operador(es)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
-#, fuzzy
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n semiOp(es)"
 msgstr[1] "%n semiOp(es)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
-#, fuzzy
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] "%n con voz"
 msgstr[1] "%n con voz"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
-#, fuzzy
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] "%n Usuario(s)"
-msgstr[1] "%n Usuario(s)"
-
-#~ msgctxt "AliasesSettingsPage#1"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "AliasesSettingsPage#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "AliasesSettingsPage#4"
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgctxt "AliasesSettingsPage#5"
-#~ msgid "Delete"
-#~ msgstr "Borrar"
-
-#~ msgctxt "AppearanceSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "AppearanceSettingsPage#4"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "AppearanceSettingsPage#12"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "AwayLogView#2"
-#~ msgid "Show Network Name"
-#~ msgstr "Mostrar nombre de red"
-
-#~ msgctxt "AwayLogView#3"
-#~ msgid "Show Buffer Name"
-#~ msgstr "Mostrar nombre del búfer"
-
-#~ msgctxt "BacklogSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "BacklogSettingsPage#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "BacklogSettingsPage#16"
-#~ msgid "Unlimited"
-#~ msgstr "Ilimitado"
-
-#~ msgctxt "BufferViewEditDlg#1"
-#~ msgid "Dialog"
-#~ msgstr "Diálogo"
-
-#~ msgctxt "BufferViewSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "BufferViewSettingsPage#6"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "BufferViewSettingsPage#7"
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgctxt "BufferViewSettingsPage#8"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "BufferViewSettingsPage#9"
-#~ msgid "De&lete"
-#~ msgstr "&Borrar"
-
-#~ msgctxt "BufferViewSettingsPage#11"
-#~ msgid "Network:"
-#~ msgstr "Red:"
-
-#~ msgctxt "BufferViewSettingsPage#23"
-#~ msgid "Highlight"
-#~ msgstr "Resaltar"
-
-#~ msgctxt "ChatMonitorSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ChatMonitorSettingsPage#2"
-#~ msgid "Chat Monitor"
-#~ msgstr "Monitor de charla"
-
-#~ msgctxt "ChatMonitorSettingsPage#7"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ChatMonitorView#2"
-#~ msgid "Show Network Name"
-#~ msgstr "Mostrar nombre de red"
-
-#~ msgctxt "ChatMonitorView#3"
-#~ msgid "Show Buffer Name"
-#~ msgstr "Mostrar nombre del búfer"
-
-#~ msgctxt "ChatViewSearchBar#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ChatViewSearchBar#2"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "ChatViewSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ChatViewSettingsPage#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ChatViewSettingsPage#12"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "ConnectionSettingsPage#1"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "ConnectionSettingsPage#5"
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgctxt "ContextMenuActionProvider#1"
-#~ msgid "Connect"
-#~ msgstr "Conectar"
-
-#~ msgctxt "ContextMenuActionProvider#2"
-#~ msgid "Disconnect"
-#~ msgstr "Desconectar"
-
-#~ msgctxt "ContextMenuActionProvider#3"
-#~ msgid "Join"
-#~ msgstr "Unirse"
-
-#~ msgctxt "ContextMenuActionProvider#4"
-#~ msgid "Part"
-#~ msgstr "Parte"
-
-#~ msgctxt "ContextMenuActionProvider#19"
-#~ msgid "Whois"
-#~ msgstr "Quién es"
-
-#~ msgctxt "ContextMenuActionProvider#37"
-#~ msgid "CTCP"
-#~ msgstr "CTCP"
-
-#~ msgctxt "Core#18"
-#~ msgid "Client"
-#~ msgstr "Cliente"
-
-#~ msgctxt "CoreAccount#1"
-#~ msgid "Internal Core"
-#~ msgstr "Núcleo interno"
-
-#~ msgctxt "CoreAccountEditDlg#6"
-#~ msgid "localhost"
-#~ msgstr "anfitrión local"
-
-#~ msgctxt "CoreAccountEditDlg#7"
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
-#~ msgctxt "CoreAccountEditDlg#9"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "CoreAccountEditDlg#11"
-#~ msgid "Use a Proxy"
-#~ msgstr "Usar un proxy"
-
-#~ msgctxt "CoreAccountEditDlg#12"
-#~ msgid "Proxy Type:"
-#~ msgstr "Tipo de proxy:"
-
-#~ msgctxt "CoreAccountEditDlg#13"
-#~ msgid "Socks 5"
-#~ msgstr "Socks 5"
-
-#~ msgctxt "CoreAccountEditDlg#14"
-#~ msgid "HTTP"
-#~ msgstr "HTTP"
-
-#~ msgctxt "CoreAccountModel#1"
-#~ msgid "Internal Core"
-#~ msgstr "Núcleo interno"
-
-#~ msgctxt "CoreAccountSettingsPage#1"
-#~ msgid "Remote Cores"
-#~ msgstr "Núcleos remotos"
-
-#~ msgctxt "CoreAccountSettingsPage#5"
-#~ msgid "Add..."
-#~ msgstr "Añadir..."
-
-#~ msgctxt "CoreAccountSettingsPage#6"
-#~ msgid "Delete"
-#~ msgstr "Borrar"
-
-#~ msgctxt "CoreConfigWizardAdminUserPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConfigWizardAdminUserPage#2"
-#~ msgid "Username:"
-#~ msgstr "Usuario:"
-
-#~ msgctxt "CoreConfigWizardAdminUserPage#3"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "CoreConfigWizardAdminUserPage#5"
-#~ msgid "Remember password"
-#~ msgstr "Recordar contraseña"
-
-#~ msgctxt "CoreConfigWizardIntroPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConfigWizardStorageSelectionPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConfigWizardStorageSelectionPage#2"
-#~ msgid "Storage Backend:"
-#~ msgstr "Motor de almacenamiento"
+msgstr[1] "%n usuario(s)"
 
-#~ msgctxt "CoreConfigWizardSyncPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConfigWizardSyncPage#5"
-#~ msgid "Storage Backend:"
-#~ msgstr "Motor de almacenamiento"
-
-#~ msgctxt "CoreConnectAuthDlg#4"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "CoreConnectAuthDlg#5"
-#~ msgid "Username:"
-#~ msgstr "Usuario:"
-
-#~ msgctxt "CoreConnectAuthDlg#6"
-#~ msgid "Remember password"
-#~ msgstr "Recordar contraseña"
-
-#~ msgctxt "CoreConnectionSettingsPage#1"
-#~ msgid "Remote Cores"
-#~ msgstr "Núcleos remotos"
-
-#~ msgctxt "CoreConnectionSettingsPage#2"
-#~ msgid "Connection"
-#~ msgstr "Conexión"
-
-#~ msgctxt "CoreConnectionSettingsPage#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConnectionSettingsPage#9"
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "ms"
-#~ msgstr "ms"
-
-#~ msgctxt "CoreConnectionStatusWidget#6"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConnectionStatusWidget#7"
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgctxt "CoreInfoDlg#12"
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgctxt "CoreSession#1"
-#~ msgid "Client"
-#~ msgstr "Cliente"
+#~ msgid "Finger"
+#~ msgstr "Dedo"
 
 #~ msgid "Add Buffers Automatically:"
 #~ msgstr "Añadir conversaciones automáticamente:"
@@ -5466,1034 +5582,5 @@ msgstr[1] "%n Usuario(s)"
 #~ msgid "Hide inactive buffers:"
 #~ msgstr "Ocultar conversaciones inactivas:"
 
-#~ msgctxt "DebugLogWidget#2"
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgctxt "HighlightSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "HighlightSettingsPage#2"
-#~ msgid "Highlight"
-#~ msgstr "Resaltar"
-
-#~ msgctxt "HighlightSettingsPage#5"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "HighlightSettingsPage#11"
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
-#~ msgctxt "IdentitiesSettingsPage#1"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "IdentitiesSettingsPage#3"
-#~ msgid "<b>The following problems need to be corrected before your changes can be applied:</b><ul>"
-#~ msgstr "<b>Los siguientes problemas han de ser corregidos antes de que sus cambios puedan ser aplicados:</b><ul>"
-
-#~ msgctxt "IdentitiesSettingsPage#8"
-#~ msgid "</ul>"
-#~ msgstr "</ul>"
-
-#~ msgctxt "IdentitiesSettingsPage#12"
-#~ msgid "Rename Identity"
-#~ msgstr "Renombrar identidad"
-
-#~ msgctxt "IdentitiesSettingsPage#14"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "IdentitiesSettingsPage#16"
-#~ msgid "Add..."
-#~ msgstr "Añadir..."
-
-#~ msgctxt "IdentityEditWidget#1"
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgctxt "IdentityEditWidget#14"
-#~ msgid "Add Nickname"
-#~ msgstr "Añadir apodo"
-
-#~ msgctxt "IdentityEditWidget#15"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "IdentityEditWidget#17"
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
-#~ msgctxt "IdentityEditWidget#18"
-#~ msgid "Rename Identity"
-#~ msgstr "Renombrar identidad"
-
-#~ msgctxt "IdentityEditWidget#19"
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgctxt "IdentityEditWidget#20"
-#~ msgid "Move upwards in list"
-#~ msgstr "Subir en la lista"
-
-#~ msgctxt "IdentityEditWidget#21"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "IdentityEditWidget#22"
-#~ msgid "Move downwards in list"
-#~ msgstr "Bajar en la lista"
-
-#~ msgctxt "IdentityEditWidget#43"
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgctxt "IgnoreListEditDlg#9"
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgctxt "IgnoreListEditDlg#10"
-#~ msgid "CTCP"
-#~ msgstr "CTCP"
-
-#~ msgctxt "IgnoreListEditDlg#12"
-#~ msgid "Ignore Rule"
-#~ msgstr "Ignorar regla"
-
-#~ msgctxt "IgnoreListEditDlg#18"
-#~ msgid "Network"
-#~ msgstr "Red"
-
-#~ msgctxt "IgnoreListEditDlg#19"
-#~ msgid "Channel"
-#~ msgstr "Canal"
-
-#~ msgctxt "IgnoreListModel#7"
-#~ msgid "Ignore Rule"
-#~ msgstr "Ignorar regla"
-
-#~ msgctxt "IgnoreListSettingsPage#1"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "IgnoreListSettingsPage#5"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "IgnoreListSettingsPage#6"
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgctxt "IgnoreListSettingsPage#7"
-#~ msgid "Delete"
-#~ msgstr "Borrar"
-
-#~ msgctxt "IndicatorNotificationConfigWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgid "Ctrl+L"
-#~ msgstr "Ctrl+L"
-
-#~ msgctxt "InputWidget#20"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "InputWidgetSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "InputWidgetSettingsPage#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "InputWidgetSettingsPage#4"
-#~ msgid "Custom font:"
-#~ msgstr "Tipografía personalizada"
-
-#~ msgctxt "IrcListModel#1"
-#~ msgid "Channel"
-#~ msgstr "Canal"
-
-#~ msgctxt "IrcListModel#3"
-#~ msgid "Topic"
-#~ msgstr "Tema"
-
-#~ msgctxt "IrcServerHandler#4"
-#~ msgid "%1"
-#~ msgstr "%1"
-
-#~ msgctxt "IrcUserItem#1"
-#~ msgid "idling since %1"
-#~ msgstr "inactivo desde %1"
-
-#~ msgctxt "IrcUserItem#2"
-#~ msgid "login time: %1"
-#~ msgstr "hora de acceso: %1"
-
-#~ msgctxt "IrcUserItem#3"
-#~ msgid "server: %1"
-#~ msgstr "servidor: %1"
-
-#~ msgctxt "ItemViewSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ItemViewSettingsPage#3"
-#~ msgid "Network"
-#~ msgstr "Red"
-
-#~ msgctxt "ItemViewSettingsPage#7"
-#~ msgid "Highlight"
-#~ msgstr "Resaltar"
-
-#~ msgctxt "ItemViewSettingsPage#9"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ItemViewSettingsPage#10"
-#~ msgid "Custom font:"
-#~ msgstr "Tipografía personalizada"
-
-#~ msgctxt "ItemViewSettingsPage#17"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Ctrl+Q"
-#~ msgstr "Ctrl+Q"
-
-#~ msgid "Ctrl+M"
-#~ msgstr "Ctrl+M"
-
-#~ msgid "F7"
-#~ msgstr "F7"
-
-#~ msgctxt "MainWin#35"
-#~ msgid "Chat Monitor"
-#~ msgstr "Monitor de charla"
-
-#~ msgctxt "MainWin#39"
-#~ msgid "Topic"
-#~ msgstr "Tema"
-
-#~ msgctxt "MainWin#50"
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgctxt "MsgProcessorStatusWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "NetworkAddDlg#1"
-#~ msgid "Add Network"
-#~ msgstr "Añadir Red"
-
-#~ msgctxt "NetworkAddDlg#5"
-#~ msgid "Network name:"
-#~ msgstr "Nombre de la red:"
-
-#~ msgctxt "NetworkAddDlg#6"
-#~ msgid "Server address:"
-#~ msgstr "Dirección del servidor:"
-
-#~ msgctxt "NetworkAddDlg#7"
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
-#~ msgctxt "NetworkEditDlg#1"
-#~ msgid "Dialog"
-#~ msgstr "Diálogo"
-
-#~ msgctxt "NetworkEditDlg#3"
-#~ msgid "Add Network"
-#~ msgstr "Añadir red"
-
-#~ msgctxt "NetworkItem#2"
-#~ msgid "Users: %1"
-#~ msgstr "Usuarios: %1"
-
-#~ msgctxt "NetworkItem#3"
-#~ msgid "Lag: %1 msecs"
-#~ msgstr "Demora: %1 ms"
-
-#~ msgctxt "NetworkModel#2"
-#~ msgid "Topic"
-#~ msgstr "Tema"
-
-#~ msgctxt "NetworkModelController::JoinDlg#2"
-#~ msgid "Network:"
-#~ msgstr "Red:"
-
-#~ msgctxt "NetworkModelController::JoinDlg#4"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "NetworksSettingsPage#1"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "NetworksSettingsPage#3"
-#~ msgid "<b>The following problems need to be corrected before your changes can be applied:</b><ul>"
-#~ msgstr "<b>Los siguientes problemas han de ser corregidos antes de que sus cambios puedan ser aplicados:</b><ul>"
-
-#~ msgctxt "NetworksSettingsPage#5"
-#~ msgid "</ul>"
-#~ msgstr "</ul>"
-
-#~ msgctxt "NetworksSettingsPage#9"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "NetworksSettingsPage#10"
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgctxt "NetworksSettingsPage#11"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "NetworksSettingsPage#12"
-#~ msgid "De&lete"
-#~ msgstr "&Borrar"
-
-#~ msgctxt "NetworksSettingsPage#15"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "NetworksSettingsPage#16"
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgctxt "NetworksSettingsPage#18"
-#~ msgid "&Edit..."
-#~ msgstr "&Editar..."
-
-#~ msgctxt "NetworksSettingsPage#19"
-#~ msgid "Move upwards in list"
-#~ msgstr "Subir en la lista"
-
-#~ msgctxt "NetworksSettingsPage#20"
-#~ msgid "Move downwards in list"
-#~ msgstr "Bajar en la lista"
-
-#~ msgctxt "NetworksSettingsPage#25"
-#~ msgid "Connection"
-#~ msgstr "Conexión"
-
-#~ msgctxt "NetworksSettingsPage#32"
-#~ msgid "Unlimited"
-#~ msgstr "Ilimitado"
-
-#~ msgctxt "NetworksSettingsPage#37"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "NickEditDlg#1"
-#~ msgid "Add Nickname"
-#~ msgstr "Añadir apodo"
-
-#~ msgctxt "NotificationsSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "PhononNotificationConfigWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "QueryBufferItem#2"
-#~ msgid "idling since %1"
-#~ msgstr "inactivo desde %1"
-
-#~ msgctxt "QueryBufferItem#3"
-#~ msgid "login time: %1"
-#~ msgstr "hora de acceso: %1"
-
-#~ msgctxt "QueryBufferItem#4"
-#~ msgid "server: %1"
-#~ msgstr "servidor: %1"
-
-#~ msgctxt "ServerEditDlg#1"
-#~ msgid "Dialog"
-#~ msgstr "Diálogo"
-
-#~ msgctxt "ServerEditDlg#3"
-#~ msgid "Server address:"
-#~ msgstr "Dirección del servidor:"
-
-#~ msgctxt "ServerEditDlg#4"
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
-#~ msgctxt "ServerEditDlg#5"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "ServerEditDlg#7"
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgctxt "ServerEditDlg#13"
-#~ msgid "Use a Proxy"
-#~ msgstr "Usar un proxy"
-
-#~ msgctxt "ServerEditDlg#14"
-#~ msgid "Proxy Type:"
-#~ msgstr "Tipo de proxy:"
-
-#~ msgctxt "ServerEditDlg#15"
-#~ msgid "Socks 5"
-#~ msgstr "Socks 5"
-
-#~ msgctxt "ServerEditDlg#16"
-#~ msgid "HTTP"
-#~ msgstr "HTTP"
-
-#~ msgctxt "ServerEditDlg#18"
-#~ msgid "localhost"
-#~ msgstr "anfitrión local"
-
-#~ msgctxt "SettingsDlg#1"
-#~ msgid "Settings"
-#~ msgstr "Configuración"
-
-#~ msgctxt "SettingsDlg#4"
-#~ msgid "Configure %1"
-#~ msgstr "Configurar %1"
-
-#~ msgctxt "SettingsDlg#5"
-#~ msgid "Reload Settings"
-#~ msgstr "Recargar configuración"
-
-#~ msgctxt "SettingsDlg#6"
-#~ msgid "Do you like to reload the settings, undoing your changes on this page?"
-#~ msgstr "¿Quiere recargar las preferencias, deshaciendo sus cambios en esta página?"
-
-#~ msgctxt "SettingsDlg#7"
-#~ msgid "Restore Defaults"
-#~ msgstr "Restaurar predeterminados"
-
-#~ msgctxt "SettingsDlg#8"
-#~ msgid "Do you like to restore the default values for this page?"
-#~ msgstr "¿Le gustaría restaurar los valores predeterminados para ésta página?"
-
-#~ msgctxt "SettingsDlg#9"
-#~ msgid "Configure Quassel"
-#~ msgstr "Configurar Quassel"
-
-#~ msgctxt "SettingsPageDlg#1"
-#~ msgid "Configure %1"
-#~ msgstr "Configurar %1"
-
-#~ msgctxt "SettingsPageDlg#2"
-#~ msgid "Reload Settings"
-#~ msgstr "Recargar configuración"
-
-#~ msgctxt "SettingsPageDlg#3"
-#~ msgid "Do you like to reload the settings, undoing your changes on this page?"
-#~ msgstr "¿Quiere recargar la configuración, deshaciendo sus cambios en esta página?"
-
-#~ msgctxt "SettingsPageDlg#4"
-#~ msgid "Restore Defaults"
-#~ msgstr "Restaurar predeterminados"
-
-#~ msgctxt "SettingsPageDlg#5"
-#~ msgid "Do you like to restore the default values for this page?"
-#~ msgstr "¿Le gustaría restaurar los valores predeterminados para ésta página?"
-
-#~ msgctxt "SettingsPageDlg#6"
-#~ msgid "Configure Quassel"
-#~ msgstr "Configurar Quassel"
-
-#~ msgctxt "SettingsPageDlg#7"
-#~ msgid "Settings"
-#~ msgstr "Configuración"
-
-#~ msgctxt "SimpleNetworkEditor#1"
-#~ msgid "Network name:"
-#~ msgstr "Nombre de la red:"
-
-#~ msgctxt "SimpleNetworkEditor#3"
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgctxt "SimpleNetworkEditor#6"
-#~ msgid "&Edit..."
-#~ msgstr "&Editar..."
-
-#~ msgctxt "SimpleNetworkEditor#8"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "SimpleNetworkEditor#10"
-#~ msgid "De&lete"
-#~ msgstr "&Borrar"
-
-#~ msgctxt "SimpleNetworkEditor#11"
-#~ msgid "Move upwards in list"
-#~ msgstr "Subir en la lista"
-
-#~ msgctxt "SimpleNetworkEditor#12"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "SimpleNetworkEditor#13"
-#~ msgid "Move downwards in list"
-#~ msgstr "Bajar en la lista"
-
-#~ msgctxt "TaskbarNotificationBackend::ConfigWidget#3"
-#~ msgid "Unlimited"
-#~ msgstr "Ilimitado"
-
-#~ msgctxt "TaskbarNotificationBackend::ConfigWidget#4"
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgctxt "ToolBarActionProvider#1"
-#~ msgid "Connect"
-#~ msgstr "Conectar"
-
-#~ msgctxt "ToolBarActionProvider#3"
-#~ msgid "Disconnect"
-#~ msgstr "Desconectar"
-
-#~ msgctxt "ToolBarActionProvider#5"
-#~ msgid "Part"
-#~ msgstr "Parte"
-
-#~ msgctxt "ToolBarActionProvider#7"
-#~ msgid "Join"
-#~ msgstr "Unirse"
-
-#~ msgctxt "ToolBarActionProvider#11"
-#~ msgid "Whois"
-#~ msgstr "Quién es"
-
-#~ msgctxt "TopicWidget#1"
-#~ msgid "Users: %1"
-#~ msgstr "Usuarios: %1"
-
-#~ msgctxt "TopicWidget#2"
-#~ msgid "Lag: %1 msecs"
-#~ msgstr "Demora: %1 ms"
-
-#~ msgctxt "TopicWidget#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "TopicWidget#4"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "TopicWidgetSettingsPage#1"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "TopicWidgetSettingsPage#3"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "TopicWidgetSettingsPage#4"
-#~ msgid "Custom font:"
-#~ msgstr "Tipografía personalizada"
-
-#~ msgctxt "UiStyle::StyledMessage#1"
-#~ msgid "%1"
-#~ msgstr "%1"
-
-#~ msgctxt "AliasesSettingsPage#2"
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgctxt "AliasesSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "AliasesSettingsPage#4"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "AliasesSettingsPage#3"
-#~ msgid "Delete"
-#~ msgstr "Borrar"
-
-#~ msgctxt "AppearanceSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgid "<Original>"
-#~ msgstr "<Original>"
-
-#~ msgctxt "AppearanceSettingsPage#10"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "AppearanceSettingsPage#20"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "BacklogSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "BacklogSettingsPage#14"
-#~ msgid "Unlimited"
-#~ msgstr "Ilimitado"
-
-#~ msgctxt "BacklogSettingsPage#19"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "BufferViewSettingsPage#6"
-#~ msgid "Network:"
-#~ msgstr "Red:"
-
-#~ msgctxt "BufferViewSettingsPage#4"
-#~ msgid "De&lete"
-#~ msgstr "&Borrar"
-
-#~ msgctxt "BufferViewSettingsPage#3"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "BufferViewSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "BufferViewSettingsPage#21"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "BufferViewSettingsPage#19"
-#~ msgid "Highlight"
-#~ msgstr "Resaltado"
-
-#~ msgctxt "ChatMonitorSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ChatMonitorSettingsPage#11"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ChatViewSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ChatViewSettingsPage#10"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "ChatViewSettingsPage#22"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ConnectionSettingsPage#4"
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgctxt "ConnectionSettingsPage#13"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "BufferViewSettingsPage#2"
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgctxt "CoreAccountSettingsPage#9"
-#~ msgid "Remote Cores"
-#~ msgstr "Núcleos remotos"
-
-#~ msgid "Desktop Notification (via D-Bus)"
-#~ msgstr "Notificación de escritorio (vía D-Bus)"
-
-#~ msgctxt "ChatMonitorSettingsPage#12"
-#~ msgid "Chat Monitor"
-#~ msgstr "Monitor de charla"
-
-#~ msgctxt "CoreAccountSettingsPage#4"
-#~ msgid "Add..."
-#~ msgstr "Añadir..."
-
-#~ msgctxt "CoreAccountSettingsPage#5"
-#~ msgid "Delete"
-#~ msgstr "Borrar"
-
-#~ msgctxt "CoreConnectAuthDlg#5"
-#~ msgid "Remember password"
-#~ msgstr "Recordar contraseña"
-
-#~ msgctxt "CoreConnectAuthDlg#3"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "CoreConnectAuthDlg#4"
-#~ msgid "Username:"
-#~ msgstr "Usuario:"
-
-#~ msgctxt "CoreConnectionSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConnectionSettingsPage#7"
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgctxt "CoreConnectionStatusWidget#2"
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgctxt "CoreConnectionStatusWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "CoreConnectionSettingsPage#13"
-#~ msgid "Connection"
-#~ msgstr "Conexión"
-
-#~ msgctxt "CoreConnectionSettingsPage#12"
-#~ msgid "Remote Cores"
-#~ msgstr "Núcleos remotos"
-
-#~ msgctxt "CoreInfoDlg#10"
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgid "X: "
-#~ msgstr "X: "
-
-#~ msgctxt "HighlightSettingsPage#8"
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
-#~ msgctxt "HighlightSettingsPage#3"
-#~ msgid "Highlight"
-#~ msgstr "Resaltado"
-
-#~ msgctxt "HighlightSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "IdentitiesSettingsPage#13"
-#~ msgid "</ul>"
-#~ msgstr "</ul>"
-
-#~ msgctxt "IdentitiesSettingsPage#4"
-#~ msgid "Add..."
-#~ msgstr "Añadir..."
-
-#~ msgctxt "IdentitiesSettingsPage#2"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "IdentitiesSettingsPage#1"
-#~ msgid "Rename Identity"
-#~ msgstr "Renombrar la identidad"
-
-#~ msgctxt "HighlightSettingsPage#14"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "IdentitiesSettingsPage#6"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "DesktopNotificationConfigWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "DesktopNotificationConfigWidget#4"
-#~ msgid " s"
-#~ msgstr " s"
-
-#~ msgid "Timeout:"
-#~ msgstr "Tiempo de espera:"
-
-#~ msgid " px"
-#~ msgstr " px"
-
-#~ msgid "Y: "
-#~ msgstr "Y: "
-
-#~ msgctxt "IdentityEditWidget#35"
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgctxt "IdentityEditWidget#5"
-#~ msgid "Add Nickname"
-#~ msgstr "Añadir el apodo"
-
-#~ msgctxt "IdentityEditWidget#6"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "IdentityEditWidget#9"
-#~ msgid "Rename Identity"
-#~ msgstr "Renombrar identidad"
-
-#~ msgctxt "IdentityEditWidget#10"
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgctxt "IdentityEditWidget#8"
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
-#~ msgctxt "IdentityEditWidget#12"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "IdentityEditWidget#26"
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgctxt "IgnoreListSettingsPage#5"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "IgnoreListSettingsPage#3"
-#~ msgid "Delete"
-#~ msgstr "Borrar"
-
-#~ msgctxt "IgnoreListSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "IgnoreListSettingsPage#2"
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgctxt "InputWidgetSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "InputWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "IgnoreListEditDlg#11"
-#~ msgid "Ignore Rule"
-#~ msgstr "Ignorar regla"
-
-#~ msgctxt "IgnoreListEditDlg#18"
-#~ msgid "Channel"
-#~ msgstr "Canal"
-
-#~ msgctxt "IgnoreListEditDlg#17"
-#~ msgid "Network"
-#~ msgstr "Red"
-
-#~ msgctxt "InputWidgetSettingsPage#2"
-#~ msgid "Custom font:"
-#~ msgstr "Tipografía personalizada:"
-
-#~ msgctxt "InputWidgetSettingsPage#12"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ItemViewSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "ItemViewSettingsPage#2"
-#~ msgid "Custom font:"
-#~ msgstr "Tipografía personalizada:"
-
-#~ msgctxt "ItemViewSettingsPage#9"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "ItemViewSettingsPage#18"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "ItemViewSettingsPage#20"
-#~ msgid "Network"
-#~ msgstr "Red"
-
-#~ msgctxt "ItemViewSettingsPage#24"
-#~ msgid "Highlight"
-#~ msgstr "Resaltado"
-
-#~ msgctxt "NetworksSettingsPage#17"
-#~ msgid "Connection"
-#~ msgstr "Conexión"
-
-#~ msgid "Interval:"
-#~ msgstr "Intervalo:"
-
-#~ msgctxt "NetworksSettingsPage#21"
-#~ msgid " s"
-#~ msgstr " s"
-
-#~ msgctxt "NetworksSettingsPage#7"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "NetworksSettingsPage#8"
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgctxt "NetworksSettingsPage#3"
-#~ msgid "&Add..."
-#~ msgstr "&Añadir..."
-
-#~ msgctxt "NetworksSettingsPage#2"
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgctxt "NetworksSettingsPage#4"
-#~ msgid "De&lete"
-#~ msgstr "&Borrar"
-
-#~ msgctxt "NetworksSettingsPage#10"
-#~ msgid "&Edit..."
-#~ msgstr "&Editar..."
-
-#~ msgctxt "NetworksSettingsPage#39"
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgctxt "NetworksSettingsPage#28"
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgctxt "NetworksSettingsPage#23"
-#~ msgid "Unlimited"
-#~ msgstr "Ilimitado"
-
-#~ msgctxt "NetworksSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "NickEditDlg#4"
-#~ msgid "Add Nickname"
-#~ msgstr "Añadir el apodo"
-
-#~ msgctxt "NetworksSettingsPage#43"
-#~ msgid "</ul>"
-#~ msgstr "</ul>"
-
-#~ msgctxt "SettingsDlg#8"
-#~ msgid "Restore Defaults"
-#~ msgstr "Restaurar valores predeterminados"
-
-#~ msgctxt "SettingsPageDlg#1"
-#~ msgid "Configure Quassel"
-#~ msgstr "Configurar Quassel"
-
-#~ msgctxt "SettingsPageDlg#2"
-#~ msgid "Settings"
-#~ msgstr "Opciones"
-
-#~ msgctxt "SettingsDlg#2"
-#~ msgid "Settings"
-#~ msgstr "Configuración"
-
-#~ msgctxt "SettingsDlg#5"
-#~ msgid "Configure %1"
-#~ msgstr "Configurar %1"
-
-#~ msgctxt "SettingsPageDlg#6"
-#~ msgid "Restore Defaults"
-#~ msgstr "Restaurar valores predeterminados"
-
-#~ msgctxt "SettingsPageDlg#3"
-#~ msgid "Configure %1"
-#~ msgstr "Configurar %1"
-
-#~ msgid "Animate"
-#~ msgstr "Animar"
-
-#~ msgid "System Tray Icon"
-#~ msgstr "Icono de bandeja del sistema"
-
-#~ msgctxt "TaskbarNotificationBackend::ConfigWidget#4"
-#~ msgid " s"
-#~ msgstr " s"
-
-#~ msgctxt "TopicWidget#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "TopicWidgetSettingsPage#5"
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgctxt "TopicWidget#2"
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgctxt "TopicWidgetSettingsPage#1"
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgctxt "TopicWidgetSettingsPage#2"
-#~ msgid "Custom font:"
-#~ msgstr "Tipografía personalizada:"
-
-#~ msgctxt "IdentityEditWidget#11"
-#~ msgid "Move upwards in list"
-#~ msgstr "Subir en la lista"
-
-#~ msgctxt "IdentityEditWidget#13"
-#~ msgid "Move downwards in list"
-#~ msgstr "Bajar en la lista"
-
-#~ msgid "Show messages in indicator"
-#~ msgstr "Mostrar mensajes en el indicador"
-
-#~ msgctxt "NetworksSettingsPage#12"
-#~ msgid "Move downwards in list"
-#~ msgstr "Bajar en la lista"
-
-#~ msgctxt "NetworksSettingsPage#11"
-#~ msgid "Move upwards in list"
-#~ msgstr "Subir en la lista"
-
-#~ msgctxt "SettingsDlg#1"
-#~ msgid "Configure Quassel"
-#~ msgstr "Configurar Quassel"
-
-#~ msgctxt "SettingsDlg#6"
-#~ msgid "Reload Settings"
-#~ msgstr "Recargar configuración"
-
-#~ msgctxt "SettingsPageDlg#4"
-#~ msgid "Reload Settings"
-#~ msgstr "Recargar contrafiguración"
-
-#~ msgctxt "IdentitiesSettingsPage#8"
-#~ msgid "<b>The following problems need to be corrected before your changes can be applied:</b><ul>"
-#~ msgstr "<b>Los siguientes problemas necesitan ser corregidos para que sus cambios puedan ser aplicados</b><ul>"
-
-#~ msgid "<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2009 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 "<b>Un moderno cliente de IRC, distribuido</b><br><br>&copy;2005-2009 por el Proyecto Quassel<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 está sujeto a doble licencia bajo <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> y <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>La mayoría de los iconos son &copy; por el <a href=\"http://www.oxygen-icons.org\">Equipo de Oxigen</a> y usados bajo la <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Por favor, utilice <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> para reportar fallos."
-
-#~ msgid "sending CTCP-%1 request"
-#~ msgstr "enviando solicitud CTCP-%1"
-
-#~ msgid "Position hint:"
-#~ msgstr "Indicador de posición:"
-
-#~ msgid "Queue unread notifications"
-#~ msgstr "Encolar notificaciones sin leer"
-
-#~ msgid "Control automatic reconnect to the network"
-#~ msgstr "Control de reconexión automática a la red"
-
-#~ msgid "Retries:"
-#~ msgstr "Intentos:"
-
-#~ msgid "Rejoin all channels on reconnect"
-#~ msgstr "Volver a unirse a todos los canales al reconectarse"
-
-#~ msgid "Audio Notification (via Phonon)"
-#~ msgstr "Notificación con sonido (vía Phonon)"
-
-#~ msgid "Play File:"
-#~ msgstr "Reproducir:"
-
-#~ msgid "Show bubble"
-#~ msgstr "Mostrar mensaje emergente"
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] mesaje de inactivo: %1"
diff --git a/po/it.po b/po/it.po
index b0cf1344..8b05c9e6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -95,12 +95,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr "Un ringraziamento speciale va a:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>per l'icona Quassel originale - L'Occhio Che Tutto Vede</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-icons.org\">Il Team Oxygen</a></b></dt><dd>per aver creato tutte le illustrazioni per Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software formalmente conosciuta come Trolltech</a></b></dt><dd>per aver creato Qt e Qtopia, e per aver sponsorizzato lo sviluppo di QuasselTopia sui Greenphones e molto altro</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>per aver mantenuto Qt in vita, e per sponsorizzare lo sviluppo di Quassel Mobile sui dispositivi N810</dd>"
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Lo Schema installato (versione %1) non è aggiornato. Aggiornamento alla versione %2..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Aggiornamento fallito..."
 
@@ -169,6 +169,8 @@ msgstr "Espansione"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -194,6 +196,7 @@ msgstr "Espansione"
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -306,33 +309,33 @@ msgstr "Percorso:"
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -422,22 +425,25 @@ msgstr "Errori:"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "Interfaccia"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr "Per favore scegliere un file di foglio di stile"
 
@@ -587,7 +593,7 @@ msgid "Backlog Fetching"
 msgstr "Prelevamento dei backlog"
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -791,47 +797,58 @@ msgid "BufferView"
 msgstr "VistaBuffer"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Zoom avanti"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Zoom indietro"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Dimensioni originali"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+msgid "Set Marker Line"
+msgstr "Imposta evidenziatore"
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "Imposta evidenziatore"
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Canale %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Utenti:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Modalità:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Argomento:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "Non attivo <br /> Doppio click per entrare"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -944,7 +961,7 @@ msgstr "Mostra i propri messaggi"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "Monitor di chat"
 
@@ -974,7 +991,7 @@ msgid "Configure..."
 msgstr "Configura..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Copia Selezione"
 
@@ -1015,89 +1032,109 @@ msgstr "Font per la finestra di chat personalizzato"
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr "Mostra testo colorato nella finestra di chat"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr "Consenti testo colorato (codici colori mIRC)"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr "Visualizza l'anteprima di un sito web quando muovi il cursore sopra un indirizzo web"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr "Visualizza anteprima pagine web (al passaggio del mouse)"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr "Imposta l'evidenziatore in basso nella finestra di chat corrente quando viene selezionato un altro canale"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr "Imposta evidenziatore automaticamente al passaggio tra chat"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "Colori Personalizzati"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "Azione:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Timestamp:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Messaggio canale:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "Colore di primo piano per l'evento:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Messaggio comando:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "Colore di sfondo per l'evento:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Messaggio server:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "Linea evidenziatrice:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Messaggio di errore:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Sfondo:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr "Usa colorazione del mittente"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Propri messaggi:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr "Vista chat"
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr "è necessaria la versione 0.6 del core quassel per questa caratteristica"
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1113,6 +1150,16 @@ msgstr "Elaborati %1 messaggi in %2 secondi."
 msgid "All Chats"
 msgstr "Tutte le Chat"
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr "/JOIN attende un canale"
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr "/QUERY attende come minimo un nick"
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1184,7 +1231,7 @@ msgid "Minimum delay between requests:"
 msgstr "Ritardo minimo tra le richieste:"
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Copia indirizzo"
 
@@ -1320,8 +1367,9 @@ msgstr "Ping"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr "Finger"
+#, fuzzy
+msgid "Client info"
+msgstr "Client"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1919,97 +1967,97 @@ msgid "Connect to Core"
 msgstr "Connetti al Core..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr "La rete è inattiva"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "Ricerca in corso di %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206
-#: ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "Connessione a %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Connesso a %1"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "Disconnessione da %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr "Il Quassel Core a cui stai tentando di connetterti è troppo vecchio! Sei pregato di aggiornarlo quanto prima."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr "Dati non validi ricevuti dal core"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "Disconnesso dal Core"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr "Connessione non sicura annullata"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr "Sincronizzazione al Core..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr "<b>Il Quassel Core a cui stai tentando di connetterti è troppo vecchio!</b><br>E' necessario almeno un core/client che utilizzi il protocollo v%1 per connettersi ad esso."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Connessione in corso..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "Login annullato"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr "Ricezione dello stato sessione:"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr "Sincronizzazione con %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr "Ricezioni degli stati della rete"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr "Sincronizzato con %1"
 
@@ -2193,12 +2241,12 @@ msgid "Core Shutdown"
 msgstr "Spegni Core"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "Impossibile connettersi a %1 (%2)"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Connessione fallita: %1"
 
@@ -2218,15 +2266,56 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr "CoreSession::createNetwork(): Tentativo di creare una rete già esistente, aggiornamento in corso!"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "assente"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr "invio richiesta CTCP-%1 a %2"
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "Nessun topic impostato per %1."
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2249,41 +2338,53 @@ msgstr "Duplica:"
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+#, fuzzy
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr "Ricevuta richiesta CTCP PING da %1"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+#, fuzzy
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr "Ricevuta risposta CTCP TIME da %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "Ricevuta richiesta CTCP PING da %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "Ricevuta risposta CTCP PING da %1 con %2 secondi di round trip"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "Ricevuta richiesta CTCP VERSION da %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "Ricevuta risposta CTCP VERSION da %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr "Ricevuta richiesta CTCP TIME da %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr "Ricevuta risposta CTCP TIME da %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Ricevuto CTCP sconosciuto %1 da %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr " con argomenti: %1"
 
@@ -2456,8 +2557,14 @@ msgstr "Tutti i nick dell'identità"
 msgid "Current nick"
 msgstr "Nick corrente"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Nessuno"
 
@@ -2595,8 +2702,12 @@ msgstr "Qui non siamo all'asilo!"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Chat comfortably. Anywhere."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr "Generale"
 
@@ -2774,7 +2885,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Continua"
 
@@ -3137,93 +3248,93 @@ msgid "Show messages in application indicator"
 msgstr "Mostra messaggi nell'indicatore dell'applicazione"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr "Bianco"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr "Nero"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr "Blu scuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr "Verde scuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr "Rosso"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr "Rosso scuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr "Magenta scuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr "Arancione"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr "Giallo"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr "Verde"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr "Azzurro scuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr "Azzurro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr "Blu"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr "Magenta"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr "Grigio scuro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Light gray"
 msgstr "Grigio chiaro"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:86
-#: ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr "Elimina colore"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Seleziona Campo Inserimento Testo"
 
@@ -3261,36 +3372,46 @@ msgstr "Mostra pulsanti di stile"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr "Abilita associazione tasti (limitata) di Emacs nella barra di input."
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr "Associazioni tasti Emacs"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr "Modifica Multi-Riga"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr "Mostra al più"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "righe"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "Abilita barre di scorrimento"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr "Completamento Tab"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Suffisso autocompletamento:"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
@@ -3316,23 +3437,28 @@ msgstr "Utenti"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Argomento"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 ha cambiato argomento per il canale %2 in: \"%3\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Ricevuto RPL_ISUPPORT (005) senza parametri!"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr "Ricevuto un messaggio non RFC-compliamnt RPL_ISUPPORT: potrebbe portare ad un comportamento inatteso!"
 
@@ -3350,161 +3476,166 @@ msgstr "Ricevuto un messaggio non RFC-compliamnt RPL_ISUPPORT: potrebbe portare
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 è assente: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 è assente: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 è %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 è online tramite %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr "[Whowas] %1 era %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Fine della lista /WHO per %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 è loggato da %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr "[Whois] %1 è inattivo da %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] messaggio di inattività: %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 è utente sui canali: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 ha il voice sui canali: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 è operatore sui canali: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "Il canale %1 ha %2 utenti. Il topic è: %3"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Lista canali terminata"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr "Pagina home per %1 è %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr "Canale %1 creato il %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "Nessun topic impostato per %1."
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "Il topic di %1 è \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Topic impostato da %1 il %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "Il nick %1 contiene caratteri non validi"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Nick già utilizzato: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr "Nick/canale temporaneamente non disponibile: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr "Nessun nick libero e valido trovato nella lista nickname. Utilizza: /nick <altronickname> per continuare"
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 msgid " is away"
 msgstr " è assente"
 
@@ -3512,8 +3643,8 @@ msgstr " è assente"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr "inattivo da %1"
 
@@ -3521,8 +3652,8 @@ msgstr "inattivo da %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr "durata autenticazione: %1"
 
@@ -3530,8 +3661,8 @@ msgstr "durata autenticazione: %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "server: %1"
 
@@ -3641,254 +3772,484 @@ msgid_plural "%n pending highlights"
 msgstr[0] "%n evento in attesa"
 msgstr[1] "%n eventi in attesa"
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr "Il tasto appena premuto non è supportato da Qt."
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr "Tasto non supportato"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+"Cliccare sul pulsante, poi inserire la scorciatoia così come si vorrebbe nel programma.\n"
+"Esempio per Ctrl+a: tenere premuto il tasto Ctrl e premere a."
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr "Tasto Alt (Meta)"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr "Tasto Ctrl"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Tasto Alt (Meta)"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr "Tasto Shift"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Input"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Nessuna"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr "Conflitto tra scorciatoie"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+"La scorciatoia \"%1\" è già in uso, e non può essere configurata.\n"
+"Per favore sceglierne un'altra."
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr "La scorciatoia \"%1\" è in conflitto con la scorciatoia per la seguente azione:"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr "Si desidera riassegnare questa scorciatoia all'azione selezionata?"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr "Riassegna"
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "&Connetti al Core..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Disconnetti dal Core"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "&Informazioni Core..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "Configura &Reti..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "&Esci"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr "&Configura Liste Chat..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "&Blocca Layout"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Mostra Barra di &Ricerca"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr "Mostra Log Assenza"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "Mostra &Barra dei menu"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "Mostra Status &Bar"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+msgid "Configure &Shortcuts..."
+msgstr "Configura &scorciatioie..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "&Configura Quassel..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "&Informazioni su Quassel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "Informazioni su &Qt"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "Debug &ModelloRete"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr "Debug & OverlayVistaBuffer"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "Debug &ModelloMessaggio"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr "Debug &Hotlist"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "Debug &Log"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr "Ricarica Fogli di Stile"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+msgid "Navigation"
+msgstr "Navigazione"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr "Passa alla chat attiva"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr "Imposta accesso rapido #0"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr "Imposta accesso rapido #1"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr "Imposta accesso rapido #2"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr "Imposta accesso rapido #3"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr "Imposta accesso rapido #4"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr "Imposta accesso rapido #5"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr "Imposta accesso rapido #6"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr "Imposta accesso rapido #7"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr "Imposta accesso rapido #8"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr "Imposta accesso rapido #9"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr "Accesso rapido #0"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr "Accesso rapido #1"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr "Accesso rapido #2"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr "Accesso rapido #3"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr "Accesso rapido #4"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr "Accesso rapido #5"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr "Accesso rapido #6"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr "Accesso rapido #7"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr "Accesso rapido #8"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr "Accesso rapido #9"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "Eliminare lista chat?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "Vai alla Chat"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "Vai alla Chat"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "&File"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Reti"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Visualizza"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "&Liste Chat"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "&Barre degli strumenti"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "&Impostazioni"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "&Aiuto"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Debug"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Nick"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Mostra Lista Nick"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Mostra Chat Monitor"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "Campo Inserimento Testo"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Mostra Campo Inserimento Testo"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Mostra Linea del Topic"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "Barra principale"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Connesso al core."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "Non connesso al core."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr "Connessione non criptata"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Il client non supporta SSL</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr "I dati sensibili, come le password, verranno trasmesse in chiaro al core Quassel."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Il core non supporta SSL</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr "Certificato di sicurezza non fidato"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr "<b>Il certificato SSL fornito dal cora a %1 non è fidato per i seguenti motivi:</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr "Mostra certificato"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr "Si desidera accettare questo certificato per sempre senza chiederlo nuovamente?"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr "Solo per la sessione corrente"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr "Per sempre"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr "Errore nella connessione al core"
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+#, fuzzy
+msgid "&Normal mode"
+msgstr "Normale"
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3900,14 +4261,14 @@ msgid "Receiving Backlog"
 msgstr "Ricezione Backlog in corso"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] "Si desidera davvero incollare %1 riga?"
 msgstr[1] "Si desidera davvero incollare %n righe?"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "Paste Protection"
 
@@ -3969,7 +4330,7 @@ msgid "Please enter a network name:"
 msgstr "Inserisci il nome della rete:"
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Server: %1"
 
@@ -3977,7 +4338,7 @@ msgstr "Server: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Utenti: %1"
@@ -3986,18 +4347,18 @@ msgstr "Utenti: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Latenza: %1 msecs"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "Chat"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Numero nick"
 
@@ -4325,7 +4686,7 @@ msgstr "Questa procedura guidata ti aiuterà ad impostare la tua identità prede
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr "Dichiarazione blocco non valida: %1"
 
@@ -4345,146 +4706,146 @@ msgid "Invalid subelement name in %1"
 msgstr "Nome del subelemento non valido in %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr "Tipo di messaggio non valido in %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr "Condizione %1 non valida"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr "Etichetta messaggio non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr "Specifica hash del mittente non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "L'hash del mittente può essere al massimo \"0x0f\"!"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr "Nome formato non valido: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Specifica colore IRC illegale (deve essere compresa tra 00 e 0f): %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr "Condizione non gestita: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr "Proplist %1 non valida"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr "Tipo elemento della lista chat non valido: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr "Stato lista chat %1 non valido"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr "Dichiarazione proprietà non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr "Proprietà font non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr "Proprietà ChatLine sconosciuta: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr "Specifica regola della tavolozza colore non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr "Regola tavolozza colore non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr "Dichiarazione gradiente non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr "Gradiente non valido ferma la lista: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr "Specifica font non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr "Specifica stile font non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr "Specifica peso font non valida: %1"
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr "Specifica dimensione font non valida: %1"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "anno"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "giorno"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "h"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "min"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "sec"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Query con %1</b>"
 
@@ -4629,6 +4990,41 @@ msgstr "Ripristina predefiniti"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Si desidera ripristinare i valori predefiniti per questa pagina?"
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+msgid "Action"
+msgstr "Azione"
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr "Scorciatoia"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgid "Search:"
+msgstr "Cerca:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr "Scorciatoia per l'azione selezionata"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgid "Default:"
+msgstr "Predefinito:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgid "Custom:"
+msgstr "Personalizzato:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr "Scorciatoie"
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4968,359 +5364,201 @@ msgstr "Widget per Topic"
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr "%DN%1%DN %2"
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr "Sei ora conosciuto come %DN%1%DN"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN è ora conosciuto come %DN%2%DN"
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "Modalità utente: %DM%1%DM"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Modalità %DM%1%DM da %DN%2%DN"
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH è entrato in %DC%4%DC"
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH è uscito da %DC%4%DC"
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH è uscito"
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN ha cacciato %DN%2%DN da %DC%3%DC"
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr "{Oggi è %1}"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr "Netsplit tra %DH%1%DH e %DH%2%DH terminato. Utenti entrati: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (ancora %2)"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "Netsplit tra %DH%1%DH e %DH%2%DH. Utenti usciti: "
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr "<-x"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr "-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr "=>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr "<="
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] "%n proprietario(i)"
 msgstr[1] "%n proprietario (i)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] "%n amministratore(i)"
 msgstr[1] "%n amministratore(i)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] "%n operatore(i)"
 msgstr[1] "%n operatore(i)"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n half-op"
 msgstr[1] "%n half-op"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] "%n voice"
 msgstr[1] "%n voice"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] "%n utente(i)"
 msgstr[1] "%n utente(i)"
 
-#~ msgid "Set Marker Line"
-#~ msgstr "Imposta evidenziatore"
-
-#~ msgid "Show colored text in the chat window"
-#~ msgstr "Mostra testo colorato nella finestra di chat"
-
-#~ msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
-#~ msgstr "Imposta l'evidenziatore in basso nella finestra di chat corrente quando viene selezionato un altro canale"
-
-#~ msgid "Set marker line automatically when switching chats"
-#~ msgstr "Imposta evidenziatore automaticamente al passaggio tra chat"
-
-#~ msgid "You need at 0.6 quasselcore to use this feature"
-#~ msgstr "è necessaria la versione 0.6 del core quassel per questa caratteristica"
-
-#~ msgid "/JOIN expects a channel"
-#~ msgstr "/JOIN attende un canale"
-
-#~ msgid "/QUERY expects at least a nick"
-#~ msgstr "/QUERY attende come minimo un nick"
-
-#~ msgid "Enables (limited) Emacs key bindings in the input field."
-#~ msgstr "Abilita associazione tasti (limitata) di Emacs nella barra di input."
-
-#~ msgid "Emacs key bindings"
-#~ msgstr "Associazioni tasti Emacs"
-
-#~ msgid "The key you just pressed is not supported by Qt."
-#~ msgstr "Il tasto appena premuto non è supportato da Qt."
-
-#~ msgid "Unsupported Key"
-#~ msgstr "Tasto non supportato"
-
-#~ 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 ""
-#~ "Cliccare sul pulsante, poi inserire la scorciatoia così come si vorrebbe nel programma.\n"
-#~ "Esempio per Ctrl+a: tenere premuto il tasto Ctrl e premere a."
-
-#~ msgctxt "Meta key"
-#~ msgid "Meta"
-#~ msgstr "Tasto Alt (Meta)"
-
-#~ msgctxt "Ctrl key"
-#~ msgid "Ctrl"
-#~ msgstr "Tasto Ctrl"
-
-#~ msgctxt "Alt key"
-#~ msgid "Alt"
-#~ msgstr "Tasto Alt (Meta)"
-
-#~ msgctxt "Shift key"
-#~ msgid "Shift"
-#~ msgstr "Tasto Shift"
-
-#~ msgctxt "What the user inputs now will be taken as the new shortcut"
-#~ msgid "Input"
-#~ msgstr "Input"
-
-#~ msgctxt "No shortcut defined"
-#~ msgid "None"
-#~ msgstr "Nessuna"
-
-#~ msgid "Shortcut Conflict"
-#~ msgstr "Conflitto tra scorciatoie"
-
-#~ msgid ""
-#~ "The \"%1\" shortcut is already in use, and cannot be configured.\n"
-#~ "Please choose another one."
-#~ msgstr ""
-#~ "La scorciatoia \"%1\" è già in uso, e non può essere configurata.\n"
-#~ "Per favore sceglierne un'altra."
-
-#~ msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
-#~ msgstr "La scorciatoia \"%1\" è in conflitto con la scorciatoia per la seguente azione:"
-
-#~ msgid "Do you want to reassign this shortcut to the selected action?"
-#~ msgstr "Si desidera riassegnare questa scorciatoia all'azione selezionata?"
-
-#~ msgid "Reassign"
-#~ msgstr "Riassegna"
-
-#~ msgid "Configure &Shortcuts..."
-#~ msgstr "Configura &scorciatioie..."
-
-#~ msgid "Navigation"
-#~ msgstr "Navigazione"
-
-#~ msgid "Set Quick Access #0"
-#~ msgstr "Imposta accesso rapido #0"
-
-#~ msgid "Set Quick Access #1"
-#~ msgstr "Imposta accesso rapido #1"
-
-#~ msgid "Set Quick Access #2"
-#~ msgstr "Imposta accesso rapido #2"
-
-#~ msgid "Set Quick Access #3"
-#~ msgstr "Imposta accesso rapido #3"
-
-#~ msgid "Set Quick Access #4"
-#~ msgstr "Imposta accesso rapido #4"
-
-#~ msgid "Set Quick Access #5"
-#~ msgstr "Imposta accesso rapido #5"
-
-#~ msgid "Set Quick Access #6"
-#~ msgstr "Imposta accesso rapido #6"
-
-#~ msgid "Set Quick Access #7"
-#~ msgstr "Imposta accesso rapido #7"
-
-#~ msgid "Set Quick Access #8"
-#~ msgstr "Imposta accesso rapido #8"
-
-#~ msgid "Set Quick Access #9"
-#~ msgstr "Imposta accesso rapido #9"
-
-#~ msgid "Quick Access #0"
-#~ msgstr "Accesso rapido #0"
-
-#~ msgid "Quick Access #1"
-#~ msgstr "Accesso rapido #1"
-
-#~ msgid "Quick Access #2"
-#~ msgstr "Accesso rapido #2"
-
-#~ msgid "Quick Access #3"
-#~ msgstr "Accesso rapido #3"
-
-#~ msgid "Quick Access #4"
-#~ msgstr "Accesso rapido #4"
-
-#~ msgid "Quick Access #5"
-#~ msgstr "Accesso rapido #5"
-
-#~ msgid "Quick Access #6"
-#~ msgstr "Accesso rapido #6"
-
-#~ msgid "Quick Access #7"
-#~ msgstr "Accesso rapido #7"
-
-#~ msgid "Quick Access #8"
-#~ msgstr "Accesso rapido #8"
-
-#~ msgid "Quick Access #9"
-#~ msgstr "Accesso rapido #9"
-
-#~ msgid "Action"
-#~ msgstr "Azione"
-
-#~ msgid "Shortcut"
-#~ msgstr "Scorciatoia"
-
-#~ msgid "Search:"
-#~ msgstr "Cerca:"
-
-#~ msgid "Shortcut for Selected Action"
-#~ msgstr "Scorciatoia per l'azione selezionata"
-
-#~ msgid "Default:"
-#~ msgstr "Predefinito:"
-
-#~ msgid "Custom:"
-#~ msgstr "Personalizzato:"
+#~ msgid "Finger"
+#~ msgstr "Finger"
 
-#~ msgid "Shortcuts"
-#~ msgstr "Scorciatoie"
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] messaggio di inattività: %1"
 
 #~ msgid "Add Buffers Automatically:"
 #~ msgstr "Aggiungi Buffer Automaticamente:"
diff --git a/po/ja.po b/po/ja.po
index 01927357..ffb8e8d5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -92,12 +92,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr ""
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr ""
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "更新に失敗しました..."
 
@@ -166,6 +166,8 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -191,6 +193,7 @@ msgstr ""
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -303,33 +306,33 @@ msgstr "パス名："
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -419,22 +422,25 @@ msgstr "エラー："
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "インターフェース"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr "スタイルシートのファイルを選択してください"
 
@@ -577,7 +583,7 @@ msgid "Backlog Fetching"
 msgstr ""
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -777,48 +783,60 @@ msgid "BufferView"
 msgstr "バッファビュー"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "拡大"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "縮小"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "実際サイズ"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+#, fuzzy
+msgid "Set Marker Line"
+msgstr "しおり："
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "しおり："
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>チャンネル %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>ユーザ：</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>モード：</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>トピック：</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 #, fuzzy
 msgid "Not active <br /> Double-click to join"
 msgstr "非アクティブ<br />ダブルクリックをして入室"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -923,7 +941,7 @@ msgstr "自分のメッセージを表示"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "チャットモニター"
 
@@ -953,7 +971,7 @@ msgid "Configure..."
 msgstr "設定..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "セレクションをコピー"
 
@@ -994,89 +1012,109 @@ msgstr "カスタムチャットウィンドウのフォント："
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "カスタム色"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "操作："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "タイムスタンプ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "チャンネルメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "強調表示の前景色："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "コマンドメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "強調表示の背景色："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "サーバメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "しおり："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "エラーメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "背景:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "自分のメッセージ："
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr "チャットビュー"
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1092,6 +1130,16 @@ msgstr ""
 msgid "All Chats"
 msgstr "すべてのチャット"
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1164,7 +1212,7 @@ msgid "Minimum delay between requests:"
 msgstr ""
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "リンクアドレスをコピー"
 
@@ -1301,8 +1349,9 @@ msgstr ""
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr ""
+#, fuzzy
+msgid "Client info"
+msgstr "クライアント"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1897,98 +1946,98 @@ msgid "Connect to Core"
 msgstr "コアに接続"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 #, fuzzy
 msgid "Network is down"
 msgstr "ネットワークはダウンしています"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "切断しました"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206
-#: ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "%1 に接続中..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "%1 に接続しました"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "%1 から切断中..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "コアから切断しました。"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "ログイン中..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "ログインがキャンセルしました"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr ""
 
@@ -2174,12 +2223,12 @@ msgid "Core Shutdown"
 msgstr "コアをシャットダウン"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "接続に失敗しました：%1"
 
@@ -2199,15 +2248,55 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr ""
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "退席中"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+msgid "No key has been set for %1."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2230,41 +2319,51 @@ msgstr "個人情報を複製："
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr ""
 
@@ -2437,8 +2536,14 @@ msgstr ""
 msgid "Current nick"
 msgstr "現在のニック"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "なし"
 
@@ -2577,8 +2682,12 @@ msgstr ""
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr ""
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr ""
 
@@ -2757,7 +2866,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 #, fuzzy
 msgid "Continue"
 msgstr "続く"
@@ -3071,97 +3180,97 @@ msgid "Show messages in application indicator"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr "白色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr "黒色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr "濃青色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr "濃緑色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr "赤色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr "暗紅色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr "暗紫色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr "オレンジ色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr "黄色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr "緑色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 #, fuzzy
 msgid "Dark cyan"
 msgstr "暗シアン"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 #, fuzzy
 msgid "Cyan"
 msgstr "シアン"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr "青色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr "紫色"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 #, fuzzy
 msgid "Dark gray"
 msgstr "濃グレー"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 #, fuzzy
 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
 msgid "Clear Color"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr ""
 
@@ -3199,36 +3308,46 @@ msgstr ""
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr "複数行の編集"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "行"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "スクロールバーを有効"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
@@ -3255,23 +3374,28 @@ msgstr "ユーザ"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "トピック"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr ""
 
@@ -3289,162 +3413,167 @@ msgstr ""
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr ""
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 #, fuzzy
 msgid "End of channel list"
 msgstr "チャンネルリストの終わり"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr ""
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 #, fuzzy
 msgid " is away"
 msgstr "退席中"
@@ -3453,8 +3582,8 @@ msgstr "退席中"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr ""
 
@@ -3462,8 +3591,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr ""
 
@@ -3471,8 +3600,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "サーバ：%1"
 
@@ -3582,254 +3711,483 @@ msgid "%n pending highlights"
 msgid_plural "%n pending highlights"
 msgstr[0] ""
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "すべて"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "なし"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "コアに接続(&C)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "コアに切断(&D)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "コア情報(&I)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "ネットワークを設定(&N)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "閉じる(&Q)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr "チャットリストを設定(&C)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "検索バーを表示(&S)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "メニューバーを表示(&M)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "ステータスバーを表示(&B)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "ネットワークを設定(&N)..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "Quassel を設定(&C)..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "Quassel について(&A)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "Qt について(&Q)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "デバグログ(&L)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr "スタイルシートを再読み込む"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "通知"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "チャットリストを削除してもよろしいですか？"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "チャットへ"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "チャットへ"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "ファイル(&F)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "ネットワーク(&N)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "表示(&V)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "チャットリスト(&C)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "ツールバー（&T）"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "設定(&S)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "デバグ"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "ニック"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "ニックリストを表示"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "チャットモニタを表示"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "メインツールバー"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr ""
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+msgid "&Normal mode"
+msgstr ""
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3841,13 +4199,13 @@ msgid "Receiving Backlog"
 msgstr ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr ""
 
@@ -3909,7 +4267,7 @@ msgid "Please enter a network name:"
 msgstr "ネットワーク名を入力してください："
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "サーバ：%1"
 
@@ -3917,7 +4275,7 @@ msgstr "サーバ：%1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "ユーザ：%1"
@@ -3926,18 +4284,18 @@ msgstr "ユーザ：%1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr ""
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "チャット"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr ""
 
@@ -4257,7 +4615,7 @@ msgstr ""
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
@@ -4277,146 +4635,146 @@ msgid "Invalid subelement name in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "å¹´"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "日"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "時"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "分"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "秒"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr ""
 
@@ -4561,6 +4919,45 @@ msgstr ""
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "操作："
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+#, fuzzy
+msgid "Search:"
+msgstr "検索パターン:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+#, fuzzy
+msgid "Default:"
+msgstr "デフォルトのターゲット"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "カスタム..."
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4903,180 +5300,186 @@ msgstr "トピックウィジェット"
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr "%DN%1%DN %2"
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "ユーザモード：%DM%1%DM"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr "<-x"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr "-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr "=>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr "<="
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] "%n 所有者"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] "%n 管理者"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] "%n オペレータ"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n サブオペレータ"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] "%n 発言権所持者"
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] "%n ユーザ"
diff --git a/po/nl.po b/po/nl.po
index 306be8ea..eb7ddc21 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,468 +7,605 @@ msgid ""
 msgstr ""
 "Project-Id-Version: quassel\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-03 10:51+0200\n"
-"PO-Revision-Date: 2010-04-13 12:53+0000\n"
-"Last-Translator: cumulus007 <cumulus0007@gmail.com>\n"
+"POT-Creation-Date: 2010-05-05 02:45+0000\n"
+"PO-Revision-Date: 2010-08-07 10:35+0000\n"
+"Last-Translator: Redmar <redmar@ubuntu-nl.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-13 20:24+0000\n"
+"X-Launchpad-Export-Date: 2010-08-11 21:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: AboutDlg#1
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
-msgstr "<b>Versie:</b> %1<br><b>Protocol versie:</b> %2<br><b>Built:</b> %3"
-
-#: AboutDlg#2
-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 ""
-"<b>Een moderne, gedistribueerde IRC-client</b><br><br>&copy;2005-2010 het "
-"Quassel project<br><a href=\"http://quassel-irc.org\">http://quassel-"
-"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> op <a "
-"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel-IRC valt onder "
-"twee licenties: <a href=\"http://www.gnu.org/licenses/gpl-"
-"2.0.txt\">GPLv2</a> en <a href=\"http://www.gnu.org/licenses/gpl-"
-"3.0.txt\">GPLv3</a>.<br>De meeste pictogrammen zijn &copy; van het <a "
-"href=\"http://www.oxygen-icons.org\">Oxygen Team</a> en vallen onder de <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Gebruik <a "
-"href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> om bugs "
-"te melden."
-
-#: AboutDlg#3
-msgid "Quassel IRC is mainly developed by:"
-msgstr "Quassel-IRC wordt voornamelijk ontwikkeld door:"
-
-#: AboutDlg#4
-msgid ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
-msgstr ""
-"We willen de volgende personen (in alfabetische volgorde) bedanken die een "
-"steentje bijgedragen hebben, naast iedereen die we hier vergeten zijn:"
-
-#: AboutDlg#5
-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 ""
-"Onze speciale dank gaat uit naar:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>voor het originele Quassel "
-"pictogram - 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>voor het creëren van al het "
-"artwork dat u in Quassel ziet </dd><dt><img src=\":/pics/qt-logo-"
-"32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software het "
-"vroegere Trolltech</a></b></dt><dd>voor het maken van Qt en Qtopia, en voor "
-"het sponsoren van QuasselTopia met Greenphones en meer</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>voor het in stand houden van Qt en "
-"voor het sponsoren van de ontwikkeling van Quassel Mobile met N810's</dd>"
-
-#: AboutDlg#6
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:17
 msgid "About Quassel"
 msgstr "Over Quassel"
 
-#: AboutDlg#7
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:59
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; "
-"font-weight:600; font-style:normal;\">\n"
-"<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>"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n"
+"<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 ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; "
-"font-weight:600; font-style:normal;\">\n"
-"<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>"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n"
+"<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>"
 
-#: AboutDlg#8
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:75
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
-"font-weight:600; font-style:normal;\">\n"
-"<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>"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n"
+"<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 ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
-"font-weight:600; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Versie 0.2.0-pre, Build "
-"&gt;= 474 (2008-02-08)</p></body></html>"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Versie 0.2.0-pre, Build &gt;= 474 (2008-02-08)</p></body></html>"
 
-#: AboutDlg#9
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:115
 msgid "&About"
 msgstr "I&nfo"
 
-#: AboutDlg#10
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:135
 msgid "A&uthors"
 msgstr "A&uteurs"
 
-#: AboutDlg#11
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:155
 msgid "&Contributors"
 msgstr "&Medewerkers"
 
-#: AboutDlg#12
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:175
 msgid "&Thanks To"
 msgstr "Me&t dank aan"
 
-#: AbstractSqlStorage#1
-msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
-msgstr ""
-"Het geïnstalleerde Schema (versie %1) is niet de laatste versie. Upgraden "
-"naar versie %2..."
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:32
+msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgstr "<b>Versie:</b> %1<br><b>Protocol versie:</b> %2<br><b>Built:</b> %3"
+
+#. 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."
+msgstr "<b>Een moderne, gedistribueerde IRC-client</b><br><br>&copy;2005-2010 het Quassel project<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> op <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel-IRC valt onder twee licenties: <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> en <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>De meeste pictogrammen zijn &copy; van het <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> en vallen onder de <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Gebruik <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> om bugs te melden."
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:62
+msgid "Quassel IRC is mainly developed by:"
+msgstr "Quassel-IRC wordt voornamelijk ontwikkeld door:"
+
+#. 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:"
+msgstr "We willen de volgende personen (in alfabetische volgorde) bedanken die een steentje bijgedragen hebben, naast iedereen die we hier vergeten zijn:"
+
+#. 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 "Onze speciale dank gaat uit naar:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>voor het originele Quassel pictogram - 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>voor het creëren van al het artwork dat u in Quassel ziet </dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software het vroegere Trolltech</a></b></dt><dd>voor het maken van Qt en Qtopia, en voor het sponsoren van QuasselTopia met Greenphones en meer</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>voor het in stand houden van Qt en voor het sponsoren van de ontwikkeling van Quassel Mobile met N810's</dd>"
+
+#. ts-context AbstractSqlStorage
+#: ../src/core/abstractsqlstorage.cpp:115
+msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+msgstr "Het geïnstalleerde Schema (versie %1) is niet de laatste versie. Upgraden naar versie %2..."
 
-#: AbstractSqlStorage#2
+#. ts-context AbstractSqlStorage
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Upgraden mislukt..."
 
-#: AliasesModel#1
-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 ""
-"<b>De afkorting voor de alias</b><br />Het kan als een regulier slash-"
-"commando gebruikt worden.<br /><br /><b>Voorbeeld:</b> \"foo\" kan gebruikt "
-"worden met /foo"
+#. 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"
+msgstr "<b>De afkorting voor de alias</b><br />Het kan als een regulier slash-commando gebruikt worden.<br /><br /><b>Voorbeeld:</b> \"foo\" kan gebruikt worden met /foo"
 
-#: AliasesModel#2
-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 ""
-"<b>De zin in de afkorting zal uitgeschreven worden naar</b><br /><b>speciale "
-"variabelen:</b><br /> - <b>$i</b> staat voor de i-de parameter.<br /> - "
-"<b>$i..j</b> staat voor de i-de to j-de parameter, gescheiden door "
-"spaties.<br /> - <b>$i..</b> staat voor alle parameters vanaf i gescheiden "
-"door spaties.<br /> - <b>$i:hostname</b> staat voor de hostname van de "
-"gebruiker geïdentificeerd door de i-de parameter of een * als dit niet "
-"bekend is.<br /> - <b>$0</b> de hele zin.<br /> - <b>$nick</b> uw huidige "
-"bijnaam<br /> - <b>$channel</b> de naam van het geselecteerde kanaal<br "
-"/><br />Meerdere commando's kunnen door puntkomma's gescheiden worden.<br "
-"/><br /><b>Voorbeeld:</b> \"Test $1; Test $2; Test Alle $0\" zal "
-"uitgeschreven worden als drie verschillende berichten \"Test 1\", \"Test 2\" "
-"and \"Test Alle 1 2 3\" wanneer aangeroepen met /test 1 2 3"
-
-#: AliasesModel#3
+#. 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"
+msgstr "<b>De zin in de afkorting zal uitgeschreven worden naar</b><br /><b>speciale variabelen:</b><br /> - <b>$i</b> staat voor de i-de parameter.<br /> - <b>$i..j</b> staat voor de i-de to j-de parameter, gescheiden door spaties.<br /> - <b>$i..</b> staat voor alle parameters vanaf i gescheiden door spaties.<br /> - <b>$i:hostname</b> staat voor de hostname van de gebruiker geïdentificeerd door de i-de parameter of een * als dit niet bekend is.<br /> - <b>$0</b> de hele zin.<br /> - <b>$nick</b> uw huidige bijnaam<br /> - <b>$channel</b> de naam van het geselecteerde kanaal<br /><br />Meerdere commando's kunnen door puntkomma's gescheiden worden.<br /><br /><b>Voorbeeld:</b> \"Test $1; Test $2; Test Alle $0\" zal uitgeschreven worden als drie verschillende berichten \"Test 1\", \"Test 2\" and \"Test Alle 1 2 3\" wanneer aangeroepen met /test 1 2 3"
+
+#. ts-context AliasesModel
+#: ../src/qtui/settingspages/aliasesmodel.cpp:170
 msgid "Alias"
 msgstr "Alias"
 
-#: AliasesModel#4
+#. ts-context AliasesModel
+#: ../src/qtui/settingspages/aliasesmodel.cpp:171
 msgid "Expansion"
 msgstr "Uitbreiding"
 
-#: AliasesSettingsPage#1
-msgctxt "AliasesSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
-
-#: AliasesSettingsPage#2
-msgid "Aliases"
-msgstr "Aliassen"
-
-#: AliasesSettingsPage#3
-msgctxt "AliasesSettingsPage#3"
+#. #-#-#-#-#  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 ShortcutsSettingsPage
+#. #-#-#-#-#  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/settingspages/shortcutssettingspage.ui:14
+#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
-msgstr "Form"
-
-#: AliasesSettingsPage#4
-msgctxt "AliasesSettingsPage#4"
+msgstr "Formulier"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AliasesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.ui:27
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
 msgid "New"
 msgstr "Nieuw"
 
-#: AliasesSettingsPage#5
-msgctxt "AliasesSettingsPage#5"
+#. #-#-#-#-#  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
 msgid "Delete"
 msgstr "Verwijder"
 
-#: AppearanceSettingsPage#1
-msgctxt "AppearanceSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: AppearanceSettingsPage#2
-msgid "<System Default>"
-msgstr "<Systeemstandaard>"
-
-#: AppearanceSettingsPage#3
-msgid "Please choose a stylesheet file"
-msgstr "Kies een stylesheet-bestand"
+#. #-#-#-#-#  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
+msgid "IRC"
+msgstr "IRC"
 
-#: AppearanceSettingsPage#4
-msgctxt "AppearanceSettingsPage#4"
-msgid "Form"
-msgstr "Form"
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgid "Aliases"
+msgstr "Aliassen"
 
-#: AppearanceSettingsPage#5
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgid "Client style:"
 msgstr "Clientstijl:"
 
-#: AppearanceSettingsPage#6
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
 msgstr "Stel programmastijl in"
 
-#: AppearanceSettingsPage#7
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:36
 msgid "Language:"
 msgstr "Taal:"
 
-#: AppearanceSettingsPage#8
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
 msgstr "Stel de programmataal in. Herstart vereist!"
 
-#: AppearanceSettingsPage#9
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
 msgid "<Untranslated>"
 msgstr "<Onvertaald>"
 
-#: AppearanceSettingsPage#10
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+msgid "<System Default>"
+msgstr "<Systeemstandaard>"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
 msgid "Use custom stylesheet"
 msgstr "Gebruik eigen stylesheet"
 
-#: AppearanceSettingsPage#11
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
 msgid "Path:"
 msgstr "Pad"
 
-#: AppearanceSettingsPage#12
-msgctxt "AppearanceSettingsPage#12"
+#. #-#-#-#-#  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:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+#: ../src/qtui/settingspages/identityeditwidget.ui:168
+#: ../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
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: AppearanceSettingsPage#13
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
 msgid "Show system tray icon"
 msgstr "Systeemvakpictogram tonen"
 
-#: AppearanceSettingsPage#14
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
 msgid "Hide to tray on close button"
 msgstr "Verberg naar systeemvak als het venster wordt gesloten"
 
-#: AppearanceSettingsPage#15
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:216
 msgid "Enable animations"
 msgstr "Activeer animaties"
 
-#: AppearanceSettingsPage#16
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:231
 msgid "Message Redirection"
 msgstr "Berichten doorsturen"
 
-#: AppearanceSettingsPage#17
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:237
 msgid "User Notices:"
 msgstr "Gebruikers waarschuwingen:"
 
-#: AppearanceSettingsPage#18
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:280
 msgid "Server Notices:"
 msgstr "Server waarschuwingen"
 
-#: AppearanceSettingsPage#19
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:294
 msgid "Default Target"
 msgstr "Standaarddoel"
 
-#: AppearanceSettingsPage#20
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:301
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: AppearanceSettingsPage#21
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:308
 msgid "Current Chat"
 msgstr "Huidige chat"
 
-#: AppearanceSettingsPage#22
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:315
 msgid "Errors:"
 msgstr "Fouten:"
 
-#: AwayLogView#1
+#. #-#-#-#-#  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 ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgid "Interface"
+msgstr "Interface"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+msgid "Please choose a stylesheet file"
+msgstr "Kies een stylesheet-bestand"
+
+#. ts-context AwayLogView
+#: ../src/qtui/awaylogview.cpp:33
 msgid "Away Log"
 msgstr "Altijd loggen"
 
-#: AwayLogView#2
-msgctxt "AwayLogView#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AwayLogView
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorView
+#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/chatmonitorview.cpp:59
 msgid "Show Network Name"
 msgstr "Toon netwerknaam"
 
-#: AwayLogView#3
-msgctxt "AwayLogView#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AwayLogView
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorView
+#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/chatmonitorview.cpp:64
 msgid "Show Buffer Name"
 msgstr "Toon buffernaam"
 
-#: BacklogSettingsPage#1
-msgctxt "BacklogSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: BacklogSettingsPage#2
-msgid "Backlog Fetching"
-msgstr "Backlog verkrijgen"
-
-#: BacklogSettingsPage#3
-msgctxt "BacklogSettingsPage#3"
-msgid "Form"
-msgstr "Form"
-
-#: BacklogSettingsPage#4
-msgid ""
-"Number of messages to be requested from the core when using scrolling up in "
-"the buffer view."
-msgstr ""
-"Aantal berichten dat van de core gevraagd moet worden wanneer omhoog wordt "
-"gescrold in de buffer-view."
+#. 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."
+msgstr "Aantal berichten dat van de core gevraagd moet worden wanneer omhoog wordt gescrold in de buffer-view."
 
-#: BacklogSettingsPage#5
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:25
 msgid "Dynamic backlog amount:"
 msgstr "Grootte van dynamische backlog"
 
-#: BacklogSettingsPage#6
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:75
 msgid "Backlog request method:"
 msgstr "Backlog aanvraagmethode:"
 
-#: BacklogSettingsPage#7
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:83
 msgid "Fixed amount per chat"
 msgstr "Vaste hoeveelheid per chat"
 
-#: BacklogSettingsPage#8
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:88
 msgid "Unread messages per chat"
 msgstr "Ongelezen berichten per chat"
 
-#: BacklogSettingsPage#9
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:93
 msgid "Globally unread messages"
 msgstr "Globaal ongelezen berichten"
 
-#: BacklogSettingsPage#10
-msgid ""
-"The simplest requester. It fetches a fixed amount of lines for each chat "
-"window from the backlog."
-msgstr ""
-"Eenvoudig ophalen. Haal voor elk venster een vast aantal regels op van de "
-"backlog."
+#. 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."
+msgstr "Eenvoudig ophalen. Haal voor elk venster een vast aantal regels op van de backlog."
 
-#: BacklogSettingsPage#11
-msgid ""
-"amount of messages per buffer that are requested after the core connection "
-"has been established."
-msgstr ""
-"aantal berichten per buffer dat wordt opgevraagd nadat de core-verbinding "
-"tot stand is gebracht."
+#. 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."
+msgstr "aantal berichten per buffer dat wordt opgevraagd nadat de core-verbinding tot stand is gebracht."
 
-#: BacklogSettingsPage#12
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgid "Initial backlog amount:"
 msgstr "Initiële grootte backlog:"
 
-#: BacklogSettingsPage#13
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:205
 msgid ""
-"This requester fetches unread messages for each chat window individually. "
-"The amount of lines can be limited per chat.\n"
+"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."
+"You can also choose to fetch additional older chatlines to provide a better context."
 msgstr ""
-"Haal voor elk individueel venster de ongelezen berichten op. Het maximale "
-"aantal regels kan per chat ingesteld worden.\n"
+"Haal voor elk individueel venster de ongelezen berichten op. Het maximale aantal regels kan per chat ingesteld worden.\n"
 "\n"
-"U kunt er ook voor kiezen nog extra regels op te vragen voor een betere "
-"context."
+"U kunt er ook voor kiezen nog extra regels op te vragen voor een betere context."
 
-#: BacklogSettingsPage#14
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:222
+#: ../src/qtui/settingspages/backlogsettingspage.ui:232
+#: ../src/qtui/settingspages/backlogsettingspage.ui:354
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr "Maximaal aantal berichten dat per buffer opgehaald kan worden."
 
-#: BacklogSettingsPage#15
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:225
+#: ../src/qtui/settingspages/backlogsettingspage.ui:347
 msgid "Limit:"
 msgstr "Limiet:"
 
-#: BacklogSettingsPage#16
-msgctxt "BacklogSettingsPage#16"
+#. #-#-#-#-#  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
 msgid "Unlimited"
-msgstr "Ongelimiteerd"
-
-#: BacklogSettingsPage#17
-msgid ""
-"Amount of messages to be fetched in addition to the unread messages. The "
-"Limit does not apply here."
-msgstr ""
-"Aantal berichten dat naast het aantal ongelezen berichten opgehaald kan "
-"worden. Het Limiet is hierbij niet van toepassing."
-
-#: BacklogSettingsPage#18
+msgstr "Onbeperkt"
+
+#. 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."
+msgstr "Aantal berichten dat naast het aantal ongelezen berichten opgehaald kan worden. Het Limiet is hierbij niet van toepassing."
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:263
+#: ../src/qtui/settingspages/backlogsettingspage.ui:385
 msgid "Additional Messages:"
 msgstr "Extra berichten:"
 
-#: BacklogSettingsPage#19
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:324
 msgid ""
-"This requester fetches all messages newer than the oldest unread message for "
-"all chats.\n"
+"This requester fetches all messages newer than the oldest unread message for all chats.\n"
 "\n"
-"Note: This requester is not recommended if you use hidden chat windows or "
-"have inactive chats (i.e.: no stale queries or channels).\n"
-"It is useful to limit the total amount of the backlog and is probably the "
-"fastest.\n"
+"Note: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels).\n"
+"It is useful to limit the total amount of the backlog and is probably the fastest.\n"
 "\n"
-"You can also chose to fetch additional older chatlines to provide a better "
-"context."
+"You can also chose to fetch additional older chatlines to provide a better context."
 msgstr ""
-"Haal voor elke chat alle berichten op die nieuwer zijn dan het oudste "
-"ongelezen bericht.\n"
+"Haal voor elke chat alle berichten op die nieuwer zijn dan het oudste ongelezen bericht.\n"
 "\n"
-"Let op: Dit is niet aan te raden als u verborgen chatvensters gebruikt of "
-"inactieve chats heeft (dwz: geen stale-queries of kanalen).\n"
-"Het is wel nuttig om de totale grootte van het backlog te beperken en is "
-"waarschijnlijk het snelste.\n"
+"Let op: Dit is niet aan te raden als u verborgen chatvensters gebruikt of inactieve chats heeft (dwz: geen stale-queries of kanalen).\n"
+"Het is wel nuttig om de totale grootte van het backlog te beperken en is waarschijnlijk het snelste.\n"
 "\n"
 "U kunt er ook van kiezen extra berichten op te halen voor een betere context."
 
-#: BacklogSettingsPage#20
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:344
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Maximaal aantal op te halen berichten voor alle buffers bij elkaar."
 
-#: BufferItem#1
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Backlog Fetching"
+msgstr "Backlog verkrijgen"
+
+#. ts-context BufferItem
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#: BufferView#1
+#. ts-context BufferView
+#: ../src/uisupport/bufferview.cpp:248
 msgid "Merge buffers permanently?"
 msgstr "Buffers definitief samenvoegen?"
 
-#: BufferView#2
+#. ts-context BufferView
+#: ../src/uisupport/bufferview.cpp:249
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"
@@ -476,74 +613,96 @@ msgstr ""
 "Wilt u de buffer \"%1\" definitief in buffer \"%2\" invoegen?\n"
 " Dit kan niet ongedaan gemaakt worden!"
 
-#: BufferViewEditDlg#1
-msgctxt "BufferViewEditDlg#1"
+#. #-#-#-#-#  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
 msgid "Dialog"
-msgstr "Dialoog"
+msgstr "Dialoogvenster"
 
-#: BufferViewEditDlg#2
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
 msgid "Please enter a name for the chat list:"
 msgstr "Vul een naam voor de chatlijst in:"
 
-#: BufferViewEditDlg#3
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
 msgid "Add Chat List"
 msgstr "Chatlijst toevoegen"
 
-#: BufferViewFilter#1
+#. ts-context BufferViewFilter
+#: ../src/uisupport/bufferviewfilter.cpp:52
 msgid "Show / Hide Chats"
 msgstr "Chats tonen/verbergen"
 
-#: BufferViewSettingsPage#1
-msgctxt "BufferViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: BufferViewSettingsPage#2
-msgid "Custom Chat Lists"
-msgstr "Eigen chatlijst"
-
-#: BufferViewSettingsPage#3
-msgid "All"
-msgstr "Alle"
-
-#: BufferViewSettingsPage#4
-msgid "Delete Chat List?"
-msgstr "Chatlijst verwijderen?"
-
-#: BufferViewSettingsPage#5
-msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr "Wilt u echt de chatlijst \"%1\" verwijderen?"
-
-#: BufferViewSettingsPage#6
-msgctxt "BufferViewSettingsPage#6"
-msgid "Form"
-msgstr "Form"
-
-#: BufferViewSettingsPage#7
-msgctxt "BufferViewSettingsPage#7"
+#. #-#-#-#-#  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
 msgid "Re&name..."
-msgstr "Her&noemen..."
-
-#: BufferViewSettingsPage#8
-msgctxt "BufferViewSettingsPage#8"
+msgstr "Her&noemen…"
+
+#. #-#-#-#-#  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
 msgid "&Add..."
 msgstr "&Toevoegen..."
 
-#: BufferViewSettingsPage#9
-msgctxt "BufferViewSettingsPage#9"
+#. #-#-#-#-#  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
 msgid "De&lete"
-msgstr "&Verwijderen"
+msgstr "&Verwijder"
 
-#: BufferViewSettingsPage#10
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
 msgid "Chat List Settings"
 msgstr "Chatlijst instellingen"
 
-#: BufferViewSettingsPage#11
-msgctxt "BufferViewSettingsPage#11"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:92
+#: ../src/uisupport/networkmodelcontroller.cpp:487
 msgid "Network:"
 msgstr "Netwerk:"
 
-#: BufferViewSettingsPage#12
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+msgid "All"
+msgstr "Alle"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."
@@ -551,104 +710,163 @@ msgstr ""
 "Deze optie is niet beschikbaar wanneer alle Netwerken zichtbaar zijn.\n"
 "In deze modus wordt geen aparte statusbuffer getoond."
 
-#: BufferViewSettingsPage#13
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
 msgid "Show status window"
 msgstr "Toon statusvenster"
 
-#: BufferViewSettingsPage#14
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
 msgid "Show channels"
 msgstr "Toon kanalen"
 
-#: BufferViewSettingsPage#15
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
 msgid "Show queries"
 msgstr "Toon aanvragen"
 
-#: BufferViewSettingsPage#16
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
 msgid "Hide inactive chats"
 msgstr "Inactieve chats verbergen"
 
-#: BufferViewSettingsPage#17
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
 msgid "Add new chats automatically"
 msgstr "Automatisch nieuwe chats toevoegen"
 
-#: BufferViewSettingsPage#18
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
 msgid "Sort alphabetically"
 msgstr "Op alfabet sorteren"
 
-#: BufferViewSettingsPage#19
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
 msgid "Minimum Activity:"
 msgstr "Minimale activiteit:"
 
-#: BufferViewSettingsPage#20
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
 msgid "No Activity"
 msgstr "Geen activiteit"
 
-#: BufferViewSettingsPage#21
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
 msgid "Other Activity"
 msgstr "Andere activiteit"
 
-#: BufferViewSettingsPage#22
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: BufferViewSettingsPage#23
-msgctxt "BufferViewSettingsPage#23"
+#. #-#-#-#-#  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
 msgid "Highlight"
 msgstr "Markeer"
 
-#: BufferViewSettingsPage#24
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
 msgid "Preview:"
 msgstr "Voorbeeld:"
 
-#: BufferViewWidget#1
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgid "Custom Chat Lists"
+msgstr "Eigen chatlijst"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+msgid "Delete Chat List?"
+msgstr "Chatlijst verwijderen?"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+msgid "Do you really want to delete the chat list \"%1\"?"
+msgstr "Wilt u echt de chatlijst \"%1\" verwijderen?"
+
+#. ts-context BufferViewWidget
+#: ../src/qtui/ui/bufferviewwidget.ui:26
 msgid "BufferView"
 msgstr "Bufferweergave"
 
-#: BufferWidget#1
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Inzoomen"
 
-#: BufferWidget#2
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Uitzoomen"
 
-#: BufferWidget#3
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Werkelijke grootte"
 
-#: ChannelBufferItem#1
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+#, fuzzy
+msgid "Set Marker Line"
+msgstr "Markeerlijn:"
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "Markeerlijn:"
+
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Kanaal %1</b>"
 
-#: ChannelBufferItem#2
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Gebruikers:</b> %1"
 
-#: ChannelBufferItem#3
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Modus:</b> %1"
 
-#: ChannelBufferItem#4
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Onderwerp:</b> %1"
 
-#: ChannelBufferItem#5
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "Niet actief <br /> Dubbelklik om binnen te gaan"
 
-#: ChannelBufferItem#6
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
-#: ChannelListDlg#1
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:14
 msgid "Channel List"
 msgstr "Kanaallijst"
 
-#: ChannelListDlg#2
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:38
 msgid "Search Pattern:"
 msgstr "Zoekpatroon:"
 
-#: ChannelListDlg#3
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:48
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows to pass search strings to the IRC Server."
@@ -656,1868 +874,2152 @@ msgstr ""
 "Wissel tussen eenvoudige en geavanceerde modus.\n"
 "In de geavanceerde modus kunt u zoekopdrachten naar de IRC-server sturen."
 
-#: ChannelListDlg#4
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:62
 msgid "Show Channels"
 msgstr "Toon kanalen"
 
-#: ChannelListDlg#5
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:86
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ChannelListDlg#6
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:98
 msgid "Errors Occured:"
 msgstr "Er zijn fouten opgetreden:"
 
-#: ChannelListDlg#7
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:132
 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"
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC "
-"ERROR!!11</span></p>\n"
-"<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>"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></p>\n"
+"<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 ""
-"<!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"
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Lucida Grande'; font-size:13pt;\">SUPERERGE CATASTROFALE "
-"FOUT!!11</span></p>\n"
-"<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>"
-
-#: ChatMonitorSettingsPage#1
-msgctxt "ChatMonitorSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: ChatMonitorSettingsPage#2
-msgctxt "ChatMonitorSettingsPage#2"
-msgid "Chat Monitor"
-msgstr "Chatmonitor"
-
-#: ChatMonitorSettingsPage#3
-msgid "Opt In"
-msgstr "Opt in"
-
-#: ChatMonitorSettingsPage#4
-msgid "Opt Out"
-msgstr "Opt out"
-
-#: ChatMonitorSettingsPage#5
-msgid "Show:"
-msgstr "Toon:"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPERERGE CATASTROFALE FOUT!!11</span></p>\n"
+"<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>"
 
-#: ChatMonitorSettingsPage#6
-msgid "Ignore:"
-msgstr "Negeer:"
-
-#: ChatMonitorSettingsPage#7
-msgctxt "ChatMonitorSettingsPage#7"
-msgid "Form"
-msgstr "Form"
-
-#: ChatMonitorSettingsPage#8
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
 msgid "Operation Mode:"
 msgstr "Operatie-modus:"
 
-#: ChatMonitorSettingsPage#9
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
 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"
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Operation modes:</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
-"style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span "
-"style=\" font-weight:400;\">Only buffers on the right side are shown in "
-"chatmonitor</span></p>\n"
-"<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>"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operation modes:</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
+"<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 ""
-"<!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"
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Operatie-modus:</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
-"style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span "
-"style=\" font-weight:400;\">Alleen buffers aan de rechterkant worden in de "
-"chatmonitor getoond</span></p>\n"
-"<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 aan de rechterkant zullen "
-"in de chatmonitor genegeerd worden</p></body></html>"
-
-#: ChatMonitorSettingsPage#10
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operatie-modus:</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Alleen buffers aan de rechterkant worden in de chatmonitor getoond</span></p>\n"
+"<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 aan de rechterkant zullen in de chatmonitor genegeerd worden</p></body></html>"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgid "Available:"
 msgstr "Beschikbaar:"
 
-#: ChatMonitorSettingsPage#11
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
 msgid "Move selected buffers to the left"
 msgstr "Verplaats de geselecteerde buffers naar links"
 
-#: ChatMonitorSettingsPage#12
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
 msgid "Move selected buffers to the right"
 msgstr "Verplaats de geselecteerde buffers naar rechts"
 
-#: ChatMonitorSettingsPage#13
-msgid ""
-"Show highlights in chatmonitor even if the originating buffer is ignored"
-msgstr ""
-"Toon markeringen in de chatmonitor zelfs als de oorspronkelijke buffer "
-"genegeerd wordt"
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+msgid "Show:"
+msgstr "Toon:"
 
-#: ChatMonitorSettingsPage#14
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
+msgid "Show highlights in chatmonitor even if the originating buffer is ignored"
+msgstr "Toon markeringen in de chatmonitor zelfs als de oorspronkelijke buffer genegeerd wordt"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
 msgid "Always show highlighted messages"
 msgstr "Toon gemarkeerde berichten altijd"
 
-#: ChatMonitorSettingsPage#15
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
 msgid "Show own messages"
 msgstr "Toon eigen berichten"
 
-#: ChatMonitorView#1
-msgid "Show Own Messages"
-msgstr "Toon eigen berichten"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/mainwin.cpp:743
+msgid "Chat Monitor"
+msgstr "Chatmonitor"
 
-#: ChatMonitorView#2
-msgctxt "ChatMonitorView#2"
-msgid "Show Network Name"
-msgstr "Toon netwerknaam"
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+msgid "Opt In"
+msgstr "Opt in"
 
-#: ChatMonitorView#3
-msgctxt "ChatMonitorView#3"
-msgid "Show Buffer Name"
-msgstr "Toon buffernaam"
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+msgid "Opt Out"
+msgstr "Opt out"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+msgid "Ignore:"
+msgstr "Negeer:"
+
+#. ts-context ChatMonitorView
+#: ../src/qtui/chatmonitorview.cpp:52
+msgid "Show Own Messages"
+msgstr "Toon eigen berichten"
 
-#: ChatMonitorView#4
+#. ts-context ChatMonitorView
+#: ../src/qtui/chatmonitorview.cpp:71
 msgid "Configure..."
 msgstr "Instellen…"
 
-#: ChatScene#1
+#. ts-context ChatScene
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Selectie kopiëren"
 
-#: ChatViewSearchBar#1
-msgctxt "ChatViewSearchBar#1"
-msgid "Form"
-msgstr "Form"
-
-#: ChatViewSearchBar#2
-msgctxt "ChatViewSearchBar#2"
-msgid "..."
-msgstr "..."
-
-#: ChatViewSearchBar#3
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:55
 msgid "case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: ChatViewSearchBar#4
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:62
 msgid "search nick"
 msgstr "zoek nick"
 
-#: ChatViewSearchBar#5
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:69
 msgid "search message"
 msgstr "zoek bericht"
 
-#: ChatViewSearchBar#6
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:82
 msgid "ignore joins, parts, etc."
 msgstr "negeer binnenkomen, verlaten, etc,"
 
-#: ChatViewSettingsPage#1
-msgctxt "ChatViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: ChatViewSettingsPage#2
-msgid "Chat View"
-msgstr "Chatvenster"
-
-#: ChatViewSettingsPage#3
-msgctxt "ChatViewSettingsPage#3"
-msgid "Form"
-msgstr "Form"
-
-#: ChatViewSettingsPage#4
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgid "Timestamp format:"
 msgstr "Tijdformaat"
 
-#: ChatViewSettingsPage#5
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
 msgid "[hh:mm:ss]"
 msgstr "[hh:mm:ss]"
 
-#: ChatViewSettingsPage#6
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
 msgid "Custom chat window font:"
 msgstr "Chatvenster lettertype:"
 
-#: ChatViewSettingsPage#7
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr "Sta gekleurde tekst toe (mIRC color codes)"
 
-#: ChatViewSettingsPage#8
-msgid ""
-"Show a website preview window when hovering the mouse over a web address"
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr "Toon een previewvenster wanneer u uw muis boven een url houdt."
 
-#: ChatViewSettingsPage#9
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr "Toon previews van webpagina's als uw muis boven een url staat"
 
-#: ChatViewSettingsPage#10
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "Eigen kleuren"
 
-#: ChatViewSettingsPage#11
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "Actie:"
 
-#: ChatViewSettingsPage#12
-msgctxt "ChatViewSettingsPage#12"
-msgid "..."
-msgstr "..."
-
-#: ChatViewSettingsPage#13
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Tijd:"
 
-#: ChatViewSettingsPage#14
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Kanaalbericht:"
 
-#: ChatViewSettingsPage#15
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "Voorgrond bij markering:"
 
-#: ChatViewSettingsPage#16
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Commandobericht:"
 
-#: ChatViewSettingsPage#17
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "Achtergrond bij markering:"
 
-#: ChatViewSettingsPage#18
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Serverbericht:"
 
-#: ChatViewSettingsPage#19
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "Markeerlijn:"
 
-#: ChatViewSettingsPage#20
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Foutbericht:"
 
-#: ChatViewSettingsPage#21
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Achtergrond:"
 
-#: ChatViewSettingsPage#22
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr "Kleur naar verzender"
 
-#: ChatViewSettingsPage#23
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Eigen berichten:"
 
-#: Client#1
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgid "Chat View"
+msgstr "Chatvenster"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
+#. ts-context Client
+#: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
 msgstr "Identiteit bestaat al in client!"
 
-#: Client#2
+#. ts-context ClientBacklogManager
+#: ../src/client/clientbacklogmanager.cpp:161
+msgid "Processed %1 messages in %2 seconds."
+msgstr "In %2 seconden %1 berichten verwerkt"
+
+#. ts-context ClientBufferViewManager
+#: ../src/client/clientbufferviewmanager.cpp:52
 msgid "All Chats"
 msgstr "Alle chats"
 
-#: ClientBacklogManager#1
-msgid "Processed %1 messages in %2 seconds."
-msgstr "In %2 seconden %1 berichten verwerkt"
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
 
-#: ConnectionSettingsPage#1
-msgctxt "ConnectionSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
 
-#: ConnectionSettingsPage#2
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
 msgstr "Configureer de IRC-verbinding"
 
-#: ConnectionSettingsPage#3
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:20
 msgid "Enable Ping Timeout Detection"
 msgstr "Detecteer ping-timeout"
 
-#: ConnectionSettingsPage#4
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:37
 msgid "Ping interval:"
 msgstr "Ping-interval:"
 
-#: ConnectionSettingsPage#5
-msgctxt "ConnectionSettingsPage#5"
+#. #-#-#-#-#  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
 msgid " seconds"
 msgstr " seconden"
 
-#: ConnectionSettingsPage#6
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:80
 msgid "Disconnect after"
 msgstr "Verbreek de verbinding na"
 
-#: ConnectionSettingsPage#7
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:103
 msgid "missed pings"
 msgstr "gemiste pings"
 
-#: ConnectionSettingsPage#8
-msgid ""
-"This enables periodic polling of user information using /WHO. This is mostly "
-"interesting for tracking users' away status."
-msgstr ""
-"Vraag periodiek gebruikersinformatie op met /WHO. Dit is vooral handig voor "
-"het bijhouden van de afwezigheidsstatus van gebruikers."
+#. 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."
+msgstr "Vraag periodiek gebruikersinformatie op met /WHO. Dit is vooral handig voor het bijhouden van de afwezigheidsstatus van gebruikers."
 
-#: ConnectionSettingsPage#9
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:131
 msgid "Enable Automatic User Information Lookup (/WHO)"
 msgstr "Activeer automatisch opvragen van gebruikersinformatie (/WHO)"
 
-#: ConnectionSettingsPage#10
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:148
 msgid "Update interval:"
 msgstr "Vernieuwingsinterval"
 
-#: ConnectionSettingsPage#11
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:177
 msgid "Ignore channels with more than:"
 msgstr "Negeer kanalen met meer dan:"
 
-#: ConnectionSettingsPage#12
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:184
 msgid " users"
 msgstr " gebruikers"
 
-#: ConnectionSettingsPage#13
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:206
 msgid "Minimum delay between requests:"
 msgstr "Minimale vertraging tussen aanvragen:"
 
-#: ContentsChatItem#1
+#. ts-context ContentsChatItem
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Kopieer link-adres"
 
-#: ContextMenuActionProvider#1
-msgctxt "ContextMenuActionProvider#1"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgid "Connect"
-msgstr "Verbindt"
-
-#: ContextMenuActionProvider#2
-msgctxt "ContextMenuActionProvider#2"
+msgstr "Verbind"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect"
-msgstr "Verbinding verbreken"
+msgstr "Verbreek verbinding"
 
-#: ContextMenuActionProvider#3
-msgctxt "ContextMenuActionProvider#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:35
 msgid "Join"
 msgstr "Binnengaan"
 
-#: ContextMenuActionProvider#4
-msgctxt "ContextMenuActionProvider#4"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:34
 msgid "Part"
 msgstr "Verlaat"
 
-#: ContextMenuActionProvider#5
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgid "Delete Chat(s)..."
 msgstr "Verwijder chat(s)..."
 
-#: ContextMenuActionProvider#6
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgid "Go to Chat"
 msgstr "Ga naar chat"
 
-#: ContextMenuActionProvider#7
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
 msgid "Joins"
 msgstr "Binnenkomstberichten"
 
-#: ContextMenuActionProvider#8
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgid "Parts"
 msgstr "Vertrekberichten"
 
-#: ContextMenuActionProvider#9
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgid "Quits"
 msgstr "Afsluitberichten"
 
-#: ContextMenuActionProvider#10
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgid "Nick Changes"
 msgstr "Veranderde bijnaam"
 
-#: ContextMenuActionProvider#11
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgid "Mode Changes"
 msgstr "Modus verandert"
 
-#: ContextMenuActionProvider#12
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgid "Day Changes"
 msgstr "Dag verandert"
 
-#: ContextMenuActionProvider#13
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgid "Topic Changes"
 msgstr "Onderwerp verandert"
 
-#: ContextMenuActionProvider#14
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgid "Set as Default..."
 msgstr "Stel in als standaard..."
 
-#: ContextMenuActionProvider#15
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgid "Use Defaults..."
 msgstr "Gebruik standaardwaarden..."
 
-#: ContextMenuActionProvider#16
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
 msgid "Join Channel..."
 msgstr "Kanaal binnengaan..."
 
-#: ContextMenuActionProvider#17
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:58
 msgid "Start Query"
 msgstr "Start aanvraag"
 
-#: ContextMenuActionProvider#18
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
 msgid "Show Query"
 msgstr "Toon aanvraag"
 
-#: ContextMenuActionProvider#19
-msgctxt "ContextMenuActionProvider#19"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Whois"
 msgstr "Whois"
 
-#: ContextMenuActionProvider#20
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:62
 msgid "Version"
 msgstr "Version"
 
-#: ContextMenuActionProvider#21
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
 msgid "Time"
 msgstr "Time"
 
-#: ContextMenuActionProvider#22
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgid "Ping"
 msgstr "Ping"
 
-#: ContextMenuActionProvider#23
-msgid "Finger"
-msgstr "Finger"
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#, fuzzy
+msgid "Client info"
+msgstr "Client"
 
-#: ContextMenuActionProvider#24
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
 msgid "Custom..."
 msgstr "Eigen..."
 
-#: ContextMenuActionProvider#25
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:78
 msgid "Give Operator Status"
 msgstr "Geef operatorstatus"
 
-#: ContextMenuActionProvider#26
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
 msgid "Take Operator Status"
 msgstr "Herroep operatorstatus"
 
-#: ContextMenuActionProvider#27
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgid "Give Voice"
 msgstr "Geef Voice"
 
-#: ContextMenuActionProvider#28
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgid "Take Voice"
 msgstr "Herroep Voice"
 
-#: ContextMenuActionProvider#29
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgid "Kick From Channel"
 msgstr "Schop het kanaal uit"
 
-#: ContextMenuActionProvider#30
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgid "Ban From Channel"
 msgstr "Verban uit het kanaal"
 
-#: ContextMenuActionProvider#31
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgid "Kick && Ban"
 msgstr "Kick && Ban"
 
-#: ContextMenuActionProvider#32
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgid "Hide Chat(s) Temporarily"
 msgstr "Chat(s) tijdelijk verbergen"
 
-#: ContextMenuActionProvider#33
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgid "Hide Chat(s) Permanently"
 msgstr "Chat(s) permanent verbergen"
 
-#: ContextMenuActionProvider#34
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
 msgid "Show Channel List"
 msgstr "Toon kanaallijst"
 
-#: ContextMenuActionProvider#35
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
 msgid "Show Ignore List"
 msgstr "Toon negeerlijst"
 
-#: ContextMenuActionProvider#36
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:102
 msgid "Hide Events"
 msgstr "Verberg gebeurtenissen"
 
-#: ContextMenuActionProvider#37
-msgctxt "ContextMenuActionProvider#37"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
 msgid "CTCP"
 msgstr "CTCP"
 
-#: ContextMenuActionProvider#38
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:122
 msgid "Actions"
 msgstr "Acties"
 
-#: ContextMenuActionProvider#39
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:126
 msgid "Ignore"
 msgstr "Negeer"
 
-#: ContextMenuActionProvider#40
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:131
 msgid "Add Ignore Rule"
 msgstr "Voeg negeer-regel toe"
 
-#: ContextMenuActionProvider#41
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
 msgid "Existing Rules"
 msgstr "Bestaande regels"
 
-#: Core#1
+#. ts-context Core
+#: ../src/core/core.cpp:182
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr "Kon geen opslag-backend starten! Afsluiten..."
 
-#: Core#2
+#. ts-context Core
+#: ../src/core/core.cpp:183
 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"
+"Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."
 msgstr ""
 "Quassel ondersteunt momenteel SQLite3 en PostgreSQL. U moet uw\n"
-"Qt-bibliotheek met de sqlite of postgres plug-in bouwen anders zal "
-"quasselcore\n"
+"Qt-bibliotheek met de sqlite of postgres plug-in bouwen anders zal quasselcore\n"
 "niet werken."
 
-#: Core#3
+#. ts-context Core
+#: ../src/core/core.cpp:232
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "restoreState() aanroepen hoewel een sessie actief is!"
 
-#: Core#4
+#. ts-context Core
+#: ../src/core/core.cpp:273
 msgid "Admin user or password not set."
 msgstr "Beheerderaccount of wachtwoord niet ingesteld."
 
-#: Core#5
+#. ts-context Core
+#: ../src/core/core.cpp:277
 msgid "Could not setup storage!"
 msgstr "Kon opslag niet starten!"
 
-#: Core#6
+#. ts-context Core
+#: ../src/core/core.cpp:281
 msgid "Creating admin user..."
 msgstr "Beheerderaccount instellen..."
 
-#: Core#7
+#. ts-context Core
+#: ../src/core/core.cpp:394
 msgid "Invalid listen address %1"
 msgstr "Ongeldig luisteradres %1"
 
-#: Core#8
-msgid ""
-"Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-msgstr ""
-"Op IPv4 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
+#. ts-context Core
+#: ../src/core/core.cpp:402
+msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr "Op IPv4 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
 
-#: Core#9
+#. ts-context Core
+#: ../src/core/core.cpp:410
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr "Kon IPv4-interface niet openen %1:%2: %3"
 
-#: Core#10
-msgid ""
-"Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
-msgstr ""
-"Op IPv6 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
+#. ts-context Core
+#: ../src/core/core.cpp:418
+msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
+msgstr "Op IPv6 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
 
-#: Core#11
+#. ts-context Core
+#: ../src/core/core.cpp:429
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "Kon IPv6-interface niet openen %1:%2: %3"
 
-#: Core#12
+#. ts-context Core
+#: ../src/core/core.cpp:437
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Ongeldig luisteradres %1, onbekend netwerkprotocol"
 
-#: Core#13
+#. ts-context Core
+#: ../src/core/core.cpp:446
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Kon geen enkele netwerkinterface openen om bij te luisteren!"
 
-#: Core#14
+#. ts-context Core
+#: ../src/core/core.cpp:480
 msgid "Client connected from"
 msgstr "Client verbindt vanaf"
 
-#: Core#15
+#. ts-context Core
+#: ../src/core/core.cpp:483
 msgid "Closing server for basic setup."
 msgstr "Server afsluiten voor standaard set-up."
 
-#: Core#16
+#. ts-context Core
+#: ../src/core/core.cpp:502
 msgid "Antique client trying to connect... refusing."
 msgstr "Verouderde client probeert te verbinden... weiger."
 
-#: Core#17
-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 ""
-"<b>Uw Quassel client is te oud!</b><br>Deze core heeft minstens client/core "
-"protocol versie %1 nodig.<br>Upgrade alstublieft uw client."
-
-#: Core#18
-msgctxt "Core#18"
+#. 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."
+msgstr "<b>Uw Quassel client is te oud!</b><br>Deze core heeft minstens client/core protocol versie %1 nodig.<br>Upgrade alstublieft uw client."
+
+#. #-#-#-#-#  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
 msgid "Client"
 msgstr "Client"
 
-#: Core#19
+#. ts-context Core
+#: ../src/core/core.cpp:518
 msgid "too old, rejecting."
 msgstr "te oud, weigeren."
 
-#: Core#20
-msgid ""
-"<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr ""
-"<b>Quassel-core versie %1</b><br>Built: %2<br>Op %3d%4h%5m (sinds %6)"
+#. ts-context Core
+#: ../src/core/core.cpp:535
+msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgstr "<b>Quassel-core versie %1</b><br>Built: %2<br>Op %3d%4h%5m (sinds %6)"
 
-#: Core#21
+#. ts-context Core
+#: ../src/core/core.cpp:588
 msgid "Starting TLS for Client:"
 msgstr "TLS voor client starten:"
 
-#: Core#22
-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
-msgstr ""
-"<b>Client niet geïnitialiseerd!</b><br>U moet een init-bericht sturen "
-"voordat u probeert in te loggen."
+#. 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."
+msgstr "<b>Client niet geïnitialiseerd!</b><br>U moet een init-bericht sturen voordat u probeert in te loggen."
 
-#: Core#23
+#. ts-context Core
+#: ../src/core/core.cpp:608
 msgid "did not send an init message before trying to login, rejecting."
 msgstr "verstuurde geen init-bericht voordat er werd aangemeld, weigeren."
 
-#: Core#24
-msgid ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
-msgstr ""
-"<b>Ongeldige gebruikersnaam of wachtwoord!</b><br>De "
-"gebruikersnaam/wachtwoord-combinatie die u opgaf kon niet in de database "
-"gevonden worden."
+#. 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."
+msgstr "<b>Ongeldige gebruikersnaam of wachtwoord!</b><br>De gebruikersnaam/wachtwoord-combinatie die u opgaf kon niet in de database gevonden worden."
 
-#: Core#25
+#. ts-context Core
+#: ../src/core/core.cpp:632
 msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
 msgstr "initialisatie en authenticatie succesvol als \"%1\"(Userid: %2)."
 
-#: Core#26
+#. ts-context Core
+#: ../src/core/core.cpp:643
 msgid "Non-authed client disconnected."
 msgstr "Verbinding zonder authenticatie verbroken."
 
-#: Core#27
+#. ts-context Core
+#: ../src/core/core.cpp:649
 msgid "Non-authed client disconnected. (socket allready destroyed)"
 msgstr "Verbinding zonder authenticatie verbroken. (socket is al geleegd)"
 
-#: Core#28
+#. ts-context Core
+#: ../src/core/core.cpp:697
 msgid "Could not initialize session for client:"
 msgstr "Kon geen sessie initialiseren voor client:"
 
-#: Core#29
+#. ts-context Core
+#: ../src/core/core.cpp:719
 msgid "Could not find a session for client:"
 msgstr "Kon geen sessie vinden voor client:"
 
-#: CoreAccount#1
-msgctxt "CoreAccount#1"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccount
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountModel
+#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccountmodel.cpp:64
 msgid "Internal Core"
 msgstr "Interne core"
 
-#: CoreAccountEditDlg#1
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
 msgid "Edit Core Account"
 msgstr "Core-account bewerken"
 
-#: CoreAccountEditDlg#2
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
 msgid "Account Details"
 msgstr "Accountdetails"
 
-#: CoreAccountEditDlg#3
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
 msgid "Account Name:"
 msgstr "Accountnaam:"
 
-#: CoreAccountEditDlg#4
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
 msgid "Local Core"
 msgstr "Locale core"
 
-#: CoreAccountEditDlg#5
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
 msgid "Hostname:"
 msgstr "Hostnaam:"
 
-#: CoreAccountEditDlg#6
-msgctxt "CoreAccountEditDlg#6"
+#. #-#-#-#-#  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
 msgid "localhost"
 msgstr "localhost"
 
-#: CoreAccountEditDlg#7
-msgctxt "CoreAccountEditDlg#7"
+#. #-#-#-#-#  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
 msgid "Port:"
 msgstr "Poort:"
 
-#: CoreAccountEditDlg#8
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: CoreAccountEditDlg#9
-msgctxt "CoreAccountEditDlg#9"
+#. #-#-#-#-#  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
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: CoreAccountEditDlg#10
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
 msgid "Remember"
 msgstr "Onthoudt"
 
-#: CoreAccountEditDlg#11
-msgctxt "CoreAccountEditDlg#11"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
+#: ../src/qtui/settingspages/servereditdlg.ui:171
 msgid "Use a Proxy"
 msgstr "Gebruik een proxy"
 
-#: CoreAccountEditDlg#12
-msgctxt "CoreAccountEditDlg#12"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/servereditdlg.ui:188
 msgid "Proxy Type:"
-msgstr "Proxytype"
+msgstr "Proxytype:"
 
-#: CoreAccountEditDlg#13
-msgctxt "CoreAccountEditDlg#13"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/servereditdlg.ui:196
 msgid "Socks 5"
 msgstr "Socks 5"
 
-#: CoreAccountEditDlg#14
-msgctxt "CoreAccountEditDlg#14"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+#: ../src/qtui/settingspages/servereditdlg.ui:201
 msgid "HTTP"
 msgstr "HTTP"
 
-#: CoreAccountEditDlg#15
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
 msgid "Add Core Account"
 msgstr "Core-account toevoegen"
 
-#: CoreAccountModel#1
-msgctxt "CoreAccountModel#1"
-msgid "Internal Core"
-msgstr "Interne core"
-
-#: CoreAccountSettingsPage#1
-msgctxt "CoreAccountSettingsPage#1"
-msgid "Remote Cores"
-msgstr "Remote-core"
-
-#: CoreAccountSettingsPage#2
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
 msgid "Connect to Quassel Core"
 msgstr "Verbindt met Quassel-core"
 
-#: CoreAccountSettingsPage#3
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
 msgid "Core Accounts"
 msgstr "Core-accounts"
 
-#: CoreAccountSettingsPage#4
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
 msgid "Edit..."
 msgstr "Bewerken..."
 
-#: CoreAccountSettingsPage#5
-msgctxt "CoreAccountSettingsPage#5"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
 msgid "Add..."
-msgstr "Toevoegen..."
-
-#: CoreAccountSettingsPage#6
-msgctxt "CoreAccountSettingsPage#6"
-msgid "Delete"
-msgstr "Verwijder"
+msgstr "Toevoegen…"
 
-#: CoreAccountSettingsPage#7
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
 msgid "Automatically connect on startup"
 msgstr "Bij starten automatisch verbinden"
 
-#: CoreAccountSettingsPage#8
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
 msgid "Connect to last account used"
 msgstr "Met laatst gebruikte account verbinden"
 
-#: CoreAccountSettingsPage#9
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
 msgid "Always connect to"
 msgstr "Altijd verbinden met"
 
-#: CoreConfigWizard#1
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgid "Remote Cores"
+msgstr "Remote-cores"
+
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:69
 msgid "Core Configuration Wizard"
 msgstr "Core-configuratie"
 
-#: CoreConfigWizard#2
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:97
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Uw core is succesvol geconfigureerd. Aanmelden..."
 
-#: CoreConfigWizard#3
-msgid ""
-"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
-msgstr ""
-"Core-configuratie mislukt:<br><b>%1</b><br>Druk op <em>volgende</em> om "
-"opnieuw te beginnen."
-
-#: CoreConfigWizard#4
-msgid ""
-"Your are now logged into your freshly configured Quassel Core!<br>Please "
-"remember to configure your identities and networks now."
-msgstr ""
-"U bent nu aangemeld bij uw nieuw configureerde Quassel-core!<br>Denk er aan "
-"dat u uw netwerken en identiteiten nog moet instellen."
-
-#: CoreConfigWizardAdminUserPage#1
-msgctxt "CoreConfigWizardAdminUserPage#1"
-msgid "Form"
-msgstr "Form"
-
-#: CoreConfigWizardAdminUserPage#2
-msgctxt "CoreConfigWizardAdminUserPage#2"
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:104
+msgid "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
+msgstr "Core-configuratie mislukt:<br><b>%1</b><br>Druk op <em>volgende</em> om opnieuw te beginnen."
+
+#. 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."
+msgstr "U bent nu aangemeld bij uw nieuw configureerde Quassel-core!<br>Denk er aan dat u uw netwerken en identiteiten nog moet instellen."
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardAdminUserPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: CoreConfigWizardAdminUserPage#3
-msgctxt "CoreConfigWizardAdminUserPage#3"
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: CoreConfigWizardAdminUserPage#4
+#. ts-context CoreConfigWizardAdminUserPage
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
 msgid "Repeat password:"
 msgstr "Herhaal wachtwoord:"
 
-#: CoreConfigWizardAdminUserPage#5
-msgctxt "CoreConfigWizardAdminUserPage#5"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardAdminUserPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
-#: CoreConfigWizardAdminUserPage#6
+#. ts-context CoreConfigWizardAdminUserPage
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
 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>\"."
+"<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 ""
-"<b>Let op:</b> Meer gebruikers toevoegen of uw gebruikersnaam/wachtwoord "
-"wijzigen is nog niet mogelijk via de Quassel-client interface.\n"
-"Als u dit wilt doen moet u \"<tt><nobr>quasselcore --help</nobr></tt>\" "
-"uitvoeren."
-
-#: CoreConfigWizardIntroPage#1
-msgctxt "CoreConfigWizardIntroPage#1"
-msgid "Form"
-msgstr "Form"
+"<b>Let op:</b> Meer gebruikers toevoegen of uw gebruikersnaam/wachtwoord wijzigen is nog niet mogelijk via de Quassel-client interface.\n"
+"Als u dit wilt doen moet u \"<tt><nobr>quasselcore --help</nobr></tt>\" uitvoeren."
 
-#: CoreConfigWizardIntroPage#2
+#. ts-context CoreConfigWizardIntroPage
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:19
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Deze wizard helpt u bij het opzetten van uw Quassel-core."
 
-#: CoreConfigWizardPages::AdminUserPage#1
+#. ts-context CoreConfigWizardPages::AdminUserPage
+#: ../src/qtui/coreconfigwizard.cpp:150
 msgid "Create Admin User"
 msgstr "Beheerder aanmaken"
 
-#: CoreConfigWizardPages::AdminUserPage#2
-msgid ""
-"First, we will create a user on the core. This first user will have "
-"administrator privileges."
-msgstr ""
-"Eerst zullen we een gebruiker op de core aanmaken. Deze eerste gebruiker zal "
-"beheerdersrechten hebben."
+#. 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."
+msgstr "Eerst zullen we een gebruiker op de core aanmaken. Deze eerste gebruiker zal beheerdersrechten hebben."
 
-#: CoreConfigWizardPages::IntroPage#1
+#. ts-context CoreConfigWizardPages::IntroPage
+#: ../src/qtui/coreconfigwizard.cpp:135
 msgid "Introduction"
 msgstr "Introductie"
 
-#: CoreConfigWizardPages::StorageSelectionPage#1
+#. ts-context CoreConfigWizardPages::StorageSelectionPage
+#: ../src/qtui/coreconfigwizard.cpp:182
 msgid "Select Storage Backend"
 msgstr "Selecteer opslag-backend"
 
-#: CoreConfigWizardPages::StorageSelectionPage#2
-msgid ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
-msgstr ""
-"Selecteer een database-backend voor de Quassel-core opslag om het backlog en "
-"andere data in op te slaan."
+#. 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."
+msgstr "Selecteer een database-backend voor de Quassel-core opslag om het backlog en andere data in op te slaan."
 
-#: CoreConfigWizardPages::StorageSelectionPage#3
+#. ts-context CoreConfigWizardPages::StorageSelectionPage
+#: ../src/qtui/coreconfigwizard.cpp:277
 msgid "Connection Properties"
 msgstr "Eigenschappen verbinding"
 
-#: CoreConfigWizardPages::SyncPage#1
+#. ts-context CoreConfigWizardPages::SyncPage
+#: ../src/qtui/coreconfigwizard.cpp:317
 msgid "Storing Your Settings"
 msgstr "Uw instellingen opslaan"
 
-#: CoreConfigWizardPages::SyncPage#2
-msgid ""
-"Your settings are now stored in the core, and you will be logged in "
-"automatically."
-msgstr ""
-"Uw instellingen zijn nu in de core opgeslagen en u zult automatisch "
-"aangemeld worden."
-
-#: CoreConfigWizardStorageSelectionPage#1
-msgctxt "CoreConfigWizardStorageSelectionPage#1"
-msgid "Form"
-msgstr "Form"
-
-#: CoreConfigWizardStorageSelectionPage#2
-msgctxt "CoreConfigWizardStorageSelectionPage#2"
+#. 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."
+msgstr "Uw instellingen zijn nu in de core opgeslagen en u zult automatisch aangemeld worden."
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardStorageSelectionPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
 msgid "Storage Backend:"
 msgstr "Opslag-backend:"
 
-#: CoreConfigWizardStorageSelectionPage#3
+#. ts-context CoreConfigWizardStorageSelectionPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
 msgid "Description"
 msgstr "Beschrijving"
 
-#: CoreConfigWizardStorageSelectionPage#4
+#. ts-context CoreConfigWizardStorageSelectionPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
 msgid "Foobar"
 msgstr "Foobar"
 
-#: CoreConfigWizardSyncPage#1
-msgctxt "CoreConfigWizardSyncPage#1"
-msgid "Form"
-msgstr "Form"
-
-#: CoreConfigWizardSyncPage#2
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
 msgid "Your Choices"
 msgstr "Uw keuzes"
 
-#: CoreConfigWizardSyncPage#3
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
 msgid "Admin User:"
 msgstr "Beheerder:"
 
-#: CoreConfigWizardSyncPage#4
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
 msgid "foo"
 msgstr "foo"
 
-#: CoreConfigWizardSyncPage#5
-msgctxt "CoreConfigWizardSyncPage#5"
-msgid "Storage Backend:"
-msgstr "Opslag backend:"
-
-#: CoreConfigWizardSyncPage#6
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
 msgid "bar"
 msgstr "bar"
 
-#: CoreConfigWizardSyncPage#7
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr "Een moment, uw instellingen worden naar de core verzonden..."
 
-#: CoreConnectAuthDlg#1
-msgid "Please enter your credentials for %1:"
-msgstr "Vul uw aanmeldgegevens voor %1 in:"
-
-#: CoreConnectAuthDlg#2
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
 msgid "Authentication Required"
 msgstr "Aanmelden verplicht"
 
-#: CoreConnectAuthDlg#3
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
 msgid "Please enter your account data:"
 msgstr "Vul uw accountgegevens in:"
 
-#: CoreConnectAuthDlg#4
-msgctxt "CoreConnectAuthDlg#4"
-msgid "Password:"
-msgstr "Wachtwoord:"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/coreconnectdlg.cpp:75
+msgid "Please enter your credentials for %1:"
+msgstr "Vul uw aanmeldgegevens voor %1 in:"
 
-#: CoreConnectAuthDlg#5
-msgctxt "CoreConnectAuthDlg#5"
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: CoreConnectAuthDlg#6
-msgctxt "CoreConnectAuthDlg#6"
-msgid "Remember password"
-msgstr "Wachtwoord onthouden"
-
-#: CoreConnectDlg#1
+#. ts-context CoreConnectDlg
+#: ../src/qtui/coreconnectdlg.cpp:40
 msgid "Connect to Core"
 msgstr "Verbindt met core"
 
-#: CoreConnection#1
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr "Netwerk is niet actief"
 
-#: CoreConnection#2
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: CoreConnection#3
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "%1 opzoeken..."
 
-#: CoreConnection#4
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "Met %1 verbinden..."
 
-#: CoreConnection#5
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Verbonden met %1"
 
-#: CoreConnection#6
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "Verbinding met %1 verbreken..."
 
-#: CoreConnection#7
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
-msgstr ""
-"De Quassel-core waarmee u wilt verbinden is te oud! Probeer een nieuwere "
-"versie te installeren."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:272
+msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
+msgstr "De Quassel-core waarmee u wilt verbinden is te oud! Probeer een nieuwere versie te installeren."
 
-#: CoreConnection#8
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr "Ongeldige data van de core ontvangen"
 
-#: CoreConnection#9
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "Verbinding met de core verbroken."
 
-#: CoreConnection#10
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr "Onversleutelde verbinding afgebroken"
 
-#: CoreConnection#11
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr "Met de core synchroniseren..."
 
-#: CoreConnection#12
-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 ""
-"<b>De Quassel-core waarmee u wilt verbinden is te oud!</b><br>Minstens "
-"core/client protocol v%1 benodigd om te verbinden."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:478
+msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
+msgstr "<b>De Quassel-core waarmee u wilt verbinden is te oud!</b><br>Minstens core/client protocol v%1 benodigd om te verbinden."
 
-#: CoreConnection#13
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Aanmelden..."
 
-#: CoreConnection#14
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "Aanmelden afgebroken"
 
-#: CoreConnection#15
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr "Sessiestatus ontvangen"
 
-#: CoreConnection#16
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr "Met %1 synchroniseren..."
 
-#: CoreConnection#17
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr "Netwerkstatus ontvangen"
 
-#: CoreConnection#18
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr "Met %1 gesynchroniseerd"
 
-#: CoreConnectionSettingsPage#1
-msgctxt "CoreConnectionSettingsPage#1"
-msgid "Remote Cores"
-msgstr "Core op afstand"
-
-#: CoreConnectionSettingsPage#2
-msgctxt "CoreConnectionSettingsPage#2"
-msgid "Connection"
-msgstr "Verbinding"
-
-#: CoreConnectionSettingsPage#3
-msgctxt "CoreConnectionSettingsPage#3"
-msgid "Form"
-msgstr "Form"
-
-#: CoreConnectionSettingsPage#4
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
 msgid "Network Status Detection"
 msgstr "Netwerkstatus detecteren"
 
-#: CoreConnectionSettingsPage#5
-msgid ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most "
-"KDE users"
-msgstr ""
-"Gebruik de KDE hardwarelayer om er achter te komen of we online zijn. "
-"Aangeraden voor de meeste KDE-gebruikers"
+#. 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"
+msgstr "Gebruik de KDE hardwarelayer om er achter te komen of we online zijn. Aangeraden voor de meeste KDE-gebruikers"
 
-#: CoreConnectionSettingsPage#6
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
 msgid "Use KDE's network status detection (via Solid)"
 msgstr "Gebruik de netwerkstatusdetectie van KDE (via Solid)"
 
-#: CoreConnectionSettingsPage#7
-msgid ""
-"Actively ping the remote core and disconnect if we didn't get a reply after "
-"a certain time"
-msgstr ""
-"Ping de core op afstand en verbreek de verbinding als we niet binnen een "
-"bepaalde tijd een reactie krijgen"
+#. 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"
+msgstr "Ping de core op afstand en verbreek de verbinding als we niet binnen een bepaalde tijd een reactie krijgen"
 
-#: CoreConnectionSettingsPage#8
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
 msgid "Ping timeout after"
 msgstr "Ping timeout na"
 
-#: CoreConnectionSettingsPage#9
-msgctxt "CoreConnectionSettingsPage#9"
-msgid " seconds"
-msgstr " seconden"
-
-#: CoreConnectionSettingsPage#10
-msgid ""
-"Only disconnect if the network socket gets closed by the operating system. "
-"This may take a long time after actually losing connectivity"
-msgstr ""
-"Verbreek de verbinding pas als de netwerk-socket door het besturingssysteem "
-"gesloten wordt. Dit kan lang na het daadwerkelijk verliezen van de "
-"verbinding zijn"
+#. ts-context CoreConnectionSettingsPage
+#: ../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"
+msgstr "Verbreek de verbinding pas als de netwerk-socket door het besturingssysteem gesloten wordt. Dit kan lang na het daadwerkelijk verliezen van de verbinding zijn"
 
-#: CoreConnectionSettingsPage#11
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
 msgid "Never time out actively"
 msgstr "Nooit actief verlopen"
 
-#: CoreConnectionSettingsPage#12
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
 msgid "Automatically reconnect on network failures"
 msgstr "Automatisch opnieuw verbinden na netwerkfouten"
 
-#: CoreConnectionSettingsPage#13
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
 msgid "Retry every"
 msgstr "Probeer opnieuw na elke"
 
-#: CoreConnectionStatusWidget#1
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgid "Connection"
+msgstr "Verbinding"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionStatusWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgid "Message"
+msgstr "Bericht"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "seconds"
 msgid "s"
 msgstr "s"
 
-#: CoreConnectionStatusWidget#2
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: CoreConnectionStatusWidget#3
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:62
 msgid "(Lag: %1 %2)"
 msgstr "(Vertraging: %1 %2)"
 
-#: CoreConnectionStatusWidget#4
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:75
 msgid "The connection to your core is encrypted with SSL."
 msgstr "De verbinding met uw core is versleuteld met SSL."
 
-#: CoreConnectionStatusWidget#5
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:78
 msgid "The connection to your core is not encrypted."
 msgstr "De verbinding met uw core is niet versleuteld."
 
-#: CoreConnectionStatusWidget#6
-msgctxt "CoreConnectionStatusWidget#6"
-msgid "Form"
-msgstr "Form"
-
-#: CoreConnectionStatusWidget#7
-msgctxt "CoreConnectionStatusWidget#7"
-msgid "Message"
-msgstr "Bericht"
-
-#: CoreInfoDlg#1
-msgid "%n Day(s)"
-msgstr "%n Dag(en)"
-
-#: CoreInfoDlg#2
-msgid " %1:%2:%3 (since %4)"
-msgstr " %1:%2:%3 (sinds %4)"
-
-#: CoreInfoDlg#3
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:13
 msgid "Core Information"
 msgstr "Core informatie"
 
-#: CoreInfoDlg#4
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:21
 msgid "Version:"
 msgstr "Versie:"
 
-#: CoreInfoDlg#5
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:28
 msgid "<core version>"
 msgstr "<core-versie>"
 
-#: CoreInfoDlg#6
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:35
 msgid "Uptime:"
 msgstr "Uptime:"
 
-#: CoreInfoDlg#7
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:42
 msgid "Connected Clients:"
 msgstr "Verbonden clients:"
 
-#: CoreInfoDlg#8
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:49
 msgid "<connected clients>"
 msgstr "<verbonden clients>"
 
-#: CoreInfoDlg#9
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:56
 msgid "<core uptime>"
 msgstr "<core uptime>"
 
-#: CoreInfoDlg#10
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:63
 msgid "Build date:"
 msgstr "Build datum:"
 
-#: CoreInfoDlg#11
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:70
 msgid "<build date>"
 msgstr "<build datum>"
 
-#: CoreInfoDlg#12
-msgctxt "CoreInfoDlg#12"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreInfoDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context DebugLogWidget
+#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/ui/debuglogwidget.ui:43
 msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
+
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:53
+msgid "%n Day(s)"
+msgid_plural "%n Day(s)"
+msgstr[0] "%n Dag(en)"
+msgstr[1] "%n Dag(en)"
+
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:54
+msgid " %1:%2:%3 (since %4)"
+msgstr " %1:%2:%3 (sinds %4)"
 
-#: CoreNetwork#1
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:153
 msgid "Connection failed. Cycling to next Server"
 msgstr "Verbinden mislukt. Volgende server proberen"
 
-#: CoreNetwork#2
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:161
+#: ../src/core/corenetwork.cpp:162
 msgid "Connecting to %1:%2..."
 msgstr "Verbinden met %1:%2..."
 
-#: CoreNetwork#3
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:210
 msgid "Disconnecting. (%1)"
 msgstr "Verbinding verbreken. (%1)"
 
-#: CoreNetwork#4
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:210
 msgid "Core Shutdown"
 msgstr "Core uitschakelen"
 
-#: CoreNetwork#5
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "Kon niet met %1 (%2) verbinden"
 
-#: CoreNetwork#6
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Verbinden mislukt: %1"
 
-#: CoreSession#1
-msgctxt "CoreSession#1"
-msgid "Client"
-msgstr "Client"
-
-#: CoreSession#2
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:195
 msgid "disconnected (UserId: %1)."
 msgstr "verbinding verbroken (Userid: %1)."
 
-#: CoreSession#3
-msgid ""
-"CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
-"create network %1!"
-msgstr ""
-"CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
-"create network %1!"
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:413
+msgid "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!"
+msgstr "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!"
 
-#: CoreSession#4
-msgid ""
-"CoreSession::createNetwork(): Trying to create a network that already "
-"exists, updating instead!"
-msgstr ""
-"CoreSession::createNetwork(): Trying to create a network that already "
-"exists, updating instead!"
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:444
+msgid "CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"
+msgstr "CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"
 
-#: CoreUserInputHandler#1
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "afwezig"
 
-#: CoreUserInputHandler#2
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr "CTCP-%1 request naar %2 sturen"
 
-#: CreateIdentityDlg#1
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "Geen onderwerp ingesteld voor %1."
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
 msgstr "Nieuwe identiteit aanmaken"
 
-#: CreateIdentityDlg#2
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
 msgid "Identity name:"
 msgstr "Naam van identiteit:"
 
-#: CreateIdentityDlg#3
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
 msgid "Create blank identity"
 msgstr "Lege identiteit aanmaken"
 
-#: CreateIdentityDlg#4
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
 msgid "Duplicate:"
 msgstr "Dupliceer:"
 
-#: CtcpHandler#1
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:197
+#, fuzzy
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr "CTCP PING request van %1 ontvangen"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+#, fuzzy
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr "CTCP TIME antwoord van %1: %2 ontvangen"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "CTCP PING request van %1 ontvangen"
 
-#: CtcpHandler#2
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "CTCP PING antwoord van %1 ontvangen met %2 seconden round trip time"
 
-#: CtcpHandler#3
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "CTCP VERSION request van %1 ontvangen"
 
-#: CtcpHandler#4
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "CTCP VERSION antwoord ontvangen van %1: %2"
 
-#: CtcpHandler#5
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr "CTCP TIME request van %1 ontvangen"
 
-#: CtcpHandler#6
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr "CTCP TIME antwoord van %1: %2 ontvangen"
 
-#: CtcpHandler#7
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Onbekende CTCP %1 ontvangen van %2"
 
-#: CtcpHandler#8
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr " met argumenten: %1"
 
-#: DebugBufferViewOverlay#1
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+msgid "Debug BufferView Overlay"
+msgstr "Debug BufferView Overlay"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+msgid "Overlay View"
+msgstr "Overlay View"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+msgid "Overlay Properties"
+msgstr "Overlay eigenschappen"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:50
 msgid "BufferViews:"
 msgstr "BufferViews:"
 
-#: DebugBufferViewOverlay#2
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:51
 msgid "All Networks:"
 msgstr "Alle netwerken:"
 
-#: DebugBufferViewOverlay#3
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:52
 msgid "Networks:"
 msgstr "Netwerken:"
 
-#: DebugBufferViewOverlay#4
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:53
 msgid "Buffers:"
 msgstr "Buffers:"
 
-#: DebugBufferViewOverlay#5
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:54
 msgid "Removed buffers:"
 msgstr "Verwijderde buffers:"
 
-#: DebugBufferViewOverlay#6
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:55
 msgid "Temp. removed buffers:"
 msgstr "Tijdelijk verwijderde buffers:"
 
-#: DebugBufferViewOverlay#7
-msgid "Add Buffers Automatically:"
-msgstr "Automatisch buffers toevoegen:"
-
-#: DebugBufferViewOverlay#8
-msgid "Hide inactive buffers:"
-msgstr "Inactieve buffers verbergen:"
-
-#: DebugBufferViewOverlay#9
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:57
 msgid "Allowed buffer types:"
 msgstr "Toegestane buffertypes:"
 
-#: DebugBufferViewOverlay#10
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
 msgid "Minimum activity:"
 msgstr "Minimale activiteit:"
 
-#: DebugBufferViewOverlay#11
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:60
 msgid "Is initialized:"
 msgstr "Is geïnitialiseerd:"
 
-#: DebugBufferViewOverlay#12
-msgid "Debug BufferView Overlay"
-msgstr "Debug BufferView Overlay"
-
-#: DebugBufferViewOverlay#13
-msgid "Overlay View"
-msgstr "Overlay View"
-
-#: DebugBufferViewOverlay#14
-msgid "Overlay Properties"
-msgstr "Overlay eigenschappen"
-
-#: DebugConsole#1
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:14
 msgid "Debug Console"
 msgstr "Debug console"
 
-#: DebugConsole#2
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:44
 msgid "local"
 msgstr "lokaal"
 
-#: DebugConsole#3
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:54
 msgid "core"
 msgstr "core"
 
-#: DebugConsole#4
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:82
 msgid "Evaluate!"
 msgstr "Evalueer!"
 
-#: DebugLogWidget#1
+#. ts-context DebugLogWidget
+#: ../src/qtui/ui/debuglogwidget.ui:13
 msgid "Debug Log"
 msgstr "Debug log"
 
-#: DebugLogWidget#2
-msgctxt "DebugLogWidget#2"
-msgid "Close"
-msgstr "Sluit"
-
-#: ExecWrapper#1
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:45
 msgid "Invalid command string for /exec: %1"
 msgstr "Ongeldige opdracht voor /exec: %1"
 
-#: ExecWrapper#2
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:53
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr "Naam \"%1\" is ongeldig: ../ of ..\\ is niet toegestaan!"
 
-#: ExecWrapper#3
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:64
 msgid "Could not find script \"%1\""
 msgstr "Kon het script \"%1\" niet vinden"
 
-#: ExecWrapper#4
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:82
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr "Script \"%1\" crashte met exit code %2."
 
-#: ExecWrapper#5
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:98
 msgid "Script \"%1\" could not start."
 msgstr "Script \"%1\" kon niet starten."
 
-#: ExecWrapper#6
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:100
 msgid "Script \"%1\" caused error %2."
 msgstr "Script \"%1\" veroorzaakte fout %2."
 
-#: FontSelector#1
+#. ts-context FontSelector
+#: ../src/uisupport/fontselector.cpp:31
 msgid "Choose..."
 msgstr "Kies..."
 
-#: HighlightSettingsPage#1
-msgctxt "HighlightSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: HighlightSettingsPage#2
-msgctxt "HighlightSettingsPage#2"
-msgid "Highlight"
-msgstr "Markeer"
-
-#: HighlightSettingsPage#3
-msgid "this shouldn't be empty"
-msgstr "dit zou niet leeg moeten zijn"
-
-#: HighlightSettingsPage#4
-msgid "highlight rule"
-msgstr "markeringsregel"
-
-#: HighlightSettingsPage#5
-msgctxt "HighlightSettingsPage#5"
-msgid "Form"
-msgstr "Form"
-
-#: HighlightSettingsPage#6
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:19
 msgid "Custom Highlights"
 msgstr "Eigen markering"
 
-#: HighlightSettingsPage#7
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:37
 msgid "RegEx"
 msgstr "RegEx"
 
-#: HighlightSettingsPage#8
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:42
 msgid "CS"
 msgstr "CS"
 
-#: HighlightSettingsPage#9
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:47
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: HighlightSettingsPage#10
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:55
 msgid "Add"
 msgstr "Toevoegen"
 
-#: HighlightSettingsPage#11
-msgctxt "HighlightSettingsPage#11"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
 msgid "Remove"
-msgstr "Verwijderen"
+msgstr "Verwijder"
 
-#: HighlightSettingsPage#12
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:85
 msgid "Highlight Nicks"
 msgstr "Markeer nicks"
 
-#: HighlightSettingsPage#13
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:91
 msgid "All nicks from identity"
 msgstr "Alle nicks van identiteit"
 
-#: HighlightSettingsPage#14
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:98
 msgid "Current nick"
 msgstr "Huidige nick"
 
-#: HighlightSettingsPage#15
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Geen"
 
-#: HighlightSettingsPage#16
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:115
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: IdentitiesSettingsPage#1
-msgctxt "IdentitiesSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+msgid "this shouldn't be empty"
+msgstr "dit zou niet leeg moeten zijn"
+
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.h:45
+msgid "highlight rule"
+msgstr "markeringsregel"
+
+#. #-#-#-#-#  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
+msgid "Rename Identity"
+msgstr "Identiteit hernoemen"
 
-#: IdentitiesSettingsPage#2
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:51
+msgid "Add Identity"
+msgstr "Identiteit toevoegen"
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:74
+msgid "Remove Identity"
+msgstr "Identiteit verwijderen"
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 msgid "Identities"
 msgstr "Identiteiten"
 
-#: IdentitiesSettingsPage#3
-msgctxt "IdentitiesSettingsPage#3"
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
-msgstr ""
-"<b>De volgende problemen moeten opgelost worden voordat uw wijzigingen "
-"toegepast kunnen worden:</b><ul>"
-
-#: IdentitiesSettingsPage#4
+#. #-#-#-#-#  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>"
+msgstr "<b>De volgende problemen moeten opgelost worden voordat uw wijzigingen toegepast kunnen worden:</b><ul>"
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
 msgid "<li>All identities need an identity name set</li>"
 msgstr "<li>U moet voor alle identiteiten een naam instellen</li>"
 
-#: IdentitiesSettingsPage#5
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
 msgid "<li>Every identity needs at least one nickname defined</li>"
-msgstr ""
-"<li>Voor elke identiteit moet minstens een bijnaam ingesteld zijn</li>"
+msgstr "<li>Voor elke identiteit moet minstens een bijnaam ingesteld zijn</li>"
 
-#: IdentitiesSettingsPage#6
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr "<li>U moet voor elke identiteit een echte naam opgeven</li>"
 
-#: IdentitiesSettingsPage#7
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr "<li>U moet voor elke identiteit een ident opgeven</li>"
 
-#: IdentitiesSettingsPage#8
-msgctxt "IdentitiesSettingsPage#8"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/networkssettingspage.cpp:169
 msgid "</ul>"
 msgstr "</ul>"
 
-#: IdentitiesSettingsPage#9
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
 msgid "One or more identities are invalid"
 msgstr "Een of meer identiteiten zijn niet geldig"
 
-#: IdentitiesSettingsPage#10
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
 msgid "Delete Identity?"
 msgstr "Identiteit verwijderen?"
 
-#: IdentitiesSettingsPage#11
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Wilt u echt identiteit \"%1\" verwijderen?"
 
-#: IdentitiesSettingsPage#12
-msgctxt "IdentitiesSettingsPage#12"
-msgid "Rename Identity"
-msgstr "Identiteit hernoemen"
-
-#: IdentitiesSettingsPage#13
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:323
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr "Vul een nieuwe naam in voor identiteit \"%1\"."
 
-#: IdentitiesSettingsPage#14
-msgctxt "IdentitiesSettingsPage#14"
-msgid "..."
-msgstr "..."
-
-#: IdentitiesSettingsPage#15
-msgid "Add Identity"
-msgstr "Identiteit toevoegen"
-
-#: IdentitiesSettingsPage#16
-msgctxt "IdentitiesSettingsPage#16"
-msgid "Add..."
-msgstr "Toevoegen..."
-
-#: IdentitiesSettingsPage#17
-msgid "Remove Identity"
-msgstr "Identiteit verwijderen"
-
-#: Identity#1
+#. ts-context Identity
+#: ../src/common/identity.cpp:134
 msgid "Quassel IRC User"
 msgstr "Quassel IRC-gebruiker"
 
-#: Identity#2
+#. ts-context Identity
+#: ../src/common/identity.cpp:162
 msgid "<empty>"
 msgstr "<leeg>"
 
-#: Identity#3
+#. ts-context Identity
+#: ../src/common/identity.cpp:168
 msgid "Gone fishing."
 msgstr "Aan het vissen."
 
-#: Identity#4
+#. ts-context Identity
+#: ../src/common/identity.cpp:172
 msgid "Not here. No, really. not here!"
 msgstr "Niet hier. Echt waar, niet hier!"
 
-#: Identity#5
+#. ts-context Identity
+#: ../src/common/identity.cpp:175
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr "Alle Quassel-clients zijn van de aardbodem verdwenen..."
 
-#: Identity#6
+#. ts-context Identity
+#: ../src/common/identity.cpp:178
 msgid "Kindergarten is elsewhere!"
 msgstr "Kleutelschool is ergens anders!"
 
-#: Identity#7
+#. ts-context Identity
+#: ../src/common/identity.cpp:179
+#: ../src/common/identity.cpp:180
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Chat comfortabel. Waar dan ook."
 
-#: IdentityEditWidget#1
-msgctxt "IdentityEditWidget#1"
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: IdentityEditWidget#2
-msgid "Load a Key"
-msgstr "Laadt een sleutel"
-
-#: IdentityEditWidget#3
-msgid "No Key loaded"
-msgstr "Geen sleutel geladen"
-
-#: IdentityEditWidget#4
-msgid "Load"
-msgstr "Laden"
-
-#: IdentityEditWidget#5
-msgid "RSA"
-msgstr "RSA"
-
-#: IdentityEditWidget#6
-msgid "DSA"
-msgstr "DSA"
-
-#: IdentityEditWidget#7
-msgid "Clear"
-msgstr "Wis"
-
-#: IdentityEditWidget#8
-msgid "Load a Certificate"
-msgstr "Laadt een certificaat"
-
-#: IdentityEditWidget#9
-msgid "No Certificate loaded"
-msgstr "Geen certificaat geladen"
-
-#: IdentityEditWidget#10
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr "Algemeen"
 
-#: IdentityEditWidget#11
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:38
 msgid "Real Name:"
 msgstr "Echte naam:"
 
-#: IdentityEditWidget#12
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:45
 msgid "The \"Real Name\" is shown in /whois."
 msgstr "De \"Echte naam\" wordt getoond in /whois."
 
-#: IdentityEditWidget#13
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:54
 msgid "Nicknames"
 msgstr "Bijnamen (Nicknames)"
 
-#: IdentityEditWidget#14
-msgctxt "IdentityEditWidget#14"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/identityeditwidget.ui:90
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
 msgid "Add Nickname"
 msgstr "Bijnaam toevoegen"
 
-#: IdentityEditWidget#15
-msgctxt "IdentityEditWidget#15"
-msgid "&Add..."
-msgstr "&Toevoegen..."
-
-#: IdentityEditWidget#16
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:116
 msgid "Remove Nickname"
 msgstr "Verwijder bijnaam"
 
-#: IdentityEditWidget#17
-msgctxt "IdentityEditWidget#17"
-msgid "Remove"
-msgstr "Verwijder"
-
-#: IdentityEditWidget#18
-msgctxt "IdentityEditWidget#18"
-msgid "Rename Identity"
-msgstr "Identiteit hernoemen"
-
-#: IdentityEditWidget#19
-msgctxt "IdentityEditWidget#19"
-msgid "Re&name..."
-msgstr "Her&noemen..."
-
-#: IdentityEditWidget#20
-msgctxt "IdentityEditWidget#20"
+#. #-#-#-#-#  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
 msgid "Move upwards in list"
 msgstr "In de lijst omhoog verplaatsen"
 
-#: IdentityEditWidget#21
-msgctxt "IdentityEditWidget#21"
-msgid "..."
-msgstr "..."
-
-#: IdentityEditWidget#22
-msgctxt "IdentityEditWidget#22"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/identityeditwidget.ui:179
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/ui/simplenetworkeditor.ui:179
 msgid "Move downwards in list"
 msgstr "In de lijst omlaag verplaatsen"
 
-#: IdentityEditWidget#23
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgid "A&way"
 msgstr "&Weg"
 
-#: IdentityEditWidget#24
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:233
 msgid "Default Away Settings"
 msgstr "Standaard afwezigheidsinstellingen"
 
-#: IdentityEditWidget#25
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:244
 msgid "Nick to be used when being away"
 msgstr "Te gebruiken bijnaam als u afwezig bent"
 
-#: IdentityEditWidget#26
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:254
 msgid "Default away reason"
 msgstr "Standaard afwezigheidsreden"
 
-#: IdentityEditWidget#27
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:261
 msgid "Away Nick:"
 msgstr "Afwezigheidsbijnaam:"
 
-#: IdentityEditWidget#28
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:268
+#: ../src/qtui/settingspages/identityeditwidget.ui:297
+#: ../src/qtui/settingspages/identityeditwidget.ui:366
 msgid "Away Reason:"
 msgstr "Afwezigheidsreden:"
 
-#: IdentityEditWidget#29
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:280
 msgid "Set away when all clients have detached from the core"
 msgstr "Stel afwezig in wanneer alle clients van de core ontkoppeld zijn"
 
-#: IdentityEditWidget#30
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:283
 msgid "Away On Detach"
 msgstr "Afwezig bij ontkoppelen"
 
-#: IdentityEditWidget#31
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:315
 msgid "Not implemented yet"
 msgstr "Nog niet geïmplementeerd"
 
-#: IdentityEditWidget#32
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:318
 msgid "Away On Idle"
 msgstr "Afwezig bij geen activiteit"
 
-#: IdentityEditWidget#33
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:332
 msgid "Set away after"
 msgstr "Stel afwezig in na"
 
-#: IdentityEditWidget#34
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:342
 msgid "minutes of being idle"
 msgstr "minuten zonder activiteit"
 
-#: IdentityEditWidget#35
+#. #-#-#-#-#  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
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:407
 msgid "Ident:"
 msgstr "Ident:"
 
-#: IdentityEditWidget#36
-msgid ""
-"The \"ident\" is part of your hostmask and, together with your host, "
-"uniquely identifies you within the IRC network."
-msgstr ""
-"Het \"identi\" is deel van uw hostmask en identificeert u, in combinatie met "
-"uw host, bij het IRC-netwerk."
+#. 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."
+msgstr "Het \"identi\" is deel van uw hostmask en identificeert u, in combinatie met uw host, bij het IRC-netwerk."
 
-#: IdentityEditWidget#37
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgid "Messages"
 msgstr "Berichten"
 
-#: IdentityEditWidget#38
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:431
 msgid "Part Reason:"
 msgstr "Vertrek reden:"
 
-#: IdentityEditWidget#39
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:444
 msgid "Quit Reason:"
 msgstr "Afsluit reden:"
 
-#: IdentityEditWidget#40
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:454
 msgid "Kick Reason:"
 msgstr "Kick reden:"
 
-#: IdentityEditWidget#41
-msgid ""
-"You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
-msgstr ""
-"U heeft een clien nodig die SSL begrijpt als u de SSL-sleutel en -"
-"certificaat wilt bewerken"
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:488
+msgid "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
+msgstr "U heeft een clien nodig die SSL begrijpt als u de SSL-sleutel en -certificaat wilt bewerken"
 
-#: IdentityEditWidget#42
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:517
 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 ""
-"Waarschuwing: uw verbinding met de Quassel-core is niet beveiligd! Als u "
-"doorgaat zult u uw SSL-sleutel en certificaat niet-beveiligd verzenden!"
-
-#: IdentityEditWidget#43
-msgctxt "IdentityEditWidget#43"
+"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 "Waarschuwing: uw verbinding met de Quassel-core is niet beveiligd! Als u doorgaat zult u uw SSL-sleutel en certificaat niet-beveiligd verzenden!"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:546
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: IdentityEditWidget#44
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:584
 msgid "Use SSL Key"
 msgstr "Gebruik SSL-sleutel"
 
-#: IdentityEditWidget#45
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:598
 msgid "Key Type:"
 msgstr "Sleuteltype:"
 
-#: IdentityEditWidget#46
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:605
+#: ../src/qtui/settingspages/identityeditwidget.cpp:317
+#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+msgid "No Key loaded"
+msgstr "Geen sleutel geladen"
+
+#. 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
+msgid "Load"
+msgstr "Laden"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:637
 msgid "Use SSL Certificate"
 msgstr "Gebruik SSL-certificaat"
 
-#: IdentityEditWidget#47
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:656
 msgid "Organisation:"
 msgstr "Organisatie:"
 
-#: IdentityEditWidget#48
+#. 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
+msgid "No Certificate loaded"
+msgstr "Geen certificaat geladen"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:690
 msgid "CommonName:"
 msgstr "CommonName:"
 
-#: IdentityPage#1
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+msgid "Load a Key"
+msgstr "Laadt een sleutel"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+msgid "RSA"
+msgstr "RSA"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+msgid "DSA"
+msgstr "DSA"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:330
+#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+msgid "Clear"
+msgstr "Wis"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+msgid "Load a Certificate"
+msgstr "Laadt een certificaat"
+
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:107
 msgid "Setup Identity"
 msgstr "Identiteit instellen"
 
-#: IdentityPage#2
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:112
 msgid "Default Identity"
 msgstr "Standaard identiteit"
 
-#: IgnoreListEditDlg#1
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
 msgid "Configure Ignore Rule"
 msgstr "Configureer negeer-regel"
 
-#: IgnoreListEditDlg#2
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
 msgid ""
 "<p><b>Strictness:</b></p>\n"
 "<p><u>Dynamic:</u></p>\n"
 "<p>Messages are filtered \"on the fly\".\n"
-"Whenever you disable/delete the ignore rule, the messages are shown "
-"again.</p>\n"
+"Whenever you disable/delete the ignore rule, the messages are shown again.</p>\n"
 "<p><u>Permanent:</u></p>\n"
 "<p>Messages are filtered before they get stored in the database.</p>"
 msgstr ""
 "<p><b>Strengheid:</b></p>\n"
 "<p><u>Dynamisch:</u></p>\n"
 "<p>Berichten worden \"on the fly\" gefilterd.\n"
-"Wanneer u de negeer-regel uitschakelt of verwijdert worden de berichten weer "
-"zichtbaar.</p>\n"
+"Wanneer u de negeer-regel uitschakelt of verwijdert worden de berichten weer zichtbaar.</p>\n"
 "<p><u>Permanent:</u></p>\n"
-"<p>Berichten worden gefilterd voordat ze in de database opgeslagen "
-"worden.</p>"
+"<p>Berichten worden gefilterd voordat ze in de database opgeslagen worden.</p>"
 
-#: IgnoreListEditDlg#3
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
 msgid "Strictness"
 msgstr "Strengheid"
 
-#: IgnoreListEditDlg#4
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
 msgid "Dynamic"
 msgstr "Dynamisch"
 
-#: IgnoreListEditDlg#5
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
 msgid "Permanent"
 msgstr "Permanent"
 
-#: IgnoreListEditDlg#6
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
 msgid ""
 "<p><b>Rule Type:</b></p>\n"
 "<p><u>Sender:</u></p>\n"
@@ -2533,29 +3035,21 @@ msgstr ""
 "<p><u>Bericht:</u></p>\n"
 "<p>De regel wordt gebruikt op grond van de inhoud van het bericht</p>"
 
-#: IgnoreListEditDlg#7
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
 msgid "Rule Type"
 msgstr "Regeltype"
 
-#: IgnoreListEditDlg#8
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
 msgid "Sender"
 msgstr "Afzender"
 
-#: IgnoreListEditDlg#9
-msgctxt "IgnoreListEditDlg#9"
-msgid "Message"
-msgstr "Bericht"
-
-#: IgnoreListEditDlg#10
-msgctxt "IgnoreListEditDlg#10"
-msgid "CTCP"
-msgstr "CTCP"
-
-#: IgnoreListEditDlg#11
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
 msgid ""
 "<p><b>Ignore rule:</b></p>\n"
-"<p>Depending on the type of the rule, the text is matched against "
-"either:</p>\n"
+"<p>Depending on the type of the rule, the text is matched against either:</p>\n"
 "<p><u>- the message content:</u></p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
@@ -2565,97 +3059,104 @@ msgid ""
 "<br />\n"
 "- <i>*@foobar.com</i> matches any sender from host <i>foobar.com</i>\n"
 "<br />\n"
-"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> "
-"from any host</p>"
+"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
 msgstr ""
 "<p><b>Negeer-regel:</b></p>\n"
 "<p>Afhankelijk van het regeltype wordt de tekst vergeleken met:</p>\n"
 "<p><u>- de inhoud van het bericht:</u></p>\n"
 "<p><i>Voorbeeld:</i>\n"
 "<br />\n"
-"<i>*foobar*</i> is van toepassing op elke tekst die het woord <i>foobar</i> "
-"bevat</p>\n"
+"<i>*foobar*</i> is van toepassing op elke tekst die het woord <i>foobar</i> bevat</p>\n"
 "<p><u>- de afzender</u>  <i>(nick!ident@host.name)</i></p>\n"
 "<p><i>Voorbeelden:</i>\n"
 "<br />\n"
-"- <i>*@foobar.com</i> is van toepassing op elke verzender van host  "
-"<i>foobar.com</i>\n"
+"- <i>*@foobar.com</i> is van toepassing op elke verzender van host  <i>foobar.com</i>\n"
 "<br />\n"
-"- <i>stupid!.+</i> (RegEx) is van toepassing op elke verzender met de "
-"nickname <i>stupid</i> van elke host</p>"
-
-#: IgnoreListEditDlg#12
-msgctxt "IgnoreListEditDlg#12"
+"- <i>stupid!.+</i> (RegEx) is van toepassing op elke verzender met de nickname <i>stupid</i> van elke host</p>"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
 msgid "Ignore Rule"
 msgstr "Negeer-regel"
 
-#: IgnoreListEditDlg#13
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:123
 msgid ""
 "<p><b>Use regular expressions:</b></p>\n"
 "<p>If enabled, rules follow regular expression syntax.</p>\n"
-"<p>Otherwise rules allow wildcard matching with the following special "
-"characters:</p>\n"
+"<p>Otherwise rules allow wildcard matching with the following special characters:</p>\n"
 "<p> *: representing \"any amount of any character\"\n"
 "<br />\n"
 "?: representing \"exactly one character\"</p>"
 msgstr ""
 "<p><b>Gebruik regular expressions:</b></p>\n"
 "<p>Gebruik regular expression syntaxis.</p>\n"
-"<p>Anders kunnen regels ook wildcards bevatten met de volgende speciale "
-"tekens:</p>\n"
+"<p>Anders kunnen regels ook wildcards bevatten met de volgende speciale tekens:</p>\n"
 "<p> *: staat voor \"elk aantal van welk teken dan ook\"\n"
 "<br />\n"
 "?: staat voor \"precies een teken\"</p>"
 
-#: IgnoreListEditDlg#14
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
 msgid "Regular expression"
 msgstr "Regular expression"
 
-#: IgnoreListEditDlg#15
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
 "<p>The rule is active for any channel on any network</p>\n"
 "<p><u>Network:</u></p>\n"
-"<p>The list below is interpreted as a list of networks for which the rule "
-"should match</p>\n"
+"<p>The list below is interpreted as a list of networks for which the rule should match</p>\n"
 "<p><u>Channel:</u></p>\n"
-"<p>The list below is interpreted as a list of channels for which the rule "
-"should match</p>"
+"<p>The list below is interpreted as a list of channels for which the rule should match</p>"
 msgstr ""
 "<p><b>Bereik:</b></p>\n"
 "<p><u>Globaal:</u></p>\n"
 "<p>Deze regel is actief voor elk kanaal op elk netwerk</p>\n"
 "<p><u>Netwerk:</u></p>\n"
-"<p>De lijst hieronder bevat de netwerken waarop de regel van toepassing moet "
-"zijn</p>\n"
+"<p>De lijst hieronder bevat de netwerken waarop de regel van toepassing moet zijn</p>\n"
 "<p><u>Kanaal:</u></p>\n"
-"<p>De lijst hieronder bevat de kanalen waarop de regel van toepassing moet "
-"zijn</p>"
+"<p>De lijst hieronder bevat de kanalen waarop de regel van toepassing moet zijn</p>"
 
-#: IgnoreListEditDlg#16
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
 msgid "Scope"
 msgstr "Beriek"
 
-#: IgnoreListEditDlg#17
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
 msgid "Global"
 msgstr "Globaal"
 
-#: IgnoreListEditDlg#18
-msgctxt "IgnoreListEditDlg#18"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
 msgid "Network"
 msgstr "Netwerk"
 
-#: IgnoreListEditDlg#19
-msgctxt "IgnoreListEditDlg#19"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
+#: ../src/client/irclistmodel.cpp:59
 msgid "Channel"
 msgstr "Kanaal"
 
-#: IgnoreListEditDlg#20
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
 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"
+"<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
 "<i>#quassel*; #foobar</i>\n"
@@ -2663,16 +3164,15 @@ msgid ""
 "would match on #foobar and on any channel starting with <i>#quassel</i></p>"
 msgstr ""
 "<p><b>Bereik regel:</b></p>\n"
-"<p>Het bereik van een regel is gegeven als een lijst van <i>netwerk</i>- of "
-"<i>kanaal</i>-namen, gescheiden door puntkomma's.</p>\n"
+"<p>Het bereik van een regel is gegeven als een lijst van <i>netwerk</i>- of <i>kanaal</i>-namen, gescheiden door puntkomma's.</p>\n"
 "<p><i>Voorbeeld:</i>\n"
 "<br />\n"
 "<i>#quassel*; #foobar</i>\n"
 "<br />\n"
-"zou van toepassing zijn op #foobar en elk kanaal dat met <i>#quassel</i> "
-"begint.</p>"
+"zou van toepassing zijn op #foobar en elk kanaal dat met <i>#quassel</i> begint.</p>"
 
-#: IgnoreListEditDlg#21
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -2682,77 +3182,60 @@ msgstr ""
 "<p><b>Inschakelen/uitschakelen:</b></p>\n"
 "<p>Alleen ingeschakelde regels zijn van toepassing.\n"
 "<br />\n"
-"Voor dynamische regels zal uitschakelen de gefilterde berichten juist weer "
-"tonen.</p>"
+"Voor dynamische regels zal uitschakelen de gefilterde berichten juist weer tonen.</p>"
 
-#: IgnoreListEditDlg#22
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
 msgid "Rule is enabled"
 msgstr "Regel is ingeschakeld"
 
-#: IgnoreListModel#1
-msgid ""
-"<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
-"dynamic rules, disabling actually shows the filtered messages again"
-msgstr ""
-"<b>Inschakelen/uitschakelen:</b><br />Alleen ingeschakelde regels zijn van "
-"toepassing. <br /> Voor dynamische regels zal uitschakelen de gefilterde "
-"berichten juist weer tonen.</p>"
+#. 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"
+msgstr "<b>Inschakelen/uitschakelen:</b><br />Alleen ingeschakelde regels zijn van toepassing. <br /> Voor dynamische regels zal uitschakelen de gefilterde berichten juist weer tonen.</p>"
 
-#: IgnoreListModel#2
-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 ""
-"<b>Negeer-regel:</b><br />Afhankelijk van het type regels is deze van "
-"toepassing op:<br /><br />- <u>de inhoud van het bericht:</u><br "
-"/><i>Voorbeeld:<i><br />    \"*foobar*\" komt overeen met elke tekst die het "
-"woord \"foobar\" bevat\"<br /><br />- <u>de afzender "
-"<i>nick!ident@host.name<i></u><br /><i>Voorbeeld:</i><br />    "
-"\"*@foobar.com\" komt overeen met elke afzender van de host  foobar.com<br "
-"/>    \"stupid!.+\" (RegEx) komt overeen met elke afzender met de bijnaam "
-"\"stupid\" van elke host<br />"
-
-#: IgnoreListModel#3
+#. 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 />"
+msgstr "<b>Negeer-regel:</b><br />Afhankelijk van het type regels is deze van toepassing op:<br /><br />- <u>de inhoud van het bericht:</u><br /><i>Voorbeeld:<i><br />    \"*foobar*\" komt overeen met elke tekst die het woord \"foobar\" bevat\"<br /><br />- <u>de afzender <i>nick!ident@host.name<i></u><br /><i>Voorbeeld:</i><br />    \"*@foobar.com\" komt overeen met elke afzender van de host  foobar.com<br />    \"stupid!.+\" (RegEx) komt overeen met elke afzender met de bijnaam \"stupid\" van elke host<br />"
+
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
 msgid "By Sender"
 msgstr "Naar afzender"
 
-#: IgnoreListModel#4
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
 msgid "By Message"
 msgstr "Naar bericht"
 
-#: IgnoreListModel#5
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: IgnoreListModel#6
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
 msgid "Type"
 msgstr "Type"
 
-#: IgnoreListModel#7
-msgctxt "IgnoreListModel#7"
-msgid "Ignore Rule"
-msgstr "Negeer-regel"
-
-#: IgnoreListSettingsPage#1
-msgctxt "IgnoreListSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+msgid "&Edit"
+msgstr "Be&werk"
 
-#: IgnoreListSettingsPage#2
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
 msgid "Ignore List"
 msgstr "Negeerlijst"
 
-#: IgnoreListSettingsPage#3
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
 msgid "Rule already exists"
 msgstr "Regel bestaat al"
 
-#: IgnoreListSettingsPage#4
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
@@ -2762,1058 +3245,1323 @@ msgstr ""
 "\"%1\"\n"
 "Kies een andere regel."
 
-#: IgnoreListSettingsPage#5
-msgctxt "IgnoreListSettingsPage#5"
-msgid "Form"
-msgstr "Form"
-
-#: IgnoreListSettingsPage#6
-msgctxt "IgnoreListSettingsPage#6"
-msgid "New"
-msgstr "Nieuw"
-
-#: IgnoreListSettingsPage#7
-msgctxt "IgnoreListSettingsPage#7"
-msgid "Delete"
-msgstr "Verwijder"
-
-#: IgnoreListSettingsPage#8
-msgid "&Edit"
-msgstr "Be&werk"
-
-#: IndicatorNotificationConfigWidget#1
-msgctxt "IndicatorNotificationConfigWidget#1"
-msgid "Form"
-msgstr "Form"
-
-#: IndicatorNotificationConfigWidget#2
-msgid ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
-msgstr ""
-"Dit activeert ondersteuning voor de yatana Project's application indicator "
-"(libindicate)."
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
+msgid "This enables support for the Ayatana Project's application indicator (libindicate)."
+msgstr "Dit activeert ondersteuning voor de yatana Project's application indicator (libindicate)."
 
-#: IndicatorNotificationConfigWidget#3
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
 msgid "Show messages in application indicator"
 msgstr "Toon berichten in applicatie-indicator"
 
-#: InputWidget#1
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr "Wit"
 
-#: InputWidget#2
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr "Zwart"
 
-#: InputWidget#3
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr "Donkerblauw"
 
-#: InputWidget#4
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr "Donkergroen"
 
-#: InputWidget#5
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr "Rood"
 
-#: InputWidget#6
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: InputWidget#7
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr "Donkermagenta"
 
-#: InputWidget#8
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr "Oranje"
 
-#: InputWidget#9
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr "Geel"
 
-#: InputWidget#10
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr "Groen"
 
-#: InputWidget#11
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr "Donkercyaan"
 
-#: InputWidget#12
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr "Cyaan"
 
-#: InputWidget#13
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr "Blauw"
 
-#: InputWidget#14
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr "Magenta"
 
-#: InputWidget#15
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr "Donkergrijs"
 
-#: InputWidget#16
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Light gray"
 msgstr "Lichtgrijs"
 
-#: InputWidget#17
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr "Heldere kleur"
 
-#: InputWidget#18
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Focus inputregel"
 
-#: InputWidget#19
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context InputWidgetSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:22
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
+msgid "Custom font:"
+msgstr "Eigen lettertype:"
 
-#: InputWidget#20
-msgctxt "InputWidget#20"
-msgid "Form"
-msgstr "Form"
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
+msgid "Enable spell check"
+msgstr "Spellingscontrole activeren"
 
-#: InputWidgetSettingsPage#1
-msgctxt "InputWidgetSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: InputWidgetSettingsPage#2
-msgid "Input Widget"
-msgstr "Input widget"
-
-#: InputWidgetSettingsPage#3
-msgctxt "InputWidgetSettingsPage#3"
-msgid "Form"
-msgstr "Form"
-
-#: InputWidgetSettingsPage#4
-msgctxt "InputWidgetSettingsPage#4"
-msgid "Custom font:"
-msgstr "Eigen lettertype:"
-
-#: InputWidgetSettingsPage#5
-msgid "Enable spell check"
-msgstr "Spellingscontrole activeren"
-
-#: InputWidgetSettingsPage#6
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
 msgid "Enable per chat history"
 msgstr "Geschiedenis per chat activeren"
 
-#: InputWidgetSettingsPage#7
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
 msgid "Show nick selector"
 msgstr "Toon nick-kiezen"
 
-#: InputWidgetSettingsPage#8
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
 msgid "Show style buttons"
 msgstr "Toon stijlknoppen"
 
-#: InputWidgetSettingsPage#9
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr "Meerdere regels bewerken"
 
-#: InputWidgetSettingsPage#10
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr "Toon maximaal"
 
-#: InputWidgetSettingsPage#11
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "regels"
 
-#: InputWidgetSettingsPage#12
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "Activeer schuifbalken"
 
-#: InputWidgetSettingsPage#13
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr "Tab-completion"
 
-#: InputWidgetSettingsPage#14
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Completion suffix:"
 
-#: InputWidgetSettingsPage#15
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
-#: IrcConnectionWizard#1
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+msgid "Input Widget"
+msgstr "Input widget"
+
+#. ts-context IrcConnectionWizard
+#: ../src/qtui/ircconnectionwizard.cpp:51
 msgid "Save && Connect"
 msgstr "Save && Connect"
 
-#: IrcListModel#1
-msgctxt "IrcListModel#1"
-msgid "Channel"
-msgstr "Kanaal"
-
-#: IrcListModel#2
+#. ts-context IrcListModel
+#: ../src/client/irclistmodel.cpp:60
 msgid "Users"
 msgstr "Gebruikers"
 
-#: IrcListModel#3
-msgctxt "IrcListModel#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcListModel
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModel
+#: ../src/client/irclistmodel.cpp:61
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Onderwerp"
 
-#: IrcServerHandler#1
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 heeft het onderwerp van %2 verandert naar: \"%3\""
 
-#: IrcServerHandler#2
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Received RPL_ISUPPORT (005) without parameters!"
 
-#: IrcServerHandler#3
-msgid ""
-"Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected "
-"behavior!"
-msgstr ""
-"Received non RFC compliant RPL_ISUPPORT: dit kan tot onverwacht gedrag "
-"leiden!"
-
-#: IrcServerHandler#4
-msgctxt "IrcServerHandler#4"
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:642
+msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
+msgstr "Received non RFC compliant RPL_ISUPPORT: dit kan tot onverwacht gedrag leiden!"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcServerHandler
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. Plain Message
+#. ----------
+#. Notice Message
+#. ----------
+#. Server Message
+#. ----------
+#. Info Message
+#. ----------
+#. Error Message
+#. ----------
+#. Topic Message
+#. ----------
+#. Invite Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
-#: IrcServerHandler#5
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 is afwezig: \"%2\""
 
-#: IrcServerHandler#6
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 is afwezig: \"%2\""
 
-#: IrcServerHandler#7
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
-#: IrcServerHandler#8
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 is %2 (%3)"
 
-#: IrcServerHandler#9
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 is online via %2 (%3)"
 
-#: IrcServerHandler#10
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
-#: IrcServerHandler#11
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr "[Whowas] %1 was %2 (%3)"
 
-#: IrcServerHandler#12
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Einde van de /WHO-lijst voor %1"
 
-#: IrcServerHandler#13
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 is aangemeld sinds %2"
 
-#: IrcServerHandler#14
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr "[Whois] %1 is %2 (%3) inactief"
 
-#: IrcServerHandler#15
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] inactief-bericht: %1"
-
-#: IrcServerHandler#16
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 is een gebruiker in kanalen: %2"
 
-#: IrcServerHandler#17
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 heeft voice op kanalen: %2"
 
-#: IrcServerHandler#18
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 is een operator op kanalen: %2"
 
-#: IrcServerHandler#19
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "Kanaal %1 heeft %2 gebruikers. Onderwerp is: %3"
 
-#: IrcServerHandler#20
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Einde van kanaallijst"
 
-#: IrcServerHandler#21
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr "Homepage van %1 is %2"
 
-#: IrcServerHandler#22
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr "Kanaal %1 is op %2 aangemaakt"
 
-#: IrcServerHandler#23
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "Geen onderwerp ingesteld voor %1."
 
-#: IrcServerHandler#24
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "Onderwerp voor %1 is \"%2\""
 
-#: IrcServerHandler#25
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Onderwerp op %2 door %1 ingesteld"
 
-#: IrcServerHandler#26
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
-#: IrcServerHandler#27
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "Nick %1 bevat niet-toegestane tekens"
 
-#: IrcServerHandler#28
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Nick is al in gebruik: %1"
 
-#: IrcServerHandler#29
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr "Nick/kanaal is tijdelijk niet beschikbaar: %1"
 
-#: IrcServerHandler#30
-msgid ""
-"No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
-msgstr ""
-"Geen beschikbare en toegestane nicks in de lijst gevonden. Gebruik /nick "
-"<anderenick> om door te gaan"
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1270
+msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
+msgstr "Geen beschikbare en toegestane nicks in de lijst gevonden. Gebruik /nick <anderenick> om door te gaan"
 
-#: IrcUserItem#1
-msgctxt "IrcUserItem#1"
+#. ts-context IrcUserItem
+#: ../src/client/networkmodel.cpp:806
+#, fuzzy
+msgid " is away"
+msgstr "%1 is afwezig: \"%2\""
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr "niet actief sinds %1"
 
-#: IrcUserItem#2
-msgctxt "IrcUserItem#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr "logintijd: %1"
 
-#: IrcUserItem#3
-msgctxt "IrcUserItem#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "server: %1"
 
-#: ItemViewSettingsPage#1
-msgctxt "ItemViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: ItemViewSettingsPage#2
-msgid "Chat & Nick Lists"
-msgstr "Chat & Nicklijsten"
-
-#: ItemViewSettingsPage#3
-msgctxt "ItemViewSettingsPage#3"
-msgid "Network"
-msgstr "Netwerk"
-
-#: ItemViewSettingsPage#4
-msgid "Inactive"
-msgstr "Niet actief"
-
-#: ItemViewSettingsPage#5
-msgid "Normal"
-msgstr "Normaal"
-
-#: ItemViewSettingsPage#6
-msgid "Unread messages"
-msgstr "Ongelezen berichten"
-
-#: ItemViewSettingsPage#7
-msgctxt "ItemViewSettingsPage#7"
-msgid "Highlight"
-msgstr "Markeer"
-
-#: ItemViewSettingsPage#8
-msgid "Other activity"
-msgstr "Andere activiteit"
-
-#: ItemViewSettingsPage#9
-msgctxt "ItemViewSettingsPage#9"
-msgid "Form"
-msgstr "Form"
-
-#: ItemViewSettingsPage#10
-msgctxt "ItemViewSettingsPage#10"
-msgid "Custom font:"
-msgstr "Eigen lettertype:"
-
-#: ItemViewSettingsPage#11
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:50
 msgid "Show icons"
 msgstr "Toon pictogrammen"
 
-#: ItemViewSettingsPage#12
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:66
 msgid "Chat List"
 msgstr "Chatlijst"
 
-#: ItemViewSettingsPage#13
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:72
 msgid "Display topic in tooltip"
 msgstr "Toon onderwerp in tooltip"
 
-#: ItemViewSettingsPage#14
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:85
 msgid "Mouse wheel changes selected chat"
 msgstr "Muiswiel verandert geselecteerde chat"
 
-#: ItemViewSettingsPage#15
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:101
 msgid "Use Custom Colors"
 msgstr "Gebruik eigen kleuren"
 
-#: ItemViewSettingsPage#16
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
 msgid "Standard:"
 msgstr "Standaard:"
 
-#: ItemViewSettingsPage#17
-msgctxt "ItemViewSettingsPage#17"
-msgid "..."
-msgstr "..."
-
-#: ItemViewSettingsPage#18
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
 msgid "Inactive:"
 msgstr "Inactief:"
 
-#: ItemViewSettingsPage#19
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
 msgid "Unread messages:"
 msgstr "Ongelezen berichten:"
 
-#: ItemViewSettingsPage#20
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
 msgid "Highlight:"
 msgstr "Markeer:"
 
-#: ItemViewSettingsPage#21
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
 msgid "Other activity:"
 msgstr "Andere activiteit:"
 
-#: ItemViewSettingsPage#22
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
 msgid "1"
 msgstr "1"
 
-#: ItemViewSettingsPage#23
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 msgid "Custom Nick List Colors"
 msgstr "Eigen kleuren voor nicklijst"
 
-#: ItemViewSettingsPage#24
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
 msgid "Online:"
 msgstr "Online:"
 
-#: ItemViewSettingsPage#25
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
 msgid "Away:"
 msgstr "Afwezig:"
 
-#: KNotificationBackend#1
-msgctxt "KNotificationBackend#1"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+msgid "Chat & Nick Lists"
+msgstr "Chat & Nicklijsten"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+msgid "Inactive"
+msgstr "Niet actief"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+msgid "Normal"
+msgstr "Normaal"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+msgid "Unread messages"
+msgstr "Ongelezen berichten"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+msgid "Other activity"
+msgstr "Andere activiteit"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context KNotificationBackend
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SystrayNotificationBackend
+#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/systraynotificationbackend.cpp:125
 msgid "%n pending highlights"
-msgstr "%n markeringen in wachtrij"
+msgid_plural "%n pending highlights"
+msgstr[0] "%n markering in wachtrij"
+msgstr[1] "%n markeringen in wachtrij"
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Alle"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+#, fuzzy
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Invoerregel"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Geen"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#, fuzzy
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+"Er bestaat al een regel\n"
+"\"%1\"\n"
+"Kies een andere regel."
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
 
-#: MainWin#1
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "Verbindt met &core..."
 
-#: MainWin#2
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Verbreek verbinding met core"
 
-#: MainWin#3
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "Core &informatie"
 
-#: MainWin#4
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "&Netwerken configureren..."
 
-#: MainWin#5
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: MainWin#6
-msgid "Ctrl+Q"
-msgstr "Ctrl+Q"
-
-#: MainWin#7
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr "&Configureer chatlijsten..."
 
-#: MainWin#8
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "Zet &lay-out vast"
 
-#: MainWin#9
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Toon &zoekbalk"
 
-#: MainWin#10
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr "Toon afwezigheidslog"
 
-#: MainWin#11
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "Toon &menubalk"
 
-#: MainWin#12
-msgid "Ctrl+M"
-msgstr "Ctrl+M"
-
-#: MainWin#13
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "Toon status&balk"
 
-#: MainWin#14
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "&Netwerken configureren..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "&Configureer Quassel..."
 
-#: MainWin#15
-msgid "F7"
-msgstr "F7"
-
-#: MainWin#16
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "&Over Quassel"
 
-#: MainWin#17
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "Over &Qt"
 
-#: MainWin#18
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "Debug &NetworkModel"
 
-#: MainWin#19
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr "Debug &BufferViewOverlay"
 
-#: MainWin#20
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "Debug &MessageModel"
 
-#: MainWin#21
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr "Debug &HotList"
 
-#: MainWin#22
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "Debug &log"
 
-#: MainWin#23
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr "Herlaadt stijlsheet"
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "Organisatie:"
+
 # Niet heel exact, maar dit is wat jump to hot chat betekent:
 #
 # you switch to the channel with the oldest unread message
-#: MainWin#24
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr "Open het kanaal met oudste ongelezen bericht"
 
-#: MainWin#25
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "Chatlijst verwijderen?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "Ga naar chat"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "Ga naar chat"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "&Bestand"
 
-#: MainWin#26
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Netwerken"
 
-#: MainWin#27
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Toon"
 
-#: MainWin#28
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "&Chatlijsten"
 
-#: MainWin#29
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "&Werkbalken"
 
-#: MainWin#30
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "&Instellingen"
 
-#: MainWin#31
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "&Hulp"
 
-#: MainWin#32
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Debug"
 
-#: MainWin#33
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Nicks"
 
-#: MainWin#34
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Toon nicklijst"
 
-#: MainWin#35
-msgctxt "MainWin#35"
-msgid "Chat Monitor"
-msgstr "Chatmonitor"
-
-#: MainWin#36
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Toon chatmonitor"
 
-#: MainWin#37
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "Invoerregel"
 
-#: MainWin#38
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Toon invoerregel"
 
-#: MainWin#39
-msgctxt "MainWin#39"
-msgid "Topic"
-msgstr "Onderwerp"
-
-#: MainWin#40
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Toon onderwerpregel"
 
-#: MainWin#41
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "Hoofdwerkbalk"
 
-#: MainWin#42
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Met core verbonden."
 
-#: MainWin#43
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "Niet met core verbonden."
 
-#: MainWin#44
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr "Onversleutelde verbinding"
 
-#: MainWin#45
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>U client ondersteunt geen SSL-versleuteling</b>"
 
-#: MainWin#46
-msgid ""
-"Sensitive data, like passwords, will be transmitted unencrypted to your "
-"Quassel core."
-msgstr ""
-"Gevoelige gegevens, zoals wachtwoorden, zullen onversleuteld naar uw Quassel-"
-"core verzonden worden."
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
+msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
+msgstr "Gevoelige gegevens, zoals wachtwoorden, zullen onversleuteld naar uw Quassel-core verzonden worden."
 
-#: MainWin#47
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>U core ondersteunt geen SSL-versleuteling</b>"
 
-#: MainWin#48
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr "Onbetrouwbaar beveiligingscertificaat"
 
-#: MainWin#49
-msgid ""
-"<b>The SSL certificate provided by the core at %1 is untrusted for the "
-"following reasons:</b>"
-msgstr ""
-"<b>Het door de core op %1 opgegeven beveiligingscertificaat is om de "
-"volgende redenen onbetrouwbaar:</b>"
-
-#: MainWin#50
-msgctxt "MainWin#50"
-msgid "Continue"
-msgstr "Doorgaan"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1041
+msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
+msgstr "<b>Het door de core op %1 opgegeven beveiligingscertificaat is om de volgende redenen onbetrouwbaar:</b>"
 
-#: MainWin#51
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr "Toon certificaat"
 
-#: MainWin#52
-msgid ""
-"Would you like to accept this certificate forever without being prompted?"
-msgstr ""
-"Wilt u dit certificaat permanent accepteren zonder hierom gevraagd te worden?"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1061
+msgid "Would you like to accept this certificate forever without being prompted?"
+msgstr "Wilt u dit certificaat permanent accepteren zonder hierom gevraagd te worden?"
 
-#: MainWin#53
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr "Alleen deze sessie"
 
-#: MainWin#54
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr "Permanent"
 
-#: MainWin#55
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr "Core-verbinding fout"
 
-#: MessageModel#1
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+#, fuzzy
+msgid "&Normal mode"
+msgstr "Normaal"
+
+#. ts-context MessageModel
+#: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "%1 berichten van de backlog aanvragen voor buffer %2:%3"
 
-#: MsgProcessorStatusWidget#1
-msgctxt "MsgProcessorStatusWidget#1"
-msgid "Form"
-msgstr "Form"
-
-#: MsgProcessorStatusWidget#2
+#. ts-context MsgProcessorStatusWidget
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
 msgid "Receiving Backlog"
 msgstr "Backlog ontvangen"
 
-#: MultiLineEdit#1
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
-msgstr "Wilt u echt %n regels plakken?"
+msgid_plural "Do you really want to paste %n lines?"
+msgstr[0] "Wilt u echt %n regel plakken?"
+msgstr[1] "Wilt u echt %n regels plakken?"
 
-#: MultiLineEdit#2
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "Plak-bescherming"
 
-#: NetworkAddDlg#1
-msgctxt "NetworkAddDlg#1"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:14
+#: ../src/qtui/settingspages/networkssettingspage.cpp:705
 msgid "Add Network"
 msgstr "Netwerk toevoegen"
 
-#: NetworkAddDlg#2
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:22
 msgid "Use preset:"
 msgstr "Gebruik voorinstellingen:"
 
-#: NetworkAddDlg#3
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:57
 msgid "Manually specify network settings"
 msgstr "Handmatig netwerkinstellingen opgeven"
 
-#: NetworkAddDlg#4
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:67
 msgid "Manual Settings"
 msgstr "Handmatige instellingen"
 
-#: NetworkAddDlg#5
-msgctxt "NetworkAddDlg#5"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkadddlg.ui:75
+#: ../src/qtui/ui/simplenetworkeditor.ui:28
 msgid "Network name:"
 msgstr "Netwerknaam:"
 
-#: NetworkAddDlg#6
-msgctxt "NetworkAddDlg#6"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:85
+#: ../src/qtui/settingspages/servereditdlg.ui:38
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: NetworkAddDlg#7
-msgctxt "NetworkAddDlg#7"
-msgid "Port:"
-msgstr "Poort:"
-
-#: NetworkAddDlg#8
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:115
 msgid "Server password:"
 msgstr "Serverwachtwoord:"
 
-#: NetworkAddDlg#9
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:131
 msgid "Use secure connection"
 msgstr "Gebruik beveiligde verbinding"
 
-#: NetworkEditDlg#1
-msgctxt "NetworkEditDlg#1"
-msgid "Dialog"
-msgstr "Dialoog"
-
-#: NetworkEditDlg#2
+#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkeditdlg.ui:21
 msgid "Please enter a network name:"
 msgstr "Vul een netwerknaam in:"
 
-#: NetworkEditDlg#3
-msgctxt "NetworkEditDlg#3"
-msgid "Add Network"
-msgstr "Netwerk toevoegen"
-
-#: NetworkItem#1
+#. ts-context NetworkItem
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Server: %1"
 
-#: NetworkItem#2
-msgctxt "NetworkItem#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/client/networkmodel.cpp:197
+#: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Gebruikers: %1"
 
-#: NetworkItem#3
-msgctxt "NetworkItem#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/client/networkmodel.cpp:200
+#: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Vertraging: %1 msec"
 
-#: NetworkModel#1
+#. ts-context NetworkModel
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "Chat"
 
-#: NetworkModel#2
-msgctxt "NetworkModel#2"
-msgid "Topic"
-msgstr "Onderwerp"
-
-#: NetworkModel#3
+#. ts-context NetworkModel
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Aantal nicks"
 
-#: NetworkModelController#1
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:154
 msgid "Do you want to delete the following buffer(s) permanently?"
-msgstr "Wilt u de volgende buffer(s) permanent verwijderen?"
+msgid_plural "Do you want to delete the following buffer(s) permanently?"
+msgstr[0] "Wilt u de volgende buffer(s) definitief verwijderen?"
+msgstr[1] "Wilt u de volgende buffer(s) definitief verwijderen?"
 
-#: NetworkModelController#2
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:167
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "...en <b>%1</b> meer<br><br>"
 
-#: NetworkModelController#3
-msgid ""
-"<b>Note:</b> This will delete all related data, including all backlog data, "
-"from the core's database and cannot be undone."
-msgstr ""
-"<b>Let op:</b> Dit zal alle bijbehorende gegevens, waaronder backlog "
-"gegevens, van de core-database verwijderen en kan niet ongedaan gemaakt "
-"worden."
+#. 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."
+msgstr "<b>Let op:</b> Dit zal alle bijbehorende gegevens, waaronder backlog gegevens, van de core-database verwijderen en kan niet ongedaan gemaakt worden."
 
-#: NetworkModelController#4
-msgid ""
-"<br>Active channel buffers cannot be deleted, please part the channel first."
-msgstr ""
-"<br>Actieve kanaalbuffers kunnen niet verwijderd worden, verlaat eerst het "
-"kanaal."
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:170
+msgid "<br>Active channel buffers cannot be deleted, please part the channel first."
+msgstr "<br>Actieve kanaalbuffers kunnen niet verwijderd worden, verlaat eerst het kanaal."
 
-#: NetworkModelController#5
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:172
 msgid "Remove buffers permanently?"
 msgstr "Buffers permanent verwijderen?"
 
-#: NetworkModelController::JoinDlg#1
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:484
 msgid "Join Channel"
 msgstr "Kanaal binnengaan"
 
-#: NetworkModelController::JoinDlg#2
-msgctxt "NetworkModelController::JoinDlg#2"
-msgid "Network:"
-msgstr "Netwerk:"
-
-#: NetworkModelController::JoinDlg#3
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:489
 msgid "Channel:"
 msgstr "Kanaal:"
 
-#: NetworkModelController::JoinDlg#4
-msgctxt "NetworkModelController::JoinDlg#4"
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: NetworkPage#1
+#. ts-context NetworkPage
+#: ../src/qtui/ircconnectionwizard.cpp:148
 msgid "Setup Network Connection"
 msgstr "Netwerkverbinding opzetten"
 
-#: NetworksSettingsPage#1
-msgctxt "NetworksSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
-
-#: NetworksSettingsPage#2
-msgid "Networks"
-msgstr "Netwerken"
-
-#: NetworksSettingsPage#3
-msgctxt "NetworksSettingsPage#3"
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
-msgstr ""
-"<b>De volgende problemen moeten opgelost worden voordat uw wijzigingen "
-"toegepast kunnen worden:</b><ul>"
-
-#: NetworksSettingsPage#4
-msgid "<li>All networks need at least one server defined</li>"
-msgstr ""
-"<li>Voor alle netwerken moet minstens een server opgegeven worden</li>"
-
-#: NetworksSettingsPage#5
-msgctxt "NetworksSettingsPage#5"
-msgid "</ul>"
-msgstr "</ul>"
-
-#: NetworksSettingsPage#6
-msgid "Invalid Network Settings"
-msgstr "Ongeldige netwerkinstellingen"
-
-#: NetworksSettingsPage#7
-msgid "Delete Network?"
-msgstr "Netwerk verwijderen?"
-
-#: NetworksSettingsPage#8
-msgid ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
-msgstr ""
-"Wilt u echt netwerk \"%1\" en alle bijbehorende gegevens, waaronder het "
-"backlog, verwijderen?"
-
-#: NetworksSettingsPage#9
-msgctxt "NetworksSettingsPage#9"
-msgid "Form"
-msgstr "Form"
-
-#: NetworksSettingsPage#10
-msgctxt "NetworksSettingsPage#10"
-msgid "Re&name..."
-msgstr "Her&noemen..."
-
-#: NetworksSettingsPage#11
-msgctxt "NetworksSettingsPage#11"
-msgid "&Add..."
-msgstr "&Toevoegen"
-
-#: NetworksSettingsPage#12
-msgctxt "NetworksSettingsPage#12"
-msgid "De&lete"
-msgstr "&Verwijder"
-
-#: NetworksSettingsPage#13
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgid "Network Details"
 msgstr "Netwerkdetails"
 
-#: NetworksSettingsPage#14
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:132
 msgid "Identity:"
 msgstr "Identiteit:"
 
-#: NetworksSettingsPage#15
-msgctxt "NetworksSettingsPage#15"
-msgid "..."
-msgstr "..."
-
-#: NetworksSettingsPage#16
-msgctxt "NetworksSettingsPage#16"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:190
+#: ../src/qtui/ui/simplenetworkeditor.ui:63
 msgid "Servers"
 msgstr "Servers"
 
-#: NetworksSettingsPage#17
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:193
 msgid "Manage servers for this network"
 msgstr "Servers voor dit netwerk beheren"
 
-#: NetworksSettingsPage#18
-msgctxt "NetworksSettingsPage#18"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:217
+#: ../src/qtui/ui/simplenetworkeditor.ui:99
 msgid "&Edit..."
-msgstr "Be&werken"
-
-#: NetworksSettingsPage#19
-msgctxt "NetworksSettingsPage#19"
-msgid "Move upwards in list"
-msgstr "In de lijst omhoog verplaatsen"
-
-#: NetworksSettingsPage#20
-msgctxt "NetworksSettingsPage#20"
-msgid "Move downwards in list"
-msgstr "In de lijst omlaag verplaatsen"
+msgstr "Be&werken…"
 
-#: NetworksSettingsPage#21
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:337
 msgid "Commands"
 msgstr "Commando's"
 
-#: NetworksSettingsPage#22
-msgid ""
-"Configure automatic identification or misc. commands to be executed after "
-"connecting to a server"
-msgstr ""
-"Configureer automatische identificatie of andere commando's om uit te voeren "
-"nadat u met een server verbonden bent"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:340
+msgid "Configure automatic identification or misc. commands to be executed after connecting to a server"
+msgstr "Configureer automatische identificatie of andere commando's om uit te voeren nadat u met een server verbonden bent"
 
-#: NetworksSettingsPage#23
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgid "Commands to execute on connect:"
 msgstr "Bij het verbinden uit te voeren commando's:"
 
-#: NetworksSettingsPage#24
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:362
 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!"
+"Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
 msgstr ""
-"Geen een lijst IRC-commando's die uitgevoerd moeten worden bij het "
-"verbinden.\n"
-"Let op dat Quassel-IRC automatisch opnieuw met kanalen verbindt, zodat /join "
-"hier zelden nodig zal zijn!"
+"Geen een lijst IRC-commando's die uitgevoerd moeten worden bij het verbinden.\n"
+"Let op dat Quassel-IRC automatisch opnieuw met kanalen verbindt, zodat /join hier zelden nodig zal zijn!"
 
-#: NetworksSettingsPage#25
-msgctxt "NetworksSettingsPage#25"
-msgid "Connection"
-msgstr "Verbinding"
-
-#: NetworksSettingsPage#26
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:383
 msgid "Automatically reconnect to the IRC network after connection failures"
-msgstr ""
-"Automatisch opnieuw met het IRC-netwerk verbinden als de verbinding wegvalt"
+msgstr "Automatisch opnieuw met het IRC-netwerk verbinden als de verbinding wegvalt"
 
-#: NetworksSettingsPage#27
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:386
 msgid "Automatic Reconnect"
 msgstr "Automatisch opnieuw verbinden"
 
-#: NetworksSettingsPage#28
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:397
 msgid "Wait"
 msgstr "Wacht"
 
-#: NetworksSettingsPage#29
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:404
 msgid " s"
 msgstr " s"
 
-#: NetworksSettingsPage#30
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:420
 msgid "between retries"
 msgstr "tussen pogingen"
 
-#: NetworksSettingsPage#31
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:444
 msgid "Number of retries:"
 msgstr "Aantal pogingen:"
 
-#: NetworksSettingsPage#32
-msgctxt "NetworksSettingsPage#32"
-msgid "Unlimited"
-msgstr "Ongelimiteerd"
-
-#: NetworksSettingsPage#33
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:489
 msgid "Rejoin all channels after reconnect"
 msgstr "Ga alle kanalen weer binnen na opnieuw verbinden"
 
-#: NetworksSettingsPage#34
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:516
+#: ../src/qtui/settingspages/networkssettingspage.ui:525
 msgid "Auto Identify"
 msgstr "Auto-identificatie"
 
-#: NetworksSettingsPage#35
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:540
 msgid "NickServ"
 msgstr "NickServ"
 
-#: NetworksSettingsPage#36
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:557
 msgid "Service:"
 msgstr "Service:"
 
-#: NetworksSettingsPage#37
-msgctxt "NetworksSettingsPage#37"
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: NetworksSettingsPage#38
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:580
 msgid "Use SASL Authentication"
 msgstr "Gebruik SASL-authenticatie"
 
-#: NetworksSettingsPage#39
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:625
 msgid "Account:"
 msgstr "Account:"
 
-#: NetworksSettingsPage#40
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:649
 msgid "Encodings"
 msgstr "Encodering"
 
-#: NetworksSettingsPage#41
-msgid ""
-"Configure advanced settings such as message encodings and automatic reconnect"
-msgstr ""
-"Configureer geavanceerde opties zoals bericht-encodering en automatisch "
-"opnieuw verbinden"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:652
+msgid "Configure advanced settings such as message encodings and automatic reconnect"
+msgstr "Configureer geavanceerde opties zoals bericht-encodering en automatisch opnieuw verbinden"
 
-#: NetworksSettingsPage#42
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:661
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Beheer encodings voor inkomende en uitgaande berichten"
 
-#: NetworksSettingsPage#43
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:664
 msgid "Use Custom Encodings"
 msgstr "Gebruik eigen encodering"
 
-#: NetworksSettingsPage#44
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
+#: ../src/qtui/settingspages/networkssettingspage.ui:695
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
@@ -3821,11 +4569,14 @@ msgstr ""
 "Stel in in welke encoding uw berichten verzonden zullen worden.\n"
 "UTF-8 is een zinnige keuze voor de meeste netwerken."
 
-#: NetworksSettingsPage#45
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:679
 msgid "Send messages in:"
 msgstr "Verzend berichten in:"
 
-#: NetworksSettingsPage#46
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:706
+#: ../src/qtui/settingspages/networkssettingspage.ui:726
 msgid ""
 "Incoming messages encoded in Utf8 will always be treated as such.\n"
 "This setting defines the encoding for messages that are not Utf8."
@@ -3833,11 +4584,14 @@ msgstr ""
 "Binnenkomende berichten in Utf8 zullen altijd zo behandeld worden.\n"
 "Deze instellingen geven de codering voor berichten die niet Utf8 zijn."
 
-#: NetworksSettingsPage#47
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:710
 msgid "Receive fallback:"
 msgstr "Ontvang-terugvaloptie:"
 
-#: NetworksSettingsPage#48
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:737
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
 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!"
@@ -3845,958 +4599,990 @@ msgstr ""
 "Dit geeft de encodering van control-messages, nicks en servernamen aan.\n"
 "Tenzij u *echt* weet wat u doet moet u dit op ISO-8859-1 laten staan!"
 
-#: NetworksSettingsPage#49
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:741
 msgid "Server encoding:"
 msgstr "Server encodering:"
 
-#: NickEditDlg#1
-msgctxt "NickEditDlg#1"
-msgid "Add Nickname"
-msgstr "Bijnaam toevoegen"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgid "Networks"
+msgstr "Netwerken"
 
-#: NickEditDlg#2
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+msgid "<li>All networks need at least one server defined</li>"
+msgstr "<li>Voor alle netwerken moet minstens een server opgegeven worden</li>"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+msgid "Invalid Network Settings"
+msgstr "Ongeldige netwerkinstellingen"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+msgid "Delete Network?"
+msgstr "Netwerk verwijderen?"
+
+#. 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?"
+msgstr "Wilt u echt netwerk \"%1\" en alle bijbehorende gegevens, waaronder het backlog, verwijderen?"
+
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgid "Edit Nickname"
 msgstr "Bijnaam bewerken"
 
-#: NickEditDlg#3
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/nickeditdlg.ui:19
 msgid "Please enter a valid nickname:"
 msgstr "Vul een geldige bijnaam in:"
 
-#: NickEditDlg#4
-msgid ""
-"A valid nickname may contain letters from the English alphabet, digits, and "
-"the special characters {, }, [, ], \\, |, `, ^, _ and -."
-msgstr ""
-"Een geldige bijnaam mag letters uit het alfabet bevatten, cijfers en de "
-"volgende speciale tekens: {, }, [, ], \\, |, `, ^, _ en -."
-
-#: NotificationsSettingsPage#1
-msgctxt "NotificationsSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
+#. 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 -."
+msgstr "Een geldige bijnaam mag letters uit het alfabet bevatten, cijfers en de volgende speciale tekens: {, }, [, ], \\, |, `, ^, _ en -."
 
-#: NotificationsSettingsPage#2
+#. ts-context NotificationsSettingsPage
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
 msgid "Notifications"
 msgstr "Notificaties"
 
-#: PhononNotificationBackend::ConfigWidget#1
+#. ts-context PhononNotificationBackend::ConfigWidget
+#: ../src/qtui/phononnotificationbackend.cpp:143
 msgid "Select Audio File"
 msgstr "Kies audiobestand"
 
-#: PhononNotificationConfigWidget#1
-msgctxt "PhononNotificationConfigWidget#1"
-msgid "Form"
-msgstr "Form"
-
-#: PhononNotificationConfigWidget#2
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
 msgid "Play a sound"
 msgstr "Speel een geluid"
 
-#: PhononNotificationConfigWidget#3
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
 msgid "Prelisten to the selected sound"
 msgstr "Luister naar het geselecteerde geluid"
 
-#: PhononNotificationConfigWidget#4
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
 msgid "Select the sound file to play"
 msgstr "Selecteer een audio bestand om af te spelen"
 
-#: PostgreSqlStorage#1
+#. ts-context PostgreSqlStorage
+#: ../src/core/postgresqlstorage.cpp:62
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr "PostgreSQL Turbo Bomber HD!"
 
-#: QObject#1
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:82
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr "Een totaal van %1 backlog-berichten voor %2 buffers aanvragen"
 
-#: QObject#2
-msgid ""
-"Requesting up to %1 of all unread backlog messages (plus additional %2)"
-msgstr ""
-"Tot %1 van alle ongelezen backlog-berichten opvragen (plus nog %2 extra)"
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:106
+msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
+msgstr "Tot %1 van alle ongelezen backlog-berichten opvragen (plus nog %2 extra)"
 
-#: QObject#3
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:123
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
-msgstr ""
-"Een totaal van %1 ongelezen backlog-berichten voor %2 buffers aanvragen"
+msgstr "Een totaal van %1 ongelezen backlog-berichten voor %2 buffers aanvragen"
 
-#: QObject#4
+#. ts-context QObject
+#: ../src/qtui/ircconnectionwizard.cpp:56
 msgid "Welcome to Quassel IRC"
 msgstr "Welkom bij Quassel-IRC"
 
-#: QObject#5
-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 ""
-"Deze wizard helpt u bij het opzetten van uw standaard identiteit en uw IRC-"
-"netwerkverbinding.<br>Dit behandelt alleen standaard instellingen. U kunt "
-"deze wizard op elk moment annuleren en het instellingenvenster gebruiken "
-"voor gedetailleerden opties."
+#. 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."
+msgstr "Deze wizard helpt u bij het opzetten van uw standaard identiteit en uw IRC-netwerkverbinding.<br>Dit behandelt alleen standaard instellingen. U kunt deze wizard op elk moment annuleren en het instellingenvenster gebruiken voor gedetailleerden opties."
 
-#: QssParser#1
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:121
+#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr "Ongeldig blok opgegeven: %1"
 
-#: QssParser#2
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:140
 msgid "Invalid palette role assignment: %1"
 msgstr "Ongeldige palette-role toegewezen: %1"
 
-#: QssParser#3
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:156
 msgid "Unknown palette role name: %1"
 msgstr "Onbekende palette-role-naam: %1"
 
-#: QssParser#4
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:192
 msgid "Invalid subelement name in %1"
 msgstr "Ongeldige subelementnaam in %1"
 
-#: QssParser#5
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr "Ongeldig berichttype in %1"
 
-#: QssParser#6
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr "Ongeldige voorwaarde %1"
 
-#: QssParser#7
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr "Ongeldig berichtlabel: %1"
 
-#: QssParser#8
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr "Ongeldige senderhash specificatie: %1"
 
-#: QssParser#9
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "Senderhash kan maximaal \"0x0f\" zijn!"
 
-#: QssParser#10
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr "Ongeldige formatnaam: %1"
 
-#: QssParser#11
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Ongeldige IRC-kleur opgegeven (moet tussen 00 en 0f liggen): %1"
 
-#: QssParser#12
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr "Onafgehandeld probleem: %1"
 
-#: QssParser#13
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr "Ongeldige proplijst %1"
 
-#: QssParser#14
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr "Ongeldig chatlijstobjecttype %1"
 
-#: QssParser#15
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr "Ongeldige chatlijststatus %1"
 
-#: QssParser#16
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr "Ongeldige eigenschapdeclaratie: %1"
 
-#: QssParser#17
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr "Ongeldige lettertype-eigenschap: %1"
 
-#: QssParser#18
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr "Onbekende ChatLine eigenschap: %1"
 
-#: QssParser#19
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr "Ongeldige palettekleur-role opgegeven: %1"
 
-#: QssParser#20
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr "Onbekende palettekleur-role: %1"
 
-#: QssParser#21
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr "Ongeldige gradiënt opgegeven: %1"
 
-#: QssParser#22
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr "Ongeldige gradiënt-stoplijst: %1"
 
-#: QssParser#23
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr "Ongeldig lettertype opgegeven: %1"
 
-#: QssParser#24
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr "Ongeldige lettertypestijl opgegeven: %1"
 
-#: QssParser#25
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr "Ongeldige lettertype-dikte opgegeven: %1"
 
-#: QssParser#26
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr "Ongeldige lettertypegrootte opgegeven: %1"
 
-#: Quassel::secondsToString()#1
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "jaar"
 
-#: Quassel::secondsToString()#2
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "dag"
 
-#: Quassel::secondsToString()#3
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "h"
 
-#: Quassel::secondsToString()#4
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "min"
 
-#: Quassel::secondsToString()#5
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "sec"
 
-#: QueryBufferItem#1
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Aanvraag met %1</b>"
 
-#: QueryBufferItem#2
-msgctxt "QueryBufferItem#2"
-msgid "idling since %1"
-msgstr "niet actief sinds %1"
-
-#: QueryBufferItem#3
-msgctxt "QueryBufferItem#3"
-msgid "login time: %1"
-msgstr "logintijd: %1"
-
-#: QueryBufferItem#4
-msgctxt "QueryBufferItem#4"
-msgid "server: %1"
-msgstr "server: %1"
-
-#: SaveIdentitiesDlg#1
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgid "Sync With Core"
 msgstr "Met core synchroniseren"
 
-#: SaveIdentitiesDlg#2
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:21
 msgid "Syncing data with core, please wait..."
 msgstr "Gegevens met core synchroniseren, een moment..."
 
-#: SaveIdentitiesDlg#3
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:81
 msgid "Abort"
 msgstr "Afbreken"
 
-#: ServerEditDlg#1
-msgctxt "ServerEditDlg#1"
-msgid "Dialog"
-msgstr "Dialoog"
-
-#: ServerEditDlg#2
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:30
 msgid "Server Info"
 msgstr "Serverinformatie"
 
-#: ServerEditDlg#3
-msgctxt "ServerEditDlg#3"
-msgid "Server address:"
-msgstr "Serveradres:"
-
-#: ServerEditDlg#4
-msgctxt "ServerEditDlg#4"
-msgid "Port:"
-msgstr "Poort:"
-
-#: ServerEditDlg#5
-msgctxt "ServerEditDlg#5"
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: ServerEditDlg#6
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:94
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
-#: ServerEditDlg#7
-msgctxt "ServerEditDlg#7"
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: ServerEditDlg#8
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:140
 msgid "SSL Version:"
 msgstr "SSL-versie"
 
-#: ServerEditDlg#9
-msgid ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
-msgstr ""
-"Pas dit niet aan tenzij u met een server wilt verbinden die SSLv3 niet "
-"ondersteunt!"
+#. 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!"
+msgstr "Pas dit niet aan tenzij u met een server wilt verbinden die SSLv3 niet ondersteunt!"
 
-#: ServerEditDlg#10
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:151
 msgid "SSLv3 (default)"
 msgstr "SSLv3 (default)"
 
-#: ServerEditDlg#11
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:156
 msgid "SSLv2"
 msgstr "SSLv2"
 
-#: ServerEditDlg#12
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:161
 msgid "TLSv1"
 msgstr "TLSv1"
 
-#: ServerEditDlg#13
-msgctxt "ServerEditDlg#13"
-msgid "Use a Proxy"
-msgstr "Gebruik een proxy"
-
-#: ServerEditDlg#14
-msgctxt "ServerEditDlg#14"
-msgid "Proxy Type:"
-msgstr "Proxytype:"
-
-#: ServerEditDlg#15
-msgctxt "ServerEditDlg#15"
-msgid "Socks 5"
-msgstr "Socks 5"
-
-#: ServerEditDlg#16
-msgctxt "ServerEditDlg#16"
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ServerEditDlg#17
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:213
 msgid "Proxy Host:"
 msgstr "Proxyhost:"
 
-#: ServerEditDlg#18
-msgctxt "ServerEditDlg#18"
-msgid "localhost"
-msgstr "localhost"
-
-#: ServerEditDlg#19
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:251
 msgid "Proxy Username:"
 msgstr "Proxy-gebruikersnaam:"
 
-#: ServerEditDlg#20
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:261
 msgid "Proxy Password:"
 msgstr "Proxywachtwoord:"
 
-#: SettingsDlg#1
-msgctxt "SettingsDlg#1"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/ui/settingspagedlg.ui:14
+msgid "Configure Quassel"
+msgstr "Configureer 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
 msgid "Settings"
-msgstr "Instellingen"
+msgstr "Voorkeuren"
 
-#: SettingsDlg#2
+#. ts-context SettingsDlg
+#: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: SettingsDlg#3
-msgid ""
-"There are unsaved changes on the current configuration page. Would you like "
-"to apply your changes now?"
-msgstr ""
-"Er zijn nog niet opgeslagen veranderingen in de huidige configuratie. Wilt u "
-"deze veranderingen nu toepassen?"
-
-#: SettingsDlg#4
-msgctxt "SettingsDlg#4"
+#. 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?"
+msgstr "Er zijn nog niet opgeslagen veranderingen in de huidige configuratie. Wilt u deze veranderingen nu toepassen?"
+
+#. #-#-#-#-#  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
 msgid "Configure %1"
 msgstr "Configureer %1"
 
-#: SettingsDlg#5
-msgctxt "SettingsDlg#5"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingspagedlg.cpp:104
 msgid "Reload Settings"
 msgstr "Instellingen herladen"
 
-#: SettingsDlg#6
-msgctxt "SettingsDlg#6"
-msgid ""
-"Do you like to reload the settings, undoing your changes on this page?"
-msgstr ""
-"Wilt u de instellingen herladen, waarmee u alle wijzigingen op deze pagina "
-"ongedaan maakt?"
-
-#: SettingsDlg#7
-msgctxt "SettingsDlg#7"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingspagedlg.cpp:104
+msgid "Do you like to reload the settings, undoing your changes on this page?"
+msgstr "Wilt u de instellingen herladen, waarmee u alle wijzigingen op deze pagina ongedaan maakt?"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingspagedlg.cpp:113
 msgid "Restore Defaults"
 msgstr "Beginwaarden terugzetten"
 
-#: SettingsDlg#8
-msgctxt "SettingsDlg#8"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingspagedlg.cpp:113
 msgid "Do you like to restore the default values for this page?"
 msgstr "Wilt u de beginwaarden voor deze pagina terugzetten?"
 
-#: SettingsDlg#9
-msgctxt "SettingsDlg#9"
-msgid "Configure Quassel"
-msgstr "Configureer Quassel"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "Actie:"
 
-#: SettingsPageDlg#1
-msgctxt "SettingsPageDlg#1"
-msgid "Configure %1"
-msgstr "Configureer %1"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
 
-#: SettingsPageDlg#2
-msgctxt "SettingsPageDlg#2"
-msgid "Reload Settings"
-msgstr "Instellingen herladen"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+#, fuzzy
+msgid "Search:"
+msgstr "Zoekpatroon:"
 
-#: SettingsPageDlg#3
-msgctxt "SettingsPageDlg#3"
-msgid ""
-"Do you like to reload the settings, undoing your changes on this page?"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
 msgstr ""
-"Wilt u de instellingen herladen, waarmee u alle wijzigingen op deze pagina "
-"ongedaan maakt?"
-
-#: SettingsPageDlg#4
-msgctxt "SettingsPageDlg#4"
-msgid "Restore Defaults"
-msgstr "Beginwaarden terugzetten"
 
-#: SettingsPageDlg#5
-msgctxt "SettingsPageDlg#5"
-msgid "Do you like to restore the default values for this page?"
-msgstr "Wilt u de beginwaarden voor deze pagina terugzetten?"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+#, fuzzy
+msgid "Default:"
+msgstr "Standaarddoel"
 
-#: SettingsPageDlg#6
-msgctxt "SettingsPageDlg#6"
-msgid "Configure Quassel"
-msgstr "Configureer Quassel"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "Eigen..."
 
-#: SettingsPageDlg#7
-msgctxt "SettingsPageDlg#7"
-msgid "Settings"
-msgstr "Instellingen"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
 
-#: SignalProxy#1
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
-msgstr ""
-"Uw peer probeerde een pakket te sturen dat groter was dan de maximale "
-"pakketgrootte!"
+msgstr "Uw peer probeerde een pakket te sturen dat groter was dan de maximale pakketgrootte!"
 
-#: SignalProxy#2
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:885
 msgid "Peer tried to send 0 byte package!"
 msgstr "Uw peer probeerde een pakket te sturen van 0 bytes!"
 
-#: SignalProxy#3
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:902
 msgid "Peer sent corrupted compressed data!"
 msgstr "Uw peer verstuurde beschadigde gecomprimeerde data!"
 
-#: SignalProxy#4
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:917
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr "Uw peer verzond beschadigde data: kan QVariant niet laden!"
 
-#: SignalProxy#5
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:1050
 msgid "Disconnecting"
 msgstr "Verbinding verbreken"
 
-#: SimpleNetworkEditor#1
-msgctxt "SimpleNetworkEditor#1"
-msgid "Network name:"
-msgstr "Netwerknaam:"
-
-#: SimpleNetworkEditor#2
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:35
 msgid "The name of the IRC network you are configuring"
 msgstr "De naam van het IRC-netwerk dat u configureert"
 
-#: SimpleNetworkEditor#3
-msgctxt "SimpleNetworkEditor#3"
-msgid "Servers"
-msgstr "Servers"
-
-#: SimpleNetworkEditor#4
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:81
 msgid "A list of IRC servers belonging to this network"
 msgstr "Een lijst van alle IRC-servers die bij dit netwerk horen"
 
-#: SimpleNetworkEditor#5
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:96
 msgid "Edit this server entry"
 msgstr "Bewerk deze serverinstellingen"
 
-#: SimpleNetworkEditor#6
-msgctxt "SimpleNetworkEditor#6"
-msgid "&Edit..."
-msgstr "Be&werken..."
-
-#: SimpleNetworkEditor#7
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:116
 msgid "Add another IRC server"
 msgstr "Nog een IRC-server toevoegen"
 
-#: SimpleNetworkEditor#8
-msgctxt "SimpleNetworkEditor#8"
-msgid "&Add..."
-msgstr "&Toevoegen..."
-
-#: SimpleNetworkEditor#9
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:136
 msgid "Remove this server entry from the list"
 msgstr "Deze server van de lijst verwijderen"
 
-#: SimpleNetworkEditor#10
-msgctxt "SimpleNetworkEditor#10"
-msgid "De&lete"
-msgstr "&Verwijder"
-
-#: SimpleNetworkEditor#11
-msgctxt "SimpleNetworkEditor#11"
-msgid "Move upwards in list"
-msgstr "In de lijst omhoog verplaatsen"
-
-#: SimpleNetworkEditor#12
-msgctxt "SimpleNetworkEditor#12"
-msgid "..."
-msgstr "..."
-
-#: SimpleNetworkEditor#13
-msgctxt "SimpleNetworkEditor#13"
-msgid "Move downwards in list"
-msgstr "In de lijst omlaag verplaatsen"
-
-#: SimpleNetworkEditor#14
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:226
 msgid "Join Channels Automatically"
 msgstr "Automatisch kanalen binnengaan"
 
-#: SimpleNetworkEditor#15
-msgid ""
-"A list of IRC channels you will join automatically after connecting to the "
-"network"
-msgstr ""
-"Een lijst van IRC-kanalen die u automatisch zult binnengaan wanneer u met "
-"het netwerk verbindt"
-
-#: SqliteStorage#1
-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 ""
-"SQLite is een file-base database-engine die weinig configuratie behoeft. Het "
-"is geschikt voor kleine tot gemiddelde databases die geen toegang vanaf het "
-"netwerk nodig hebben. Gebruik SQLite als uw Quassel-core gegevens op de "
-"locale machine moet opslaan en als slechts een paar mensen uw core zullen "
-"gebruiken"
-
-#: SslInfoDlg#1
-msgid "Yes"
-msgstr "Ja"
-
-#: SslInfoDlg#2
-msgid "No, for the following reasons:<ul>"
-msgstr "Nee, om de volgende redenen:<ul>"
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:250
+msgid "A list of IRC channels you will join automatically after connecting to the network"
+msgstr "Een lijst van IRC-kanalen die u automatisch zult binnengaan wanneer u met het netwerk verbindt"
 
-#: SslInfoDlg#3
-msgid "%1 to %2"
-msgstr "%1 tot %2"
+#. ts-context SqliteStorage
+#: ../src/core/sqlitestorage.cpp:52
+msgid "SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core."
+msgstr "SQLite is een file-base database-engine die weinig configuratie behoeft. Het is geschikt voor kleine tot gemiddelde databases die geen toegang vanaf het netwerk nodig hebben. Gebruik SQLite als uw Quassel-core gegevens op de locale machine moet opslaan en als slechts een paar mensen uw core zullen gebruiken"
 
-#: SslInfoDlg#4
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:14
 msgid "Security Information"
 msgstr "Beveiligingsinformatie"
 
-#: SslInfoDlg#5
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:22
 msgid "<b>Hostname:</b>"
 msgstr "<b>Hostnaam:</b>"
 
-#: SslInfoDlg#6
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:39
 msgid "<b>IP address:</b>"
 msgstr "<b>IP-adres:</b>"
 
-#: SslInfoDlg#7
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:56
 msgid "<b>Encryption:</b>"
 msgstr "<b>Versleuteling:</b>"
 
-#: SslInfoDlg#8
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:73
 msgid "<b>Protocol:</b>"
 msgstr "<b>Protocol:</b>"
 
-#: SslInfoDlg#9
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:90
 msgid "<b>Certificate chain:</b>"
 msgstr "<b>Certificate chain:</b>"
 
-#: SslInfoDlg#10
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:120
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: SslInfoDlg#11
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:126
+#: ../src/qtui/ui/sslinfodlg.ui:248
 msgid "<b>Common name:</b>"
 msgstr "<b>Normale naam:</b>"
 
-#: SslInfoDlg#12
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:143
+#: ../src/qtui/ui/sslinfodlg.ui:265
 msgid "<b>Organization:</b>"
 msgstr "<b>Organisatie:</b>"
 
-#: SslInfoDlg#13
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:160
+#: ../src/qtui/ui/sslinfodlg.ui:282
 msgid "<b>Organizational unit:</b>"
 msgstr "<b>Organisatieonderdeel:</b>"
 
-#: SslInfoDlg#14
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:177
+#: ../src/qtui/ui/sslinfodlg.ui:299
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: SslInfoDlg#15
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:194
+#: ../src/qtui/ui/sslinfodlg.ui:316
 msgid "<b>State or province:</b>"
 msgstr "<b>Staat of provincie:</b>"
 
-#: SslInfoDlg#16
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:231
+#: ../src/qtui/ui/sslinfodlg.ui:353
 msgid "<b>Locality:</b>"
 msgstr "<b>Lokaliteit:</b>"
 
-#: SslInfoDlg#17
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:242
 msgid "Issuer"
 msgstr "Uitgever"
 
-#: SslInfoDlg#18
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:367
 msgid "<b>Validity period:</b>"
 msgstr "<b>Geldigheidsduur:</b>"
 
-#: SslInfoDlg#19
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:384
 msgid "<b>MD5 digest:</b>"
 msgstr "<b>MD5 controlesom:</b>"
 
-#: SslInfoDlg#20
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:401
 msgid "<b>SHA1 digest:</b>"
 msgstr "<b>SHA1 controlesom:</b>"
 
-#: SslInfoDlg#21
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:431
 msgid "<b>Trusted:</b>"
 msgstr "<b>Vertrouwd:</b>"
 
-#: StatusBufferItem#1
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:69
+msgid "Yes"
+msgstr "Ja"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:71
+msgid "No, for the following reasons:<ul>"
+msgstr "Nee, om de volgende redenen:<ul>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:78
+msgid "%1 to %2"
+msgstr "%1 tot %2"
+
+#. ts-context StatusBufferItem
+#: ../src/client/networkmodel.h:144
 msgid "Status Buffer"
 msgstr "Bufferstatus"
 
-#: SystemTray#1
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:61
+#: ../src/qtui/systemtray.cpp:92
 msgid "&Minimize"
 msgstr "&Minimaliseren"
 
-#: SystemTray#2
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:94
 msgid "&Restore"
 msgstr "He&rstellen"
 
-#: SystrayNotificationBackend#1
-msgctxt "SystrayNotificationBackend#1"
-msgid "%n pending highlights"
-msgstr "%n markeringen in wachtrij"
-
-#: SystrayNotificationBackend::ConfigWidget#1
+#. ts-context SystrayNotificationBackend::ConfigWidget
+#: ../src/qtui/systraynotificationbackend.cpp:135
 msgid "Show a message in a popup"
 msgstr "Toon een bericht in pop-up venster"
 
-#: TaskbarNotificationBackend::ConfigWidget#1
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/taskbarnotificationbackend.cpp:68
 msgid "Activate dock entry, timeout:"
 msgstr "Activeer dockvermelding, timeout:"
 
-#: TaskbarNotificationBackend::ConfigWidget#2
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/taskbarnotificationbackend.cpp:70
 msgid "Mark taskbar entry, timeout:"
 msgstr "Markeer taakbalkvermelding, timeout:"
 
-#: TaskbarNotificationBackend::ConfigWidget#3
-msgctxt "TaskbarNotificationBackend::ConfigWidget#3"
-msgid "Unlimited"
-msgstr "Ongelimiteerd"
-
-#: TaskbarNotificationBackend::ConfigWidget#4
-msgctxt "TaskbarNotificationBackend::ConfigWidget#4"
-msgid " seconds"
-msgstr " seconden"
-
-#: ToolBarActionProvider#1
-msgctxt "ToolBarActionProvider#1"
-msgid "Connect"
-msgstr "Verbindt"
-
-#: ToolBarActionProvider#2
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgid "Connect to IRC"
 msgstr "Verbindt met IRC"
 
-#: ToolBarActionProvider#3
-msgctxt "ToolBarActionProvider#3"
-msgid "Disconnect"
-msgstr "Verbreek verbinding"
-
-#: ToolBarActionProvider#4
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect from IRC"
 msgstr "Verbinding met IRC verbreken"
 
-#: ToolBarActionProvider#5
-msgctxt "ToolBarActionProvider#5"
-msgid "Part"
-msgstr "Verlaat"
-
-#: ToolBarActionProvider#6
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:34
 msgid "Leave currently selected channel"
 msgstr "Verlaat het geselecteerde kanaal"
 
-#: ToolBarActionProvider#7
-msgctxt "ToolBarActionProvider#7"
-msgid "Join"
-msgstr "Binnengaan"
-
-#: ToolBarActionProvider#8
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:35
 msgid "Join a channel"
 msgstr "Een kanaal binnengaan"
 
-#: ToolBarActionProvider#9
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Query"
 msgstr "Aanvraag"
 
-#: ToolBarActionProvider#10
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Start a private conversation"
 msgstr "Start een privégesprek"
 
-#: ToolBarActionProvider#11
-msgctxt "ToolBarActionProvider#11"
-msgid "Whois"
-msgstr "Whois"
-
-#: ToolBarActionProvider#12
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Request user information"
 msgstr "Vraag gebruikersinformatie op"
 
-#: ToolBarActionProvider#13
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgid "Op"
 msgstr "Op"
 
-#: ToolBarActionProvider#14
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgid "Give operator privileges to user"
 msgstr "Geef operator-rechten aan gebruiker"
 
-#: ToolBarActionProvider#15
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:41
 msgid "Deop"
 msgstr "Deop"
 
-#: ToolBarActionProvider#16
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:41
 msgid "Take operator privileges from user"
 msgstr "Neem operator-rechten van gebruiker af"
 
-#: ToolBarActionProvider#17
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgid "Voice"
 msgstr "Voice"
 
-#: ToolBarActionProvider#18
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgid "Give voice to user"
 msgstr "Geef voice aan gebruiker"
 
-#: ToolBarActionProvider#19
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgid "Devoice"
 msgstr "Ont-voice"
 
-#: ToolBarActionProvider#20
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgid "Take voice from user"
 msgstr "Voice van gebruiker afnemen"
 
-#: ToolBarActionProvider#21
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Kick"
 msgstr "Kick"
 
-#: ToolBarActionProvider#22
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Remove user from channel"
 msgstr "Verwijder gebruiker van kanaal"
 
-#: ToolBarActionProvider#23
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgid "Ban"
 msgstr "Ban"
 
-#: ToolBarActionProvider#24
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgid "Ban user from channel"
 msgstr "Verban gebruiker van kanaal"
 
-#: ToolBarActionProvider#25
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Kick/Ban"
 msgstr "Kick/Ban"
 
-#: ToolBarActionProvider#26
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Remove and ban user from channel"
 msgstr "Verwijder en verban gebruiker van kanaal"
 
-#: ToolBarActionProvider#27
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:51
 msgid "Connect to all"
 msgstr "Met alle verbinden"
 
-#: ToolBarActionProvider#28
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:58
 msgid "Disconnect from all"
 msgstr "Verbinding met alle verbreken"
 
-#: TopicWidget#1
-msgctxt "TopicWidget#1"
-msgid "Users: %1"
-msgstr "Gebruikers: %1"
-
-#: TopicWidget#2
-msgctxt "TopicWidget#2"
-msgid "Lag: %1 msecs"
-msgstr "Vertraging: %1 msec"
-
-#: TopicWidget#3
-msgctxt "TopicWidget#3"
-msgid "Form"
-msgstr "Form"
-
-#: TopicWidget#4
-msgctxt "TopicWidget#4"
-msgid "..."
-msgstr "..."
-
-#: TopicWidgetSettingsPage#1
-msgctxt "TopicWidgetSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: TopicWidgetSettingsPage#2
-msgid "Topic Widget"
-msgstr "Onderwerpwidget"
-
-#: TopicWidgetSettingsPage#3
-msgctxt "TopicWidgetSettingsPage#3"
-msgid "Form"
-msgstr "Form"
-
-#: TopicWidgetSettingsPage#4
-msgctxt "TopicWidgetSettingsPage#4"
-msgid "Custom font:"
-msgstr "Eigen lettertype:"
-
-#: TopicWidgetSettingsPage#5
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
 msgid "Resize dynamically to fit contents"
 msgstr "Dynamisch herschalen om inhoud te bevatten"
 
-#: TopicWidgetSettingsPage#6
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:84
 msgid "On hover only"
 msgstr "Alleen bij over-zweven"
 
-#: UiStyle::StyledMessage#1
-msgctxt "UiStyle::StyledMessage#1"
-msgid "%1"
-msgstr "%1"
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgid "Topic Widget"
+msgstr "Onderwerpwidget"
 
-#: UiStyle::StyledMessage#2
+#. Action Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr "%DN%1%DN %2"
 
-#: UiStyle::StyledMessage#3
+#. Nick Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr "U staat nu bekend als %DN%1%DN"
 
-#: UiStyle::StyledMessage#4
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN staat nu bekend als %DN%2%DN"
 
-#: UiStyle::StyledMessage#5
+#. Mode Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "Gebruikersmodus: %DM%1%DM"
 
-#: UiStyle::StyledMessage#6
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Modus %DM%1%DM door %DN%2%DN"
 
-#: UiStyle::StyledMessage#7
+#. Join Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH is %DC%4%DC binnengekomen"
 
-#: UiStyle::StyledMessage#8
+#. Part Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH heeft %DC%4%DC verlaten"
 
-#: UiStyle::StyledMessage#9
+#. Quit Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH heeft afgesloten"
 
-#: UiStyle::StyledMessage#10
+#. Kick Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN heeft %DN%2%DN %DC%3%DC uitgeschopt"
 
-#: UiStyle::StyledMessage#11
+#. Day Change Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr "{Dag veranderd naar %1}"
 
-#: UiStyle::StyledMessage#12
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
-msgstr ""
-"De netsplit tussen %DH%1%DH en %DH%2%DH is voorbij. Gebruikers "
-"binnengekomen: "
+msgstr "De netsplit tussen %DH%1%DH en %DH%2%DH is voorbij. Gebruikers binnengekomen: "
 
-#: UiStyle::StyledMessage#13
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (%2 meer)"
 
-#: UiStyle::StyledMessage#14
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "Netsplit tussen %DH%1%DH en %DH%2%DH. Gebruikers verlaten: "
 
-#: UiStyle::StyledMessage#15
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
-#: UiStyle::StyledMessage#16
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
-#: UiStyle::StyledMessage#17
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
-#: UiStyle::StyledMessage#18
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
-#: UiStyle::StyledMessage#19
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
-#: UiStyle::StyledMessage#20
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
-#: UiStyle::StyledMessage#21
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
-#: UiStyle::StyledMessage#22
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
-#: UiStyle::StyledMessage#23
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr "<-x"
 
-#: UiStyle::StyledMessage#24
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
-#: UiStyle::StyledMessage#25
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr "-"
 
-#: UiStyle::StyledMessage#26
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr "=>"
 
-#: UiStyle::StyledMessage#27
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr "<="
 
-#: UserCategoryItem#1
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
-msgstr "%n Eigenaar(s)"
+msgid_plural "%n Owner(s)"
+msgstr[0] "%n Eigenaar"
+msgstr[1] "%n Eigenaars"
 
-#: UserCategoryItem#2
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
-msgstr "%n Administrator(s)"
+msgid_plural "%n Admin(s)"
+msgstr[0] "%n Administrator"
+msgstr[1] "%n Administrators"
 
-#: UserCategoryItem#3
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
-msgstr "%n Operator(s)"
+msgid_plural "%n Operator(s)"
+msgstr[0] "%n Operator"
+msgstr[1] "%n Operators"
 
-#: UserCategoryItem#4
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
-msgstr "%n Half-Op(s)"
+msgid_plural "%n Half-Op(s)"
+msgstr[0] "%n Half-Op"
+msgstr[1] "%n Half-Ops"
 
-#: UserCategoryItem#5
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
-msgstr "%n met voice"
+msgid_plural "%n Voiced"
+msgstr[0] "%n met voice"
+msgstr[1] "%n met voice"
 
-#: UserCategoryItem#6
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
-msgstr "%n Gebruiker(s)"
+msgid_plural "%n User(s)"
+msgstr[0] "%n Gebruiker"
+msgstr[1] "%n Gebruikers"
+
+#~ msgid "Finger"
+#~ msgstr "Finger"
+
+#~ msgid "Add Buffers Automatically:"
+#~ msgstr "Automatisch buffers toevoegen:"
+
+#~ msgid "Hide inactive buffers:"
+#~ msgstr "Inactieve buffers verbergen:"
+
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] inactief-bericht: %1"
diff --git a/po/oc.po b/po/oc.po
index ff43160e..1356c79d 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,2380 +7,2977 @@ msgid ""
 msgstr ""
 "Project-Id-Version: quassel\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-03 10:51+0200\n"
-"PO-Revision-Date: 2010-04-09 14:13+0000\n"
-"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"POT-Creation-Date: 2010-05-05 02:45+0000\n"
+"PO-Revision-Date: 2010-05-15 08:14+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-04-13 20:24+0000\n"
+"X-Launchpad-Export-Date: 2010-08-11 21:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: AboutDlg#1
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
-msgstr ""
-"<b>Version:</b> %1<br><b>Version del protocòl:</b> %2<br><b>Compilacion:</b> "
-"%3"
-
-#: AboutDlg#2
-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 ""
-
-#: AboutDlg#3
-msgid "Quassel IRC is mainly developed by:"
-msgstr "Quassel IRC es principalament desvolopat per :"
-
-#: AboutDlg#4
-msgid ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
-msgstr ""
-
-#: AboutDlg#5
-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 ""
-"Mercejaments particulars a :<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>pour son grand travail "
-"artistique et pour le logo Quassel</dt><dt><img "
-"src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-"
-"icons.org\">The Oxygen Team</a></b></dt><dd>per la creacion de la majoretat "
-"de las autras bèlas icònas que podètz veire dins Quassel</dd><dt><img "
-"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
-"href=\"http://www.trolltech.com\">Qt Software precedentament nomenada "
-"Trolltech</a></b></dt><dd>per la creacion de Qt et Qtopia, e coma sponsor "
-"del desvolopament de QuasselTopia amb Greenphones e d'autres</dd><dt><b><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\">Nokia</a></b></dt><dd>per gardar en vida Qt, e per "
-"esponsorizar lo desvolopament de Quassel Mobile amb N810s</dd>"
-
-#: AboutDlg#6
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:17
 msgid "About Quassel"
 msgstr "A pepaus de Quassel"
 
-#: AboutDlg#7
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:59
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; "
-"font-weight:600; font-style:normal;\">\n"
-"<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 ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body "
-"style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-"
-"style:normal;\"><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>"
-
-#: AboutDlg#8
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n"
+"<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 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\"><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>"
+
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:75
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
-"font-weight:600; font-style:normal;\">\n"
-"<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 ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body "
-"style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-"
-"style:normal;\"><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>"
-
-#: AboutDlg#9
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n"
+"<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 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\"><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>"
+
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:115
 msgid "&About"
 msgstr "&A prepaus"
 
-#: AboutDlg#10
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:135
 msgid "A&uthors"
 msgstr "A&utors"
 
-#: AboutDlg#11
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:155
 msgid "&Contributors"
 msgstr "&Contributors"
 
-#: AboutDlg#12
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:175
 msgid "&Thanks To"
 msgstr "&Mercejaments a"
 
-#: AbstractSqlStorage#1
-msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:32
+msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgstr "<b>Version:</b> %1<br><b>Version del protocòl:</b> %2<br><b>Compilacion:</b> %3"
+
+#. 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."
 msgstr ""
 
-#: AbstractSqlStorage#2
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:62
+msgid "Quassel IRC is mainly developed by:"
+msgstr "Quassel IRC es principalament desvolopat per :"
+
+#. 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:"
+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 "Mercejaments particulars a :<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>pour son grand travail artistique et pour le logo Quassel</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>per la creacion de la majoretat de las autras bèlas icònas que podètz veire dins Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software precedentament nomenada Trolltech</a></b></dt><dd>per la creacion de Qt et Qtopia, e coma sponsor del desvolopament de QuasselTopia amb Greenphones e d'autres</dd><dt><b><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\">Nokia</a></b></dt><dd>per gardar en vida Qt, e per esponsorizar lo desvolopament de Quassel Mobile amb N810s</dd>"
+
+#. ts-context AbstractSqlStorage
+#: ../src/core/abstractsqlstorage.cpp:115
+msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+msgstr ""
+
+#. ts-context AbstractSqlStorage
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Fracàs de la mesa a jorn..."
 
-#: AliasesModel#1
-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"
+#. 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"
 msgstr ""
 
-#: AliasesModel#2
-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 ""
-
-#: AliasesModel#3
+#. 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"
+msgstr ""
+
+#. ts-context AliasesModel
+#: ../src/qtui/settingspages/aliasesmodel.cpp:170
 msgid "Alias"
 msgstr "Aliàs"
 
-#: AliasesModel#4
+#. ts-context AliasesModel
+#: ../src/qtui/settingspages/aliasesmodel.cpp:171
 msgid "Expansion"
 msgstr "Comanda espandida"
 
-#: AliasesSettingsPage#1
-msgctxt "AliasesSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
-
-#: AliasesSettingsPage#2
-msgid "Aliases"
-msgstr "Aliases"
-
-#: AliasesSettingsPage#3
-msgctxt "AliasesSettingsPage#3"
+#. #-#-#-#-#  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 ShortcutsSettingsPage
+#. #-#-#-#-#  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/settingspages/shortcutssettingspage.ui:14
+#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
 msgstr "Formulari"
 
-#: AliasesSettingsPage#4
-msgctxt "AliasesSettingsPage#4"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AliasesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.ui:27
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
 msgid "New"
 msgstr "Novèl"
 
-#: AliasesSettingsPage#5
-msgctxt "AliasesSettingsPage#5"
+#. #-#-#-#-#  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
 msgid "Delete"
 msgstr "Suprimir"
 
-#: AppearanceSettingsPage#1
-msgctxt "AppearanceSettingsPage#1"
-msgid "Interface"
-msgstr "Interfàcia"
-
-#: AppearanceSettingsPage#2
-msgid "<System Default>"
-msgstr "<Sistèma per defaut>"
-
-#: AppearanceSettingsPage#3
-msgid "Please choose a stylesheet file"
-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
+msgid "IRC"
+msgstr "IRC"
 
-#: AppearanceSettingsPage#4
-msgctxt "AppearanceSettingsPage#4"
-msgid "Form"
-msgstr "Formulari"
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgid "Aliases"
+msgstr "Aliases"
 
-#: AppearanceSettingsPage#5
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgid "Client style:"
 msgstr "Estil del Client :"
 
-#: AppearanceSettingsPage#6
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
 msgstr "Definir l'estil"
 
-#: AppearanceSettingsPage#7
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:36
 msgid "Language:"
 msgstr "Lenga :"
 
-#: AppearanceSettingsPage#8
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
 msgstr "Definir la lenga de l'aplicacion. Necessita una reaviada !"
 
-#: AppearanceSettingsPage#9
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
 msgid "<Untranslated>"
 msgstr ""
 
-#: AppearanceSettingsPage#10
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+msgid "<System Default>"
+msgstr "<Sistèma per defaut>"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
 msgid "Use custom stylesheet"
 msgstr ""
 
-#: AppearanceSettingsPage#11
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
 msgid "Path:"
 msgstr "Camin :"
 
-#: AppearanceSettingsPage#12
-msgctxt "AppearanceSettingsPage#12"
+#. #-#-#-#-#  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:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+#: ../src/qtui/settingspages/identityeditwidget.ui:168
+#: ../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
 msgid "..."
 msgstr "..."
 
-#: AppearanceSettingsPage#13
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
 msgid "Show system tray icon"
-msgstr ""
+msgstr "Afichar l'icòna dins la bóstia de miniaturas"
 
-#: AppearanceSettingsPage#14
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
 msgid "Hide to tray on close button"
 msgstr ""
 
-#: AppearanceSettingsPage#15
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:216
 msgid "Enable animations"
 msgstr "Activar las animacions"
 
-#: AppearanceSettingsPage#16
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:231
 msgid "Message Redirection"
 msgstr "Redireccion de Messatge"
 
-#: AppearanceSettingsPage#17
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:237
 msgid "User Notices:"
 msgstr ""
 
-#: AppearanceSettingsPage#18
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:280
 msgid "Server Notices:"
 msgstr ""
 
-#: AppearanceSettingsPage#19
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:294
 msgid "Default Target"
 msgstr ""
 
-#: AppearanceSettingsPage#20
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:301
 msgid "Status Window"
 msgstr "Fenèstra d'Estat"
 
-#: AppearanceSettingsPage#21
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:308
 msgid "Current Chat"
 msgstr "Dialòg Corrent"
 
-#: AppearanceSettingsPage#22
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:315
 msgid "Errors:"
 msgstr "Errors :"
 
-#: AwayLogView#1
+#. #-#-#-#-#  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 ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgid "Interface"
+msgstr "Interfàcia"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+msgid "Please choose a stylesheet file"
+msgstr ""
+
+#. ts-context AwayLogView
+#: ../src/qtui/awaylogview.cpp:33
 msgid "Away Log"
 msgstr "Istoric d'abséncia"
 
-#: AwayLogView#2
-msgctxt "AwayLogView#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AwayLogView
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorView
+#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/chatmonitorview.cpp:59
 msgid "Show Network Name"
 msgstr "Afichar lo Nom de la Ret"
 
-#: AwayLogView#3
-msgctxt "AwayLogView#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context AwayLogView
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorView
+#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/chatmonitorview.cpp:64
 msgid "Show Buffer Name"
 msgstr "Afichar lo Nom del Tampon"
 
-#: BacklogSettingsPage#1
-msgctxt "BacklogSettingsPage#1"
-msgid "Interface"
-msgstr "Interfàcia"
-
-#: BacklogSettingsPage#2
-msgid "Backlog Fetching"
-msgstr ""
-
-#: BacklogSettingsPage#3
-msgctxt "BacklogSettingsPage#3"
-msgid "Form"
-msgstr "Formulari"
-
-#: BacklogSettingsPage#4
-msgid ""
-"Number of messages to be requested from the core when using scrolling up in "
-"the buffer view."
+#. 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."
 msgstr ""
 
-#: BacklogSettingsPage#5
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:25
 msgid "Dynamic backlog amount:"
 msgstr ""
 
-#: BacklogSettingsPage#6
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:75
 msgid "Backlog request method:"
 msgstr ""
 
-#: BacklogSettingsPage#7
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:83
 msgid "Fixed amount per chat"
 msgstr "Nombre fixe per dialòg"
 
-#: BacklogSettingsPage#8
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:88
 msgid "Unread messages per chat"
 msgstr ""
 
-#: BacklogSettingsPage#9
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:93
 msgid "Globally unread messages"
 msgstr ""
 
-#: BacklogSettingsPage#10
-msgid ""
-"The simplest requester. It fetches a fixed amount of lines for each chat "
-"window from the backlog."
+#. 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."
 msgstr ""
 
-#: BacklogSettingsPage#11
-msgid ""
-"amount of messages per buffer that are requested after the core connection "
-"has been established."
+#. 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."
 msgstr ""
 
-#: BacklogSettingsPage#12
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgid "Initial backlog amount:"
 msgstr ""
 
-#: BacklogSettingsPage#13
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:205
 msgid ""
-"This requester fetches unread messages for each chat window individually. "
-"The amount of lines can be limited per chat.\n"
+"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."
+"You can also choose to fetch additional older chatlines to provide a better context."
 msgstr ""
 
-#: BacklogSettingsPage#14
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:222
+#: ../src/qtui/settingspages/backlogsettingspage.ui:232
+#: ../src/qtui/settingspages/backlogsettingspage.ui:354
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr ""
 
-#: BacklogSettingsPage#15
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:225
+#: ../src/qtui/settingspages/backlogsettingspage.ui:347
 msgid "Limit:"
 msgstr "Limit :"
 
-#: BacklogSettingsPage#16
-msgctxt "BacklogSettingsPage#16"
+#. #-#-#-#-#  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
 msgid "Unlimited"
 msgstr "Illimitat"
 
-#: BacklogSettingsPage#17
-msgid ""
-"Amount of messages to be fetched in addition to the unread messages. The "
-"Limit does not apply here."
+#. 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."
 msgstr ""
 
-#: BacklogSettingsPage#18
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:263
+#: ../src/qtui/settingspages/backlogsettingspage.ui:385
 msgid "Additional Messages:"
-msgstr ""
+msgstr "Messatges complementaris :"
 
-#: BacklogSettingsPage#19
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:324
 msgid ""
-"This requester fetches all messages newer than the oldest unread message for "
-"all chats.\n"
+"This requester fetches all messages newer than the oldest unread message for all chats.\n"
 "\n"
-"Note: This requester is not recommended if you use hidden chat windows or "
-"have inactive chats (i.e.: no stale queries or channels).\n"
-"It is useful to limit the total amount of the backlog and is probably the "
-"fastest.\n"
+"Note: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels).\n"
+"It is useful to limit the total amount of the backlog and is probably the fastest.\n"
 "\n"
-"You can also chose to fetch additional older chatlines to provide a better "
-"context."
+"You can also chose to fetch additional older chatlines to provide a better context."
 msgstr ""
 
-#: BacklogSettingsPage#20
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:344
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 
-#: BufferItem#1
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Backlog Fetching"
+msgstr ""
+
+#. ts-context BufferItem
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#: BufferView#1
+#. ts-context BufferView
+#: ../src/uisupport/bufferview.cpp:248
 msgid "Merge buffers permanently?"
 msgstr ""
 
-#: BufferView#2
+#. ts-context BufferView
+#: ../src/uisupport/bufferview.cpp:249
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"
 msgstr ""
 
-#: BufferViewEditDlg#1
-msgctxt "BufferViewEditDlg#1"
+#. #-#-#-#-#  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
 msgid "Dialog"
 msgstr "Bóstia de dialòg"
 
-#: BufferViewEditDlg#2
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
 msgid "Please enter a name for the chat list:"
 msgstr ""
 
-#: BufferViewEditDlg#3
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
 msgid "Add Chat List"
 msgstr ""
 
-#: BufferViewFilter#1
+#. ts-context BufferViewFilter
+#: ../src/uisupport/bufferviewfilter.cpp:52
 msgid "Show / Hide Chats"
 msgstr ""
 
-#: BufferViewSettingsPage#1
-msgctxt "BufferViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interfàcia"
-
-#: BufferViewSettingsPage#2
-msgid "Custom Chat Lists"
-msgstr ""
-
-#: BufferViewSettingsPage#3
-msgid "All"
-msgstr "Totes"
-
-#: BufferViewSettingsPage#4
-msgid "Delete Chat List?"
-msgstr ""
-
-#: BufferViewSettingsPage#5
-msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr ""
-
-#: BufferViewSettingsPage#6
-msgctxt "BufferViewSettingsPage#6"
-msgid "Form"
-msgstr "Formulari"
-
-#: BufferViewSettingsPage#7
-msgctxt "BufferViewSettingsPage#7"
+#. #-#-#-#-#  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
 msgid "Re&name..."
 msgstr "To&rnar nomenar..."
 
-#: BufferViewSettingsPage#8
-msgctxt "BufferViewSettingsPage#8"
+#. #-#-#-#-#  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
 msgid "&Add..."
 msgstr "&Apondre..."
 
-#: BufferViewSettingsPage#9
-msgctxt "BufferViewSettingsPage#9"
+#. #-#-#-#-#  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
 msgid "De&lete"
 msgstr "&Suprimir"
 
-#: BufferViewSettingsPage#10
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
 msgid "Chat List Settings"
-msgstr ""
-
-#: BufferViewSettingsPage#11
-msgctxt "BufferViewSettingsPage#11"
+msgstr "Paramètres de las vistas"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context BufferViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:92
+#: ../src/uisupport/networkmodelcontroller.cpp:487
 msgid "Network:"
 msgstr "Ret :"
 
-#: BufferViewSettingsPage#12
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+msgid "All"
+msgstr "Totes"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."
 msgstr ""
 
-#: BufferViewSettingsPage#13
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
 msgid "Show status window"
 msgstr "Afichar la fenèstra d'Estat"
 
-#: BufferViewSettingsPage#14
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
 msgid "Show channels"
 msgstr "Veire los canals"
 
-#: BufferViewSettingsPage#15
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
 msgid "Show queries"
 msgstr "Afichar las requèstas"
 
-#: BufferViewSettingsPage#16
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
 msgid "Hide inactive chats"
 msgstr ""
 
-#: BufferViewSettingsPage#17
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
 msgid "Add new chats automatically"
 msgstr ""
 
-#: BufferViewSettingsPage#18
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
 msgid "Sort alphabetically"
 msgstr "Triar alfabeticament"
 
-#: BufferViewSettingsPage#19
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
 msgid "Minimum Activity:"
-msgstr ""
+msgstr "Activitat minimala :"
 
-#: BufferViewSettingsPage#20
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
 msgid "No Activity"
 msgstr "Pas d'activitat"
 
-#: BufferViewSettingsPage#21
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
 msgid "Other Activity"
 msgstr "Autra activitat"
 
-#: BufferViewSettingsPage#22
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
 msgid "New Message"
 msgstr "Messatge novèl"
 
-#: BufferViewSettingsPage#23
-msgctxt "BufferViewSettingsPage#23"
+#. #-#-#-#-#  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
 msgid "Highlight"
-msgstr "Suslinhar"
+msgstr "Susbrilhança"
 
-#: BufferViewSettingsPage#24
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
 msgid "Preview:"
 msgstr "Apercebut :"
 
-#: BufferViewWidget#1
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgid "Custom Chat Lists"
+msgstr ""
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+msgid "Delete Chat List?"
+msgstr "Suprimir la Vista ?"
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+msgid "Do you really want to delete the chat list \"%1\"?"
+msgstr ""
+
+#. ts-context BufferViewWidget
+#: ../src/qtui/ui/bufferviewwidget.ui:26
 msgid "BufferView"
 msgstr "Vista"
 
-#: BufferWidget#1
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: BufferWidget#2
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Zoom arrièr"
 
-#: BufferWidget#3
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Talha reala"
 
-#: ChannelBufferItem#1
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+#, fuzzy
+msgid "Set Marker Line"
+msgstr "Linha de separacion :"
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+#, fuzzy
+msgid "Go to Marker Line"
+msgstr "Linha de separacion :"
+
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Canal %1</b>"
 
-#: ChannelBufferItem#2
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Utilizaires :</b> %1"
 
-#: ChannelBufferItem#3
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Mòde :</b> %1"
 
-#: ChannelBufferItem#4
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Subjècte :</b> %1"
 
-#: ChannelBufferItem#5
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr ""
 
-#: ChannelBufferItem#6
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
-#: ChannelListDlg#1
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:14
 msgid "Channel List"
 msgstr "Lista dels canals"
 
-#: ChannelListDlg#2
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:38
 msgid "Search Pattern:"
 msgstr ""
 
-#: ChannelListDlg#3
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:48
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows to pass search strings to the IRC Server."
 msgstr ""
 
-#: ChannelListDlg#4
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:62
 msgid "Show Channels"
 msgstr "Veire los canals"
 
-#: ChannelListDlg#5
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:86
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: ChannelListDlg#6
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:98
 msgid "Errors Occured:"
 msgstr ""
 
-#: ChannelListDlg#7
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:132
 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"
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC "
-"ERROR!!11</span></p>\n"
-"<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 ""
-
-#: ChatMonitorSettingsPage#1
-msgctxt "ChatMonitorSettingsPage#1"
-msgid "Interface"
-msgstr "Interfàcia"
-
-#: ChatMonitorSettingsPage#2
-msgctxt "ChatMonitorSettingsPage#2"
-msgid "Chat Monitor"
-msgstr "Monitor de discussion"
-
-#: ChatMonitorSettingsPage#3
-msgid "Opt In"
-msgstr "Activat"
-
-#: ChatMonitorSettingsPage#4
-msgid "Opt Out"
-msgstr "Inactivat"
-
-#: ChatMonitorSettingsPage#5
-msgid "Show:"
-msgstr "Afichar :"
-
-#: ChatMonitorSettingsPage#6
-msgid "Ignore:"
-msgstr "Ignorar :"
-
-#: ChatMonitorSettingsPage#7
-msgctxt "ChatMonitorSettingsPage#7"
-msgid "Form"
-msgstr "Formulari"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></p>\n"
+"<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 ""
 
-#: ChatMonitorSettingsPage#8
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
 msgid "Operation Mode:"
 msgstr "Mòde de foncionament :"
 
-#: ChatMonitorSettingsPage#9
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
 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"
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Operation modes:</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
-"style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span "
-"style=\" font-weight:400;\">Only buffers on the right side are shown in "
-"chatmonitor</span></p>\n"
-"<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 ""
-"<!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"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operation modes:</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
+"<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 ""
+"<!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"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Mòdes de foncionament:</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
-"style=\" font-weight:400; text-decoration: underline;\">Activat :</span> "
-"<span style=\" font-weight:400;\">Sols los tampons visibles a drecha son "
-"afichats dins lo Monitor de discussion</span></p>\n"
-"<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;\">Inactivat :</span> Los tampons que figuran a drecha "
-"son ignorats dins lo Monitor de discusssion</p></body></html>"
-
-#: ChatMonitorSettingsPage#10
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Mòdes de foncionament:</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Activat :</span> <span style=\" font-weight:400;\">Sols los tampons visibles a drecha son afichats dins lo Monitor de discussion</span></p>\n"
+"<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;\">Inactivat :</span> Los tampons que figuran a drecha son ignorats dins lo Monitor de discusssion</p></body></html>"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgid "Available:"
 msgstr "Disponible :"
 
-#: ChatMonitorSettingsPage#11
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
 msgid "Move selected buffers to the left"
 msgstr ""
 
-#: ChatMonitorSettingsPage#12
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
 msgid "Move selected buffers to the right"
 msgstr ""
 
-#: ChatMonitorSettingsPage#13
-msgid ""
-"Show highlights in chatmonitor even if the originating buffer is ignored"
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+msgid "Show:"
+msgstr "Afichar :"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
+msgid "Show highlights in chatmonitor even if the originating buffer is ignored"
 msgstr ""
 
-#: ChatMonitorSettingsPage#14
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
 msgid "Always show highlighted messages"
 msgstr ""
 
-#: ChatMonitorSettingsPage#15
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
 msgid "Show own messages"
 msgstr "Afichar mos messatges"
 
-#: ChatMonitorView#1
-msgid "Show Own Messages"
-msgstr "Afichar Mos Messatges"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ChatMonitorSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/mainwin.cpp:743
+msgid "Chat Monitor"
+msgstr "Monitor de discussion"
 
-#: ChatMonitorView#2
-msgctxt "ChatMonitorView#2"
-msgid "Show Network Name"
-msgstr "Afichar lo Nom de la Ret"
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+msgid "Opt In"
+msgstr "Activat"
 
-#: ChatMonitorView#3
-msgctxt "ChatMonitorView#3"
-msgid "Show Buffer Name"
-msgstr "Afichar lo Nom del Tampon"
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+msgid "Opt Out"
+msgstr "Inactivat"
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+msgid "Ignore:"
+msgstr "Ignorar :"
+
+#. ts-context ChatMonitorView
+#: ../src/qtui/chatmonitorview.cpp:52
+msgid "Show Own Messages"
+msgstr "Afichar Mos Messatges"
 
-#: ChatMonitorView#4
+#. ts-context ChatMonitorView
+#: ../src/qtui/chatmonitorview.cpp:71
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: ChatScene#1
+#. ts-context ChatScene
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Copiar la Seleccion"
 
-#: ChatViewSearchBar#1
-msgctxt "ChatViewSearchBar#1"
-msgid "Form"
-msgstr "Formulari"
-
-#: ChatViewSearchBar#2
-msgctxt "ChatViewSearchBar#2"
-msgid "..."
-msgstr "..."
-
-#: ChatViewSearchBar#3
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:55
 msgid "case sensitive"
 msgstr "sensible a la cassa"
 
-#: ChatViewSearchBar#4
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:62
 msgid "search nick"
 msgstr "cercar un escais"
 
-#: ChatViewSearchBar#5
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:69
 msgid "search message"
 msgstr "cercar un messatge"
 
-#: ChatViewSearchBar#6
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:82
 msgid "ignore joins, parts, etc."
 msgstr ""
 
-#: ChatViewSettingsPage#1
-msgctxt "ChatViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interfàcia"
-
-#: ChatViewSettingsPage#2
-msgid "Chat View"
-msgstr "Fenèstra de dialòg"
-
-#: ChatViewSettingsPage#3
-msgctxt "ChatViewSettingsPage#3"
-msgid "Form"
-msgstr "Formulari"
-
-#: ChatViewSettingsPage#4
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgid "Timestamp format:"
 msgstr "Format d'ora :"
 
-#: ChatViewSettingsPage#5
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
 msgid "[hh:mm:ss]"
 msgstr "[hh:mm:ss]"
 
-#: ChatViewSettingsPage#6
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
 msgid "Custom chat window font:"
 msgstr "Poliça personalizada de la fenèstra :"
 
-#: ChatViewSettingsPage#7
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr ""
 
-#: ChatViewSettingsPage#8
-msgid ""
-"Show a website preview window when hovering the mouse over a web address"
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
-#: ChatViewSettingsPage#9
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
-#: ChatViewSettingsPage#10
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "Colors personalizadas"
 
-#: ChatViewSettingsPage#11
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "Accion :"
 
-#: ChatViewSettingsPage#12
-msgctxt "ChatViewSettingsPage#12"
-msgid "..."
-msgstr "..."
-
-#: ChatViewSettingsPage#13
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Format d'ora :"
 
-#: ChatViewSettingsPage#14
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Messatge del Canal :"
 
-#: ChatViewSettingsPage#15
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr ""
 
-#: ChatViewSettingsPage#16
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Messatge d'una comanda :"
 
-#: ChatViewSettingsPage#17
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr ""
 
-#: ChatViewSettingsPage#18
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Messatge del servidor :"
 
-#: ChatViewSettingsPage#19
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "Linha de separacion :"
 
-#: ChatViewSettingsPage#20
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Messatge d'error :"
 
-#: ChatViewSettingsPage#21
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Rèire plan :"
 
-#: ChatViewSettingsPage#22
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr ""
 
-#: ChatViewSettingsPage#23
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Mos messatges :"
 
-#: Client#1
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgid "Chat View"
+msgstr "Fenèstra de dialòg"
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
+#. ts-context Client
+#: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
 msgstr ""
 
-#: Client#2
+#. ts-context ClientBacklogManager
+#: ../src/client/clientbacklogmanager.cpp:161
+msgid "Processed %1 messages in %2 seconds."
+msgstr ""
+
+#. ts-context ClientBufferViewManager
+#: ../src/client/clientbufferviewmanager.cpp:52
 msgid "All Chats"
 msgstr "Totas las discussions"
 
-#: ClientBacklogManager#1
-msgid "Processed %1 messages in %2 seconds."
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
 msgstr ""
 
-#: ConnectionSettingsPage#1
-msgctxt "ConnectionSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
 
-#: ConnectionSettingsPage#2
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
 msgstr "Configuracion de la connexion IRC"
 
-#: ConnectionSettingsPage#3
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:20
 msgid "Enable Ping Timeout Detection"
 msgstr ""
 
-#: ConnectionSettingsPage#4
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:37
 msgid "Ping interval:"
 msgstr "interval del Ping :"
 
-#: ConnectionSettingsPage#5
-msgctxt "ConnectionSettingsPage#5"
+#. #-#-#-#-#  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
 msgid " seconds"
 msgstr " segondas"
 
-#: ConnectionSettingsPage#6
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:80
 msgid "Disconnect after"
 msgstr "Desconnectar aprèp"
 
-#: ConnectionSettingsPage#7
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:103
 msgid "missed pings"
 msgstr "pings perduts"
 
-#: ConnectionSettingsPage#8
-msgid ""
-"This enables periodic polling of user information using /WHO. This is mostly "
-"interesting for tracking users' away status."
+#. 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."
 msgstr ""
 
-#: ConnectionSettingsPage#9
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:131
 msgid "Enable Automatic User Information Lookup (/WHO)"
 msgstr ""
 
-#: ConnectionSettingsPage#10
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:148
 msgid "Update interval:"
 msgstr "Interval de mesa a jorn :"
 
-#: ConnectionSettingsPage#11
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:177
 msgid "Ignore channels with more than:"
 msgstr ""
 
-#: ConnectionSettingsPage#12
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:184
 msgid " users"
 msgstr " utilizaires"
 
-#: ConnectionSettingsPage#13
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:206
 msgid "Minimum delay between requests:"
 msgstr ""
 
-#: ContentsChatItem#1
+#. ts-context ContentsChatItem
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Copiar l'adreça del ligam"
 
-#: ContextMenuActionProvider#1
-msgctxt "ContextMenuActionProvider#1"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgid "Connect"
-msgstr "Connectar"
-
-#: ContextMenuActionProvider#2
-msgctxt "ContextMenuActionProvider#2"
+msgstr "Se connectar"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect"
-msgstr "Desconnectar"
-
-#: ContextMenuActionProvider#3
-msgctxt "ContextMenuActionProvider#3"
+msgstr "Se desconnectar"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:35
 msgid "Join"
 msgstr "Rejónher"
 
-#: ContextMenuActionProvider#4
-msgctxt "ContextMenuActionProvider#4"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:34
 msgid "Part"
-msgstr "Partir"
+msgstr "Partiment"
 
-#: ContextMenuActionProvider#5
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgid "Delete Chat(s)..."
 msgstr ""
 
-#: ContextMenuActionProvider#6
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgid "Go to Chat"
 msgstr "Dialogar"
 
-#: ContextMenuActionProvider#7
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
 msgid "Joins"
 msgstr "Arribadas"
 
-#: ContextMenuActionProvider#8
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgid "Parts"
 msgstr "Sortidas"
 
-#: ContextMenuActionProvider#9
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgid "Quits"
 msgstr "Desparts"
 
-#: ContextMenuActionProvider#10
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgid "Nick Changes"
 msgstr "Cambiaments d'Escais"
 
-#: ContextMenuActionProvider#11
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgid "Mode Changes"
 msgstr "Cambiament de Mòde"
 
-#: ContextMenuActionProvider#12
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgid "Day Changes"
 msgstr "Cambiament de Jorn"
 
-#: ContextMenuActionProvider#13
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgid "Topic Changes"
 msgstr "Cambiament de Subjècte"
 
-#: ContextMenuActionProvider#14
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgid "Set as Default..."
 msgstr "Definir per defaut..."
 
-#: ContextMenuActionProvider#15
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgid "Use Defaults..."
 msgstr "Utilizar los paramètres per defaut..."
 
-#: ContextMenuActionProvider#16
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
 msgid "Join Channel..."
 msgstr "Rejónher lo canal..."
 
-#: ContextMenuActionProvider#17
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:58
 msgid "Start Query"
 msgstr "Aviar la requèsta"
 
-#: ContextMenuActionProvider#18
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
 msgid "Show Query"
 msgstr "Afichar la requèsta"
 
-#: ContextMenuActionProvider#19
-msgctxt "ContextMenuActionProvider#19"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Whois"
 msgstr "Whois"
 
-#: ContextMenuActionProvider#20
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:62
 msgid "Version"
 msgstr "Version"
 
-#: ContextMenuActionProvider#21
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
 msgid "Time"
 msgstr "Ora"
 
-#: ContextMenuActionProvider#22
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgid "Ping"
 msgstr "Ping"
 
-#: ContextMenuActionProvider#23
-msgid "Finger"
-msgstr "Finger"
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#, fuzzy
+msgid "Client info"
+msgstr "Client"
 
-#: ContextMenuActionProvider#24
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
 msgid "Custom..."
 msgstr "Personalizar..."
 
-#: ContextMenuActionProvider#25
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:78
 msgid "Give Operator Status"
 msgstr ""
 
-#: ContextMenuActionProvider#26
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
 msgid "Take Operator Status"
 msgstr ""
 
-#: ContextMenuActionProvider#27
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgid "Give Voice"
 msgstr ""
 
-#: ContextMenuActionProvider#28
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgid "Take Voice"
 msgstr ""
 
-#: ContextMenuActionProvider#29
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgid "Kick From Channel"
 msgstr "Kicker del Canal"
 
-#: ContextMenuActionProvider#30
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgid "Ban From Channel"
 msgstr "Bandir del Canal"
 
-#: ContextMenuActionProvider#31
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgid "Kick && Ban"
 msgstr "Kicker && Bandir"
 
-#: ContextMenuActionProvider#32
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgid "Hide Chat(s) Temporarily"
 msgstr ""
 
-#: ContextMenuActionProvider#33
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgid "Hide Chat(s) Permanently"
 msgstr ""
 
-#: ContextMenuActionProvider#34
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
 msgid "Show Channel List"
 msgstr ""
 
-#: ContextMenuActionProvider#35
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
 msgid "Show Ignore List"
 msgstr ""
 
-#: ContextMenuActionProvider#36
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:102
 msgid "Hide Events"
 msgstr ""
 
-#: ContextMenuActionProvider#37
-msgctxt "ContextMenuActionProvider#37"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
 msgid "CTCP"
 msgstr "CTCP"
 
-#: ContextMenuActionProvider#38
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:122
 msgid "Actions"
 msgstr "Accions"
 
-#: ContextMenuActionProvider#39
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:126
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ContextMenuActionProvider#40
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:131
 msgid "Add Ignore Rule"
 msgstr ""
 
-#: ContextMenuActionProvider#41
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
 msgid "Existing Rules"
 msgstr "Règlas existentas"
 
-#: Core#1
+#. ts-context Core
+#: ../src/core/core.cpp:182
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr ""
 
-#: Core#2
+#. ts-context Core
+#: ../src/core/core.cpp:183
 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"
+"Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."
 msgstr ""
 
-#: Core#3
+#. ts-context Core
+#: ../src/core/core.cpp:232
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr ""
 
-#: Core#4
+#. ts-context Core
+#: ../src/core/core.cpp:273
 msgid "Admin user or password not set."
 msgstr ""
 
-#: Core#5
+#. ts-context Core
+#: ../src/core/core.cpp:277
 msgid "Could not setup storage!"
 msgstr ""
 
-#: Core#6
+#. ts-context Core
+#: ../src/core/core.cpp:281
 msgid "Creating admin user..."
 msgstr ""
 
-#: Core#7
+#. ts-context Core
+#: ../src/core/core.cpp:394
 msgid "Invalid listen address %1"
 msgstr ""
 
-#: Core#8
-msgid ""
-"Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+#. ts-context Core
+#: ../src/core/core.cpp:402
+msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
 msgstr ""
 
-#: Core#9
+#. ts-context Core
+#: ../src/core/core.cpp:410
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr ""
 
-#: Core#10
-msgid ""
-"Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
+#. ts-context Core
+#: ../src/core/core.cpp:418
+msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
 msgstr ""
 
-#: Core#11
+#. ts-context Core
+#: ../src/core/core.cpp:429
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr ""
 
-#: Core#12
+#. ts-context Core
+#: ../src/core/core.cpp:437
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr ""
 
-#: Core#13
+#. ts-context Core
+#: ../src/core/core.cpp:446
 msgid "Could not open any network interfaces to listen on!"
 msgstr ""
 
-#: Core#14
+#. ts-context Core
+#: ../src/core/core.cpp:480
 msgid "Client connected from"
 msgstr "Client connectat per"
 
-#: Core#15
+#. ts-context Core
+#: ../src/core/core.cpp:483
 msgid "Closing server for basic setup."
 msgstr ""
 
-#: Core#16
+#. ts-context Core
+#: ../src/core/core.cpp:502
 msgid "Antique client trying to connect... refusing."
 msgstr ""
 
-#: Core#17
-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."
+#. 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."
 msgstr ""
 
-#: Core#18
-msgctxt "Core#18"
+#. #-#-#-#-#  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
 msgid "Client"
-msgstr ""
+msgstr "Client"
 
-#: Core#19
+#. ts-context Core
+#: ../src/core/core.cpp:518
 msgid "too old, rejecting."
 msgstr ""
 
-#: Core#20
-msgid ""
-"<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+#. ts-context Core
+#: ../src/core/core.cpp:535
+msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
 msgstr ""
 
-#: Core#21
+#. ts-context Core
+#: ../src/core/core.cpp:588
 msgid "Starting TLS for Client:"
 msgstr ""
 
-#: Core#22
-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
+#. 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."
 msgstr ""
 
-#: Core#23
+#. ts-context Core
+#: ../src/core/core.cpp:608
 msgid "did not send an init message before trying to login, rejecting."
 msgstr ""
 
-#: Core#24
-msgid ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
+#. 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."
 msgstr ""
 
-#: Core#25
+#. ts-context Core
+#: ../src/core/core.cpp:632
 msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
 msgstr ""
 
-#: Core#26
+#. ts-context Core
+#: ../src/core/core.cpp:643
 msgid "Non-authed client disconnected."
 msgstr ""
 
-#: Core#27
+#. ts-context Core
+#: ../src/core/core.cpp:649
 msgid "Non-authed client disconnected. (socket allready destroyed)"
 msgstr ""
 
-#: Core#28
+#. ts-context Core
+#: ../src/core/core.cpp:697
 msgid "Could not initialize session for client:"
 msgstr ""
 
-#: Core#29
+#. ts-context Core
+#: ../src/core/core.cpp:719
 msgid "Could not find a session for client:"
 msgstr ""
 
-#: CoreAccount#1
-msgctxt "CoreAccount#1"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccount
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountModel
+#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccountmodel.cpp:64
 msgid "Internal Core"
 msgstr ""
 
-#: CoreAccountEditDlg#1
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
 msgid "Edit Core Account"
 msgstr ""
 
-#: CoreAccountEditDlg#2
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
 msgid "Account Details"
-msgstr ""
+msgstr "Detalhs del comptes"
 
-#: CoreAccountEditDlg#3
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
 msgid "Account Name:"
-msgstr ""
+msgstr "Nom del compte :"
 
-#: CoreAccountEditDlg#4
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
 msgid "Local Core"
 msgstr ""
 
-#: CoreAccountEditDlg#5
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
 msgid "Hostname:"
-msgstr ""
-
-#: CoreAccountEditDlg#6
-msgctxt "CoreAccountEditDlg#6"
+msgstr "Nom d'òste :"
+
+#. #-#-#-#-#  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
 msgid "localhost"
-msgstr ""
-
-#: CoreAccountEditDlg#7
-msgctxt "CoreAccountEditDlg#7"
+msgstr "(fichièrs locals)"
+
+#. #-#-#-#-#  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
 msgid "Port:"
-msgstr ""
+msgstr "Pòrt :"
 
-#: CoreAccountEditDlg#8
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
 msgid "User:"
-msgstr ""
-
-#: CoreAccountEditDlg#9
-msgctxt "CoreAccountEditDlg#9"
+msgstr "Utilizaire :"
+
+#. #-#-#-#-#  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
 msgid "Password:"
-msgstr ""
+msgstr "Senhal :"
 
-#: CoreAccountEditDlg#10
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
 msgid "Remember"
-msgstr ""
-
-#: CoreAccountEditDlg#11
-msgctxt "CoreAccountEditDlg#11"
+msgstr "Memorizar"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
+#: ../src/qtui/settingspages/servereditdlg.ui:171
 msgid "Use a Proxy"
-msgstr ""
-
-#: CoreAccountEditDlg#12
-msgctxt "CoreAccountEditDlg#12"
+msgstr "Utilizar un proxy"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/servereditdlg.ui:188
 msgid "Proxy Type:"
-msgstr ""
-
-#: CoreAccountEditDlg#13
-msgctxt "CoreAccountEditDlg#13"
+msgstr "Tipe de Proxy :"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/servereditdlg.ui:196
 msgid "Socks 5"
-msgstr ""
-
-#: CoreAccountEditDlg#14
-msgctxt "CoreAccountEditDlg#14"
+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
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
-#: CoreAccountEditDlg#15
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
 msgid "Add Core Account"
 msgstr ""
 
-#: CoreAccountModel#1
-msgctxt "CoreAccountModel#1"
-msgid "Internal Core"
-msgstr ""
-
-#: CoreAccountSettingsPage#1
-msgctxt "CoreAccountSettingsPage#1"
-msgid "Remote Cores"
-msgstr ""
-
-#: CoreAccountSettingsPage#2
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
 msgid "Connect to Quassel Core"
 msgstr ""
 
-#: CoreAccountSettingsPage#3
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
 msgid "Core Accounts"
 msgstr ""
 
-#: CoreAccountSettingsPage#4
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
 msgid "Edit..."
-msgstr ""
-
-#: CoreAccountSettingsPage#5
-msgctxt "CoreAccountSettingsPage#5"
+msgstr "Modificar..."
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
 msgid "Add..."
-msgstr ""
-
-#: CoreAccountSettingsPage#6
-msgctxt "CoreAccountSettingsPage#6"
-msgid "Delete"
-msgstr ""
+msgstr "Apondre..."
 
-#: CoreAccountSettingsPage#7
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
 msgid "Automatically connect on startup"
-msgstr ""
+msgstr "Connexion automatica a l'aviada"
 
-#: CoreAccountSettingsPage#8
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
 msgid "Connect to last account used"
 msgstr ""
 
-#: CoreAccountSettingsPage#9
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
 msgid "Always connect to"
 msgstr ""
 
-#: CoreConfigWizard#1
-msgid "Core Configuration Wizard"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreAccountSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgid "Remote Cores"
 msgstr ""
 
-#: CoreConfigWizard#2
-msgid "Your core has been successfully configured. Logging you in..."
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:69
+msgid "Core Configuration Wizard"
 msgstr ""
 
-#: CoreConfigWizard#3
-msgid ""
-"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:97
+msgid "Your core has been successfully configured. Logging you in..."
 msgstr ""
 
-#: CoreConfigWizard#4
-msgid ""
-"Your are now logged into your freshly configured Quassel Core!<br>Please "
-"remember to configure your identities and networks now."
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:104
+msgid "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
 msgstr ""
 
-#: CoreConfigWizardAdminUserPage#1
-msgctxt "CoreConfigWizardAdminUserPage#1"
-msgid "Form"
+#. 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."
 msgstr ""
 
-#: CoreConfigWizardAdminUserPage#2
-msgctxt "CoreConfigWizardAdminUserPage#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardAdminUserPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
 msgid "Username:"
-msgstr ""
+msgstr "Nom d'utilizaire :"
 
-#: CoreConfigWizardAdminUserPage#3
-msgctxt "CoreConfigWizardAdminUserPage#3"
-msgid "Password:"
-msgstr ""
-
-#: CoreConfigWizardAdminUserPage#4
+#. ts-context CoreConfigWizardAdminUserPage
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
 msgid "Repeat password:"
-msgstr ""
-
-#: CoreConfigWizardAdminUserPage#5
-msgctxt "CoreConfigWizardAdminUserPage#5"
+msgstr "Repetir lo senhal :"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardAdminUserPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
 msgid "Remember password"
-msgstr ""
+msgstr "Se remembrar del senhal"
 
-#: CoreConfigWizardAdminUserPage#6
+#. ts-context CoreConfigWizardAdminUserPage
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
 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 ""
-
-#: CoreConfigWizardIntroPage#1
-msgctxt "CoreConfigWizardIntroPage#1"
-msgid "Form"
+"<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 ""
 
-#: CoreConfigWizardIntroPage#2
+#. ts-context CoreConfigWizardIntroPage
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:19
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr ""
 
-#: CoreConfigWizardPages::AdminUserPage#1
+#. ts-context CoreConfigWizardPages::AdminUserPage
+#: ../src/qtui/coreconfigwizard.cpp:150
 msgid "Create Admin User"
 msgstr ""
 
-#: CoreConfigWizardPages::AdminUserPage#2
-msgid ""
-"First, we will create a user on the core. This first user will have "
-"administrator privileges."
+#. 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."
 msgstr ""
 
-#: CoreConfigWizardPages::IntroPage#1
+#. ts-context CoreConfigWizardPages::IntroPage
+#: ../src/qtui/coreconfigwizard.cpp:135
 msgid "Introduction"
-msgstr ""
+msgstr "Introduccion"
 
-#: CoreConfigWizardPages::StorageSelectionPage#1
+#. ts-context CoreConfigWizardPages::StorageSelectionPage
+#: ../src/qtui/coreconfigwizard.cpp:182
 msgid "Select Storage Backend"
 msgstr ""
 
-#: CoreConfigWizardPages::StorageSelectionPage#2
-msgid ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
+#. 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."
 msgstr ""
 
-#: CoreConfigWizardPages::StorageSelectionPage#3
+#. ts-context CoreConfigWizardPages::StorageSelectionPage
+#: ../src/qtui/coreconfigwizard.cpp:277
 msgid "Connection Properties"
-msgstr ""
+msgstr "Proprietats de la connexion"
 
-#: CoreConfigWizardPages::SyncPage#1
+#. ts-context CoreConfigWizardPages::SyncPage
+#: ../src/qtui/coreconfigwizard.cpp:317
 msgid "Storing Your Settings"
-msgstr ""
-
-#: CoreConfigWizardPages::SyncPage#2
-msgid ""
-"Your settings are now stored in the core, and you will be logged in "
-"automatically."
-msgstr ""
+msgstr "Salvar vòstres paramètres"
 
-#: CoreConfigWizardStorageSelectionPage#1
-msgctxt "CoreConfigWizardStorageSelectionPage#1"
-msgid "Form"
+#. 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."
 msgstr ""
 
-#: CoreConfigWizardStorageSelectionPage#2
-msgctxt "CoreConfigWizardStorageSelectionPage#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardStorageSelectionPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
 msgid "Storage Backend:"
-msgstr ""
+msgstr "Banca de donadas :"
 
-#: CoreConfigWizardStorageSelectionPage#3
+#. ts-context CoreConfigWizardStorageSelectionPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
 msgid "Description"
-msgstr ""
+msgstr "Descripcion"
 
-#: CoreConfigWizardStorageSelectionPage#4
+#. ts-context CoreConfigWizardStorageSelectionPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
 msgid "Foobar"
-msgstr ""
-
-#: CoreConfigWizardSyncPage#1
-msgctxt "CoreConfigWizardSyncPage#1"
-msgid "Form"
-msgstr ""
+msgstr "Pè"
 
-#: CoreConfigWizardSyncPage#2
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
 msgid "Your Choices"
 msgstr ""
 
-#: CoreConfigWizardSyncPage#3
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
 msgid "Admin User:"
 msgstr ""
 
-#: CoreConfigWizardSyncPage#4
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
 msgid "foo"
 msgstr ""
 
-#: CoreConfigWizardSyncPage#5
-msgctxt "CoreConfigWizardSyncPage#5"
-msgid "Storage Backend:"
-msgstr ""
-
-#: CoreConfigWizardSyncPage#6
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
 msgid "bar"
-msgstr ""
+msgstr "barra"
 
-#: CoreConfigWizardSyncPage#7
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 
-#: CoreConnectAuthDlg#1
-msgid "Please enter your credentials for %1:"
-msgstr ""
-
-#: CoreConnectAuthDlg#2
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
 msgid "Authentication Required"
-msgstr ""
+msgstr "Autentificacion necessària"
 
-#: CoreConnectAuthDlg#3
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
 msgid "Please enter your account data:"
 msgstr ""
 
-#: CoreConnectAuthDlg#4
-msgctxt "CoreConnectAuthDlg#4"
-msgid "Password:"
-msgstr ""
-
-#: CoreConnectAuthDlg#5
-msgctxt "CoreConnectAuthDlg#5"
-msgid "Username:"
-msgstr ""
-
-#: CoreConnectAuthDlg#6
-msgctxt "CoreConnectAuthDlg#6"
-msgid "Remember password"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/coreconnectdlg.cpp:75
+msgid "Please enter your credentials for %1:"
 msgstr ""
 
-#: CoreConnectDlg#1
+#. ts-context CoreConnectDlg
+#: ../src/qtui/coreconnectdlg.cpp:40
 msgid "Connect to Core"
 msgstr ""
 
-#: CoreConnection#1
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr ""
 
-#: CoreConnection#2
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
-msgstr ""
+msgstr "Desconnectat"
 
-#: CoreConnection#3
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
-msgstr ""
+msgstr "Recèrca de %1..."
 
-#: CoreConnection#4
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
-msgstr ""
+msgstr "Connexion a %1..."
 
-#: CoreConnection#5
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
-msgstr ""
+msgstr "Connectat a %1"
 
-#: CoreConnection#6
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr ""
 
-#: CoreConnection#7
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:272
+msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
 
-#: CoreConnection#8
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr ""
 
-#: CoreConnection#9
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr ""
 
-#: CoreConnection#10
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr ""
 
-#: CoreConnection#11
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr ""
 
-#: CoreConnection#12
-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."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:478
+msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr ""
 
-#: CoreConnection#13
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
-msgstr ""
+msgstr "Connexion en cors…"
 
-#: CoreConnection#14
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr ""
 
-#: CoreConnection#15
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr ""
 
-#: CoreConnection#16
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr ""
 
-#: CoreConnection#17
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr ""
 
-#: CoreConnection#18
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr ""
 
-#: CoreConnectionSettingsPage#1
-msgctxt "CoreConnectionSettingsPage#1"
-msgid "Remote Cores"
-msgstr ""
-
-#: CoreConnectionSettingsPage#2
-msgctxt "CoreConnectionSettingsPage#2"
-msgid "Connection"
-msgstr ""
-
-#: CoreConnectionSettingsPage#3
-msgctxt "CoreConnectionSettingsPage#3"
-msgid "Form"
-msgstr ""
-
-#: CoreConnectionSettingsPage#4
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
 msgid "Network Status Detection"
 msgstr ""
 
-#: CoreConnectionSettingsPage#5
-msgid ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most "
-"KDE users"
+#. 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"
 msgstr ""
 
-#: CoreConnectionSettingsPage#6
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
 msgid "Use KDE's network status detection (via Solid)"
 msgstr ""
 
-#: CoreConnectionSettingsPage#7
-msgid ""
-"Actively ping the remote core and disconnect if we didn't get a reply after "
-"a certain time"
+#. 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"
 msgstr ""
 
-#: CoreConnectionSettingsPage#8
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
 msgid "Ping timeout after"
 msgstr ""
 
-#: CoreConnectionSettingsPage#9
-msgctxt "CoreConnectionSettingsPage#9"
-msgid " seconds"
-msgstr ""
-
-#: CoreConnectionSettingsPage#10
-msgid ""
-"Only disconnect if the network socket gets closed by the operating system. "
-"This may take a long time after actually losing connectivity"
+#. ts-context CoreConnectionSettingsPage
+#: ../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"
 msgstr ""
 
-#: CoreConnectionSettingsPage#11
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
 msgid "Never time out actively"
 msgstr ""
 
-#: CoreConnectionSettingsPage#12
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
 msgid "Automatically reconnect on network failures"
 msgstr ""
 
-#: CoreConnectionSettingsPage#13
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
 msgid "Retry every"
 msgstr ""
 
-#: CoreConnectionStatusWidget#1
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgid "Connection"
+msgstr "Connexion"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreConnectionStatusWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgid "Message"
+msgstr "Messatge"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "seconds"
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: CoreConnectionStatusWidget#2
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "milliseconds"
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: CoreConnectionStatusWidget#3
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:62
 msgid "(Lag: %1 %2)"
 msgstr ""
 
-#: CoreConnectionStatusWidget#4
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:75
 msgid "The connection to your core is encrypted with SSL."
 msgstr ""
 
-#: CoreConnectionStatusWidget#5
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:78
 msgid "The connection to your core is not encrypted."
 msgstr ""
 
-#: CoreConnectionStatusWidget#6
-msgctxt "CoreConnectionStatusWidget#6"
-msgid "Form"
-msgstr ""
-
-#: CoreConnectionStatusWidget#7
-msgctxt "CoreConnectionStatusWidget#7"
-msgid "Message"
-msgstr ""
-
-#: CoreInfoDlg#1
-msgid "%n Day(s)"
-msgstr ""
-
-#: CoreInfoDlg#2
-msgid " %1:%2:%3 (since %4)"
-msgstr ""
-
-#: CoreInfoDlg#3
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:13
 msgid "Core Information"
 msgstr ""
 
-#: CoreInfoDlg#4
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:21
 msgid "Version:"
-msgstr ""
+msgstr "Version :"
 
-#: CoreInfoDlg#5
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:28
 msgid "<core version>"
-msgstr ""
+msgstr "<core version>"
 
-#: CoreInfoDlg#6
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:35
 msgid "Uptime:"
 msgstr ""
 
-#: CoreInfoDlg#7
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:42
 msgid "Connected Clients:"
-msgstr ""
+msgstr "Clients connectats :"
 
-#: CoreInfoDlg#8
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:49
 msgid "<connected clients>"
-msgstr ""
+msgstr "<clients connectats>"
 
-#: CoreInfoDlg#9
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:56
 msgid "<core uptime>"
 msgstr ""
 
-#: CoreInfoDlg#10
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:63
 msgid "Build date:"
-msgstr ""
+msgstr "Version del :"
 
-#: CoreInfoDlg#11
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:70
 msgid "<build date>"
-msgstr ""
-
-#: CoreInfoDlg#12
-msgctxt "CoreInfoDlg#12"
+msgstr "<data de version>"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context CoreInfoDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context DebugLogWidget
+#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/ui/debuglogwidget.ui:43
 msgid "Close"
-msgstr ""
+msgstr "Tampar"
+
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:53
+msgid "%n Day(s)"
+msgid_plural "%n Day(s)"
+msgstr[0] "%n Jorn"
+msgstr[1] "%n Jorn(s)"
+
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:54
+msgid " %1:%2:%3 (since %4)"
+msgstr " %1:%2:%3 (%4)"
 
-#: CoreNetwork#1
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:153
 msgid "Connection failed. Cycling to next Server"
 msgstr ""
 
-#: CoreNetwork#2
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:161
+#: ../src/core/corenetwork.cpp:162
 msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "Connexion a %1 : %2..."
 
-#: CoreNetwork#3
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:210
 msgid "Disconnecting. (%1)"
-msgstr ""
+msgstr "Desconnècta. (%1)"
 
-#: CoreNetwork#4
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:210
 msgid "Core Shutdown"
 msgstr ""
 
-#: CoreNetwork#5
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
-msgstr ""
+msgstr "Impossible de se connectar a %1 (%2)"
 
-#: CoreNetwork#6
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
+msgstr "Fracàs de connexion : %1"
+
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:195
+msgid "disconnected (UserId: %1)."
+msgstr "desconnectat (IdUtilizaire : %1)."
+
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:413
+msgid "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!"
 msgstr ""
 
-#: CoreSession#1
-msgctxt "CoreSession#1"
-msgid "Client"
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:444
+msgid "CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"
 msgstr ""
 
-#: CoreSession#2
-msgid "disconnected (UserId: %1)."
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:81
+msgid "away"
+msgstr "absent"
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:150
+msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
-#: CoreSession#3
-msgid ""
-"CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
-"create network %1!"
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
 msgstr ""
 
-#: CoreSession#4
-msgid ""
-"CoreSession::createNetwork(): Trying to create a network that already "
-"exists, updating instead!"
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "Pas de subjècte per %1."
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
 msgstr ""
 
-#: CoreUserInputHandler#1
-msgid "away"
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
 msgstr ""
 
-#: CoreUserInputHandler#2
-msgid "sending CTCP-%1 request to %2"
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
 msgstr ""
 
-#: CreateIdentityDlg#1
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
 msgstr ""
 
-#: CreateIdentityDlg#2
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
 msgid "Identity name:"
-msgstr ""
+msgstr "Nom de l'identitat :"
 
-#: CreateIdentityDlg#3
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
 msgid "Create blank identity"
 msgstr ""
 
-#: CreateIdentityDlg#4
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
 msgid "Duplicate:"
+msgstr "Duplicar :"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:197
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr ""
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
 msgstr ""
 
-#: CtcpHandler#1
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr ""
 
-#: CtcpHandler#2
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr ""
 
-#: CtcpHandler#3
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr ""
 
-#: CtcpHandler#4
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr ""
 
-#: CtcpHandler#5
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr ""
 
-#: CtcpHandler#6
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr ""
 
-#: CtcpHandler#7
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 
-#: CtcpHandler#8
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr ""
 
-#: DebugBufferViewOverlay#1
-msgid "BufferViews:"
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+msgid "Debug BufferView Overlay"
 msgstr ""
 
-#: DebugBufferViewOverlay#2
-msgid "All Networks:"
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+msgid "Overlay View"
 msgstr ""
 
-#: DebugBufferViewOverlay#3
-msgid "Networks:"
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+msgid "Overlay Properties"
 msgstr ""
 
-#: DebugBufferViewOverlay#4
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:50
+msgid "BufferViews:"
+msgstr "Vistas :"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:51
+msgid "All Networks:"
+msgstr "Totas las rets :"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:52
+msgid "Networks:"
+msgstr "Rets :"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:53
 msgid "Buffers:"
-msgstr ""
+msgstr "Tampons :"
 
-#: DebugBufferViewOverlay#5
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:54
 msgid "Removed buffers:"
 msgstr ""
 
-#: DebugBufferViewOverlay#6
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:55
 msgid "Temp. removed buffers:"
 msgstr ""
 
-#: DebugBufferViewOverlay#7
-msgid "Add Buffers Automatically:"
-msgstr ""
-
-#: DebugBufferViewOverlay#8
-msgid "Hide inactive buffers:"
-msgstr ""
-
-#: DebugBufferViewOverlay#9
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:57
 msgid "Allowed buffer types:"
 msgstr ""
 
-#: DebugBufferViewOverlay#10
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
 msgid "Minimum activity:"
 msgstr ""
 
-#: DebugBufferViewOverlay#11
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:60
 msgid "Is initialized:"
 msgstr ""
 
-#: DebugBufferViewOverlay#12
-msgid "Debug BufferView Overlay"
-msgstr ""
-
-#: DebugBufferViewOverlay#13
-msgid "Overlay View"
-msgstr ""
-
-#: DebugBufferViewOverlay#14
-msgid "Overlay Properties"
-msgstr ""
-
-#: DebugConsole#1
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:14
 msgid "Debug Console"
 msgstr ""
 
-#: DebugConsole#2
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:44
 msgid "local"
-msgstr ""
+msgstr "local"
 
-#: DebugConsole#3
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:54
 msgid "core"
 msgstr ""
 
-#: DebugConsole#4
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:82
 msgid "Evaluate!"
-msgstr ""
+msgstr "Avalorar !"
 
-#: DebugLogWidget#1
+#. ts-context DebugLogWidget
+#: ../src/qtui/ui/debuglogwidget.ui:13
 msgid "Debug Log"
 msgstr ""
 
-#: DebugLogWidget#2
-msgctxt "DebugLogWidget#2"
-msgid "Close"
-msgstr ""
-
-#: ExecWrapper#1
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:45
 msgid "Invalid command string for /exec: %1"
-msgstr ""
+msgstr "Comanda invalida per /exec : %1"
 
-#: ExecWrapper#2
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:53
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr ""
 
-#: ExecWrapper#3
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:64
 msgid "Could not find script \"%1\""
-msgstr ""
+msgstr "Impossible de trobar l'escript \"%1\""
 
-#: ExecWrapper#4
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:82
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr ""
 
-#: ExecWrapper#5
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:98
 msgid "Script \"%1\" could not start."
 msgstr ""
 
-#: ExecWrapper#6
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:100
 msgid "Script \"%1\" caused error %2."
 msgstr ""
 
-#: FontSelector#1
+#. ts-context FontSelector
+#: ../src/uisupport/fontselector.cpp:31
 msgid "Choose..."
-msgstr ""
-
-#: HighlightSettingsPage#1
-msgctxt "HighlightSettingsPage#1"
-msgid "Interface"
-msgstr ""
-
-#: HighlightSettingsPage#2
-msgctxt "HighlightSettingsPage#2"
-msgid "Highlight"
-msgstr ""
-
-#: HighlightSettingsPage#3
-msgid "this shouldn't be empty"
-msgstr ""
-
-#: HighlightSettingsPage#4
-msgid "highlight rule"
-msgstr ""
-
-#: HighlightSettingsPage#5
-msgctxt "HighlightSettingsPage#5"
-msgid "Form"
-msgstr ""
+msgstr "Causir..."
 
-#: HighlightSettingsPage#6
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:19
 msgid "Custom Highlights"
 msgstr ""
 
-#: HighlightSettingsPage#7
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:37
 msgid "RegEx"
-msgstr ""
+msgstr "Expression regulara"
 
-#: HighlightSettingsPage#8
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:42
 msgid "CS"
-msgstr ""
+msgstr "CS"
 
-#: HighlightSettingsPage#9
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:47
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
 
-#: HighlightSettingsPage#10
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:55
 msgid "Add"
-msgstr ""
-
-#: HighlightSettingsPage#11
-msgctxt "HighlightSettingsPage#11"
+msgstr "Apondre"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
 msgid "Remove"
-msgstr ""
+msgstr "Suprimir"
 
-#: HighlightSettingsPage#12
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:85
 msgid "Highlight Nicks"
 msgstr ""
 
-#: HighlightSettingsPage#13
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:91
 msgid "All nicks from identity"
 msgstr ""
 
-#: HighlightSettingsPage#14
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:98
 msgid "Current nick"
 msgstr ""
 
-#: HighlightSettingsPage#15
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
-msgstr ""
+msgstr "Pas cap"
 
-#: HighlightSettingsPage#16
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:115
 msgid "Case sensitive"
+msgstr "Sensible a la cassa"
+
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+msgid "this shouldn't be empty"
 msgstr ""
 
-#: IdentitiesSettingsPage#1
-msgctxt "IdentitiesSettingsPage#1"
-msgid "IRC"
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.h:45
+msgid "highlight rule"
 msgstr ""
 
-#: IdentitiesSettingsPage#2
-msgid "Identities"
+#. #-#-#-#-#  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
+msgid "Rename Identity"
 msgstr ""
 
-#: IdentitiesSettingsPage#3
-msgctxt "IdentitiesSettingsPage#3"
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:51
+msgid "Add Identity"
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:74
+msgid "Remove Identity"
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgid "Identities"
+msgstr "Identitats"
+
+#. #-#-#-#-#  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>"
 msgstr ""
 
-#: IdentitiesSettingsPage#4
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
 msgid "<li>All identities need an identity name set</li>"
 msgstr ""
 
-#: IdentitiesSettingsPage#5
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr ""
 
-#: IdentitiesSettingsPage#6
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr ""
 
-#: IdentitiesSettingsPage#7
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr ""
 
-#: IdentitiesSettingsPage#8
-msgctxt "IdentitiesSettingsPage#8"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentitiesSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/networkssettingspage.cpp:169
 msgid "</ul>"
-msgstr ""
+msgstr "</ul>"
 
-#: IdentitiesSettingsPage#9
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
 msgid "One or more identities are invalid"
 msgstr ""
 
-#: IdentitiesSettingsPage#10
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
 msgid "Delete Identity?"
 msgstr ""
 
-#: IdentitiesSettingsPage#11
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr ""
 
-#: IdentitiesSettingsPage#12
-msgctxt "IdentitiesSettingsPage#12"
-msgid "Rename Identity"
-msgstr ""
-
-#: IdentitiesSettingsPage#13
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:323
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 
-#: IdentitiesSettingsPage#14
-msgctxt "IdentitiesSettingsPage#14"
-msgid "..."
-msgstr ""
-
-#: IdentitiesSettingsPage#15
-msgid "Add Identity"
-msgstr ""
-
-#: IdentitiesSettingsPage#16
-msgctxt "IdentitiesSettingsPage#16"
-msgid "Add..."
-msgstr ""
-
-#: IdentitiesSettingsPage#17
-msgid "Remove Identity"
-msgstr ""
-
-#: Identity#1
+#. ts-context Identity
+#: ../src/common/identity.cpp:134
 msgid "Quassel IRC User"
-msgstr ""
+msgstr "Utilizaire Quassel IRC"
 
-#: Identity#2
+#. ts-context Identity
+#: ../src/common/identity.cpp:162
 msgid "<empty>"
-msgstr ""
+msgstr "<void>"
 
-#: Identity#3
+#. ts-context Identity
+#: ../src/common/identity.cpp:168
 msgid "Gone fishing."
 msgstr ""
 
-#: Identity#4
+#. ts-context Identity
+#: ../src/common/identity.cpp:172
 msgid "Not here. No, really. not here!"
 msgstr ""
 
-#: Identity#5
+#. ts-context Identity
+#: ../src/common/identity.cpp:175
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr ""
 
-#: Identity#6
+#. ts-context Identity
+#: ../src/common/identity.cpp:178
 msgid "Kindergarten is elsewhere!"
 msgstr ""
 
-#: Identity#7
+#. ts-context Identity
+#: ../src/common/identity.cpp:179
+#: ../src/common/identity.cpp:180
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
-msgstr ""
-
-#: IdentityEditWidget#1
-msgctxt "IdentityEditWidget#1"
-msgid "Advanced"
-msgstr ""
-
-#: IdentityEditWidget#2
-msgid "Load a Key"
-msgstr ""
-
-#: IdentityEditWidget#3
-msgid "No Key loaded"
-msgstr ""
-
-#: IdentityEditWidget#4
-msgid "Load"
-msgstr ""
-
-#: IdentityEditWidget#5
-msgid "RSA"
-msgstr ""
-
-#: IdentityEditWidget#6
-msgid "DSA"
-msgstr ""
-
-#: IdentityEditWidget#7
-msgid "Clear"
-msgstr ""
-
-#: IdentityEditWidget#8
-msgid "Load a Certificate"
-msgstr ""
-
-#: IdentityEditWidget#9
-msgid "No Certificate loaded"
-msgstr ""
-
-#: IdentityEditWidget#10
+msgstr "http://quassel-irc.org - Discutir simplament. Pertot."
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
-msgstr ""
+msgstr "General"
 
-#: IdentityEditWidget#11
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:38
 msgid "Real Name:"
-msgstr ""
+msgstr "Nom vertadièr :"
 
-#: IdentityEditWidget#12
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:45
 msgid "The \"Real Name\" is shown in /whois."
 msgstr ""
 
-#: IdentityEditWidget#13
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:54
 msgid "Nicknames"
-msgstr ""
-
-#: IdentityEditWidget#14
-msgctxt "IdentityEditWidget#14"
+msgstr "Escaisses"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/identityeditwidget.ui:90
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
 msgid "Add Nickname"
 msgstr ""
 
-#: IdentityEditWidget#15
-msgctxt "IdentityEditWidget#15"
-msgid "&Add..."
-msgstr ""
-
-#: IdentityEditWidget#16
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:116
 msgid "Remove Nickname"
 msgstr ""
 
-#: IdentityEditWidget#17
-msgctxt "IdentityEditWidget#17"
-msgid "Remove"
-msgstr ""
-
-#: IdentityEditWidget#18
-msgctxt "IdentityEditWidget#18"
-msgid "Rename Identity"
-msgstr ""
-
-#: IdentityEditWidget#19
-msgctxt "IdentityEditWidget#19"
-msgid "Re&name..."
-msgstr ""
-
-#: IdentityEditWidget#20
-msgctxt "IdentityEditWidget#20"
+#. #-#-#-#-#  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
 msgid "Move upwards in list"
 msgstr ""
 
-#: IdentityEditWidget#21
-msgctxt "IdentityEditWidget#21"
-msgid "..."
-msgstr ""
-
-#: IdentityEditWidget#22
-msgctxt "IdentityEditWidget#22"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/identityeditwidget.ui:179
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/ui/simplenetworkeditor.ui:179
 msgid "Move downwards in list"
 msgstr ""
 
-#: IdentityEditWidget#23
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgid "A&way"
-msgstr ""
+msgstr "A&bséncia"
 
-#: IdentityEditWidget#24
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:233
 msgid "Default Away Settings"
 msgstr ""
 
-#: IdentityEditWidget#25
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:244
 msgid "Nick to be used when being away"
 msgstr ""
 
-#: IdentityEditWidget#26
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:254
 msgid "Default away reason"
 msgstr ""
 
-#: IdentityEditWidget#27
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:261
 msgid "Away Nick:"
 msgstr ""
 
-#: IdentityEditWidget#28
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:268
+#: ../src/qtui/settingspages/identityeditwidget.ui:297
+#: ../src/qtui/settingspages/identityeditwidget.ui:366
 msgid "Away Reason:"
 msgstr ""
 
-#: IdentityEditWidget#29
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:280
 msgid "Set away when all clients have detached from the core"
 msgstr ""
 
-#: IdentityEditWidget#30
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:283
 msgid "Away On Detach"
 msgstr ""
 
-#: IdentityEditWidget#31
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:315
 msgid "Not implemented yet"
 msgstr ""
 
-#: IdentityEditWidget#32
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:318
 msgid "Away On Idle"
 msgstr ""
 
-#: IdentityEditWidget#33
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:332
 msgid "Set away after"
 msgstr ""
 
-#: IdentityEditWidget#34
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:342
 msgid "minutes of being idle"
 msgstr ""
 
-#: IdentityEditWidget#35
+#. #-#-#-#-#  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
+msgid "Advanced"
+msgstr "Avançat"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:407
 msgid "Ident:"
 msgstr ""
 
-#: IdentityEditWidget#36
-msgid ""
-"The \"ident\" is part of your hostmask and, together with your host, "
-"uniquely identifies you within the IRC network."
+#. 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."
 msgstr ""
 
-#: IdentityEditWidget#37
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgid "Messages"
-msgstr ""
+msgstr "Messatges"
 
-#: IdentityEditWidget#38
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:431
 msgid "Part Reason:"
 msgstr ""
 
-#: IdentityEditWidget#39
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:444
 msgid "Quit Reason:"
 msgstr ""
 
-#: IdentityEditWidget#40
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:454
 msgid "Kick Reason:"
 msgstr ""
 
-#: IdentityEditWidget#41
-msgid ""
-"You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:488
+msgid "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
 msgstr ""
 
-#: IdentityEditWidget#42
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:517
 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!"
+"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 ""
 
-#: IdentityEditWidget#43
-msgctxt "IdentityEditWidget#43"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:546
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
-msgstr ""
+msgstr "Contunhar"
 
-#: IdentityEditWidget#44
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:584
 msgid "Use SSL Key"
-msgstr ""
+msgstr "Utilizar una clau SSL"
 
-#: IdentityEditWidget#45
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:598
 msgid "Key Type:"
+msgstr "Tipe de clau :"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:605
+#: ../src/qtui/settingspages/identityeditwidget.cpp:317
+#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+msgid "No Key loaded"
 msgstr ""
 
-#: IdentityEditWidget#46
+#. 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
+msgid "Load"
+msgstr "Cargar"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:637
 msgid "Use SSL Certificate"
-msgstr ""
+msgstr "Utilizar un certificat SSL"
 
-#: IdentityEditWidget#47
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:656
 msgid "Organisation:"
-msgstr ""
+msgstr "Organizacion :"
+
+#. 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
+msgid "No Certificate loaded"
+msgstr "Pas de Certificat cargat"
 
-#: IdentityEditWidget#48
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:690
 msgid "CommonName:"
-msgstr ""
+msgstr "Nom :"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+msgid "Load a Key"
+msgstr "Cargar una Clau"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+msgid "RSA"
+msgstr "RSA"
 
-#: IdentityPage#1
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+msgid "DSA"
+msgstr "DSA"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:330
+#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+msgid "Clear"
+msgstr "Netejar"
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+msgid "Load a Certificate"
+msgstr "Cargar un Certificat"
+
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:107
 msgid "Setup Identity"
-msgstr ""
+msgstr "Parametratge d'Identitat"
 
-#: IdentityPage#2
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:112
 msgid "Default Identity"
-msgstr ""
+msgstr "Identitat per defaut"
 
-#: IgnoreListEditDlg#1
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
 msgid "Configure Ignore Rule"
-msgstr ""
+msgstr "Configuracion d'una règla d'exclusion"
 
-#: IgnoreListEditDlg#2
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
 msgid ""
 "<p><b>Strictness:</b></p>\n"
 "<p><u>Dynamic:</u></p>\n"
 "<p>Messages are filtered \"on the fly\".\n"
-"Whenever you disable/delete the ignore rule, the messages are shown "
-"again.</p>\n"
+"Whenever you disable/delete the ignore rule, the messages are shown again.</p>\n"
 "<p><u>Permanent:</u></p>\n"
 "<p>Messages are filtered before they get stored in the database.</p>"
 msgstr ""
 
-#: IgnoreListEditDlg#3
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
 msgid "Strictness"
-msgstr ""
+msgstr "Restriccon"
 
-#: IgnoreListEditDlg#4
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
 msgid "Dynamic"
-msgstr ""
+msgstr "Dinamic"
 
-#: IgnoreListEditDlg#5
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
 msgid "Permanent"
-msgstr ""
+msgstr "Permanent"
 
-#: IgnoreListEditDlg#6
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
 msgid ""
 "<p><b>Rule Type:</b></p>\n"
 "<p><u>Sender:</u></p>\n"
@@ -2390,29 +2987,21 @@ msgid ""
 "<p>The rule is matched against the actual message content</p>"
 msgstr ""
 
-#: IgnoreListEditDlg#7
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
 msgid "Rule Type"
-msgstr ""
+msgstr "Tipe de règla"
 
-#: IgnoreListEditDlg#8
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
 msgid "Sender"
-msgstr ""
-
-#: IgnoreListEditDlg#9
-msgctxt "IgnoreListEditDlg#9"
-msgid "Message"
-msgstr ""
-
-#: IgnoreListEditDlg#10
-msgctxt "IgnoreListEditDlg#10"
-msgid "CTCP"
-msgstr ""
+msgstr "Expeditor"
 
-#: IgnoreListEditDlg#11
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
 msgid ""
 "<p><b>Ignore rule:</b></p>\n"
-"<p>Depending on the type of the rule, the text is matched against "
-"either:</p>\n"
+"<p>Depending on the type of the rule, the text is matched against either:</p>\n"
 "<p><u>- the message content:</u></p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
@@ -2422,66 +3011,79 @@ msgid ""
 "<br />\n"
 "- <i>*@foobar.com</i> matches any sender from host <i>foobar.com</i>\n"
 "<br />\n"
-"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> "
-"from any host</p>"
+"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
 msgstr ""
 
-#: IgnoreListEditDlg#12
-msgctxt "IgnoreListEditDlg#12"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
 msgid "Ignore Rule"
-msgstr ""
+msgstr "Règla d'exclusion"
 
-#: IgnoreListEditDlg#13
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:123
 msgid ""
 "<p><b>Use regular expressions:</b></p>\n"
 "<p>If enabled, rules follow regular expression syntax.</p>\n"
-"<p>Otherwise rules allow wildcard matching with the following special "
-"characters:</p>\n"
+"<p>Otherwise rules allow wildcard matching with the following special characters:</p>\n"
 "<p> *: representing \"any amount of any character\"\n"
 "<br />\n"
 "?: representing \"exactly one character\"</p>"
 msgstr ""
 
-#: IgnoreListEditDlg#14
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
 msgid "Regular expression"
-msgstr ""
+msgstr "Expression regulara"
 
-#: IgnoreListEditDlg#15
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
 "<p>The rule is active for any channel on any network</p>\n"
 "<p><u>Network:</u></p>\n"
-"<p>The list below is interpreted as a list of networks for which the rule "
-"should match</p>\n"
+"<p>The list below is interpreted as a list of networks for which the rule should match</p>\n"
 "<p><u>Channel:</u></p>\n"
-"<p>The list below is interpreted as a list of channels for which the rule "
-"should match</p>"
+"<p>The list below is interpreted as a list of channels for which the rule should match</p>"
 msgstr ""
 
-#: IgnoreListEditDlg#16
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
 msgid "Scope"
-msgstr ""
+msgstr "Portada"
 
-#: IgnoreListEditDlg#17
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
 msgid "Global"
-msgstr ""
-
-#: IgnoreListEditDlg#18
-msgctxt "IgnoreListEditDlg#18"
+msgstr "Totala"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
 msgid "Network"
-msgstr ""
-
-#: IgnoreListEditDlg#19
-msgctxt "IgnoreListEditDlg#19"
+msgstr "Ret"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
+#: ../src/client/irclistmodel.cpp:59
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
-#: IgnoreListEditDlg#20
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
 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"
+"<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
 "<i>#quassel*; #foobar</i>\n"
@@ -2489,7 +3091,8 @@ msgid ""
 "would match on #foobar and on any channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#: IgnoreListEditDlg#21
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -2497,2038 +3100,2379 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 
-#: IgnoreListEditDlg#22
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
 msgid "Rule is enabled"
-msgstr ""
+msgstr "Règla activada"
 
-#: IgnoreListModel#1
-msgid ""
-"<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
-"dynamic rules, disabling actually shows the filtered messages again"
+#. 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"
 msgstr ""
 
-#: IgnoreListModel#2
-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 />"
+#. 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 />"
 msgstr ""
 
-#: IgnoreListModel#3
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
 msgid "By Sender"
 msgstr ""
 
-#: IgnoreListModel#4
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
 msgid "By Message"
-msgstr ""
+msgstr "Per messatge"
 
-#: IgnoreListModel#5
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
 msgid "Enabled"
-msgstr ""
+msgstr "Activat"
 
-#: IgnoreListModel#6
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
 msgid "Type"
-msgstr ""
-
-#: IgnoreListModel#7
-msgctxt "IgnoreListModel#7"
-msgid "Ignore Rule"
-msgstr ""
+msgstr "Tipe"
 
-#: IgnoreListSettingsPage#1
-msgctxt "IgnoreListSettingsPage#1"
-msgid "IRC"
-msgstr ""
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+msgid "&Edit"
+msgstr "&Modificar"
 
-#: IgnoreListSettingsPage#2
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
 msgid "Ignore List"
-msgstr ""
+msgstr "Lista d'exclusion"
 
-#: IgnoreListSettingsPage#3
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
 msgid "Rule already exists"
 msgstr ""
 
-#: IgnoreListSettingsPage#4
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
 "Please choose another rule."
 msgstr ""
 
-#: IgnoreListSettingsPage#5
-msgctxt "IgnoreListSettingsPage#5"
-msgid "Form"
-msgstr ""
-
-#: IgnoreListSettingsPage#6
-msgctxt "IgnoreListSettingsPage#6"
-msgid "New"
-msgstr ""
-
-#: IgnoreListSettingsPage#7
-msgctxt "IgnoreListSettingsPage#7"
-msgid "Delete"
-msgstr ""
-
-#: IgnoreListSettingsPage#8
-msgid "&Edit"
-msgstr ""
-
-#: IndicatorNotificationConfigWidget#1
-msgctxt "IndicatorNotificationConfigWidget#1"
-msgid "Form"
-msgstr ""
-
-#: IndicatorNotificationConfigWidget#2
-msgid ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
+msgid "This enables support for the Ayatana Project's application indicator (libindicate)."
 msgstr ""
 
-#: IndicatorNotificationConfigWidget#3
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
 msgid "Show messages in application indicator"
 msgstr ""
 
-#: InputWidget#1
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
-msgstr ""
+msgstr "Blanc"
 
-#: InputWidget#2
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
-msgstr ""
+msgstr "Negre"
 
-#: InputWidget#3
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
-msgstr ""
+msgstr "Blau escur"
 
-#: InputWidget#4
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
-msgstr ""
+msgstr "Verd escur"
 
-#: InputWidget#5
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
-msgstr ""
+msgstr "Roge"
 
-#: InputWidget#6
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
-msgstr ""
+msgstr "Roge escur"
 
-#: InputWidget#7
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
-msgstr ""
+msgstr "Magènta escur"
 
-#: InputWidget#8
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
-msgstr ""
+msgstr "Irange"
 
-#: InputWidget#9
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
-msgstr ""
+msgstr "Jaune"
 
-#: InputWidget#10
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
-msgstr ""
+msgstr "Verd"
 
-#: InputWidget#11
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
-msgstr ""
+msgstr "Cian escur"
 
-#: InputWidget#12
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
-msgstr ""
+msgstr "Cian"
 
-#: InputWidget#13
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
-msgstr ""
+msgstr "Blau"
 
-#: InputWidget#14
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
-msgstr ""
+msgstr "Magènta"
 
-#: InputWidget#15
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
-msgstr ""
+msgstr "Gris escur"
 
-#: InputWidget#16
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Light gray"
-msgstr ""
+msgstr "Gris clar"
 
-#: InputWidget#17
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr ""
 
-#: InputWidget#18
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr ""
 
-#: InputWidget#19
-msgid "Ctrl+L"
-msgstr ""
-
-#: InputWidget#20
-msgctxt "InputWidget#20"
-msgid "Form"
-msgstr ""
-
-#: InputWidgetSettingsPage#1
-msgctxt "InputWidgetSettingsPage#1"
-msgid "Interface"
-msgstr ""
-
-#: InputWidgetSettingsPage#2
-msgid "Input Widget"
-msgstr ""
-
-#: InputWidgetSettingsPage#3
-msgctxt "InputWidgetSettingsPage#3"
-msgid "Form"
-msgstr ""
-
-#: InputWidgetSettingsPage#4
-msgctxt "InputWidgetSettingsPage#4"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context InputWidgetSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ItemViewSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:22
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
 msgid "Custom font:"
-msgstr ""
+msgstr "Poliça personalizada :"
 
-#: InputWidgetSettingsPage#5
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgid "Enable spell check"
-msgstr ""
+msgstr "Activar la correccion d'ortografia"
 
-#: InputWidgetSettingsPage#6
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
 msgid "Enable per chat history"
 msgstr ""
 
-#: InputWidgetSettingsPage#7
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
 msgid "Show nick selector"
-msgstr ""
+msgstr "Afichar lo selector d'escais"
 
-#: InputWidgetSettingsPage#8
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
 msgid "Show style buttons"
 msgstr ""
 
-#: InputWidgetSettingsPage#9
-msgid "Multi-Line Editing"
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
-#: InputWidgetSettingsPage#10
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+msgid "Multi-Line Editing"
+msgstr "Edicion multilinhas"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr ""
 
-#: InputWidgetSettingsPage#11
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
-msgstr ""
+msgstr "linhas"
 
-#: InputWidgetSettingsPage#12
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
-msgstr ""
+msgstr "Activar los ascensors"
 
-#: InputWidgetSettingsPage#13
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
-msgstr ""
+msgstr "Complement amb l'ajuda de la tòca Tab"
 
-#: InputWidgetSettingsPage#14
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
-msgstr ""
+msgstr "Sufix per completar :"
 
-#: InputWidgetSettingsPage#15
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
-msgstr ""
+msgstr ": "
 
-#: IrcConnectionWizard#1
-msgid "Save && Connect"
-msgstr ""
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+msgid "Input Widget"
+msgstr "Widget de picada"
 
-#: IrcListModel#1
-msgctxt "IrcListModel#1"
-msgid "Channel"
-msgstr ""
+#. ts-context IrcConnectionWizard
+#: ../src/qtui/ircconnectionwizard.cpp:51
+msgid "Save && Connect"
+msgstr "Salva && Connècta"
 
-#: IrcListModel#2
+#. ts-context IrcListModel
+#: ../src/client/irclistmodel.cpp:60
 msgid "Users"
-msgstr ""
-
-#: IrcListModel#3
-msgctxt "IrcListModel#3"
+msgstr "Utilizaires"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcListModel
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkModel
+#: ../src/client/irclistmodel.cpp:61
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
+msgstr "Subjècte"
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
 msgstr ""
 
-#: IrcServerHandler#1
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
-msgstr ""
+msgstr "%1 a cambiat lo subjècte de  %2 en : \"%3\""
 
-#: IrcServerHandler#2
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr ""
 
-#: IrcServerHandler#3
-msgid ""
-"Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected "
-"behavior!"
-msgstr ""
-
-#: IrcServerHandler#4
-msgctxt "IrcServerHandler#4"
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:642
+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
+#. ----------
+#. Invite Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
-msgstr ""
+msgstr "%1"
 
-#: IrcServerHandler#5
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
-msgstr ""
+msgstr "[Whois] %1 es absent : \"%2\""
 
-#: IrcServerHandler#6
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
-msgstr ""
-
-#: IrcServerHandler#7
+msgstr "%1 es absent : \"%2\""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
-msgstr ""
+msgstr "[Whois] %1"
 
-#: IrcServerHandler#8
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
-msgstr ""
+msgstr "[Whois] %1 es %2 (%3)"
 
-#: IrcServerHandler#9
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
-msgstr ""
+msgstr "%1 es connectat per %2 (%3)"
 
-#: IrcServerHandler#10
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
-msgstr ""
+msgstr "[Whowas] %1"
 
-#: IrcServerHandler#11
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
-msgstr ""
+msgstr "[Whowas] %1 èra %2 (%3)"
 
-#: IrcServerHandler#12
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
-msgstr ""
+msgstr "[Who] Fin de la lista  /WHO per %1"
 
-#: IrcServerHandler#13
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
-msgstr ""
+msgstr "[Whois] %1 es connecté dempuèi %2"
 
-#: IrcServerHandler#14
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr ""
 
-#: IrcServerHandler#15
-msgid "[Whois] idle message: %1"
-msgstr ""
-
-#: IrcServerHandler#16
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
-#: IrcServerHandler#17
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
-#: IrcServerHandler#18
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
-#: IrcServerHandler#19
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr ""
 
-#: IrcServerHandler#20
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
-msgstr ""
+msgstr "Fin de la lista dels canals"
 
-#: IrcServerHandler#21
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
-msgstr ""
+msgstr "La pagina d'acuèlh de %1 es %2"
 
-#: IrcServerHandler#22
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
-msgstr ""
+msgstr "Canal %1 creat sus %2"
 
-#: IrcServerHandler#23
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
-msgstr ""
+msgstr "Pas de subjècte per %1."
 
-#: IrcServerHandler#24
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
-msgstr ""
+msgstr "Lo subjècte per %1 es \"%2\""
 
-#: IrcServerHandler#25
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
+msgstr "Subjècte mes per %1 lo %2"
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
 msgstr ""
 
-#: IrcServerHandler#26
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
-msgstr ""
+msgstr "[Who] %1"
 
-#: IrcServerHandler#27
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
-#: IrcServerHandler#28
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr ""
 
-#: IrcServerHandler#29
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
-#: IrcServerHandler#30
-msgid ""
-"No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1270
+msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr ""
 
-#: IrcUserItem#1
-msgctxt "IrcUserItem#1"
-msgid "idling since %1"
-msgstr ""
+#. ts-context IrcUserItem
+#: ../src/client/networkmodel.cpp:806
+#, fuzzy
+msgid " is away"
+msgstr "%1 es absent : \"%2\""
 
-#: IrcUserItem#2
-msgctxt "IrcUserItem#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
+msgid "idling since %1"
+msgstr "inactiu dempuèi %1"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr ""
 
-#: IrcUserItem#3
-msgctxt "IrcUserItem#3"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcUserItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
-msgstr ""
+msgstr "servidor : %1"
 
-#: ItemViewSettingsPage#1
-msgctxt "ItemViewSettingsPage#1"
-msgid "Interface"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:50
+msgid "Show icons"
+msgstr "Afichar las icònas"
 
-#: ItemViewSettingsPage#2
-msgid "Chat & Nick Lists"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:66
+msgid "Chat List"
+msgstr "Vista"
 
-#: ItemViewSettingsPage#3
-msgctxt "ItemViewSettingsPage#3"
-msgid "Network"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:72
+msgid "Display topic in tooltip"
 msgstr ""
 
-#: ItemViewSettingsPage#4
-msgid "Inactive"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:85
+msgid "Mouse wheel changes selected chat"
 msgstr ""
 
-#: ItemViewSettingsPage#5
-msgid "Normal"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:101
+msgid "Use Custom Colors"
 msgstr ""
 
-#: ItemViewSettingsPage#6
-msgid "Unread messages"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+msgid "Standard:"
+msgstr "Estandard :"
 
-#: ItemViewSettingsPage#7
-msgctxt "ItemViewSettingsPage#7"
-msgid "Highlight"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+msgid "Inactive:"
+msgstr "Inactiu :"
 
-#: ItemViewSettingsPage#8
-msgid "Other activity"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+msgid "Unread messages:"
+msgstr "Messatges pas legits :"
 
-#: ItemViewSettingsPage#9
-msgctxt "ItemViewSettingsPage#9"
-msgid "Form"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+msgid "Highlight:"
 msgstr ""
 
-#: ItemViewSettingsPage#10
-msgctxt "ItemViewSettingsPage#10"
-msgid "Custom font:"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+msgid "Other activity:"
+msgstr "Autre activitat :"
 
-#: ItemViewSettingsPage#11
-msgid "Show icons"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
+msgid "1"
+msgstr "1"
 
-#: ItemViewSettingsPage#12
-msgid "Chat List"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+msgid "Custom Nick List Colors"
 msgstr ""
 
-#: ItemViewSettingsPage#13
-msgid "Display topic in tooltip"
-msgstr ""
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+msgid "Online:"
+msgstr "En linha :"
 
-#: ItemViewSettingsPage#14
-msgid "Mouse wheel changes selected chat"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+msgid "Away:"
+msgstr "Absent :"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+msgid "Chat & Nick Lists"
 msgstr ""
 
-#: ItemViewSettingsPage#15
-msgid "Use Custom Colors"
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+msgid "Inactive"
+msgstr "Inactiva"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+msgid "Normal"
+msgstr "Normala"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+msgid "Unread messages"
+msgstr "Messatges pas legits"
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+msgid "Other activity"
+msgstr "Autra activitat"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context KNotificationBackend
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SystrayNotificationBackend
+#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/systraynotificationbackend.cpp:125
+msgid "%n pending highlights"
+msgid_plural "%n pending highlights"
+msgstr[0] ""
+msgstr[1] ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
-#: ItemViewSettingsPage#16
-msgid "Standard:"
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
 msgstr ""
 
-#: ItemViewSettingsPage#17
-msgctxt "ItemViewSettingsPage#17"
-msgid "..."
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr ""
 
-#: ItemViewSettingsPage#18
-msgid "Inactive:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
 msgstr ""
 
-#: ItemViewSettingsPage#19
-msgid "Unread messages:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+msgctxt "Ctrl key"
+msgid "Ctrl"
 msgstr ""
 
-#: ItemViewSettingsPage#20
-msgid "Highlight:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Totes"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
 msgstr ""
 
-#: ItemViewSettingsPage#21
-msgid "Other activity:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
 msgstr ""
 
-#: ItemViewSettingsPage#22
-msgid "1"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Pas cap"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
 msgstr ""
 
-#: ItemViewSettingsPage#23
-msgid "Custom Nick List Colors"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
 msgstr ""
 
-#: ItemViewSettingsPage#24
-msgid "Online:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
 msgstr ""
 
-#: ItemViewSettingsPage#25
-msgid "Away:"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
 msgstr ""
 
-#: KNotificationBackend#1
-msgctxt "KNotificationBackend#1"
-msgid "%n pending highlights"
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
 msgstr ""
 
-#: MainWin#1
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr ""
 
-#: MainWin#2
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr ""
 
-#: MainWin#3
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr ""
 
-#: MainWin#4
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
-msgstr ""
+msgstr "Configurar las &Rets..."
 
-#: MainWin#5
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
-msgstr ""
-
-#: MainWin#6
-msgid "Ctrl+Q"
-msgstr ""
+msgstr "&Quitar"
 
-#: MainWin#7
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
-msgstr ""
+msgstr "&Configurar las Vistas..."
 
-#: MainWin#8
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
-msgstr ""
+msgstr "&Blocar la disposicion"
 
-#: MainWin#9
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
-msgstr ""
+msgstr "Afichar la barra de &recèrca"
 
-#: MainWin#10
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr ""
 
-#: MainWin#11
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
-msgstr ""
-
-#: MainWin#12
-msgid "Ctrl+M"
-msgstr ""
+msgstr "Afichar la barra de &menuts"
 
-#: MainWin#13
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
-msgstr ""
+msgstr "Afichar la Barra d'&Estat"
 
-#: MainWin#14
-msgid "&Configure Quassel..."
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
 msgstr ""
 
-#: MainWin#15
-msgid "F7"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "Configurar las &Rets..."
 
-#: MainWin#16
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
+msgid "&Configure Quassel..."
+msgstr "&Configurar Quassel..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
-msgstr ""
+msgstr "&A prepaus de Quassel"
 
-#: MainWin#17
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
-msgstr ""
+msgstr "A prepaus de &Qt"
 
-#: MainWin#18
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr ""
 
-#: MainWin#19
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
-#: MainWin#20
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr ""
 
-#: MainWin#21
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr ""
 
-#: MainWin#22
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr ""
 
-#: MainWin#23
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr ""
 
-#: MainWin#24
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "Organizacion :"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
-msgstr ""
+msgstr "Anar al Hot Chat"
 
-#: MainWin#25
-msgid "&File"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
 msgstr ""
 
-#: MainWin#26
-msgid "&Networks"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
 msgstr ""
 
-#: MainWin#27
-msgid "&View"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
 msgstr ""
 
-#: MainWin#28
-msgid "&Chat Lists"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
 msgstr ""
 
-#: MainWin#29
-msgid "&Toolbars"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
 msgstr ""
 
-#: MainWin#30
-msgid "&Settings"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
 msgstr ""
 
-#: MainWin#31
-msgid "&Help"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
 msgstr ""
 
-#: MainWin#32
-msgid "Debug"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
 msgstr ""
 
-#: MainWin#33
-msgid "Nicks"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
 msgstr ""
 
-#: MainWin#34
-msgid "Show Nick List"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
 msgstr ""
 
-#: MainWin#35
-msgctxt "MainWin#35"
-msgid "Chat Monitor"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
 msgstr ""
 
-#: MainWin#36
-msgid "Show Chat Monitor"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
 msgstr ""
 
-#: MainWin#37
-msgid "Inputline"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
 msgstr ""
 
-#: MainWin#38
-msgid "Show Input Line"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
 msgstr ""
 
-#: MainWin#39
-msgctxt "MainWin#39"
-msgid "Topic"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
 msgstr ""
 
-#: MainWin#40
-msgid "Show Topic Line"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
 msgstr ""
 
-#: MainWin#41
-msgid "Main Toolbar"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
 msgstr ""
 
-#: MainWin#42
-msgid "Connected to core."
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
 msgstr ""
 
-#: MainWin#43
-msgid "Not connected to core."
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
 msgstr ""
 
-#: MainWin#44
-msgid "Unencrypted Connection"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
 msgstr ""
 
-#: MainWin#45
-msgid "<b>Your client does not support SSL encryption</b>"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "Suprimir la Vista ?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
 msgstr ""
 
-#: MainWin#46
-msgid ""
-"Sensitive data, like passwords, will be transmitted unencrypted to your "
-"Quassel core."
-msgstr ""
-
-#: MainWin#47
-msgid "<b>Your core does not support SSL encryption</b>"
-msgstr ""
-
-#: MainWin#48
-msgid "Untrusted Security Certificate"
-msgstr ""
-
-#: MainWin#49
-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:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "Dialogar"
 
-#: MainWin#50
-msgctxt "MainWin#50"
-msgid "Continue"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "Dialogar"
 
-#: MainWin#51
-msgid "Show Certificate"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
+msgid "&File"
+msgstr "&Fichièr"
 
-#: MainWin#52
-msgid ""
-"Would you like to accept this certificate forever without being prompted?"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:454
+msgid "&Networks"
+msgstr "&Rets"
 
-#: MainWin#53
-msgid "Current Session Only"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:460
+msgid "&View"
+msgstr "Aficha&tge"
 
-#: MainWin#54
-msgid "Forever"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:461
+msgid "&Chat Lists"
+msgstr "&Vistas"
 
-#: MainWin#55
-msgid "Core Connection Error"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:463
+msgid "&Toolbars"
+msgstr "&Barra d'espleches"
 
-#: MessageModel#1
-msgid "Requesting %1 messages from backlog for buffer %2:%3"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:477
+msgid "&Settings"
+msgstr "&Configuracion"
 
-#: MsgProcessorStatusWidget#1
-msgctxt "MsgProcessorStatusWidget#1"
-msgid "Form"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:486
+msgid "&Help"
+msgstr "&Ajuda"
 
-#: MsgProcessorStatusWidget#2
-msgid "Receiving Backlog"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:494
+msgid "Debug"
+msgstr "Desbugatge"
 
-#: MultiLineEdit#1
-msgid "Do you really want to paste %n lines?"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:723
+msgid "Nicks"
+msgstr "Escaisses"
 
-#: MultiLineEdit#2
-msgid "Paste Protection"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:732
+msgid "Show Nick List"
 msgstr ""
 
-#: NetworkAddDlg#1
-msgctxt "NetworkAddDlg#1"
-msgid "Add Network"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:755
+msgid "Show Chat Monitor"
 msgstr ""
 
-#: NetworkAddDlg#2
-msgid "Use preset:"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:759
+msgid "Inputline"
 msgstr ""
 
-#: NetworkAddDlg#3
-msgid "Manually specify network settings"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:768
+msgid "Show Input Line"
 msgstr ""
 
-#: NetworkAddDlg#4
-msgid "Manual Settings"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:793
+msgid "Show Topic Line"
 msgstr ""
 
-#: NetworkAddDlg#5
-msgctxt "NetworkAddDlg#5"
-msgid "Network name:"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:871
+msgid "Main Toolbar"
+msgstr "Barra d'espleches principala"
 
-#: NetworkAddDlg#6
-msgctxt "NetworkAddDlg#6"
-msgid "Server address:"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:910
+msgid "Connected to core."
 msgstr ""
 
-#: NetworkAddDlg#7
-msgctxt "NetworkAddDlg#7"
-msgid "Port:"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1001
+msgid "Not connected to core."
 msgstr ""
 
-#: NetworkAddDlg#8
-msgid "Server password:"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
+msgid "Unencrypted Connection"
 msgstr ""
 
-#: NetworkAddDlg#9
-msgid "Use secure connection"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015
+msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
-#: NetworkEditDlg#1
-msgctxt "NetworkEditDlg#1"
-msgid "Dialog"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
+msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr ""
 
-#: NetworkEditDlg#2
-msgid "Please enter a network name:"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1023
+msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
-#: NetworkEditDlg#3
-msgctxt "NetworkEditDlg#3"
-msgid "Add Network"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
+msgid "Untrusted Security Certificate"
 msgstr ""
 
-#: NetworkItem#1
-msgid "Server: %1"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1041
+msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr ""
 
-#: NetworkItem#2
-msgctxt "NetworkItem#2"
-msgid "Users: %1"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1045
+msgid "Show Certificate"
 msgstr ""
 
-#: NetworkItem#3
-msgctxt "NetworkItem#3"
-msgid "Lag: %1 msecs"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1061
+msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
-#: NetworkModel#1
-msgid "Chat"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1063
+msgid "Current Session Only"
 msgstr ""
 
-#: NetworkModel#2
-msgctxt "NetworkModel#2"
-msgid "Topic"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1064
+msgid "Forever"
+msgstr "Indefinidament"
 
-#: NetworkModel#3
-msgid "Nick Count"
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1073
+msgid "Core Connection Error"
 msgstr ""
 
-#: NetworkModelController#1
-msgid "Do you want to delete the following buffer(s) permanently?"
-msgstr ""
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+#, fuzzy
+msgid "&Normal mode"
+msgstr "Normala"
 
-#: NetworkModelController#2
-msgid "...and <b>%1</b> more<br><br>"
+#. ts-context MessageModel
+#: ../src/client/messagemodel.cpp:375
+msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr ""
 
-#: NetworkModelController#3
-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 MsgProcessorStatusWidget
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+msgid "Receiving Backlog"
+msgstr "Recepcion de l'istoric"
 
-#: NetworkModelController#4
-msgid ""
-"<br>Active channel buffers cannot be deleted, please part the channel first."
-msgstr ""
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:661
+msgid "Do you really want to paste %n lines?"
+msgid_plural "Do you really want to paste %n lines?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: NetworkModelController#5
-msgid "Remove buffers permanently?"
-msgstr ""
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:670
+msgid "Paste Protection"
+msgstr "Proteccion Empegament"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:14
+#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+msgid "Add Network"
+msgstr "Apondre una ret"
 
-#: NetworkModelController::JoinDlg#1
-msgid "Join Channel"
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:22
+msgid "Use preset:"
 msgstr ""
 
-#: NetworkModelController::JoinDlg#2
-msgctxt "NetworkModelController::JoinDlg#2"
-msgid "Network:"
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:57
+msgid "Manually specify network settings"
 msgstr ""
 
-#: NetworkModelController::JoinDlg#3
-msgid "Channel:"
-msgstr ""
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:67
+msgid "Manual Settings"
+msgstr "Parametratge manual"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkadddlg.ui:75
+#: ../src/qtui/ui/simplenetworkeditor.ui:28
+msgid "Network name:"
+msgstr "Nom de la ret :"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkAddDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:85
+#: ../src/qtui/settingspages/servereditdlg.ui:38
+msgid "Server address:"
+msgstr "Adreça del servidor :"
 
-#: NetworkModelController::JoinDlg#4
-msgctxt "NetworkModelController::JoinDlg#4"
-msgid "Password:"
-msgstr ""
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:115
+msgid "Server password:"
+msgstr "Senhal del servidor :"
 
-#: NetworkPage#1
-msgid "Setup Network Connection"
-msgstr ""
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:131
+msgid "Use secure connection"
+msgstr "Utilizar una connexion securizada"
 
-#: NetworksSettingsPage#1
-msgctxt "NetworksSettingsPage#1"
-msgid "IRC"
+#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkeditdlg.ui:21
+msgid "Please enter a network name:"
 msgstr ""
 
-#: NetworksSettingsPage#2
-msgid "Networks"
-msgstr ""
+#. ts-context NetworkItem
+#: ../src/client/networkmodel.cpp:196
+msgid "Server: %1"
+msgstr "Servidor : %1"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/client/networkmodel.cpp:197
+#: ../src/qtui/topicwidget.cpp:106
+msgid "Users: %1"
+msgstr "Utilizaires : %1"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworkItem
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context TopicWidget
+#: ../src/client/networkmodel.cpp:200
+#: ../src/qtui/topicwidget.cpp:107
+msgid "Lag: %1 msecs"
+msgstr "Lag : %1 ms"
 
-#: NetworksSettingsPage#3
-msgctxt "NetworksSettingsPage#3"
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
-msgstr ""
+#. ts-context NetworkModel
+#: ../src/client/networkmodel.cpp:852
+msgid "Chat"
+msgstr "Messatjariá instantanèa (chat)"
 
-#: NetworksSettingsPage#4
-msgid "<li>All networks need at least one server defined</li>"
-msgstr ""
+#. ts-context NetworkModel
+#: ../src/client/networkmodel.cpp:852
+msgid "Nick Count"
+msgstr "Nombre d'Escaisses"
 
-#: NetworksSettingsPage#5
-msgctxt "NetworksSettingsPage#5"
-msgid "</ul>"
-msgstr ""
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:154
+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] ""
+msgstr[1] ""
 
-#: NetworksSettingsPage#6
-msgid "Invalid Network Settings"
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:167
+msgid "...and <b>%1</b> more<br><br>"
 msgstr ""
 
-#: NetworksSettingsPage#7
-msgid "Delete Network?"
+#. 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."
 msgstr ""
 
-#: NetworksSettingsPage#8
-msgid ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:170
+msgid "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 
-#: NetworksSettingsPage#9
-msgctxt "NetworksSettingsPage#9"
-msgid "Form"
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:172
+msgid "Remove buffers permanently?"
 msgstr ""
 
-#: NetworksSettingsPage#10
-msgctxt "NetworksSettingsPage#10"
-msgid "Re&name..."
-msgstr ""
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:484
+msgid "Join Channel"
+msgstr "Rejónher lo canal"
 
-#: NetworksSettingsPage#11
-msgctxt "NetworksSettingsPage#11"
-msgid "&Add..."
-msgstr ""
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:489
+msgid "Channel:"
+msgstr "Canal :"
 
-#: NetworksSettingsPage#12
-msgctxt "NetworksSettingsPage#12"
-msgid "De&lete"
+#. ts-context NetworkPage
+#: ../src/qtui/ircconnectionwizard.cpp:148
+msgid "Setup Network Connection"
 msgstr ""
 
-#: NetworksSettingsPage#13
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgid "Network Details"
 msgstr ""
 
-#: NetworksSettingsPage#14
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:132
 msgid "Identity:"
-msgstr ""
-
-#: NetworksSettingsPage#15
-msgctxt "NetworksSettingsPage#15"
-msgid "..."
-msgstr ""
-
-#: NetworksSettingsPage#16
-msgctxt "NetworksSettingsPage#16"
+msgstr "Identitat :"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:190
+#: ../src/qtui/ui/simplenetworkeditor.ui:63
 msgid "Servers"
-msgstr ""
+msgstr "Servidors"
 
-#: NetworksSettingsPage#17
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:193
 msgid "Manage servers for this network"
 msgstr ""
 
-#: NetworksSettingsPage#18
-msgctxt "NetworksSettingsPage#18"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context NetworksSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/settingspages/networkssettingspage.ui:217
+#: ../src/qtui/ui/simplenetworkeditor.ui:99
 msgid "&Edit..."
-msgstr ""
+msgstr "&Modificar..."
 
-#: NetworksSettingsPage#19
-msgctxt "NetworksSettingsPage#19"
-msgid "Move upwards in list"
-msgstr ""
-
-#: NetworksSettingsPage#20
-msgctxt "NetworksSettingsPage#20"
-msgid "Move downwards in list"
-msgstr ""
-
-#: NetworksSettingsPage#21
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:337
 msgid "Commands"
-msgstr ""
+msgstr "Comandas"
 
-#: NetworksSettingsPage#22
-msgid ""
-"Configure automatic identification or misc. commands to be executed after "
-"connecting to a server"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:340
+msgid "Configure automatic identification or misc. commands to be executed after connecting to a server"
 msgstr ""
 
-#: NetworksSettingsPage#23
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgid "Commands to execute on connect:"
 msgstr ""
 
-#: NetworksSettingsPage#24
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:362
 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 ""
-
-#: NetworksSettingsPage#25
-msgctxt "NetworksSettingsPage#25"
-msgid "Connection"
+"Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
 msgstr ""
 
-#: NetworksSettingsPage#26
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:383
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 
-#: NetworksSettingsPage#27
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:386
 msgid "Automatic Reconnect"
-msgstr ""
+msgstr "Connexion automatica"
 
-#: NetworksSettingsPage#28
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:397
 msgid "Wait"
-msgstr ""
+msgstr "Esperar"
 
-#: NetworksSettingsPage#29
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:404
 msgid " s"
-msgstr ""
+msgstr " s"
 
-#: NetworksSettingsPage#30
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:420
 msgid "between retries"
 msgstr ""
 
-#: NetworksSettingsPage#31
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:444
 msgid "Number of retries:"
-msgstr ""
-
-#: NetworksSettingsPage#32
-msgctxt "NetworksSettingsPage#32"
-msgid "Unlimited"
-msgstr ""
+msgstr "Nombre de temptativas :"
 
-#: NetworksSettingsPage#33
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:489
 msgid "Rejoin all channels after reconnect"
 msgstr ""
 
-#: NetworksSettingsPage#34
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:516
+#: ../src/qtui/settingspages/networkssettingspage.ui:525
 msgid "Auto Identify"
 msgstr ""
 
-#: NetworksSettingsPage#35
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:540
 msgid "NickServ"
-msgstr ""
+msgstr "NickServ"
 
-#: NetworksSettingsPage#36
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:557
 msgid "Service:"
-msgstr ""
+msgstr "Servici :"
 
-#: NetworksSettingsPage#37
-msgctxt "NetworksSettingsPage#37"
-msgid "Password:"
-msgstr ""
-
-#: NetworksSettingsPage#38
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:580
 msgid "Use SASL Authentication"
 msgstr ""
 
-#: NetworksSettingsPage#39
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:625
 msgid "Account:"
-msgstr ""
+msgstr "Compte :"
 
-#: NetworksSettingsPage#40
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:649
 msgid "Encodings"
-msgstr ""
+msgstr "Encodatges"
 
-#: NetworksSettingsPage#41
-msgid ""
-"Configure advanced settings such as message encodings and automatic reconnect"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:652
+msgid "Configure advanced settings such as message encodings and automatic reconnect"
 msgstr ""
 
-#: NetworksSettingsPage#42
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:661
 msgid "Control encodings for in- and outgoing messages"
 msgstr ""
 
-#: NetworksSettingsPage#43
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:664
 msgid "Use Custom Encodings"
 msgstr ""
 
-#: NetworksSettingsPage#44
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
+#: ../src/qtui/settingspages/networkssettingspage.ui:695
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
 msgstr ""
 
-#: NetworksSettingsPage#45
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:679
 msgid "Send messages in:"
 msgstr ""
 
-#: NetworksSettingsPage#46
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:706
+#: ../src/qtui/settingspages/networkssettingspage.ui:726
 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 ""
 
-#: NetworksSettingsPage#47
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:710
 msgid "Receive fallback:"
 msgstr ""
 
-#: NetworksSettingsPage#48
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:737
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
 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 ""
 
-#: NetworksSettingsPage#49
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:741
 msgid "Server encoding:"
+msgstr "Encodatge del servidor :"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgid "Networks"
+msgstr "Rets"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+msgid "<li>All networks need at least one server defined</li>"
 msgstr ""
 
-#: NickEditDlg#1
-msgctxt "NickEditDlg#1"
-msgid "Add Nickname"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+msgid "Invalid Network Settings"
+msgstr "Paramètres da la ret invalids"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+msgid "Delete Network?"
 msgstr ""
 
-#: NickEditDlg#2
-msgid "Edit Nickname"
+#. 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?"
 msgstr ""
 
-#: NickEditDlg#3
-msgid "Please enter a valid nickname:"
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/nickeditdlg.ui:13
+msgid "Edit Nickname"
 msgstr ""
 
-#: NickEditDlg#4
-msgid ""
-"A valid nickname may contain letters from the English alphabet, digits, and "
-"the special characters {, }, [, ], \\, |, `, ^, _ and -."
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/nickeditdlg.ui:19
+msgid "Please enter a valid nickname:"
 msgstr ""
 
-#: NotificationsSettingsPage#1
-msgctxt "NotificationsSettingsPage#1"
-msgid "Interface"
+#. 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 -."
 msgstr ""
 
-#: NotificationsSettingsPage#2
+#. ts-context NotificationsSettingsPage
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
 msgid "Notifications"
-msgstr ""
+msgstr "Notificacions"
 
-#: PhononNotificationBackend::ConfigWidget#1
+#. ts-context PhononNotificationBackend::ConfigWidget
+#: ../src/qtui/phononnotificationbackend.cpp:143
 msgid "Select Audio File"
 msgstr ""
 
-#: PhononNotificationConfigWidget#1
-msgctxt "PhononNotificationConfigWidget#1"
-msgid "Form"
-msgstr ""
-
-#: PhononNotificationConfigWidget#2
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
 msgid "Play a sound"
-msgstr ""
+msgstr "Jogar un son"
 
-#: PhononNotificationConfigWidget#3
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
 msgid "Prelisten to the selected sound"
 msgstr ""
 
-#: PhononNotificationConfigWidget#4
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
 msgid "Select the sound file to play"
 msgstr ""
 
-#: PostgreSqlStorage#1
+#. ts-context PostgreSqlStorage
+#: ../src/core/postgresqlstorage.cpp:62
 msgid "PostgreSQL Turbo Bomber HD!"
-msgstr ""
+msgstr "PostgreSQL Turbo Bomber HD!"
 
-#: QObject#1
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:82
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr ""
 
-#: QObject#2
-msgid ""
-"Requesting up to %1 of all unread backlog messages (plus additional %2)"
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:106
+msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 
-#: QObject#3
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:123
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr ""
 
-#: QObject#4
+#. ts-context QObject
+#: ../src/qtui/ircconnectionwizard.cpp:56
 msgid "Welcome to Quassel IRC"
-msgstr ""
+msgstr "Benvenguda sus Quassel IRC"
 
-#: QObject#5
-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."
+#. 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."
 msgstr ""
 
-#: QssParser#1
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:121
+#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
-#: QssParser#2
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:140
 msgid "Invalid palette role assignment: %1"
 msgstr ""
 
-#: QssParser#3
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:156
 msgid "Unknown palette role name: %1"
 msgstr ""
 
-#: QssParser#4
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:192
 msgid "Invalid subelement name in %1"
 msgstr ""
 
-#: QssParser#5
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr ""
 
-#: QssParser#6
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
-msgstr ""
+msgstr "Condicion invalida %1"
 
-#: QssParser#7
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr ""
 
-#: QssParser#8
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
-#: QssParser#9
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
-#: QssParser#10
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
-msgstr ""
+msgstr "Format de nom invalid : %1"
 
-#: QssParser#11
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
-#: QssParser#12
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
-#: QssParser#13
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
-#: QssParser#14
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
-#: QssParser#15
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
-#: QssParser#16
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
-#: QssParser#17
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
-#: QssParser#18
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
-#: QssParser#19
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
-#: QssParser#20
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
-#: QssParser#21
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
-#: QssParser#22
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
-#: QssParser#23
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
-msgstr ""
+msgstr "Poliça invalida : %1"
 
-#: QssParser#24
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
-#: QssParser#25
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
-msgstr ""
+msgstr "Largor de poliça invalida : %1"
 
-#: QssParser#26
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
-msgstr ""
+msgstr "Talha de poliça invalida : %1"
 
-#: Quassel::secondsToString()#1
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:145
 msgid "year"
-msgstr ""
+msgstr "annada"
 
-#: Quassel::secondsToString()#2
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:146
 msgid "day"
-msgstr ""
+msgstr "jorn"
 
-#: Quassel::secondsToString()#3
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:147
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#: Quassel::secondsToString()#4
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:148
 msgid "min"
-msgstr ""
+msgstr "min"
 
-#: Quassel::secondsToString()#5
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:149
 msgid "sec"
-msgstr ""
+msgstr "seg"
 
-#: QueryBufferItem#1
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
-msgstr ""
+msgstr "<b>Demanda a %1</b>"
 
-#: QueryBufferItem#2
-msgctxt "QueryBufferItem#2"
-msgid "idling since %1"
-msgstr ""
-
-#: QueryBufferItem#3
-msgctxt "QueryBufferItem#3"
-msgid "login time: %1"
-msgstr ""
-
-#: QueryBufferItem#4
-msgctxt "QueryBufferItem#4"
-msgid "server: %1"
-msgstr ""
-
-#: SaveIdentitiesDlg#1
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgid "Sync With Core"
 msgstr ""
 
-#: SaveIdentitiesDlg#2
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:21
 msgid "Syncing data with core, please wait..."
 msgstr ""
 
-#: SaveIdentitiesDlg#3
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:81
 msgid "Abort"
-msgstr ""
-
-#: ServerEditDlg#1
-msgctxt "ServerEditDlg#1"
-msgid "Dialog"
-msgstr ""
+msgstr "Abandonar"
 
-#: ServerEditDlg#2
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:30
 msgid "Server Info"
-msgstr ""
+msgstr "Informacion servidor"
 
-#: ServerEditDlg#3
-msgctxt "ServerEditDlg#3"
-msgid "Server address:"
-msgstr ""
-
-#: ServerEditDlg#4
-msgctxt "ServerEditDlg#4"
-msgid "Port:"
-msgstr ""
-
-#: ServerEditDlg#5
-msgctxt "ServerEditDlg#5"
-msgid "Password:"
-msgstr ""
-
-#: ServerEditDlg#6
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:94
 msgid "Use SSL"
-msgstr ""
+msgstr "Utilizar SSL"
 
-#: ServerEditDlg#7
-msgctxt "ServerEditDlg#7"
-msgid "Advanced"
-msgstr ""
-
-#: ServerEditDlg#8
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:140
 msgid "SSL Version:"
-msgstr ""
+msgstr "Version de SSL :"
 
-#: ServerEditDlg#9
-msgid ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
+#. 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!"
 msgstr ""
 
-#: ServerEditDlg#10
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:151
 msgid "SSLv3 (default)"
-msgstr ""
+msgstr "SSLv3 (per defaut)"
 
-#: ServerEditDlg#11
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:156
 msgid "SSLv2"
-msgstr ""
+msgstr "SSLv2"
 
-#: ServerEditDlg#12
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:161
 msgid "TLSv1"
-msgstr ""
-
-#: ServerEditDlg#13
-msgctxt "ServerEditDlg#13"
-msgid "Use a Proxy"
-msgstr ""
-
-#: ServerEditDlg#14
-msgctxt "ServerEditDlg#14"
-msgid "Proxy Type:"
-msgstr ""
+msgstr "TLSv1"
 
-#: ServerEditDlg#15
-msgctxt "ServerEditDlg#15"
-msgid "Socks 5"
-msgstr ""
-
-#: ServerEditDlg#16
-msgctxt "ServerEditDlg#16"
-msgid "HTTP"
-msgstr ""
-
-#: ServerEditDlg#17
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:213
 msgid "Proxy Host:"
-msgstr ""
+msgstr "Òste del proxy :"
 
-#: ServerEditDlg#18
-msgctxt "ServerEditDlg#18"
-msgid "localhost"
-msgstr ""
-
-#: ServerEditDlg#19
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:251
 msgid "Proxy Username:"
-msgstr ""
+msgstr "Identificant de l'utilizaire del proxy :"
 
-#: ServerEditDlg#20
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:261
 msgid "Proxy Password:"
-msgstr ""
-
-#: SettingsDlg#1
-msgctxt "SettingsDlg#1"
+msgstr "Senhal del Proxy :"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/ui/settingspagedlg.ui:14
+msgid "Configure Quassel"
+msgstr "Configurar 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
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
-#: SettingsDlg#2
+#. ts-context SettingsDlg
+#: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
-msgstr ""
+msgstr "Enregistrar las modificacions"
 
-#: SettingsDlg#3
-msgid ""
-"There are unsaved changes on the current configuration page. Would you like "
-"to apply your changes now?"
+#. 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?"
 msgstr ""
 
-#: SettingsDlg#4
-msgctxt "SettingsDlg#4"
+#. #-#-#-#-#  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
 msgid "Configure %1"
-msgstr ""
-
-#: SettingsDlg#5
-msgctxt "SettingsDlg#5"
+msgstr "Configurar %1"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingspagedlg.cpp:104
 msgid "Reload Settings"
-msgstr ""
-
-#: SettingsDlg#6
-msgctxt "SettingsDlg#6"
-msgid ""
-"Do you like to reload the settings, undoing your changes on this page?"
-msgstr ""
-
-#: SettingsDlg#7
-msgctxt "SettingsDlg#7"
+msgstr "Recargar los paramètres"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingspagedlg.cpp:104
+msgid "Do you like to reload the settings, undoing your changes on this page?"
+msgstr ""
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingspagedlg.cpp:113
 msgid "Restore Defaults"
-msgstr ""
-
-#: SettingsDlg#8
-msgctxt "SettingsDlg#8"
+msgstr "Restablir las valors per defaut"
+
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingspagedlg.cpp:113
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
-#: SettingsDlg#9
-msgctxt "SettingsDlg#9"
-msgid "Configure Quassel"
-msgstr ""
-
-#: SettingsPageDlg#1
-msgctxt "SettingsPageDlg#1"
-msgid "Configure %1"
-msgstr ""
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "Accion :"
 
-#: SettingsPageDlg#2
-msgctxt "SettingsPageDlg#2"
-msgid "Reload Settings"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
 msgstr ""
 
-#: SettingsPageDlg#3
-msgctxt "SettingsPageDlg#3"
-msgid ""
-"Do you like to reload the settings, undoing your changes on this page?"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgid "Search:"
 msgstr ""
 
-#: SettingsPageDlg#4
-msgctxt "SettingsPageDlg#4"
-msgid "Restore Defaults"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
 msgstr ""
 
-#: SettingsPageDlg#5
-msgctxt "SettingsPageDlg#5"
-msgid "Do you like to restore the default values for this page?"
-msgstr ""
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+#, fuzzy
+msgid "Default:"
+msgstr "Utilizar los paramètres per defaut..."
 
-#: SettingsPageDlg#6
-msgctxt "SettingsPageDlg#6"
-msgid "Configure Quassel"
-msgstr ""
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "Personalizar..."
 
-#: SettingsPageDlg#7
-msgctxt "SettingsPageDlg#7"
-msgid "Settings"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
 msgstr ""
 
-#: SignalProxy#1
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
 msgstr ""
 
-#: SignalProxy#2
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:885
 msgid "Peer tried to send 0 byte package!"
 msgstr ""
 
-#: SignalProxy#3
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:902
 msgid "Peer sent corrupted compressed data!"
 msgstr ""
 
-#: SignalProxy#4
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:917
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr ""
 
-#: SignalProxy#5
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:1050
 msgid "Disconnecting"
-msgstr ""
-
-#: SimpleNetworkEditor#1
-msgctxt "SimpleNetworkEditor#1"
-msgid "Network name:"
-msgstr ""
+msgstr "Desconnexion"
 
-#: SimpleNetworkEditor#2
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:35
 msgid "The name of the IRC network you are configuring"
-msgstr ""
-
-#: SimpleNetworkEditor#3
-msgctxt "SimpleNetworkEditor#3"
-msgid "Servers"
-msgstr ""
+msgstr "Nom de la ret IRC que configuratz"
 
-#: SimpleNetworkEditor#4
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:81
 msgid "A list of IRC servers belonging to this network"
 msgstr ""
 
-#: SimpleNetworkEditor#5
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:96
 msgid "Edit this server entry"
 msgstr ""
 
-#: SimpleNetworkEditor#6
-msgctxt "SimpleNetworkEditor#6"
-msgid "&Edit..."
-msgstr ""
-
-#: SimpleNetworkEditor#7
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:116
 msgid "Add another IRC server"
 msgstr ""
 
-#: SimpleNetworkEditor#8
-msgctxt "SimpleNetworkEditor#8"
-msgid "&Add..."
-msgstr ""
-
-#: SimpleNetworkEditor#9
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:136
 msgid "Remove this server entry from the list"
 msgstr ""
 
-#: SimpleNetworkEditor#10
-msgctxt "SimpleNetworkEditor#10"
-msgid "De&lete"
-msgstr ""
-
-#: SimpleNetworkEditor#11
-msgctxt "SimpleNetworkEditor#11"
-msgid "Move upwards in list"
-msgstr ""
-
-#: SimpleNetworkEditor#12
-msgctxt "SimpleNetworkEditor#12"
-msgid "..."
-msgstr ""
-
-#: SimpleNetworkEditor#13
-msgctxt "SimpleNetworkEditor#13"
-msgid "Move downwards in list"
-msgstr ""
-
-#: SimpleNetworkEditor#14
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:226
 msgid "Join Channels Automatically"
 msgstr ""
 
-#: SimpleNetworkEditor#15
-msgid ""
-"A list of IRC channels you will join automatically after connecting to the "
-"network"
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:250
+msgid "A list of IRC channels you will join automatically after connecting to the network"
 msgstr ""
 
-#: SqliteStorage#1
-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."
+#. ts-context SqliteStorage
+#: ../src/core/sqlitestorage.cpp:52
+msgid "SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core."
 msgstr ""
 
-#: SslInfoDlg#1
-msgid "Yes"
-msgstr ""
-
-#: SslInfoDlg#2
-msgid "No, for the following reasons:<ul>"
-msgstr ""
-
-#: SslInfoDlg#3
-msgid "%1 to %2"
-msgstr ""
-
-#: SslInfoDlg#4
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:14
 msgid "Security Information"
-msgstr ""
+msgstr "Informacions de seguretat"
 
-#: SslInfoDlg#5
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:22
 msgid "<b>Hostname:</b>"
 msgstr ""
 
-#: SslInfoDlg#6
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:39
 msgid "<b>IP address:</b>"
 msgstr ""
 
-#: SslInfoDlg#7
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:56
 msgid "<b>Encryption:</b>"
 msgstr ""
 
-#: SslInfoDlg#8
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:73
 msgid "<b>Protocol:</b>"
 msgstr ""
 
-#: SslInfoDlg#9
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:90
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 
-#: SslInfoDlg#10
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:120
 msgid "Subject"
-msgstr ""
+msgstr "Subjècte"
 
-#: SslInfoDlg#11
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:126
+#: ../src/qtui/ui/sslinfodlg.ui:248
 msgid "<b>Common name:</b>"
 msgstr ""
 
-#: SslInfoDlg#12
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:143
+#: ../src/qtui/ui/sslinfodlg.ui:265
 msgid "<b>Organization:</b>"
-msgstr ""
+msgstr "<b>Organizacion :</b>"
 
-#: SslInfoDlg#13
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:160
+#: ../src/qtui/ui/sslinfodlg.ui:282
 msgid "<b>Organizational unit:</b>"
 msgstr ""
 
-#: SslInfoDlg#14
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:177
+#: ../src/qtui/ui/sslinfodlg.ui:299
 msgid "<b>Country:</b>"
-msgstr ""
+msgstr "<b>País :</b>"
 
-#: SslInfoDlg#15
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:194
+#: ../src/qtui/ui/sslinfodlg.ui:316
 msgid "<b>State or province:</b>"
 msgstr ""
 
-#: SslInfoDlg#16
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:231
+#: ../src/qtui/ui/sslinfodlg.ui:353
 msgid "<b>Locality:</b>"
 msgstr ""
 
-#: SslInfoDlg#17
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:242
 msgid "Issuer"
-msgstr ""
+msgstr "Emissor"
 
-#: SslInfoDlg#18
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:367
 msgid "<b>Validity period:</b>"
 msgstr ""
 
-#: SslInfoDlg#19
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:384
 msgid "<b>MD5 digest:</b>"
 msgstr ""
 
-#: SslInfoDlg#20
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:401
 msgid "<b>SHA1 digest:</b>"
 msgstr ""
 
-#: SslInfoDlg#21
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:431
 msgid "<b>Trusted:</b>"
 msgstr ""
 
-#: StatusBufferItem#1
-msgid "Status Buffer"
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:69
+msgid "Yes"
+msgstr "Òc"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:71
+msgid "No, for the following reasons:<ul>"
 msgstr ""
 
-#: SystemTray#1
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:78
+msgid "%1 to %2"
+msgstr "%1 cap a %2"
+
+#. ts-context StatusBufferItem
+#: ../src/client/networkmodel.h:144
+msgid "Status Buffer"
+msgstr "Estat del Buffer"
+
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:61
+#: ../src/qtui/systemtray.cpp:92
 msgid "&Minimize"
-msgstr ""
+msgstr "&Reduire"
 
-#: SystemTray#2
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:94
 msgid "&Restore"
-msgstr ""
+msgstr "&Restablir"
 
-#: SystrayNotificationBackend#1
-msgctxt "SystrayNotificationBackend#1"
-msgid "%n pending highlights"
-msgstr ""
-
-#: SystrayNotificationBackend::ConfigWidget#1
+#. ts-context SystrayNotificationBackend::ConfigWidget
+#: ../src/qtui/systraynotificationbackend.cpp:135
 msgid "Show a message in a popup"
 msgstr ""
 
-#: TaskbarNotificationBackend::ConfigWidget#1
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/taskbarnotificationbackend.cpp:68
 msgid "Activate dock entry, timeout:"
 msgstr ""
 
-#: TaskbarNotificationBackend::ConfigWidget#2
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/taskbarnotificationbackend.cpp:70
 msgid "Mark taskbar entry, timeout:"
 msgstr ""
 
-#: TaskbarNotificationBackend::ConfigWidget#3
-msgctxt "TaskbarNotificationBackend::ConfigWidget#3"
-msgid "Unlimited"
-msgstr ""
-
-#: TaskbarNotificationBackend::ConfigWidget#4
-msgctxt "TaskbarNotificationBackend::ConfigWidget#4"
-msgid " seconds"
-msgstr ""
-
-#: ToolBarActionProvider#1
-msgctxt "ToolBarActionProvider#1"
-msgid "Connect"
-msgstr ""
-
-#: ToolBarActionProvider#2
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgid "Connect to IRC"
-msgstr ""
-
-#: ToolBarActionProvider#3
-msgctxt "ToolBarActionProvider#3"
-msgid "Disconnect"
-msgstr ""
+msgstr "Connectar a l'IRC"
 
-#: ToolBarActionProvider#4
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect from IRC"
-msgstr ""
+msgstr "Desconnectar de l'IRC"
 
-#: ToolBarActionProvider#5
-msgctxt "ToolBarActionProvider#5"
-msgid "Part"
-msgstr ""
-
-#: ToolBarActionProvider#6
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:34
 msgid "Leave currently selected channel"
-msgstr ""
+msgstr "Partir del canal seleccionat"
 
-#: ToolBarActionProvider#7
-msgctxt "ToolBarActionProvider#7"
-msgid "Join"
-msgstr ""
-
-#: ToolBarActionProvider#8
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:35
 msgid "Join a channel"
-msgstr ""
+msgstr "Rejónher un Canal"
 
-#: ToolBarActionProvider#9
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Query"
-msgstr ""
+msgstr "Requèsta"
 
-#: ToolBarActionProvider#10
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Start a private conversation"
-msgstr ""
-
-#: ToolBarActionProvider#11
-msgctxt "ToolBarActionProvider#11"
-msgid "Whois"
-msgstr ""
+msgstr "Començar un conversacion privada"
 
-#: ToolBarActionProvider#12
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Request user information"
-msgstr ""
+msgstr "Demandar las informacions de l'utilizaire"
 
-#: ToolBarActionProvider#13
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgid "Op"
-msgstr ""
+msgstr "Balhar los dreches d'operador"
 
-#: ToolBarActionProvider#14
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgid "Give operator privileges to user"
-msgstr ""
+msgstr "Balhar l'estatut d'operador a l'utilizaire"
 
-#: ToolBarActionProvider#15
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:41
 msgid "Deop"
-msgstr ""
+msgstr "Deop"
 
-#: ToolBarActionProvider#16
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:41
 msgid "Take operator privileges from user"
-msgstr ""
+msgstr "Levar l'estatut d'operador a l'utilizaire"
 
-#: ToolBarActionProvider#17
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgid "Voice"
-msgstr ""
+msgstr "Votz"
 
-#: ToolBarActionProvider#18
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgid "Give voice to user"
 msgstr ""
 
-#: ToolBarActionProvider#19
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgid "Devoice"
 msgstr ""
 
-#: ToolBarActionProvider#20
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgid "Take voice from user"
 msgstr ""
 
-#: ToolBarActionProvider#21
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Kick"
-msgstr ""
+msgstr "Fòrabandir"
 
-#: ToolBarActionProvider#22
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Remove user from channel"
-msgstr ""
+msgstr "Levar l'utilizaire del Canal"
 
-#: ToolBarActionProvider#23
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgid "Ban"
-msgstr ""
+msgstr "Bandir"
 
-#: ToolBarActionProvider#24
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgid "Ban user from channel"
-msgstr ""
+msgstr "Bandir l'utilizaire del Canal"
 
-#: ToolBarActionProvider#25
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Kick/Ban"
-msgstr ""
+msgstr "Kick/Bandir"
 
-#: ToolBarActionProvider#26
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Remove and ban user from channel"
 msgstr ""
 
-#: ToolBarActionProvider#27
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:51
 msgid "Connect to all"
-msgstr ""
+msgstr "Connectar a totes"
 
-#: ToolBarActionProvider#28
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:58
 msgid "Disconnect from all"
-msgstr ""
-
-#: TopicWidget#1
-msgctxt "TopicWidget#1"
-msgid "Users: %1"
-msgstr ""
+msgstr "Desconnectar de totes"
 
-#: TopicWidget#2
-msgctxt "TopicWidget#2"
-msgid "Lag: %1 msecs"
-msgstr ""
-
-#: TopicWidget#3
-msgctxt "TopicWidget#3"
-msgid "Form"
-msgstr ""
-
-#: TopicWidget#4
-msgctxt "TopicWidget#4"
-msgid "..."
-msgstr ""
-
-#: TopicWidgetSettingsPage#1
-msgctxt "TopicWidgetSettingsPage#1"
-msgid "Interface"
-msgstr ""
-
-#: TopicWidgetSettingsPage#2
-msgid "Topic Widget"
-msgstr ""
-
-#: TopicWidgetSettingsPage#3
-msgctxt "TopicWidgetSettingsPage#3"
-msgid "Form"
-msgstr ""
-
-#: TopicWidgetSettingsPage#4
-msgctxt "TopicWidgetSettingsPage#4"
-msgid "Custom font:"
-msgstr ""
-
-#: TopicWidgetSettingsPage#5
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
 msgid "Resize dynamically to fit contents"
-msgstr ""
+msgstr "Adaptar dinamicament la talha al contengut"
 
-#: TopicWidgetSettingsPage#6
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:84
 msgid "On hover only"
 msgstr ""
 
-#: UiStyle::StyledMessage#1
-msgctxt "UiStyle::StyledMessage#1"
-msgid "%1"
-msgstr ""
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+msgid "Topic Widget"
+msgstr "Títol del Widget"
 
-#: UiStyle::StyledMessage#2
+#. Action Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
-msgstr ""
+msgstr "%DN%1%DN %2"
 
-#: UiStyle::StyledMessage#3
+#. Nick Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
-#: UiStyle::StyledMessage#4
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
-#: UiStyle::StyledMessage#5
+#. Mode Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
-msgstr ""
+msgstr "Mòde Utilizaire : %DM%1%DM"
 
-#: UiStyle::StyledMessage#6
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
-msgstr ""
+msgstr "Mòde %DM%1%DM per %DN%2%DN"
 
-#: UiStyle::StyledMessage#7
+#. Join Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
-msgstr ""
+msgstr "%DN%1%DN %DH(%2@%3)%DH a rejonch %DC%4%DC"
 
-#: UiStyle::StyledMessage#8
+#. Part Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
-msgstr ""
+msgstr "%DN%1%DN %DH(%2@%3)%DH a quitat %DC%4%DC"
 
-#: UiStyle::StyledMessage#9
+#. Quit Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
-msgstr ""
+msgstr "%DN%1%DN %DH(%2@%3)%DH es partit"
 
-#: UiStyle::StyledMessage#10
+#. Kick Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
-msgstr ""
+msgstr "%DN%1%DN a bandit %DN%2%DN de %DC%3%DC"
 
-#: UiStyle::StyledMessage#11
+#. Day Change Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
-msgstr ""
+msgstr "{Lo jorn càmbia en %1}"
 
-#: UiStyle::StyledMessage#12
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
-#: UiStyle::StyledMessage#13
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
-msgstr ""
+msgstr "%DN%1%DN (e %2 autres)"
 
-#: UiStyle::StyledMessage#14
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
-#: UiStyle::StyledMessage#15
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
-msgstr ""
+msgstr "[%1]"
 
-#: UiStyle::StyledMessage#16
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
-msgstr ""
+msgstr "<%1>"
 
-#: UiStyle::StyledMessage#17
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
-msgstr ""
+msgstr "-*-"
 
-#: UiStyle::StyledMessage#18
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
-msgstr ""
+msgstr "<->"
 
-#: UiStyle::StyledMessage#19
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
-msgstr ""
+msgstr "***"
 
-#: UiStyle::StyledMessage#20
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
-msgstr ""
+msgstr "-->"
 
-#: UiStyle::StyledMessage#21
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
-msgstr ""
+msgstr "<--"
 
-#: UiStyle::StyledMessage#22
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
-msgstr ""
+msgstr "<-*"
 
-#: UiStyle::StyledMessage#23
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
-msgstr ""
+msgstr "<-x"
 
-#: UiStyle::StyledMessage#24
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: UiStyle::StyledMessage#25
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
-msgstr ""
+msgstr "-"
 
-#: UiStyle::StyledMessage#26
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
-msgstr ""
+msgstr "=>"
 
-#: UiStyle::StyledMessage#27
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
-msgstr ""
+msgstr "<="
 
-#: UserCategoryItem#1
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
-msgstr ""
+msgid_plural "%n Owner(s)"
+msgstr[0] "%n Fondador"
+msgstr[1] "%n Fondadors"
 
-#: UserCategoryItem#2
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
-msgstr ""
+msgid_plural "%n Admin(s)"
+msgstr[0] "%n Admin"
+msgstr[1] "%n Admins"
 
-#: UserCategoryItem#3
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
-msgstr ""
+msgid_plural "%n Operator(s)"
+msgstr[0] "%n Operador"
+msgstr[1] "%n Operador(s)"
 
-#: UserCategoryItem#4
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
-msgstr ""
+msgid_plural "%n Half-Op(s)"
+msgstr[0] "%n Half-Op"
+msgstr[1] "%n Half-Op(s)"
 
-#: UserCategoryItem#5
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
-msgstr ""
+msgid_plural "%n Voiced"
+msgstr[0] ""
+msgstr[1] ""
 
-#: UserCategoryItem#6
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
-msgstr ""
+msgid_plural "%n User(s)"
+msgstr[0] "%n Utilizaire"
+msgstr[1] "%n Utilizaires"
+
+#~ msgid "Finger"
+#~ msgstr "Finger"
+
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] messatge d'espèra : %1"
diff --git a/po/ru.po b/po/ru.po
index a5b76061..beb5edc8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -90,12 +90,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr "Особая благодарность:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>за оригинальный значок Quassel - Всевидящее Око</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>за всю графическую работу для Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software, ранее известная как Trolltech</a></b></dt><dd>за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810</dd>"
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Используемая схема (версии %1) устарела. Обновляю до версии %2..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Обновление не удалось..."
 
@@ -164,6 +164,8 @@ msgstr "Расширение"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -189,6 +191,7 @@ msgstr "Расширение"
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -302,33 +305,33 @@ msgstr "Путь:"
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -418,23 +421,26 @@ msgstr "Ошибки:"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 #, fuzzy
 msgid "Interface"
 msgstr "Внешний вид"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr ""
 
@@ -576,7 +582,7 @@ msgid "Backlog Fetching"
 msgstr ""
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -780,47 +786,57 @@ msgid "BufferView"
 msgstr "СписокБуферов"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Увеличить"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Уменьшить"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Исходный размер"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+msgid "Set Marker Line"
+msgstr ""
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+msgid "Go to Marker Line"
+msgstr ""
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Канал %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Пользователи:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Режим:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Тема:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "Неактивно <br /> Дважды щёлкните чтобы войти"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -933,7 +949,7 @@ msgstr "Показывать свои сообщения"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "Монитор чата"
 
@@ -963,7 +979,7 @@ msgid "Configure..."
 msgstr "Настроить..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Скопировать выделение"
 
@@ -1004,89 +1020,109 @@ msgstr ""
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr "Показывать предварительный просмотр вебсайта при наведении мышью на адрес"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr "Показывать эскиз вебсайта при наведении на URL"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Время:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr ""
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1102,6 +1138,16 @@ msgstr "Обработано сообщений: %1. Затрачено секу
 msgid "All Chats"
 msgstr ""
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1174,7 +1220,7 @@ msgid "Minimum delay between requests:"
 msgstr ""
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Скопировать адрес ссылки"
 
@@ -1310,8 +1356,9 @@ msgstr "Ping"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr "Finger"
+#, fuzzy
+msgid "Client info"
+msgstr "Клиент"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1906,97 +1953,97 @@ msgid "Connect to Core"
 msgstr "Подключение к ядру"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Отключено"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 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
 msgid "Connecting to %1..."
 msgstr "Соединяюсь с %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Соединение с %1 установлено"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "Идет отключение от %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr "Вы пытаетесь подключиться к слишком старому ядру Quassel! Пожалуйста обновите."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr "Синхронизация с ядром..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr "<b>Вы пытаетесь подключиться к слишком старому ядру Quassel!</b><br>Для соединения необходима поддержка клиент-серверного протокола по крайней мере версии %1."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Авторизуюсь..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr "Синхронизация с %1..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr "Получение состояния сетей"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr ""
 
@@ -2184,12 +2231,12 @@ msgid "Core Shutdown"
 msgstr "Ядро завершает работу"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "Не могу подсоединиться к %1 (%2)"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Сбой соединения: %1"
 
@@ -2209,16 +2256,57 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr "CoreSession::createNetwork(): Попытался создать уже существующую сеть, вместо этого обновляю!"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "отсутствует"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 #, fuzzy
 msgid "sending CTCP-%1 request to %2"
 msgstr "отправляю запрос CTCP-%1"
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "Тема для канала %1 не установлена."
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2241,43 +2329,55 @@ msgstr "Дублировать:"
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+#, fuzzy
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr "Получен запрос CTCP PING от %1"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+#, fuzzy
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr "Получен ответ на CTCP VERSION от %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "Получен запрос CTCP PING от %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "Получен ответ на CTCP от %1 с временем полного пути %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "Получен запрос CTCP VERSION от %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "Получен ответ на CTCP VERSION от %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 #, fuzzy
 msgid "Received CTCP TIME request by %1"
 msgstr "Получен запрос CTCP VERSION от %1"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 #, fuzzy
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr "Получен ответ на CTCP VERSION от %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Получен неизвестный CTCP %1 от %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr ""
 
@@ -2450,8 +2550,14 @@ msgstr "Все ники личности"
 msgid "Current nick"
 msgstr "Текущий ник"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Нет"
 
@@ -2589,8 +2695,12 @@ msgstr "Детский сад в другом месте!"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Разговаривать удобно. Везде."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr "Общие"
 
@@ -2768,7 +2878,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Продолжить"
 
@@ -3082,94 +3192,94 @@ msgid "Show messages in application indicator"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 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
 #, fuzzy
 msgid "Clear Color"
 msgstr "Очистить"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Активировать строку ввода"
 
@@ -3209,36 +3319,46 @@ msgstr "Показывать значок в трее"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr "Многострочное поле текста"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr "Показывать не более"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "строк"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Суффикс автодополнения:"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
@@ -3264,23 +3384,28 @@ msgstr "Пользователи"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Тема"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 меняет тему канала %2 на \"%3\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Получено RPL_ISUPPORT (005) без параметров!"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr "Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!"
 
@@ -3298,161 +3423,166 @@ msgstr "Получен нестандартный RPL_ISUPPORT: может сл
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 отсутствует: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 отсутствует: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 это %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 подключен через %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr "[Whowas] %1 был %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Конец списка /WHO для %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 в онлайне с %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr "[Whois] %1 неактивен %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] сообщение неактивности: %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 является участником каналов: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 является участником с голосом на каналах: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 является оператором каналов: %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "На канале %1 %2 пользователей. Тема: %3"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Конец списка каналов"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr "Создан канал %1 на сервере %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "Тема для канала %1 не установлена."
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "Тема канала %1 \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Тема установлена %1 %2"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "Ник %1 содержит недопустимые символы"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Ник уже используется: %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr "Среди ников в списке не найдено свободного и корректного. Используйте /nick <другой ник> для продолжения"
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 #, fuzzy
 msgid " is away"
 msgstr "%1 отсутствует: \"%2\""
@@ -3461,8 +3591,8 @@ msgstr "%1 отсутствует: \"%2\""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr "неактивен с %1"
 
@@ -3470,8 +3600,8 @@ msgstr "неактивен с %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr "время входа: %1"
 
@@ -3479,8 +3609,8 @@ msgstr "время входа: %1"
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "сервер: %1"
 
@@ -3591,254 +3721,482 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+#, fuzzy
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr "Ctrl+L"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Все"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+#, fuzzy
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Строкаввода"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Нет"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "&Подключиться к ядру..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Отключиться от ядра"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "&Инфромация ядра..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "Настроить &сети..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "В&ыход"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "&Блокировать расположение"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Показать строку &поиска"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr "Показать журнал отсутствия"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "Показать строку &статуса"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "Настроить &сети..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "&Настройки Quassel..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "&О Quassel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "О &Qt"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "Отладить &NetworkModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "Отладить &MessageModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "&Журнал отладки"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "Организация:"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+msgid "Activate Next Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+msgid "Go to Next Chat"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+msgid "Go to Previous Chat"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "&Файл"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Сети"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Вид"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "Па&нели"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "&Настройки"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "&Помощь"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Отладка"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Ники"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Показать список ников"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Показать монитор чата"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "Строкаввода"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Показать строку ввода"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Показать строку темы"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Соединение с ядром установлено."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "Нет соединения с ядром."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr ""
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+msgid "&Normal mode"
+msgstr ""
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3850,7 +4208,7 @@ msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] ""
@@ -3858,7 +4216,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "Защита при вставке"
 
@@ -3920,7 +4278,7 @@ msgid "Please enter a network name:"
 msgstr "Пожалуйста введите название сети:"
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Сервер: %1"
 
@@ -3928,7 +4286,7 @@ msgstr "Сервер: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Пользователи: %1"
@@ -3937,18 +4295,18 @@ msgstr "Пользователи: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Лаг: %1 мс"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr ""
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Ников"
 
@@ -4281,7 +4639,7 @@ msgstr "Этот мастер поможет настроить личность
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
@@ -4301,146 +4659,146 @@ msgid "Invalid subelement name in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "год"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "день"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "ч"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "мин"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "сек"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Приват с %1</b>"
 
@@ -4585,6 +4943,44 @@ msgstr "Вернуть умолчания"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Вернуть параметры по-умолчанию для этой вкладки?"
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "Действия"
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+#, fuzzy
+msgid "Search:"
+msgstr "Шаблон поиска:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgid "Default:"
+msgstr "По умолчанию:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "Задать шрифт:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4925,150 +5321,156 @@ msgstr ""
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr ""
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr ""
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] ""
@@ -5076,7 +5478,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] ""
@@ -5084,7 +5486,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] ""
@@ -5092,7 +5494,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] ""
@@ -5100,7 +5502,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] ""
@@ -5108,7 +5510,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] ""
@@ -5142,6 +5544,9 @@ msgstr[2] ""
 #~ msgid "Form"
 #~ msgstr "Форма"
 
+#~ msgid "Finger"
+#~ msgstr "Finger"
+
 #~ msgctxt "Core#18"
 #~ msgid "Client"
 #~ msgstr "Клиент"
@@ -5259,13 +5664,13 @@ msgstr[2] ""
 #~ msgid "Message"
 #~ msgstr "Сообщение"
 
-#~ msgid "Ctrl+L"
-#~ msgstr "Ctrl+L"
-
 #~ msgctxt "IrcListModel#3"
 #~ msgid "Topic"
 #~ msgstr "Тема"
 
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] сообщение неактивности: %1"
+
 #~ msgctxt "IrcUserItem#3"
 #~ msgid "server: %1"
 #~ msgstr "сервер: %1"
@@ -5772,9 +6177,6 @@ msgstr[2] ""
 #~ msgid "Use BG"
 #~ msgstr "Использовать фон"
 
-#~ msgid "Default:"
-#~ msgstr "По умолчанию:"
-
 #~ msgid "New Message:"
 #~ msgstr "Новое сообщение:"
 
diff --git a/po/tr.po b/po/tr.po
index 2555a188..990c2c33 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -96,12 +96,12 @@ msgid "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&n
 msgstr ""
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:112
+#: ../src/core/abstractsqlstorage.cpp:115
 msgid "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr "Schema (sürüm %1) güncel değil. %2 sürümüne yükseltiniz..."
 
 #. ts-context AbstractSqlStorage
-#: ../src/core/abstractsqlstorage.cpp:114
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "Yükseltme başarısız..."
 
@@ -170,6 +170,8 @@ msgstr "Genişleme"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context PhononNotificationConfigWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
@@ -195,6 +197,7 @@ msgstr "Genişleme"
 #: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
 #: ../src/qtui/settingspages/networkssettingspage.ui:14
 #: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
 #: ../src/qtui/ui/topicwidget.ui:32
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgid "Form"
@@ -307,33 +310,33 @@ msgstr "Yol:"
 #: ../src/qtui/ui/chatviewsearchbar.ui:19
 #: ../src/qtui/ui/chatviewsearchbar.ui:33
 #: ../src/qtui/ui/chatviewsearchbar.ui:44
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:152
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:176
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:200
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:237
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:261
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:292
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:316
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:340
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:364
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:381
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:421
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:438
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:455
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:472
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:489
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:506
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:523
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:540
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:557
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:574
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:591
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:608
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:625
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:642
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:659
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:676
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:704
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
 #: ../src/qtui/settingspages/identitiessettingspage.ui:34
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 #: ../src/qtui/settingspages/identityeditwidget.ui:168
@@ -423,22 +426,25 @@ msgstr "Hatalar:"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NotificationsSettingsPage
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 #: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 #: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
 #: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Interface"
 msgstr "Arayüz"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:223
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
 msgstr "Lütfen bir biçem deposu dosyası seçin"
 
@@ -580,7 +586,7 @@ msgid "Backlog Fetching"
 msgstr ""
 
 #. ts-context BufferItem
-#: ../src/client/networkmodel.cpp:341
+#: ../src/client/networkmodel.cpp:346
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
@@ -782,47 +788,57 @@ msgid "BufferView"
 msgstr "ArabellekGörünümü"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Yaklaş"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:82
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Uzaklaş"
 
 #. ts-context BufferWidget
-#: ../src/qtui/bufferwidget.cpp:87
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "Gerçek Boyut"
 
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:94
+msgid "Set Marker Line"
+msgstr ""
+
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:98
+msgid "Go to Marker Line"
+msgstr ""
+
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:498
+#: ../src/client/networkmodel.cpp:503
 msgid "<b>Channel %1</b>"
 msgstr "<b>Kanal %1</b>"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:501
+#: ../src/client/networkmodel.cpp:506
 msgid "<b>Users:</b> %1"
 msgstr "<b>Kullanıcılar:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:505
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Mod:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:516
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Konu:</b> %1"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:520
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "Etkin değil <br /> Katılmak için çift-tıkla"
 
 #. ts-context ChannelBufferItem
-#: ../src/client/networkmodel.cpp:523
+#: ../src/client/networkmodel.cpp:528
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
@@ -929,7 +945,7 @@ msgstr "Kendi mesajlarımı göster"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:743
 msgid "Chat Monitor"
 msgstr "Sohbet Ekranı"
 
@@ -959,7 +975,7 @@ msgid "Configure..."
 msgstr "Yapılandır..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:600
+#: ../src/qtui/chatscene.cpp:745
 msgid "Copy Selection"
 msgstr "Seçimi Kopyala"
 
@@ -1000,89 +1016,109 @@ msgstr "Özel sohbet penceresi yazı tipi:"
 
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
 msgid "Allow colored text (mIRC color codes)"
 msgstr "Renkli metne izin ver (mIRC renk kodları)"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:108
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
 msgid "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:127
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+msgid "Set the marker line to the bottom of the current chat window when selecting another channel"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+msgid "Set marker line automatically when switching chats"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
 msgid "Custom Colors"
 msgstr "Özel Renkler"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:145
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "Eylem:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:169
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Zaman bilgisi:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Kanal iletisi:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:230
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "Vurgulama önplanı:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:254
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Komut iletisi:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:278
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "Vurgulama arkaplanı:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:285
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Sunucu iletisi:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:309
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:333
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Hata iletisi:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:357
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Arkaplan:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:401
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr ""
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:697
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Kendi iletilerin:"
 
 #. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr "Sohbet Görünümü"
 
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+
 #. ts-context Client
 #: ../src/client/client.cpp:270
 msgid "Identity already exists in client!"
@@ -1098,6 +1134,16 @@ msgstr "%1 mesaj %2 saniyede işlendi."
 msgid "All Chats"
 msgstr "Tüm Sohbetler"
 
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:86
+msgid "/JOIN expects a channel"
+msgstr ""
+
+#. ts-context ClientUserInputHandler
+#: ../src/client/clientuserinputhandler.cpp:96
+msgid "/QUERY expects at least a nick"
+msgstr ""
+
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1169,7 +1215,7 @@ msgid "Minimum delay between requests:"
 msgstr "İstemler arası en az bekleme süresi :"
 
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:644
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Bağlantı Adresini Kopyala"
 
@@ -1305,8 +1351,9 @@ msgstr "Ping"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:65
-msgid "Finger"
-msgstr "Finger"
+#, fuzzy
+msgid "Client info"
+msgstr "Ä°stemci"
 
 #. ts-context ContextMenuActionProvider
 #: ../src/uisupport/contextmenuactionprovider.cpp:66
@@ -1899,97 +1946,97 @@ msgid "Connect to Core"
 msgstr "Çekirdeğe Bağlan"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:166
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:200
-#: ../src/client/coreconnection.cpp:315
+#: ../src/client/coreconnection.cpp:202
+#: ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Bağlı değil"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:203
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "%1 aranıyor..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:206
-#: ../src/client/coreconnection.cpp:443
+#: ../src/client/coreconnection.cpp:208
+#: ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "%1e bağlanılıyor..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:209
-#: ../src/client/coreconnection.cpp:566
+#: ../src/client/coreconnection.cpp:211
+#: ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "%1e bağlandı"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:212
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:269
+#: ../src/client/coreconnection.cpp:272
 msgid "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr "Bağlanmaya çalıştığınız Quassel Çekirdeği çok eski! Lütfen yeni sürüme yükseltin."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:297
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:342
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "Çekirdekle bağlantı kesildi."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:420
-#: ../src/client/coreconnection.cpp:504
-#: ../src/client/coreconnection.cpp:549
+#: ../src/client/coreconnection.cpp:427
+#: ../src/client/coreconnection.cpp:511
+#: ../src/client/coreconnection.cpp:556
 msgid "Unencrypted connection canceled"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:471
+#: ../src/client/coreconnection.cpp:478
 msgid "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at least core/client protocol v%1 to connect."
 msgstr "<b>Bağlanmaya çalıştırğınız Quassel İstemcisi çok eski!</b><br>Bağlanmak için en azından çekirdek/istemci protokolü v%1 gerekli."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:585
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Oturum açılıyor..."
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "Oturum iptal edildi"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:615
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr "Oturum durumu alınıyor"
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:617
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:641
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr ""
 
 #. ts-context CoreConnection
-#: ../src/client/coreconnection.cpp:691
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr ""
 
@@ -2172,12 +2219,12 @@ msgid "Core Shutdown"
 msgstr "Çekirdeği Kapat"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:306
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "%1 (%2) bağlanılamadı"
 
 #. ts-context CoreNetwork
-#: ../src/core/corenetwork.cpp:308
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Bağlantı hatası: %1"
 
@@ -2197,15 +2244,56 @@ msgid "CoreSession::createNetwork(): Trying to create a network that already exi
 msgstr "CoreSession::createNetwork(): Zaten varolan bir ağı oluşturmaya çalışıyor, güncelliyorum!"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:63
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "dışarıda"
 
 #. ts-context CoreUserInputHandler
-#: ../src/core/coreuserinputhandler.cpp:132
+#: ../src/core/coreuserinputhandler.cpp:150
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:173
+msgid "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:180
+#, fuzzy
+msgid "No key has been set for %1."
+msgstr "%1 için konu ayarlanmamış."
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:193
+msgid "The key for %1 has been deleted."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:197
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:461
+msgid "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:476
+msgid "The key for %1 has been set."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:479
+msgid "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+msgstr ""
+
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:587
+msgid "[Error] Could not encrypt your message: %1"
+msgstr ""
+
 #. ts-context CreateIdentityDlg
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgid "Create New Identity"
@@ -2228,41 +2316,53 @@ msgstr "Çoğalt:"
 
 #. ts-context CtcpHandler
 #: ../src/core/ctcphandler.cpp:197
+#, fuzzy
+msgid "Received CTCP CLIENTINFO request from %1"
+msgstr "%1 kullanıcısından CTCP PING isteği alındı"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:200
+#, fuzzy
+msgid "Received CTCP CLIENTINFO answer from %1: %2"
+msgstr "CTCP VERSION cevabı alındı %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:211
 msgid "Received CTCP PING request from %1"
 msgstr "%1 kullanıcısından CTCP PING isteği alındı"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:202
+#: ../src/core/ctcphandler.cpp:216
 msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
 msgstr "%1 kişisinden %2 saniye geri dönüş süresiyle CTCP PING cevabı alındı"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:215
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "%1 kullanıcısından CTCP VERSION isteği alındı"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:218
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "CTCP VERSION cevabı alındı %1: %2"
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:229
+#: ../src/core/ctcphandler.cpp:243
 msgid "Received CTCP TIME request by %1"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:232
+#: ../src/core/ctcphandler.cpp:246
 msgid "Received CTCP TIME answer from %1: %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:241
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 
 #. ts-context CtcpHandler
-#: ../src/core/ctcphandler.cpp:243
+#: ../src/core/ctcphandler.cpp:257
 msgid " with arguments: %1"
 msgstr ""
 
@@ -2435,8 +2535,14 @@ msgstr "Hesaptaki tüm takma adları"
 msgid "Current nick"
 msgstr "Mevcut takma ad"
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context HighlightSettingsPage
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ShortcutsSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
 msgid "None"
 msgstr "Yok"
 
@@ -2574,8 +2680,12 @@ msgstr "Dönüşüm muhteşem olacaaaak!"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Her yerden rahatça konuş."
 
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
+#: ../src/qtui/mainwin.cpp:312
 msgid "General"
 msgstr "Genel"
 
@@ -2751,7 +2861,7 @@ msgstr ""
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context MainWin
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
-#: ../src/qtui/mainwin.cpp:854
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Devam Et"
 
@@ -3063,93 +3173,93 @@ msgid "Show messages in application indicator"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "White"
 msgstr "Beyaz"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Black"
 msgstr "Siyah"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark blue"
 msgstr "Koyu mavi"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark green"
 msgstr "Koyu yeşil"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Red"
 msgstr "Kırmızı"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark red"
 msgstr "Koyu kırmızı"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Dark magenta"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:73
 msgid "Orange"
 msgstr "Turuncu"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Yellow"
 msgstr "Sarı"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Green"
 msgstr "Yeşil"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Cyan"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Blue"
 msgstr "Mavi"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Magenta"
 msgstr ""
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Dark gray"
 msgstr "Koyu gri"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:74
 msgid "Light gray"
 msgstr "Açık gri"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:86
-#: ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:84
+#: ../src/qtui/inputwidget.cpp:85
 msgid "Clear Color"
 msgstr "Renkleri Temizle"
 
 #. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:131
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Girdi satırına odaklan"
 
@@ -3187,36 +3297,46 @@ msgstr "Biçem düğmelerini göster"
 
 #. ts-context InputWidgetSettingsPage
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgid "Emacs key bindings"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgid "Multi-Line Editing"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:128
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:154
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "satırlar"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:176
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "Kaydırma çubuklarını etkinleştir"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr "Sekme Tamamlaması"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:203
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Tamamlama soneki:"
 
 #. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
@@ -3242,23 +3362,28 @@ msgstr "Kullanıcılar"
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context NetworkModel
 #: ../src/client/irclistmodel.cpp:61
-#: ../src/qtui/mainwin.cpp:613
-#: ../src/client/networkmodel.cpp:847
+#: ../src/qtui/mainwin.cpp:781
+#: ../src/client/networkmodel.cpp:852
 msgid "Topic"
 msgstr "Konu"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:557
+#: ../src/core/ircserverhandler.cpp:212
+msgid "%1 invited you to channel %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:584
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1, %2 kanalının başlığını şu şekilde değiştirdi: \"%3\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:607
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Parametresiz RPL_ISUPPORT (005) alındı!"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:615
+#: ../src/core/ircserverhandler.cpp:642
 msgid "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behavior!"
 msgstr "RFC uyumlu olmayan RPL_ISUPPORT alındı: bu beklenmeyen bir davranışa yol açabilir!"
 
@@ -3276,161 +3401,166 @@ msgstr "RFC uyumlu olmayan RPL_ISUPPORT alındı: bu beklenmeyen bir davranışa
 #. Error Message
 #. ----------
 #. Topic Message
+#. ----------
+#. Invite Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/core/ircserverhandler.cpp:635
-#: ../src/core/ircserverhandler.cpp:642
-#: ../src/core/ircserverhandler.cpp:649
-#: ../src/core/ircserverhandler.cpp:656
-#: ../src/uisupport/uistyle.cpp:575
-#: ../src/uisupport/uistyle.cpp:578
-#: ../src/uisupport/uistyle.cpp:618
-#: ../src/uisupport/uistyle.cpp:621
-#: ../src/uisupport/uistyle.cpp:624
-#: ../src/uisupport/uistyle.cpp:631
-#: ../src/uisupport/uistyle.cpp:732
+#: ../src/core/ircserverhandler.cpp:662
+#: ../src/core/ircserverhandler.cpp:669
+#: ../src/core/ircserverhandler.cpp:676
+#: ../src/core/ircserverhandler.cpp:683
+#: ../src/uisupport/uistyle.cpp:577
+#: ../src/uisupport/uistyle.cpp:580
+#: ../src/uisupport/uistyle.cpp:620
+#: ../src/uisupport/uistyle.cpp:623
+#: ../src/uisupport/uistyle.cpp:626
+#: ../src/uisupport/uistyle.cpp:633
+#: ../src/uisupport/uistyle.cpp:665
+#: ../src/uisupport/uistyle.cpp:739
 msgid "%1"
 msgstr "%1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:691
+#: ../src/core/ircserverhandler.cpp:718
 msgid "[Whois] %1 is away: \"%2\""
 msgstr "[Whois] %1 dışarıda: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:697
-#: ../src/core/ircserverhandler.cpp:702
+#: ../src/core/ircserverhandler.cpp:724
+#: ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 is away: \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:746
-#: ../src/core/ircserverhandler.cpp:760
-#: ../src/core/ircserverhandler.cpp:794
-#: ../src/core/ircserverhandler.cpp:810
-#: ../src/core/ircserverhandler.cpp:871
-#: ../src/core/ircserverhandler.cpp:903
+#: ../src/core/ircserverhandler.cpp:773
+#: ../src/core/ircserverhandler.cpp:787
+#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:838
+#: ../src/core/ircserverhandler.cpp:906
+#: ../src/core/ircserverhandler.cpp:938
 msgid "[Whois] %1"
 msgstr "[Whois] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:775
-#: ../src/core/ircserverhandler.cpp:777
+#: ../src/core/ircserverhandler.cpp:802
+#: ../src/core/ircserverhandler.cpp:805
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 is %2 (%3)"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:792
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1, %2 (%3) aracılığıyla çevrimiçi"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:796
-#: ../src/core/ircserverhandler.cpp:1074
+#: ../src/core/ircserverhandler.cpp:824
+#: ../src/core/ircserverhandler.cpp:1131
 msgid "[Whowas] %1"
 msgstr "[Whowas] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:822
+#: ../src/core/ircserverhandler.cpp:850
 msgid "[Whowas] %1 was %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:836
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] %1 için /WHO listesinin sonu"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:856
+#: ../src/core/ircserverhandler.cpp:886
+#: ../src/core/ircserverhandler.cpp:894
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:858
+#: ../src/core/ircserverhandler.cpp:888
+#: ../src/core/ircserverhandler.cpp:896
 msgid "[Whois] %1 is idling for %2 (%3)"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:861
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] boşta mesajı: %1"
-
-#. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:893
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:895
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:897
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:925
+#: ../src/core/ircserverhandler.cpp:960
 msgid "Channel %1 has %2 users. Topic is: %3"
 msgstr "Kanal %1'de %2 kullanıcı var. Konu: %3"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:934
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Kanal listesinin sonu"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:952
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:970
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:984
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "%1 için konu ayarlanmamış."
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:999
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "%1 kanalının konusu \"%2\""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1010
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1033
+#: ../src/core/ircserverhandler.cpp:1067
+msgid "%1 has been invited to %2"
+msgstr ""
+
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1090
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1092
+#: ../src/core/ircserverhandler.cpp:1149
 msgid "Nick %1 contains illegal characters"
 msgstr "%1 takma adı geçersiz karakterler içeriyor"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1103
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "%1 takma adı zaten kullanımda"
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1120
+#: ../src/core/ircserverhandler.cpp:1177
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
 #. ts-context IrcServerHandler
-#: ../src/core/ircserverhandler.cpp:1213
+#: ../src/core/ircserverhandler.cpp:1270
 msgid "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr "Takma ad listesinde geçerli ve kullanılmayan takma ad bulunamadı. /nick <farklıtakmaad> ile farklı bir takma ad kullanın"
 
 #. ts-context IrcUserItem
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:806
 #, fuzzy
 msgid " is away"
 msgstr "%1 is away: \"%2\""
@@ -3439,8 +3569,8 @@ msgstr "%1 is away: \"%2\""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:816
-#: ../src/client/networkmodel.cpp:442
+#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:447
 msgid "idling since %1"
 msgstr ""
 
@@ -3448,8 +3578,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:819
-#: ../src/client/networkmodel.cpp:445
+#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:450
 msgid "login time: %1"
 msgstr ""
 
@@ -3457,8 +3587,8 @@ msgstr ""
 #. ts-context IrcUserItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:822
-#: ../src/client/networkmodel.cpp:448
+#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:453
 msgid "server: %1"
 msgstr "sunucu: %1"
 
@@ -3567,254 +3697,486 @@ msgid "%n pending highlights"
 msgid_plural "%n pending highlights"
 msgstr[0] ""
 
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+msgid "The key you just pressed is not supported by Qt."
+msgstr ""
+
+#. ts-context KeySequenceButton
+#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+msgid "Unsupported Key"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+msgctxt "Meta key"
+msgid "Meta"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+#, fuzzy
+msgctxt "Ctrl key"
+msgid "Ctrl"
+msgstr "Ctrl+L"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#, fuzzy
+msgctxt "Alt key"
+msgid "Alt"
+msgstr "Tümü"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+msgctxt "Shift key"
+msgid "Shift"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+#, fuzzy
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Girdi Satırı"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#, fuzzy
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr "Yok"
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:355
+#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+msgid "Shortcut Conflict"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+msgid "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#. ts-context KeySequenceWidget
+#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+msgid "Reassign"
+msgstr ""
+
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:311
+#: ../src/qtui/mainwin.cpp:314
 msgid "&Connect to Core..."
 msgstr "&Çekirdeğe Bağlan..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Çekirdekle Bağlantıyı Kes"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "Çekirdek &Bilgisi..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "A&ğları Yapılandır..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:320
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "&Çık"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "Arayüzü &Kilitle"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "&Arama Çubuğunu Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "&Menü Çubuğunu Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:338
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "&Durum Çubuğunu Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:343
+#: ../src/qtui/mainwin.cpp:1185
+msgid "&Fullscreen mode"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:347
+#, fuzzy
+msgid "Configure &Shortcuts..."
+msgstr "A&ğları Yapılandır..."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "Quasseli &Yapılandır..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:346
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "Quassel &Hakkında"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "&Qt Hakkında"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:350
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "&NetworkModel Hata Ayıkla"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "&MessageModel Hata Ayıkla"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "&Log Hata Ayıkla"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:371
+#, fuzzy
+msgid "Navigation"
+msgstr "Organizasyon:"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:373
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:385
+msgid "Set Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:387
+msgid "Set Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:389
+msgid "Set Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:391
+msgid "Set Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:393
+msgid "Set Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:395
+msgid "Set Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:397
+msgid "Set Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:399
+msgid "Set Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:401
+msgid "Set Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:403
+msgid "Set Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:406
+msgid "Quick Access #0"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:408
+msgid "Quick Access #1"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:410
+msgid "Quick Access #2"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:412
+msgid "Quick Access #3"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:414
+msgid "Quick Access #4"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:416
+msgid "Quick Access #5"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:418
+msgid "Quick Access #6"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:420
+msgid "Quick Access #7"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:422
+msgid "Quick Access #8"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:424
+msgid "Quick Access #9"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:428
+#, fuzzy
+msgid "Activate Next Chat List"
+msgstr "Sohbet :Listesini Sil?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:430
+msgid "Activate Previous Chat List"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:432
+#, fuzzy
+msgid "Go to Next Chat"
+msgstr "Sohbete Git"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:434
+#, fuzzy
+msgid "Go to Previous Chat"
+msgstr "Sohbete Git"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:441
 msgid "&File"
 msgstr "&Dosya"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Ağ"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Görünüm"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "&Sohbet Listeleri"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "&Araç Çubukları"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "&Ayarlar"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "&Yardım"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Hata Ayıkla"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:555
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Takma Adlar"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Takma Ad Listesini Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Sohbet Ekranını Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "Girdi Satırı"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Girdi Satırını Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:625
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Konu Satırını Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:698
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "Ana Araç Çubuğu"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:737
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Çekirdeğe bağlandı."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:811
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "Çekirdeğe bağlı değil."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1015
+#: ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr "Şifrelenmemiş Bağlantı"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:825
+#: ../src/qtui/mainwin.cpp:1015
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>İstemciniz SSL şifrelemeyi desteklemiyor</b>"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:827
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:1017
+#: ../src/qtui/mainwin.cpp:1025
 msgid "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:833
+#: ../src/qtui/mainwin.cpp:1023
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:850
-#: ../src/qtui/mainwin.cpp:870
+#: ../src/qtui/mainwin.cpp:1040
+#: ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:851
+#: ../src/qtui/mainwin.cpp:1041
 msgid "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:855
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr "Sertifika Göster"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:871
+#: ../src/qtui/mainwin.cpp:1061
 msgid "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:873
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr "Sadece Geçerli Oturum"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr "Daima"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr "Çekirdek Bağlantı Hatası"
 
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1190
+#, fuzzy
+msgid "&Normal mode"
+msgstr "Normal"
+
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:375
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -3826,13 +4188,13 @@ msgid "Receiving Backlog"
 msgstr ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:547
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
 msgid_plural "Do you really want to paste %n lines?"
 msgstr[0] ""
 
 #. ts-context MultiLineEdit
-#: ../src/uisupport/multilineedit.cpp:556
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "Yapıştırma Koruması"
 
@@ -3894,7 +4256,7 @@ msgid "Please enter a network name:"
 msgstr "Lütfen bir ağ adı girin:"
 
 #. ts-context NetworkItem
-#: ../src/client/networkmodel.cpp:195
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Sunucu: %1"
 
@@ -3902,7 +4264,7 @@ msgstr "Sunucu: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:197
 #: ../src/qtui/topicwidget.cpp:106
 msgid "Users: %1"
 msgstr "Kullanıcılar: %1"
@@ -3911,18 +4273,18 @@ msgstr "Kullanıcılar: %1"
 #. ts-context NetworkItem
 #. #-#-#-#-#  quassel.po  #-#-#-#-#
 #. ts-context TopicWidget
-#: ../src/client/networkmodel.cpp:199
+#: ../src/client/networkmodel.cpp:200
 #: ../src/qtui/topicwidget.cpp:107
 msgid "Lag: %1 msecs"
 msgstr "Gecikme: %1 ms"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "Sohbet"
 
 #. ts-context NetworkModel
-#: ../src/client/networkmodel.cpp:847
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Takma Ad Sayısı"
 
@@ -4247,7 +4609,7 @@ msgstr ""
 #. ts-context QssParser
 #: ../src/uisupport/qssparser.cpp:121
 #: ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:316
 msgid "Invalid block declaration: %1"
 msgstr ""
 
@@ -4267,146 +4629,146 @@ msgid "Invalid subelement name in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:234
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:243
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:255
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:266
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:270
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:292
+#: ../src/uisupport/qssparser.cpp:294
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:300
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:329
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:348
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:364
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:390
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:420
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:442
+#: ../src/uisupport/qssparser.cpp:444
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:449
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:456
-#: ../src/uisupport/qssparser.cpp:478
-#: ../src/uisupport/qssparser.cpp:499
+#: ../src/uisupport/qssparser.cpp:458
+#: ../src/uisupport/qssparser.cpp:481
+#: ../src/uisupport/qssparser.cpp:503
 msgid "Invalid gradient declaration: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:465
-#: ../src/uisupport/qssparser.cpp:486
-#: ../src/uisupport/qssparser.cpp:509
+#: ../src/uisupport/qssparser.cpp:467
+#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:513
 msgid "Invalid gradient stops list: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:605
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:644
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:657
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
 #. ts-context QssParser
-#: ../src/uisupport/qssparser.cpp:667
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr ""
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:129
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "yıl"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:130
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "gün"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:131
+#: ../src/common/util.cpp:147
 msgid "h"
 msgstr "s"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:132
+#: ../src/common/util.cpp:148
 msgid "min"
 msgstr "dk"
 
 #. ts-context Quassel::secondsToString()
-#: ../src/common/util.cpp:133
+#: ../src/common/util.cpp:149
 msgid "sec"
 msgstr "sn"
 
 #. ts-context QueryBufferItem
-#: ../src/client/networkmodel.cpp:424
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>%1 ile konuş</b>"
 
@@ -4551,6 +4913,44 @@ msgstr "Öntanımlıları Yeniden Yükle"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#, fuzzy
+msgid "Action"
+msgstr "Eylem:"
+
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+#, fuzzy
+msgid "Search:"
+msgstr "Arama Deseni:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgid "Shortcut for Selected Action"
+msgstr ""
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgid "Default:"
+msgstr "Öntanımlı:"
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+#, fuzzy
+msgid "Custom:"
+msgstr "Özel..."
+
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+msgid "Shortcuts"
+msgstr ""
+
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:880
 msgid "Peer tried to send package larger than max package size!"
@@ -4890,190 +5290,202 @@ msgstr ""
 
 #. Action Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:581
+#: ../src/uisupport/uistyle.cpp:583
 msgid "%DN%1%DN %2"
 msgstr ""
 
 #. Nick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:585
+#: ../src/uisupport/uistyle.cpp:587
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:586
+#: ../src/uisupport/uistyle.cpp:588
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:590
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "Kullanıcı modu: %DM%1%DM"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:591
+#: ../src/uisupport/uistyle.cpp:593
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:595
+#: ../src/uisupport/uistyle.cpp:597
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:598
+#: ../src/uisupport/uistyle.cpp:600
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH %DC%4%DC kanalını terketti"
 
 #. Quit Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:603
+#: ../src/uisupport/uistyle.cpp:605
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH çıktı"
 
 #. Kick Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:610
+#: ../src/uisupport/uistyle.cpp:612
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN, %DN%2%DN kullanıcısını %DC%3%DC kanalından attı"
 
 #. Day Change Message
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:627
+#: ../src/uisupport/uistyle.cpp:629
 msgid "{Day changed to %1}"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:639
+#: ../src/uisupport/uistyle.cpp:641
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:643
-#: ../src/uisupport/uistyle.cpp:658
+#: ../src/uisupport/uistyle.cpp:645
+#: ../src/uisupport/uistyle.cpp:660
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:653
+#: ../src/uisupport/uistyle.cpp:655
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:662
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:667
+#: ../src/uisupport/uistyle.cpp:705
 msgid "[%1]"
 msgstr "[%1]"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:698
+#: ../src/uisupport/uistyle.cpp:703
 msgid "<%1>"
 msgstr "<%1>"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:702
+#: ../src/uisupport/uistyle.cpp:707
 msgid "-*-"
 msgstr "-*-"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:704
+#: ../src/uisupport/uistyle.cpp:709
 msgid "<->"
 msgstr "<->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:706
+#: ../src/uisupport/uistyle.cpp:711
 msgid "***"
 msgstr "***"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:713
 msgid "-->"
 msgstr "-->"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:710
-#: ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715
+#: ../src/uisupport/uistyle.cpp:717
 msgid "<--"
 msgstr "<--"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:714
+#: ../src/uisupport/uistyle.cpp:719
 msgid "<-*"
 msgstr "<-*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:721
 msgid "<-x"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:718
-#: ../src/uisupport/uistyle.cpp:720
-#: ../src/uisupport/uistyle.cpp:722
-#: ../src/uisupport/uistyle.cpp:726
+#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:725
+#: ../src/uisupport/uistyle.cpp:727
+#: ../src/uisupport/uistyle.cpp:731
 msgid "*"
 msgstr "*"
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:729
 msgid "-"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:733
 msgid "=>"
 msgstr ""
 
 #. ts-context UiStyle::StyledMessage
-#: ../src/uisupport/uistyle.cpp:730
+#: ../src/uisupport/uistyle.cpp:735
 msgid "<="
 msgstr ""
 
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:737
+#, fuzzy
+msgid "->"
+msgstr "<->"
+
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:692
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:693
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:694
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:695
+#: ../src/client/networkmodel.cpp:700
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:696
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] ""
 
 #. ts-context UserCategoryItem
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] ""
 
+#~ msgid "Finger"
+#~ msgstr "Finger"
+
 #~ msgid "Add Buffers Automatically:"
 #~ msgstr "Arabellekleri Otomatik Ekle:"
 
 #~ msgid "Hide inactive buffers:"
 #~ msgstr "Etkin olmayan arabellekleri gizle:"
 
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] boşta mesajı: %1"
+
 #~ msgctxt "AppearanceSettingsPage#4"
 #~ msgid "Form"
 #~ msgstr "Biçim"
@@ -5138,9 +5550,6 @@ msgstr[0] ""
 #~ msgid "Form"
 #~ msgstr "Biçim"
 
-#~ msgid "Ctrl+L"
-#~ msgstr "Ctrl+L"
-
 #~ msgid "Ctrl+Q"
 #~ msgstr "Ctrl+Q"
 
@@ -5477,9 +5886,6 @@ msgstr[0] ""
 #~ msgid "Use BG"
 #~ msgstr "AP Kullan"
 
-#~ msgid "Default:"
-#~ msgstr "Öntanımlı:"
-
 #~ msgid "New Message:"
 #~ msgstr "Yeni Mesaj:"
 
-- 
2.20.1