X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fes.po;h=59d867fae8105c692e7ac0c843dabbcba91f1556;hp=1401fa21aa36b6a6a34035690813c8a1e3fe502a;hb=c62b8c10bc6c15af2b75415cdaab1058853c6255;hpb=ccf8e091305c069bd9c3a8b391c178ad2d2286e1

diff --git a/po/es.po b/po/es.po
index 1401fa21..59d867fa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,28 +1,31 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Spanish translation for Quassel IRC
+# Copyright (c) 2010 Quassel IRC
+# This file is distributed under the same license as the Quassel IRC package.
 #
 # Rafael Belmonte <EagleScreen@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-10 13:33+0200\n"
-"PO-Revision-Date: 2010-02-25 17:19+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
+"Report-Msgid-Bugs-To: <devel@quassel-irc.org>\n"
+"POT-Creation-Date: 2010-12-15 22:38+0000\n"
+"PO-Revision-Date: 2010-08-12 04:58+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: EspaÃ±ol <kde-i18n-doc@kde.org>\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-03 01:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: es_ES\n"
 
-#: AboutDlg#1
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:17
 msgid "About Quassel"
 msgstr "Sobre Quassel"
 
-#: AboutDlg#2
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:59
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -42,7 +45,8 @@ msgstr ""
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel "
 "IRC</p></body></html>"
 
-#: AboutDlg#3
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:75
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -62,31 +66,37 @@ msgstr ""
 "right:0px; -qt-block-indent:0; text-indent:0px;\">VersiÃ³n 0.2.0-pre, "
 "CompilaciÃ³n &gt;= 474 (2008-02-08)</p></body></html>"
 
-#: AboutDlg#4
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:115
 msgid "&About"
-msgstr "&Sobre"
+msgstr "&Acerca de"
 
-#: AboutDlg#5
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:135
 msgid "A&uthors"
 msgstr "A&utores"
 
-#: AboutDlg#6
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:155
 msgid "&Contributors"
 msgstr "&Contribuidores"
 
-#: AboutDlg#7
+#. ts-context AboutDlg
+#: ../src/qtui/ui/aboutdlg.ui:175
 msgid "&Thanks To"
 msgstr "Agradecimien&tos a"
 
-#: AboutDlg#8
+#. 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>VersiÃ³n:</b> %1<br><b>VersiÃ³n de protocolo:</b> %2<br><b>CompilaciÃ³n:</b> "
 "%3"
 
-#: AboutDlg#9
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:46
 msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2009 by the "
+"<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-"
@@ -98,23 +108,25 @@ msgid ""
 "<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 "
+"<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> 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."
-
-#: AboutDlg#10
+"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
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC estÃ¡ principalmente desarrollado por:"
 
-#: AboutDlg#11
+#. 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:"
@@ -122,7 +134,8 @@ msgstr ""
 "Nos gustarÃ­a dar las gracias a los siguientes contribuidores (en orden "
 "alfabÃ©tico) y a todas las personas que olvidamos mencionar aquÃ­:"
 
-#: AboutDlg#12
+#. 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 "
@@ -150,26 +163,30 @@ msgstr ""
 "src=\":/pics/nokia.png\"></a></b></dt><dd>por mantener Qt vivo, y por apoyar "
 "el desarrollo de Quassel Mobile con N810s</dd>"
 
-#: AbstractSqlStorage#1
+#. ts-context AbstractSqlStorage
+#: ../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..."
 
-#: AbstractSqlStorage#2
+#. ts-context AbstractSqlStorage
+#: ../src/core/abstractsqlstorage.cpp:117
 msgid "Upgrade failed..."
 msgstr "ActualizaciÃ³n fallida..."
 
-#: AliasesModel#1
+#. 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>El atajo para el alias</b><br />Puede ser usado como un comando habitual "
-"de slash.<br /><br /><b>ejemplo:</b> \"foo\" puede ser usado por /foo"
+"<b>El atajo para el alias</b><br />Puede ser usado como una orden habitual "
+"de slash.<br /><br /><b>ejemplo:</b> Â«fooÂ» puede ser usado por /foo"
 
-#: AliasesModel#2
+#. 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 /> - "
@@ -196,146 +213,362 @@ msgstr ""
 "mensajes separados \"Test 1\", \"Test 2\" y \"Test All 1 2 3\" cuando sea "
 "llamado como /test 1 2 3"
 
-#: AliasesModel#3
+#. ts-context AliasesModel
+#: ../src/qtui/settingspages/aliasesmodel.cpp:170
 msgid "Alias"
-msgstr "Atajo"
+msgstr "Alias"
 
-#: AliasesModel#4
+#. ts-context AliasesModel
+#: ../src/qtui/settingspages/aliasesmodel.cpp:171
 msgid "Expansion"
 msgstr "ExpansiÃ³n"
 
-#: AliasesSettingsPage#1
-msgctxt "AliasesSettingsPage#1"
+#. #-#-#-#-#  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 "Formulario"
 
-#: AliasesSettingsPage#2
-msgctxt "AliasesSettingsPage#2"
+#. #-#-#-#-#  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 "Nuevo"
 
-#: AliasesSettingsPage#3
-msgctxt "AliasesSettingsPage#3"
+#. #-#-#-#-#  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 "Borrar"
+msgstr "Eliminar"
 
-#: AliasesSettingsPage#4
-msgctxt "AliasesSettingsPage#4"
+#. #-#-#-#-#  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"
 
-#: AliasesSettingsPage#5
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
 msgid "Aliases"
-msgstr "Atajos"
-
-#: AppearanceSettingsPage#1
-msgctxt "AppearanceSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
+msgstr "Alias"
 
-#: AppearanceSettingsPage#2
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgid "Client style:"
 msgstr "Estilo de cliente:"
 
-#: AppearanceSettingsPage#3
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
 msgstr "Establezca el estilo de aplicaciÃ³n"
 
-#: AppearanceSettingsPage#4
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:36
 msgid "Language:"
 msgstr "Lenguaje:"
 
-#: AppearanceSettingsPage#5
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
 msgstr ""
 "Establezca el lenguaje de la aplicaciÃ³n. Â¡Requiere reiniciar la aplicaciÃ³n!"
 
-#: AppearanceSettingsPage#6
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+msgid "<Untranslated>"
+msgstr "<Sin traducir>"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
 msgid "<System Default>"
 msgstr "<Predeterminado del sistema>"
 
-#: AppearanceSettingsPage#7
-msgid "<Original>"
-msgstr "<Original>"
-
-#: AppearanceSettingsPage#8
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
 msgid "Use custom stylesheet"
 msgstr "Usar estilo de hoja personalizado"
 
-#: AppearanceSettingsPage#9
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
 msgid "Path:"
-msgstr "DirecciÃ³n:"
-
-#: AppearanceSettingsPage#10
-msgctxt "AppearanceSettingsPage#10"
+msgstr "Ruta:"
+
+#. #-#-#-#-#  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#11
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
 msgid "Show system tray icon"
 msgstr "Mostrar icono en bandeja del sistema"
 
-#: AppearanceSettingsPage#12
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
 msgid "Hide to tray on close button"
 msgstr "Minimizar a la bandeja de entrada en el botÃ³n de cerrar"
 
-#: AppearanceSettingsPage#13
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+msgid "Enable animations"
+msgstr "Activar animaciones"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:231
 msgid "Message Redirection"
 msgstr "RedirecciÃ³n de mensaje"
 
-#: AppearanceSettingsPage#14
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:237
 msgid "User Notices:"
 msgstr "Noticias de usuario:"
 
-#: AppearanceSettingsPage#15
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:280
 msgid "Server Notices:"
 msgstr "Noticias de servidor:"
 
-#: AppearanceSettingsPage#16
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:294
 msgid "Default Target"
-msgstr "Objetivo por defecto"
+msgstr "Objetivo predeterminado"
 
-#: AppearanceSettingsPage#17
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:301
 msgid "Status Window"
 msgstr "Ventana de estado"
 
-#: AppearanceSettingsPage#18
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:308
 msgid "Current Chat"
 msgstr "Charla actual"
 
-#: AppearanceSettingsPage#19
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:315
 msgid "Errors:"
 msgstr "Errores:"
 
-#: AppearanceSettingsPage#20
-msgctxt "AppearanceSettingsPage#20"
+#. #-#-#-#-#  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 "Interfaz"
 
-#: AppearanceSettingsPage#21
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
 msgid "Please choose a stylesheet file"
-msgstr "Por favor, elija un archivo de estilo de hoja"
+msgstr "Elija un archivo de estilo"
 
-#: AwayLogView#1
+#. ts-context AwayLogView
+#: ../src/qtui/awaylogview.cpp:33
 msgid "Away Log"
-msgstr "Registro de Ausencia"
+msgstr "Registro de ausencias"
 
-#: 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 "Mostrar nombre de red"
+msgstr "Mostrar el nombre de la red"
 
-#: 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 "Mostrar nombre del bÃºfer"
-
-#: BacklogSettingsPage#1
-msgctxt "BacklogSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
+msgstr "Mostrar el nombre del Ã¡rea de conversaciÃ³n"
 
-#: BacklogSettingsPage#2
+#. 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."
@@ -343,27 +576,33 @@ msgstr ""
 "NÃºmero de mensajes a ser solicitados al nÃºcleo cuando se usa el "
 "desplazamiento hacia arriba en el Ã¡rea de mensajes."
 
-#: BacklogSettingsPage#3
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:25
 msgid "Dynamic backlog amount:"
 msgstr "TamaÃ±o para el registro dinÃ¡mico de mensajes atrasados:"
 
-#: BacklogSettingsPage#4
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:75
 msgid "Backlog request method:"
 msgstr "MÃ©todo de solicitud para el registro de mensajes atrasados:"
 
-#: BacklogSettingsPage#5
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:83
 msgid "Fixed amount per chat"
 msgstr "Cantidad fija por conversaciÃ³n:"
 
-#: BacklogSettingsPage#6
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:88
 msgid "Unread messages per chat"
 msgstr "Mensajes sin leer por conversaciÃ³n"
 
-#: BacklogSettingsPage#7
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:93
 msgid "Globally unread messages"
 msgstr "Mensajes sin leer en Ã¡mbito global"
 
-#: BacklogSettingsPage#8
+#. 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."
@@ -371,7 +610,8 @@ msgstr ""
 "La solicitud mÃ¡s simple. Obtiene una cantidad fija de lineas para cada "
 "ventana de conversaciÃ³n desde los mensajes atrasados."
 
-#: BacklogSettingsPage#9
+#. 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."
@@ -379,11 +619,13 @@ msgstr ""
 "cantidad de mensajes por Ã¡rea de conversaciÃ³n que son solicitados despuÃ©s de "
 "que la conexiÃ³n con el nÃºcleo haya sido establecida."
 
-#: BacklogSettingsPage#10
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgid "Initial backlog amount:"
 msgstr "Cantidad inicial de los mensajes atrasados:"
 
-#: BacklogSettingsPage#11
+#. 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"
@@ -398,21 +640,38 @@ msgstr ""
 "Usted tambiÃ©n puede escoger obtener antiguas lÃ­neas de conversaciÃ³n "
 "adicionales para proporcionar un mejor contexto."
 
-#: BacklogSettingsPage#12
+#. 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 ""
 "Cantidad mÃ¡xima de mensajes a ser obtenidos por Ã¡rea de conversaciÃ³n."
 
-#: BacklogSettingsPage#13
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:225
+#: ../src/qtui/settingspages/backlogsettingspage.ui:347
 msgid "Limit:"
 msgstr "LÃ­mite:"
 
-#: BacklogSettingsPage#14
-msgctxt "BacklogSettingsPage#14"
+#. #-#-#-#-#  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 "Ilimitado"
 
-#: BacklogSettingsPage#15
+#. 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."
@@ -420,11 +679,14 @@ msgstr ""
 "Cantidad de mensajes a ser obtenidos en adiciÃ³n a los mensajes sin leer. El "
 "lÃ­mite no se aplica aquÃ­."
 
-#: BacklogSettingsPage#16
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:263
+#: ../src/qtui/settingspages/backlogsettingspage.ui:385
 msgid "Additional Messages:"
 msgstr "Mensajes adicionales:"
 
-#: BacklogSettingsPage#17
+#. 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"
@@ -449,30 +711,30 @@ msgstr ""
 "Usted tambiÃ©n puede escoger obtener antiguas lÃ­neas de conversaciÃ³n "
 "adicionales para proporcionar un mejor contexto."
 
-#: BacklogSettingsPage#18
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.ui:344
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 "MÃ¡xima cantidad de mensajes a ser obtenidos sobre todas las Ã¡reas de "
 "conversaciÃ³n."
 
-#: BacklogSettingsPage#19
-msgctxt "BacklogSettingsPage#19"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: BacklogSettingsPage#20
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
 msgid "Backlog Fetching"
 msgstr "ObtenciÃ³n del registro"
 
-#: BufferItem#1
+#. 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 "Â¿Combinar las conversaciones de manera permanente?"
 
-#: 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!"
@@ -481,57 +743,96 @@ msgstr ""
 "\"%2\"?\n"
 "Â¡Esta operaciÃ³n es irreversible!"
 
-#: 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 "DiÃ¡logo"
 
-#: BufferViewEditDlg#2
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
 msgid "Please enter a name for the chat list:"
 msgstr "Por favor, introduzca un nombre para la lista de conversaciones:"
 
-#: BufferViewEditDlg#3
+#. ts-context BufferViewEditDlg
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
 msgid "Add Chat List"
 msgstr "AÃ±adir lista de conversaciones"
 
-#: BufferViewFilter#1
+#. ts-context BufferViewFilter
+#: ../src/uisupport/bufferviewfilter.cpp:52
 msgid "Show / Hide Chats"
 msgstr "Mostrar / Ocultar conversaciones"
 
-#: BufferViewSettingsPage#1
-msgctxt "BufferViewSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: BufferViewSettingsPage#2
-msgctxt "BufferViewSettingsPage#2"
+#. #-#-#-#-#  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 "Re&nombrar..."
 
-#: BufferViewSettingsPage#3
-msgctxt "BufferViewSettingsPage#3"
+#. #-#-#-#-#  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 "&AÃ±adir..."
 
-#: BufferViewSettingsPage#4
-msgctxt "BufferViewSettingsPage#4"
+#. #-#-#-#-#  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 "&Borrar"
+msgstr "E&liminar"
 
-#: BufferViewSettingsPage#5
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
 msgid "Chat List Settings"
 msgstr "Preferencias de la lista de conversaciones"
 
-#: BufferViewSettingsPage#6
-msgctxt "BufferViewSettingsPage#6"
+#. #-#-#-#-#  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 "Red:"
 
-#: BufferViewSettingsPage#7
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
 msgid "All"
 msgstr "Todo"
 
-#: BufferViewSettingsPage#8
+#. 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."
@@ -539,122 +840,162 @@ msgstr ""
 "Esta opciÃ³n no estÃ¡ disponible cuando todas las redes estÃ¡n visibles.\n"
 "En Ã©ste modo, el estado de la conversaciÃ³n no es mostrado por separado."
 
-#: BufferViewSettingsPage#9
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
 msgid "Show status window"
 msgstr "Mostrar ventana de estado"
 
-#: BufferViewSettingsPage#10
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
 msgid "Show channels"
 msgstr "Mostrar canales"
 
-#: BufferViewSettingsPage#11
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
 msgid "Show queries"
 msgstr "Mostrar cuestiones"
 
-#: BufferViewSettingsPage#12
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
 msgid "Hide inactive chats"
 msgstr "Esconder conversaciones inactivas"
 
-#: BufferViewSettingsPage#13
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
 msgid "Add new chats automatically"
 msgstr "AÃ±adir nuevas conversaciones automÃ¡ticamente."
 
-#: BufferViewSettingsPage#14
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabÃ©ticamente"
 
-#: BufferViewSettingsPage#15
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
 msgid "Minimum Activity:"
 msgstr "Actividad mÃ­nima:"
 
-#: BufferViewSettingsPage#16
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
 msgid "No Activity"
 msgstr "Sin actividad"
 
-#: BufferViewSettingsPage#17
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
 msgid "Other Activity"
 msgstr "Otra actividad"
 
-#: BufferViewSettingsPage#18
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
-#: BufferViewSettingsPage#19
-msgctxt "BufferViewSettingsPage#19"
+#. #-#-#-#-#  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 "Resaltado"
+msgstr "Resaltar"
 
-#: BufferViewSettingsPage#20
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
 msgid "Preview:"
 msgstr "Previsualizar:"
 
-#: BufferViewSettingsPage#21
-msgctxt "BufferViewSettingsPage#21"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: BufferViewSettingsPage#22
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 msgid "Custom Chat Lists"
 msgstr "Listas de conversaciones personalizadas"
 
-#: BufferViewSettingsPage#23
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
 msgid "Delete Chat List?"
 msgstr "Â¿Eliminar lista de conversaciones?"
 
-#: BufferViewSettingsPage#24
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr ""
 "Â¿EstÃ¡ seguro de que quiere eliminar la lista de conversaciones \"%1\"?"
 
-#: BufferViewWidget#1
+#. ts-context BufferViewWidget
+#: ../src/qtui/ui/bufferviewwidget.ui:26
 msgid "BufferView"
 msgstr "Vista del Ã¡rea de conversaciÃ³n"
 
-#: BufferWidget#1
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:79
 msgid "Zoom In"
 msgstr "Acercar zum"
 
-#: BufferWidget#2
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:85
 msgid "Zoom Out"
 msgstr "Alejar zum"
 
-#: BufferWidget#3
+#. ts-context BufferWidget
+#: ../src/qtui/bufferwidget.cpp:90
 msgid "Actual Size"
 msgstr "TamaÃ±o actual"
 
-#: ChannelBufferItem#1
+#. 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: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>Usuarios:</b> %1"
 
-#: ChannelBufferItem#3
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:510
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Modo:</b> %1"
 
-#: ChannelBufferItem#4
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:521
 msgid "<b>Topic:</b> %1"
 msgstr "<b>TÃ³pico:</b> %1"
 
-#: ChannelBufferItem#5
+#. ts-context ChannelBufferItem
+#: ../src/client/networkmodel.cpp:525
 msgid "Not active <br /> Double-click to join"
 msgstr "No activo <br /> Doble click para unirse"
 
-#: 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 de canales"
 
-#: ChannelListDlg#2
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:38
 msgid "Search Pattern:"
 msgstr "PatrÃ³n de bÃºsqueda:"
 
-#: 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."
@@ -662,19 +1003,23 @@ msgstr ""
 "Conmutar entre el modo simple y el modo avanzado.\n"
 "El modo avanzado permite pasar cadenas de texto de bÃºsqueda al servidor IRC."
 
-#: ChannelListDlg#4
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:62
 msgid "Show Channels"
 msgstr "Mostrar canales"
 
-#: ChannelListDlg#5
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:86
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ChannelListDlg#6
+#. ts-context ChannelListDlg
+#: ../src/qtui/ui/channellistdlg.ui:98
 msgid "Errors Occured:"
 msgstr "Han ocurrido errores:"
 
-#: 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"
@@ -706,16 +1051,13 @@ msgstr ""
 "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 "Form"
-msgstr "Formulario"
-
-#: ChatMonitorSettingsPage#2
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
 msgid "Operation Mode:"
 msgstr "Modo de operaciÃ³n:"
 
-#: ChatMonitorSettingsPage#3
+#. 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"
@@ -757,243 +1099,296 @@ msgstr ""
 "decoration: underline;\">Opt-Out:</span> Conversaciones en el lado derecho "
 "serÃ¡n ignoradas en el monitor de conversaciÃ³n</p></body></html>"
 
-#: ChatMonitorSettingsPage#4
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgid "Available:"
 msgstr "Disponible:"
 
-#: ChatMonitorSettingsPage#5
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
 msgid "Move selected buffers to the left"
 msgstr "Mover las conversaciones seleccionadas a la izquierda"
 
-#: ChatMonitorSettingsPage#6
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
 msgid "Move selected buffers to the right"
 msgstr "Mover las conversaciones seleccionadas a la derecha"
 
-#: ChatMonitorSettingsPage#7
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
 msgid "Show:"
 msgstr "Mostrar:"
 
-#: ChatMonitorSettingsPage#8
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
 msgid ""
 "Show highlights in chatmonitor even if the originating buffer is ignored"
 msgstr ""
 "Mostrar resaltados en el monitor de conversaciÃ³n incluso si la conversaciÃ³n "
 "original es ignorada"
 
-#: ChatMonitorSettingsPage#9
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
 msgid "Always show highlighted messages"
 msgstr "Siempre mostrar los mensajes resaltados"
 
-#: ChatMonitorSettingsPage#10
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
 msgid "Show own messages"
 msgstr "Mostrar mensajes propios"
 
-#: ChatMonitorSettingsPage#11
-msgctxt "ChatMonitorSettingsPage#11"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: ChatMonitorSettingsPage#12
-msgctxt "ChatMonitorSettingsPage#12"
+#. #-#-#-#-#  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 charla"
+msgstr "Monitor de conversaciÃ³n"
 
-#: ChatMonitorSettingsPage#13
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
 msgid "Opt In"
 msgstr "Opt entrada"
 
-#: ChatMonitorSettingsPage#14
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
 msgid "Opt Out"
 msgstr "Opt salida"
 
-#: ChatMonitorSettingsPage#15
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
 msgid "Ignore:"
 msgstr "Ignorar:"
 
-#: ChatMonitorView#1
+#. ts-context ChatMonitorView
+#: ../src/qtui/chatmonitorview.cpp:52
 msgid "Show Own Messages"
 msgstr "Mostrar mensajes propios"
 
-#: ChatMonitorView#2
-msgctxt "ChatMonitorView#2"
-msgid "Show Network Name"
-msgstr "Mostrar nombre de red"
-
-#: ChatMonitorView#3
-msgctxt "ChatMonitorView#3"
-msgid "Show Buffer Name"
-msgstr "Mostrar nombre del bÃºfer"
-
-#: 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 seleccionado"
 
-#: ChatViewSearchBar#1
-msgctxt "ChatViewSearchBar#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: ChatViewSearchBar#2
-msgctxt "ChatViewSearchBar#2"
-msgid "..."
-msgstr "..."
-
-#: ChatViewSearchBar#3
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:55
 msgid "case sensitive"
 msgstr "distinguir mayÃºsculas de minÃºsculas"
 
-#: ChatViewSearchBar#4
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:62
 msgid "search nick"
 msgstr "Buscar apodo"
 
-#: ChatViewSearchBar#5
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:69
 msgid "search message"
 msgstr "buscar mensaje"
 
-#: ChatViewSearchBar#6
+#. ts-context ChatViewSearchBar
+#: ../src/qtui/ui/chatviewsearchbar.ui:82
 msgid "ignore joins, parts, etc."
 msgstr "ignorar entradas, salidas, etc."
 
-#: ChatViewSettingsPage#1
-msgctxt "ChatViewSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: ChatViewSettingsPage#2
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgid "Timestamp format:"
 msgstr "Formato de marca de tiempo:"
 
-#: ChatViewSettingsPage#3
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
 msgid "[hh:mm:ss]"
 msgstr "[hh:mm:ss]"
 
-#: ChatViewSettingsPage#4
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
 msgid "Custom chat window font:"
 msgstr "Personalizar la tipografÃ­a de la ventana de conversaciÃ³n"
 
-#: ChatViewSettingsPage#5
+#. 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)"
 
-#: ChatViewSettingsPage#6
+#. ts-context ChatViewSettingsPage
+#: ../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"
 
-#: ChatViewSettingsPage#7
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
 msgid "Show previews of webpages on URL hover"
 msgstr "Previsualizar pÃ¡ginas web encima de una URL"
 
-#: ChatViewSettingsPage#8
+#. 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 "Colores personalizados"
 
-#: ChatViewSettingsPage#9
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
 msgid "Action:"
 msgstr "AcciÃ³n:"
 
-#: ChatViewSettingsPage#10
-msgctxt "ChatViewSettingsPage#10"
-msgid "..."
-msgstr "..."
-
-#: ChatViewSettingsPage#11
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
 msgid "Timestamp:"
 msgstr "Timestamp:"
 
-#: ChatViewSettingsPage#12
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgid "Channel message:"
 msgstr "Mensaje del canal:"
 
-#: ChatViewSettingsPage#13
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
 msgid "Highlight foreground:"
 msgstr "Resaltar el primer plano:"
 
-#: ChatViewSettingsPage#14
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
 msgid "Command message:"
 msgstr "Mensaje de comando:"
 
-#: ChatViewSettingsPage#15
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
 msgid "Highlight background:"
 msgstr "Resaltar el segundo plano:"
 
-#: ChatViewSettingsPage#16
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
 msgid "Server message:"
 msgstr "Mensaje del servidor:"
 
-#: ChatViewSettingsPage#17
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
 msgid "Marker line:"
 msgstr "LÃ­nea marcadora:"
 
-#: ChatViewSettingsPage#18
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
 msgid "Error message:"
 msgstr "Mensaje de error:"
 
-#: ChatViewSettingsPage#19
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
 msgid "Background:"
 msgstr "Segundo plano:"
 
-#: ChatViewSettingsPage#20
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
 msgid "Use Sender Coloring"
 msgstr "Usar coloreado del emisor"
 
-#: ChatViewSettingsPage#21
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
 msgid "Own messages:"
 msgstr "Mensajes propios:"
 
-#: ChatViewSettingsPage#22
-msgctxt "ChatViewSettingsPage#22"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: ChatViewSettingsPage#23
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
 msgid "Chat View"
 msgstr "Vista de conversaciÃ³n"
 
-#: Client#1
+#. 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 "Â¡Esta identidad ya existe en el cliente!"
 
-#: Client#2
+#. ts-context ClientBacklogManager
+#: ../src/client/clientbacklogmanager.cpp:161
+msgid "Processed %1 messages in %2 seconds."
+msgstr "%1 mensajes procesados en %2 segundos."
+
+#. ts-context ClientBufferViewManager
+#: ../src/client/clientbufferviewmanager.cpp:52
 msgid "All Chats"
 msgstr "Todas las conversaciones"
 
-#: ClientBacklogManager#1
-msgid "Processed %1 messages in %2 seconds."
-msgstr "%1 mensajes procesados en %2 segundos."
+#. 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 ""
 
-#: ConnectionSettingsPage#1
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
 msgstr "Configurar la conexiÃ³n IRC"
 
-#: ConnectionSettingsPage#2
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:20
 msgid "Enable Ping Timeout Detection"
 msgstr "Activar la detecciÃ³n de Ping Timeout"
 
-#: ConnectionSettingsPage#3
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:37
 msgid "Ping interval:"
 msgstr "Intervalo del Ping:"
 
-#: ConnectionSettingsPage#4
-msgctxt "ConnectionSettingsPage#4"
+#. #-#-#-#-#  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 " segundos"
 
-#: ConnectionSettingsPage#5
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:80
 msgid "Disconnect after"
 msgstr "Desconectar tras"
 
-#: ConnectionSettingsPage#6
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:103
 msgid "missed pings"
 msgstr "ecos perdidos"
 
-#: ConnectionSettingsPage#7
+#. 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."
@@ -1001,209 +1396,272 @@ msgstr ""
 "Esto activa un sondeo periÃ³dico de informaciÃ³n de usuario utilizando /WHO. "
 "Esto es interesante para rastrear el estado de ausencia de los usuarios."
 
-#: ConnectionSettingsPage#8
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:131
 msgid "Enable Automatic User Information Lookup (/WHO)"
 msgstr "Activa el rastreo de informaciÃ³n de usuarios automÃ¡tico (/WHO)"
 
-#: ConnectionSettingsPage#9
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:148
 msgid "Update interval:"
 msgstr "Intervalo de actualizaciÃ³n:"
 
-#: ConnectionSettingsPage#10
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:177
 msgid "Ignore channels with more than:"
 msgstr "Ignorar los canales con mÃ¡s de:"
 
-#: ConnectionSettingsPage#11
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:184
 msgid " users"
 msgstr " usuarios"
 
-#: ConnectionSettingsPage#12
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.ui:206
 msgid "Minimum delay between requests:"
 msgstr "Tiempo mÃ­nimo entre peticiones:"
 
-#: ConnectionSettingsPage#13
-msgctxt "ConnectionSettingsPage#13"
-msgid "IRC"
-msgstr "IRC"
-
-#: ContentsChatItem#1
+#. ts-context ContentsChatItem
+#: ../src/qtui/chatitem.cpp:683
 msgid "Copy Link Address"
 msgstr "Copiar la ruta del enlace"
 
-#: 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 "Conectar"
 
-#: ContextMenuActionProvider#2
-msgctxt "ContextMenuActionProvider#2"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ContextMenuActionProvider
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: 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 "Unirse"
 
-#: 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 "Parte"
+msgstr "Retirarse"
 
-#: ContextMenuActionProvider#5
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgid "Delete Chat(s)..."
 msgstr "Borrar conversaciÃ³n(es)..."
 
-#: ContextMenuActionProvider#6
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgid "Go to Chat"
 msgstr "Ir a la conversaciÃ³n"
 
-#: ContextMenuActionProvider#7
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
 msgid "Joins"
 msgstr "Unirse"
 
-#: ContextMenuActionProvider#8
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgid "Parts"
 msgstr "Retiradas"
 
-#: ContextMenuActionProvider#9
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgid "Quits"
 msgstr "Salidas"
 
-#: ContextMenuActionProvider#10
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgid "Nick Changes"
 msgstr "Cambios de apodos"
 
-#: ContextMenuActionProvider#11
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgid "Mode Changes"
 msgstr "Cambios de modo"
 
-#: ContextMenuActionProvider#12
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgid "Day Changes"
 msgstr "Cambios de dÃ­a"
 
-#: ContextMenuActionProvider#13
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgid "Topic Changes"
 msgstr "Cambios de tÃ³pico"
 
-#: ContextMenuActionProvider#14
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgid "Set as Default..."
 msgstr "Establecer como predeterminado..."
 
-#: ContextMenuActionProvider#15
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgid "Use Defaults..."
 msgstr "Usar valores por defecto..."
 
-#: ContextMenuActionProvider#16
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
 msgid "Join Channel..."
 msgstr "Unirse al canal..."
 
-#: ContextMenuActionProvider#17
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:58
 msgid "Start Query"
 msgstr "Iniciar pregunta"
 
-#: ContextMenuActionProvider#18
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
 msgid "Show Query"
 msgstr "Mostrar pregunta"
 
-#: 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 "QuiÃ©n es"
+msgstr "Whois"
 
-#: ContextMenuActionProvider#20
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:62
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: ContextMenuActionProvider#21
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
 msgid "Time"
 msgstr "Tiempo"
 
-#: ContextMenuActionProvider#22
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgid "Ping"
 msgstr "Ping"
 
-#: ContextMenuActionProvider#23
-msgid "Finger"
-msgstr "Dedo"
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
+msgid "Client info"
+msgstr ""
 
-#: 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 "Dar el estado del operador"
 
-#: ContextMenuActionProvider#26
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
 msgid "Take Operator Status"
 msgstr "Obtener el estado del operador"
 
-#: ContextMenuActionProvider#27
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgid "Give Voice"
 msgstr "Dar voz"
 
-#: ContextMenuActionProvider#28
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgid "Take Voice"
 msgstr "Obtener voz"
 
-#: ContextMenuActionProvider#29
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgid "Kick From Channel"
 msgstr "Expulsar del canal"
 
-#: ContextMenuActionProvider#30
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgid "Ban From Channel"
 msgstr "Prohibir entrada en el canal"
 
-#: ContextMenuActionProvider#31
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgid "Kick && Ban"
 msgstr "Expulsar && Prohibir entrada"
 
-#: ContextMenuActionProvider#32
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgid "Hide Chat(s) Temporarily"
 msgstr "Ocultar conversaciones temporalmente"
 
-#: ContextMenuActionProvider#33
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgid "Hide Chat(s) Permanently"
 msgstr "Ocultar conversaciones permanentemente"
 
-#: ContextMenuActionProvider#34
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
 msgid "Show Channel List"
 msgstr "Mostrar lista de canales"
 
-#: ContextMenuActionProvider#35
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
 msgid "Show Ignore List"
 msgstr "Mostrar la lista de ignorados"
 
-#: ContextMenuActionProvider#36
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:102
 msgid "Hide Events"
 msgstr "Ocultar eventos"
 
-#: 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 "Acciones"
 
-#: 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 "AÃ±adir regla para ignorar"
 
-#: ContextMenuActionProvider#41
+#. ts-context ContextMenuActionProvider
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
 msgid "Existing Rules"
 msgstr "Reglas existentes"
 
-#: Core#1
+#. ts-context Core
+#: ../src/core/core.cpp:182
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr "Â¡NingÃºn motor de almacenamiento pudo ser iniciado! Saliendo..."
 
-#: 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 "
@@ -1214,70 +1672,85 @@ msgstr ""
 "biblioteca Qt con el complemento o bien para sqlite o bien para postgres "
 "activado para que quasselcore funcione."
 
-#: Core#3
+#. ts-context Core
+#: ../src/core/core.cpp:232
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "Â¡Llamando a restoreState() habiendo sesiones activas!"
 
-#: Core#4
+#. ts-context Core
+#: ../src/core/core.cpp:273
 msgid "Admin user or password not set."
 msgstr "El usuario o contraseÃ±a de Administrador no ha sido establecido."
 
-#: Core#5
+#. ts-context Core
+#: ../src/core/core.cpp:277
 msgid "Could not setup storage!"
 msgstr "Â¡No se pudo configurar el almacenamiento!"
 
-#: Core#6
+#. ts-context Core
+#: ../src/core/core.cpp:281
 msgid "Creating admin user..."
 msgstr "Creando usuario de administrador..."
 
-#: Core#7
+#. ts-context Core
+#: ../src/core/core.cpp:394
 msgid "Invalid listen address %1"
 msgstr "La direcciÃ³n esperada no es vÃ¡lida %1"
 
-#: Core#8
+#. ts-context Core
+#: ../src/core/core.cpp:402
 msgid ""
 "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
 msgstr ""
 "Esperando algÃºn cliente GUI en IPv4 %1 puerto %2 usando versiÃ³n de protocolo "
 "%3"
 
-#: Core#9
+#. ts-context Core
+#: ../src/core/core.cpp:410
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr "No pudo ser abierta la interfaz IPv4: %1:%2: %3"
 
-#: Core#10
+#. ts-context Core
+#: ../src/core/core.cpp:418
 msgid ""
 "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
 msgstr ""
 "Esperando algÃºn cliente GUI en IPv6 %1 puerto %2 usando la versiÃ³n de "
 "protocolo %3"
 
-#: Core#11
+#. ts-context Core
+#: ../src/core/core.cpp:429
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "No pudo ser abierta la interfaz IPv6: %1:%2: %3"
 
-#: Core#12
+#. ts-context Core
+#: ../src/core/core.cpp:437
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "La direcciÃ³n esperada no es vÃ¡lida %1, protocolo de red desconocido"
 
-#: Core#13
+#. ts-context Core
+#: ../src/core/core.cpp:446
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Â¡No se pudo abrir ninguna interfaz de red para ponerse a la escucha!"
 
-#: Core#14
+#. ts-context Core
+#: ../src/core/core.cpp:480
 msgid "Client connected from"
 msgstr "Cliente conectado desde"
 
-#: Core#15
+#. ts-context Core
+#: ../src/core/core.cpp:483
 msgid "Closing server for basic setup."
 msgstr "Cerrando el servidor para configuraciÃ³n bÃ¡sica."
 
-#: Core#16
+#. ts-context Core
+#: ../src/core/core.cpp:502
 msgid "Antique client trying to connect... refusing."
 msgstr ""
 "El cliente con el que intenta conectar es una antigÃ¼edad... rechazando."
 
-#: Core#17
+#. 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."
@@ -1286,27 +1759,35 @@ msgstr ""
 "necesita un protocolo cliente/nÃºcleo versiÃ³n %1.<br>Por favor, considere "
 "actualizar su cliente."
 
-#: 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 "Cliente"
 
-#: Core#19
+#. ts-context Core
+#: ../src/core/core.cpp:518
 msgid "too old, rejecting."
 msgstr "demasiado viejo, rechazando."
 
-#: Core#20
+#. 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>VersiÃ³n del nÃºcleo de Quassel %1</b><br>CompilaciÃ³n: %2<br>Activo "
 "%3d%4h%5m (desde %6)"
 
-#: Core#21
+#. ts-context Core
+#: ../src/core/core.cpp:588
 msgid "Starting TLS for Client:"
 msgstr "Iniciando TLS para el cliente:"
 
-#: Core#22
+#. 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."
@@ -1314,13 +1795,15 @@ msgstr ""
 "<b>Â¡Cliente no inicializado!</b><br>Usted necesita enviar un mensaje de "
 "inicializaciÃ³n (init) antes de tratar de iniciar sesiÃ³n."
 
-#: Core#23
+#. ts-context Core
+#: ../src/core/core.cpp:608
 msgid "did not send an init message before trying to login, rejecting."
 msgstr ""
 "el mensaje de inicializaciÃ³n (init) no fue enviado antes de intentar el "
 "inicio de sesiÃ³n, rechazando."
 
-#: Core#24
+#. 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."
@@ -1329,161 +1812,236 @@ msgstr ""
 "nombre de usuario y contraseÃ±a que usted ha proporcionado no estÃ¡ en la base "
 "de datos."
 
-#: Core#25
+#. ts-context Core
+#: ../src/core/core.cpp:632
 msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
 msgstr ""
 "inicializado e identificado satisfactoriamente como \"%1\" (Id de usuario: "
 "%2)."
 
-#: Core#26
+#. ts-context Core
+#: ../src/core/core.cpp:643
 msgid "Non-authed client disconnected."
 msgstr "Cliente no autenticado desconectado."
 
-#: Core#27
+#. ts-context Core
+#: ../src/core/core.cpp:649
 msgid "Non-authed client disconnected. (socket allready destroyed)"
 msgstr "Cliente no autenticado desconectado. (encaje ya destruido)"
 
-#: Core#28
+#. ts-context Core
+#: ../src/core/core.cpp:697
 msgid "Could not initialize session for client:"
 msgstr "La sesiÃ³n no pudo ser inicializada para el cliente:"
 
-#: Core#29
+#. ts-context Core
+#: ../src/core/core.cpp:719
 msgid "Could not find a session for client:"
 msgstr "No pudo encontrarse una sesiÃ³n para el cliente:"
 
-#: 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 "NÃºcleo interno"
 
-#: CoreAccountEditDlg#1
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
 msgid "Edit Core Account"
 msgstr "Editar cuanta de nÃºcleo"
 
-#: CoreAccountEditDlg#2
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
 msgid "Account Details"
 msgstr "Detalles de la cuenta"
 
-#: CoreAccountEditDlg#3
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
 msgid "Account Name:"
 msgstr "Nombre de la cuenta:"
 
-#: CoreAccountEditDlg#4
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
 msgid "Local Core"
 msgstr "NÃºcleo local"
 
-#: CoreAccountEditDlg#5
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
 msgid "Hostname:"
 msgstr "Servname:"
 
-#: 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 "anfitriÃ³n local"
-
-#: CoreAccountEditDlg#7
-msgctxt "CoreAccountEditDlg#7"
+msgstr "servlocal"
+
+#. #-#-#-#-#  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 "Puerto:"
 
-#: CoreAccountEditDlg#8
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
 msgid "User:"
 msgstr "Usuario:"
 
-#: 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 "ContraseÃ±a:"
 
-#: CoreAccountEditDlg#10
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
 msgid "Remember"
 msgstr "Recordar"
 
-#: 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 "Usar un proxy"
-
-#: CoreAccountEditDlg#12
-msgctxt "CoreAccountEditDlg#12"
+msgstr "Utilizar 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 "Tipo de proxy:"
 
-#: 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 "AÃ±adir cuenta de nÃºcleo"
 
-#: CoreAccountModel#1
-msgctxt "CoreAccountModel#1"
-msgid "Internal Core"
-msgstr "NÃºcleo interno"
-
-#: CoreAccountSettingsPage#1
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
 msgid "Connect to Quassel Core"
 msgstr "Conectarse al nÃºcleo de Quassel"
 
-#: CoreAccountSettingsPage#2
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
 msgid "Core Accounts"
 msgstr "Cuentas del nÃºcleo"
 
-#: CoreAccountSettingsPage#3
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
 msgid "Edit..."
 msgstr "Editar..."
 
-#: CoreAccountSettingsPage#4
-msgctxt "CoreAccountSettingsPage#4"
+#. #-#-#-#-#  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 "AÃ±adir..."
 
-#: CoreAccountSettingsPage#5
-msgctxt "CoreAccountSettingsPage#5"
-msgid "Delete"
-msgstr "Borrar"
-
-#: CoreAccountSettingsPage#6
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
 msgid "Automatically connect on startup"
 msgstr "Conectar automÃ¡ticamente al inicio"
 
-#: CoreAccountSettingsPage#7
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
 msgid "Connect to last account used"
 msgstr "Conectar a la Ãºltima cuenta utilizada"
 
-#: CoreAccountSettingsPage#8
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
 msgid "Always connect to"
 msgstr "Conectar siempre a"
 
-#: CoreAccountSettingsPage#9
-msgctxt "CoreAccountSettingsPage#9"
+#. #-#-#-#-#  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 "NÃºcleos remotos"
 
-#: CoreConfigWizard#1
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:69
 msgid "Core Configuration Wizard"
 msgstr "Asistente de configuraciÃ³n del nÃºcleo"
 
-#: CoreConfigWizard#2
+#. ts-context CoreConfigWizard
+#: ../src/qtui/coreconfigwizard.cpp:97
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr ""
 "Su nÃºcleo ha sido configurado satisfactoriamente. Iniciando su sesiÃ³n..."
 
-#: CoreConfigWizard#3
+#. 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 ""
 "ConfiguraciÃ³n del nÃºcleo fallida:<br><b>%1</b><br>Pulse <em>Siguiente</em> "
 "Para volver a empezar."
 
-#: CoreConfigWizard#4
+#. 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."
@@ -1492,31 +2050,31 @@ msgstr ""
 "Quassel!<br>Por favor recuerde configurar sus identidades y redes a "
 "continuaciÃ³n."
 
-#: CoreConfigWizardAdminUserPage#1
-msgctxt "CoreConfigWizardAdminUserPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: 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 "Usuario:"
+msgstr "Nombre de usuario:"
 
-#: CoreConfigWizardAdminUserPage#3
-msgctxt "CoreConfigWizardAdminUserPage#3"
-msgid "Password:"
-msgstr "ContraseÃ±a:"
-
-#: CoreConfigWizardAdminUserPage#4
+#. ts-context CoreConfigWizardAdminUserPage
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
 msgid "Repeat password:"
 msgstr "Repita la contraseÃ±a:"
 
-#: 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 "Recordar contraseÃ±a"
+msgstr "Recordar la contraseÃ±a"
 
-#: 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"
@@ -1528,20 +2086,18 @@ msgstr ""
 "Si necesita hacer alguna de estas cosas, por favor, ejecute "
 "\"<tt><nobr>quasselcore --help</nobr></tt>\"."
 
-#: CoreConfigWizardIntroPage#1
-msgctxt "CoreConfigWizardIntroPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: 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 "Este asistente le guiarÃ¡ para configurar su nÃºcleo de Quassel."
 
-#: CoreConfigWizardPages::AdminUserPage#1
+#. ts-context CoreConfigWizardPages::AdminUserPage
+#: ../src/qtui/coreconfigwizard.cpp:150
 msgid "Create Admin User"
 msgstr "Crear usuario administrador"
 
-#: CoreConfigWizardPages::AdminUserPage#2
+#. 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."
@@ -1549,15 +2105,18 @@ msgstr ""
 "Primero, crearemos un usuario del nÃºcleo. Ãste primer usuario tendrÃ¡ "
 "privilegios de administraciÃ³n."
 
-#: CoreConfigWizardPages::IntroPage#1
+#. ts-context CoreConfigWizardPages::IntroPage
+#: ../src/qtui/coreconfigwizard.cpp:135
 msgid "Introduction"
 msgstr "IntroducciÃ³n"
 
-#: CoreConfigWizardPages::StorageSelectionPage#1
+#. ts-context CoreConfigWizardPages::StorageSelectionPage
+#: ../src/qtui/coreconfigwizard.cpp:182
 msgid "Select Storage Backend"
 msgstr "Seleccione un motor de almacenamiento"
 
-#: CoreConfigWizardPages::StorageSelectionPage#2
+#. 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."
@@ -1565,15 +2124,18 @@ msgstr ""
 "Por favor, seleccione un motor de base de datos para el nÃºcleo de Quassel "
 "almacene el registro y otros datos."
 
-#: CoreConfigWizardPages::StorageSelectionPage#3
+#. ts-context CoreConfigWizardPages::StorageSelectionPage
+#: ../src/qtui/coreconfigwizard.cpp:277
 msgid "Connection Properties"
 msgstr "Propiedades de conexiÃ³n"
 
-#: CoreConfigWizardPages::SyncPage#1
+#. ts-context CoreConfigWizardPages::SyncPage
+#: ../src/qtui/coreconfigwizard.cpp:317
 msgid "Storing Your Settings"
 msgstr "Almacenando sus preferencias"
 
-#: CoreConfigWizardPages::SyncPage#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."
@@ -1581,134 +2143,132 @@ msgstr ""
 "Sus preferencias estÃ¡n ahora almacenadas en el nÃºcleo, y su sesiÃ³n serÃ¡ "
 "iniciada automÃ¡ticamente."
 
-#: CoreConfigWizardStorageSelectionPage#1
-msgctxt "CoreConfigWizardStorageSelectionPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: 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 "Motor de almacenamiento"
+msgstr "Motor de almacenamiento:"
 
-#: CoreConfigWizardStorageSelectionPage#3
+#. ts-context CoreConfigWizardStorageSelectionPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: CoreConfigWizardStorageSelectionPage#4
+#. ts-context CoreConfigWizardStorageSelectionPage
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
 msgid "Foobar"
 msgstr "Foobar"
 
-#: CoreConfigWizardSyncPage#1
-msgctxt "CoreConfigWizardSyncPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: CoreConfigWizardSyncPage#2
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
 msgid "Your Choices"
 msgstr "Sus elecciones"
 
-#: CoreConfigWizardSyncPage#3
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
 msgid "Admin User:"
 msgstr "Usuario administrador"
 
-#: CoreConfigWizardSyncPage#4
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
 msgid "foo"
 msgstr "foo"
 
-#: CoreConfigWizardSyncPage#5
-msgctxt "CoreConfigWizardSyncPage#5"
-msgid "Storage Backend:"
-msgstr "Motor de almacenamiento"
-
-#: CoreConfigWizardSyncPage#6
+#. ts-context CoreConfigWizardSyncPage
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
 msgid "bar"
 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 ""
 "Por favor, aguarde mientras sus preferencias son transmitidas al nÃºcleo..."
 
-#: CoreConnectAuthDlg#1
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
 msgid "Authentication Required"
 msgstr "AutenticaciÃ³n requerida"
 
-#: CoreConnectAuthDlg#2
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
 msgid "Please enter your account data:"
 msgstr "Por favor, introduzca la informaciÃ³n de su cuenta:"
 
-#: CoreConnectAuthDlg#3
-msgctxt "CoreConnectAuthDlg#3"
-msgid "Password:"
-msgstr "ContraseÃ±a:"
-
-#: CoreConnectAuthDlg#4
-msgctxt "CoreConnectAuthDlg#4"
-msgid "Username:"
-msgstr "Usuario:"
-
-#: CoreConnectAuthDlg#5
-msgctxt "CoreConnectAuthDlg#5"
-msgid "Remember password"
-msgstr "Recordar contraseÃ±a"
-
-#: CoreConnectAuthDlg#6
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/coreconnectdlg.cpp:75
 msgid "Please enter your credentials for %1:"
 msgstr "Por favor, introduzca sus credenciales para %1:"
 
-#: CoreConnectDlg#1
+#. ts-context CoreConnectDlg
+#: ../src/qtui/coreconnectdlg.cpp:40
 msgid "Connect to Core"
 msgstr "Conectar al nÃºcleo"
 
-#: CoreConnection#1
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:168
 msgid "Network is down"
 msgstr "La red estÃ¡ caÃ­da"
 
-#: CoreConnection#2
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: CoreConnection#3
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:205
 msgid "Looking up %1..."
 msgstr "Buscando %1..."
 
-#: CoreConnection#4
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
 msgid "Connecting to %1..."
 msgstr "Conectando a %1"
 
-#: CoreConnection#5
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
 msgid "Connected to %1"
 msgstr "Conectado a %1"
 
-#: CoreConnection#6
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:214
 msgid "Disconnecting from %1..."
 msgstr "DesconectÃ¡ndose de %1"
 
-#: CoreConnection#7
+#. ts-context CoreConnection
+#: ../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."
 
-#: CoreConnection#8
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:300
 msgid "Invalid data received from core"
 msgstr "InformaciÃ³n no vÃ¡lida recibida del nÃºcleo"
 
-#: CoreConnection#9
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:349
 msgid "Disconnected from core."
 msgstr "Desconectado del nÃºcleo."
 
-#: 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 "ConexiÃ³n sin encriptar cancelada"
 
-#: CoreConnection#11
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:457
 msgid "Synchronizing to core..."
 msgstr "Sincronizando con el nÃºcleo..."
 
-#: CoreConnection#12
+#. 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."
@@ -1717,40 +2277,43 @@ msgstr ""
 "viejo!</b><br>Al menos se necesita un protocolo v%1 de cliente/nÃºcleo para "
 "conectarse."
 
-#: CoreConnection#13
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:592
 msgid "Logging in..."
 msgstr "Iniciando sesiÃ³n"
 
-#: CoreConnection#14
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:597
 msgid "Login canceled"
 msgstr "Inicio de sesiÃ³n cancelado"
 
-#: CoreConnection#15
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:622
 msgid "Receiving session state"
 msgstr "Recibiendo estado de la sesiÃ³n"
 
-#: CoreConnection#16
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:624
 msgid "Synchronizing to %1..."
 msgstr "Sincronizando a %1..."
 
-#: CoreConnection#17
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:648
 msgid "Receiving network states"
 msgstr "Recibiendo estados de red"
 
-#: CoreConnection#18
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:698
 msgid "Synchronized to %1"
 msgstr "Sincronizado a %1"
 
-#: CoreConnectionSettingsPage#1
-msgctxt "CoreConnectionSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: CoreConnectionSettingsPage#2
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
 msgid "Network Status Detection"
 msgstr "DetecciÃ³n del estado de la red"
 
-#: CoreConnectionSettingsPage#3
+#. 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"
@@ -1758,11 +2321,15 @@ msgstr ""
 "Contar con la capa de hardware de KDE para detectar si se estÃ¡ en lÃ­nea. "
 "Recomendado para la mayorÃ­a de usuarios KDE."
 
-#: CoreConnectionSettingsPage#4
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
 msgid "Use KDE's network status detection (via Solid)"
 msgstr "Usar la detecciÃ³n del estado de la red de KDE (vÃ­a Solid)"
 
-#: CoreConnectionSettingsPage#5
+#. 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"
@@ -1770,16 +2337,13 @@ msgstr ""
 "Hacer ping activamente al nÃºcleo remoto y desconectar si no se obtuvo "
 "respuesta tras un cierto periodo"
 
-#: CoreConnectionSettingsPage#6
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
 msgid "Ping timeout after"
 msgstr "Ping fuera de tiempo tras"
 
-#: CoreConnectionSettingsPage#7
-msgctxt "CoreConnectionSettingsPage#7"
-msgid " seconds"
-msgstr " segundos"
-
-#: CoreConnectionSettingsPage#8
+#. 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"
@@ -1787,141 +2351,168 @@ msgstr ""
 "SÃ³lo desconectar si la conexiÃ³n de red se cierra por el sistema operativo. "
 "Esto podrÃ­a tardar bastante tras perder la conectividad actualmente."
 
-#: CoreConnectionSettingsPage#9
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
 msgid "Never time out actively"
-msgstr ""
+msgstr "Nunca expira el tiempo activamente"
 
-#: CoreConnectionSettingsPage#10
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
 msgid "Automatically reconnect on network failures"
 msgstr "Reconectar automÃ¡ticamente si falla la red"
 
-#: CoreConnectionSettingsPage#11
+#. ts-context CoreConnectionSettingsPage
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
 msgid "Retry every"
 msgstr "Reintentar cada"
 
-#: CoreConnectionSettingsPage#12
-msgctxt "CoreConnectionSettingsPage#12"
-msgid "Remote Cores"
-msgstr "NÃºcleos remotos"
-
-#: CoreConnectionSettingsPage#13
-msgctxt "CoreConnectionSettingsPage#13"
+#. #-#-#-#-#  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 "ConexiÃ³n"
 
-#: CoreConnectionStatusWidget#1
-msgctxt "CoreConnectionStatusWidget#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: CoreConnectionStatusWidget#2
-msgctxt "CoreConnectionStatusWidget#2"
+#. #-#-#-#-#  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 "Mensaje"
 
-#: CoreConnectionStatusWidget#3
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "seconds"
 msgid "s"
 msgstr "s"
 
-#: CoreConnectionStatusWidget#4
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgctxt "milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: CoreConnectionStatusWidget#5
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:62
 msgid "(Lag: %1 %2)"
 msgstr "(Intervalo: %1 %2)"
 
-#: CoreConnectionStatusWidget#6
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:75
 msgid "The connection to your core is encrypted with SSL."
 msgstr "La conexiÃ³n con su nÃºcleo estÃ¡ encriptada mediante SSL."
 
-#: CoreConnectionStatusWidget#7
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:78
 msgid "The connection to your core is not encrypted."
 msgstr "La conexiÃ³n con su nÃºcleo estÃ¡ sin encriptar."
 
-#: CoreInfoDlg#1
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:13
 msgid "Core Information"
 msgstr "InformaciÃ³n del nÃºcleo"
 
-#: CoreInfoDlg#2
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:21
 msgid "Version:"
 msgstr "VersiÃ³n:"
 
-#: CoreInfoDlg#3
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:28
 msgid "<core version>"
 msgstr "<versiÃ³n del nÃºcleo>"
 
-#: CoreInfoDlg#4
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:35
 msgid "Uptime:"
 msgstr "Tiempo de funcionamiento:"
 
-#: CoreInfoDlg#5
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:42
 msgid "Connected Clients:"
 msgstr "Clientes conectados:"
 
-#: CoreInfoDlg#6
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:49
 msgid "<connected clients>"
 msgstr "<clientes conectados>"
 
-#: CoreInfoDlg#7
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:56
 msgid "<core uptime>"
 msgstr "<tiempo de funcionamiento del nÃºcleo>"
 
-#: CoreInfoDlg#8
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:63
 msgid "Build date:"
 msgstr "Fecha de compilaciÃ³n:"
 
-#: CoreInfoDlg#9
+#. ts-context CoreInfoDlg
+#: ../src/qtui/ui/coreinfodlg.ui:70
 msgid "<build date>"
 msgstr "<fecha de compilaciÃ³n>"
 
-#: CoreInfoDlg#10
-msgctxt "CoreInfoDlg#10"
+#. #-#-#-#-#  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 "Cerrar"
 
-#: CoreInfoDlg#11
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:53
 msgid "%n Day(s)"
-msgstr "%n dÃ­a(s)"
+msgid_plural "%n Day(s)"
+msgstr[0] "%n DÃ­a(s)"
+msgstr[1] "%n DÃ­as(s)"
 
-#: CoreInfoDlg#12
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:54
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 (desde %4)"
 
-#: CoreNetwork#1
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:153
 msgid "Connection failed. Cycling to next Server"
 msgstr "ConexiÃ³n fallida. Rotando al siguiente servidor"
 
-#: CoreNetwork#2
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:161 ../src/core/corenetwork.cpp:162
 msgid "Connecting to %1:%2..."
 msgstr "Conectando a %1:%2..."
 
-#: CoreNetwork#3
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:210
 msgid "Disconnecting. (%1)"
 msgstr "Desconectando. (%1)"
 
-#: CoreNetwork#4
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:210
 msgid "Core Shutdown"
 msgstr "Apagar nÃºcleo"
 
-#: CoreNetwork#5
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:339
 msgid "Could not connect to %1 (%2)"
 msgstr "No se pudo conectar a %1 (%2)"
 
-#: CoreNetwork#6
+#. ts-context CoreNetwork
+#: ../src/core/corenetwork.cpp:341
 msgid "Connection failure: %1"
 msgstr "Fallo de conexiÃ³n: %1"
 
-#: CoreSession#1
-msgctxt "CoreSession#1"
-msgid "Client"
-msgstr "Cliente"
-
-#: CoreSession#2
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:195
 msgid "disconnected (UserId: %1)."
 msgstr "Desconectado (Id de usuario: %1)."
 
-#: CoreSession#3
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:413
 msgid ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
 "create network %1!"
@@ -1929,7 +2520,8 @@ msgstr ""
 "CoreSession::createNetwork(): Â¡Obtuvo un Id de red no vÃ¡lido del nÃºcleo "
 "cuando tratÃ³ de crear la red %1!"
 
-#: CoreSession#4
+#. ts-context CoreSession
+#: ../src/core/coresession.cpp:444
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
@@ -1937,496 +2529,603 @@ msgstr ""
 "CoreSession::createNetwork(): Â¡Intentando crear una red que ya existe, "
 "actualizÃ¡ndola en lugar de crearla."
 
-#: CoreUserInputHandler#1
+#. ts-context CoreUserInputHandler
+#: ../src/core/coreuserinputhandler.cpp:81
 msgid "away"
 msgstr "ausente"
 
-#: CoreUserInputHandler#2
-msgid "sending CTCP-%1 request"
-msgstr "enviando solicitud CTCP-%1"
+#. ts-context CoreUserInputHandler
+#: ../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
+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 ""
 
-#: CreateIdentityDlg#1
+#. 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 "Crear una nueva identidad"
 
-#: CreateIdentityDlg#2
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
 msgid "Identity name:"
 msgstr "Nombre de la identidad:"
 
-#: CreateIdentityDlg#3
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
 msgid "Create blank identity"
 msgstr "Crear una identidad en blanco"
 
-#: CreateIdentityDlg#4
+#. ts-context CreateIdentityDlg
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
 msgid "Duplicate:"
 msgstr "Duplicar:"
 
-#: CtcpHandler#1
+#. 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 "Recibida peticiÃ³n de PING CTCP desde %1"
 
-#: CtcpHandler#2
+#. ts-context CtcpHandler
+#: ../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"
 
-#: CtcpHandler#3
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:229
 msgid "Received CTCP VERSION request by %1"
 msgstr "Recibida peticiÃ³n de CTCP VERSION por %1"
 
-#: CtcpHandler#4
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:232
 msgid "Received CTCP VERSION answer from %1: %2"
 msgstr "Recibida respuesta CTCP VERSION desde %1: %2"
 
-#: CtcpHandler#5
+#. ts-context CtcpHandler
+#: ../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:246
+msgid "Received CTCP TIME answer from %1: %2"
+msgstr "Se recibiÃ³ respuesta CTCP TIME desde %1: %2"
+
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:255
 msgid "Received unknown CTCP %1 by %2"
 msgstr "Recibido CTCP desconocido %1 por %2"
 
-#: DebugBufferViewOverlay#1
+#. ts-context CtcpHandler
+#: ../src/core/ctcphandler.cpp:257
+msgid " with arguments: %1"
+msgstr " con argumentos: %1"
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
 msgid "Debug BufferView Overlay"
 msgstr "Depurar el Revestimiento de la Vista de ConversaciÃ³n"
 
-#: DebugBufferViewOverlay#2
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
 msgid "Overlay View"
 msgstr "Vista del Revestimiento"
 
-#: DebugBufferViewOverlay#3
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
 msgid "Overlay Properties"
 msgstr "Propiedades del Revestimiento"
 
-#: DebugBufferViewOverlay#4
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:50
 msgid "BufferViews:"
 msgstr "Vistas de Ã¡rea de conversaciÃ³n:"
 
-#: DebugBufferViewOverlay#5
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:51
 msgid "All Networks:"
 msgstr "Todas las redes:"
 
-#: DebugBufferViewOverlay#6
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:52
 msgid "Networks:"
 msgstr "Redes:"
 
-#: DebugBufferViewOverlay#7
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:53
 msgid "Buffers:"
 msgstr "Conversaciones:"
 
-#: DebugBufferViewOverlay#8
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:54
 msgid "Removed buffers:"
 msgstr "Conversaciones borradas:"
 
-#: DebugBufferViewOverlay#9
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:55
 msgid "Temp. removed buffers:"
 msgstr "Conversaciones borradas temporalmente:"
 
-#: DebugBufferViewOverlay#10
-msgid "Add Buffers Automatically:"
-msgstr "AÃ±adir conversaciones automÃ¡ticamente:"
-
-#: DebugBufferViewOverlay#11
-msgid "Hide inactive buffers:"
-msgstr "Ocultar conversaciones inactivas:"
-
-#: DebugBufferViewOverlay#12
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:57
 msgid "Allowed buffer types:"
 msgstr "Tipos de conversaciones permitidas:"
 
-#: DebugBufferViewOverlay#13
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
 msgid "Minimum activity:"
 msgstr "Actividad mÃ­nima:"
 
-#: DebugBufferViewOverlay#14
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/debugbufferviewoverlay.cpp:60
 msgid "Is initialized:"
 msgstr "EstÃ¡ inicializado:"
 
-#: DebugConsole#1
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:14
 msgid "Debug Console"
 msgstr "Consola de depuraciÃ³n"
 
-#: DebugConsole#2
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:44
 msgid "local"
 msgstr "local"
 
-#: DebugConsole#3
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:54
 msgid "core"
 msgstr "nÃºcleo"
 
-#: DebugConsole#4
+#. ts-context DebugConsole
+#: ../src/qtui/ui/debugconsole.ui:82
 msgid "Evaluate!"
 msgstr "Â¡Evaluar!"
 
-#: DebugLogWidget#1
+#. ts-context DebugLogWidget
+#: ../src/qtui/ui/debuglogwidget.ui:13
 msgid "Debug Log"
 msgstr "Registro de depuraciÃ³n"
 
-#: DebugLogWidget#2
-msgctxt "DebugLogWidget#2"
-msgid "Close"
-msgstr "Cerrar"
-
-#: DesktopNotificationConfigWidget#1
-msgctxt "DesktopNotificationConfigWidget#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: DesktopNotificationConfigWidget#2
-msgid "Desktop Notification (via D-Bus)"
-msgstr "NotificaciÃ³n de escritorio (vÃ­a D-Bus)"
-
-#: DesktopNotificationConfigWidget#3
-msgid "Timeout:"
-msgstr "Tiempo de espera:"
-
-#: DesktopNotificationConfigWidget#4
-msgctxt "DesktopNotificationConfigWidget#4"
-msgid " s"
-msgstr " s"
-
-#: DesktopNotificationConfigWidget#5
-msgid "Position hint:"
-msgstr "Indicador de posiciÃ³n:"
-
-#: DesktopNotificationConfigWidget#6
-msgid " px"
-msgstr " px"
-
-#: DesktopNotificationConfigWidget#7
-msgid "X: "
-msgstr "X: "
-
-#: DesktopNotificationConfigWidget#8
-msgid "Y: "
-msgstr "Y: "
-
-#: DesktopNotificationConfigWidget#9
-msgid "Queue unread notifications"
-msgstr "Encolar notificaciones sin leer"
-
-#: ExecWrapper#1
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:45
 msgid "Invalid command string for /exec: %1"
 msgstr "Cadena de comando no vÃ¡lida para /exec: %1"
 
-#: ExecWrapper#2
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:53
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr "Nombre \"%1\" no vÃ¡lido: ../ Ã³ ..\\ no estÃ¡n permitidos!"
 
-#: ExecWrapper#3
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:64
 msgid "Could not find script \"%1\""
 msgstr "No se pudo encontrar el script \"%1\""
 
-#: ExecWrapper#4
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:82
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr "La ejecuciÃ³n del script \"%1\" se rompiÃ³ con el cÃ³digo de salida %2."
 
-#: ExecWrapper#5
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:98
 msgid "Script \"%1\" could not start."
 msgstr "El script \"%1\" no pudo empezar."
 
-#: ExecWrapper#6
+#. ts-context ExecWrapper
+#: ../src/client/execwrapper.cpp:100
 msgid "Script \"%1\" caused error %2."
 msgstr "El script \"%1\" provocÃ³ el error %2"
 
-#: FontSelector#1
+#. ts-context FontSelector
+#: ../src/uisupport/fontselector.cpp:31
 msgid "Choose..."
 msgstr "Escoja..."
 
-#: HighlightSettingsPage#1
-msgctxt "HighlightSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: HighlightSettingsPage#2
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:19
 msgid "Custom Highlights"
 msgstr "Personalizar resaltados"
 
-#: HighlightSettingsPage#3
-msgctxt "HighlightSettingsPage#3"
-msgid "Highlight"
-msgstr "Resaltado"
-
-#: HighlightSettingsPage#4
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:37
 msgid "RegEx"
 msgstr "RegEx"
 
-#: HighlightSettingsPage#5
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:42
 msgid "CS"
 msgstr "CS"
 
-#: HighlightSettingsPage#6
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:47
 msgid "Enable"
 msgstr "Activar"
 
-#: HighlightSettingsPage#7
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:55
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: HighlightSettingsPage#8
-msgctxt "HighlightSettingsPage#8"
+#. #-#-#-#-#  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 "Eliminar"
+msgstr "Borrar"
 
-#: HighlightSettingsPage#9
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:85
 msgid "Highlight Nicks"
 msgstr "Resaltar apodos"
 
-#: HighlightSettingsPage#10
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:91
 msgid "All nicks from identity"
 msgstr "Todos los apodos de la identidad"
 
-#: HighlightSettingsPage#11
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:98
 msgid "Current nick"
 msgstr "Apodo actual"
 
-#: HighlightSettingsPage#12
+#. #-#-#-#-#  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"
 
-#: HighlightSettingsPage#13
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:115
 msgid "Case sensitive"
 msgstr "Distinguir mayÃºsculas"
 
-#: HighlightSettingsPage#14
-msgctxt "HighlightSettingsPage#14"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: HighlightSettingsPage#15
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
 msgid "this shouldn't be empty"
 msgstr "esto no deberÃ­a estar vacÃ­o"
 
-#: HighlightSettingsPage#16
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.h:45
 msgid "highlight rule"
 msgstr "resaltar regla"
 
-#: IdentitiesSettingsPage#1
-msgctxt "IdentitiesSettingsPage#1"
+#. #-#-#-#-#  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 "Renombrar la identidad"
-
-#: IdentitiesSettingsPage#2
-msgctxt "IdentitiesSettingsPage#2"
-msgid "..."
-msgstr "..."
+msgstr "Renombrar identidad"
 
-#: IdentitiesSettingsPage#3
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:51
 msgid "Add Identity"
 msgstr "AÃ±adir identidad"
 
-#: IdentitiesSettingsPage#4
-msgctxt "IdentitiesSettingsPage#4"
-msgid "Add..."
-msgstr "AÃ±adir..."
-
-#: IdentitiesSettingsPage#5
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:74
 msgid "Remove Identity"
 msgstr "Eliminar identidad"
 
-#: IdentitiesSettingsPage#6
-msgctxt "IdentitiesSettingsPage#6"
-msgid "IRC"
-msgstr "IRC"
-
-#: IdentitiesSettingsPage#7
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 msgid "Identities"
 msgstr "Identidades"
 
-#: IdentitiesSettingsPage#8
-msgctxt "IdentitiesSettingsPage#8"
+#. #-#-#-#-#  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>Los siguientes problemas necesitan ser corregidos para que sus cambios "
-"puedan ser aplicados</b><ul>"
+"<b>Los siguientes problemas han de ser corregidos antes de que sus cambios "
+"puedan ser aplicados:</b><ul>"
 
-#: IdentitiesSettingsPage#9
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
 msgid "<li>All identities need an identity name set</li>"
 msgstr ""
 "<li>Todas las identidades necesitan un nombre de identidad establecido</li>"
 
-#: IdentitiesSettingsPage#10
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr "<li>Cada identidad necesita tener al menos un apodo definido</li>"
 
-#: IdentitiesSettingsPage#11
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr ""
 "<li>Usted necesita especificar al menos un nombre real para cada "
 "identidad</li>"
 
-#: IdentitiesSettingsPage#12
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr "<li>Debe especificar un nombre real para cada identidad</li>"
 
-#: IdentitiesSettingsPage#13
-msgctxt "IdentitiesSettingsPage#13"
+#. #-#-#-#-#  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#14
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
 msgid "One or more identities are invalid"
 msgstr "Una o mÃ¡s identidades son invÃ¡lidas"
 
-#: IdentitiesSettingsPage#15
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
 msgid "Delete Identity?"
 msgstr "Â¿Eliminar identidad?"
 
-#: IdentitiesSettingsPage#16
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Â¿EstÃ¡ seguro de que quiere eliminar la identidad \"%1\"?"
 
-#: IdentitiesSettingsPage#17
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:323
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr "Â¡Por favor, introduzca un nuevo nombre para la identidad \"%1\"!"
 
-#: Identity#1
+#. ts-context Identity
+#: ../src/common/identity.cpp:134
 msgid "Quassel IRC User"
 msgstr "Usuario de Quassel IRC"
 
-#: Identity#2
+#. ts-context Identity
+#: ../src/common/identity.cpp:162
 msgid "<empty>"
 msgstr "<vacÃ­o>"
 
-#: Identity#3
+#. ts-context Identity
+#: ../src/common/identity.cpp:168
 msgid "Gone fishing."
 msgstr "He ido a pescar."
 
-#: Identity#4
+#. ts-context Identity
+#: ../src/common/identity.cpp:172
 msgid "Not here. No, really. not here!"
 msgstr "No estoy. No, de verdad, no estoy!"
 
-#: Identity#5
+#. ts-context Identity
+#: ../src/common/identity.cpp:175
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr ""
 "Todos los clientes de Quassel han desaparecido de la faz de La Tierra..."
 
-#: Identity#6
+#. ts-context Identity
+#: ../src/common/identity.cpp:178
 msgid "Kindergarten is elsewhere!"
 msgstr "Â¡El jardÃ­n de infancia es en otra parte!"
 
-#: 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 - Chatee cÃ³modamente donde sea."
 
-#: IdentityEditWidget#1
+#. #-#-#-#-#  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"
 
-#: IdentityEditWidget#2
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:38
 msgid "Real Name:"
 msgstr "Nombre real:"
 
-#: IdentityEditWidget#3
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:45
 msgid "The \"Real Name\" is shown in /whois."
 msgstr "El \"nombre real\" es mostrado en /whois."
 
-#: IdentityEditWidget#4
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:54
 msgid "Nicknames"
 msgstr "Apodos"
 
-#: IdentityEditWidget#5
-msgctxt "IdentityEditWidget#5"
+#. #-#-#-#-#  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 "AÃ±adir el apodo"
-
-#: IdentityEditWidget#6
-msgctxt "IdentityEditWidget#6"
-msgid "&Add..."
-msgstr "&AÃ±adir..."
+msgstr "AÃ±adir apodo"
 
-#: IdentityEditWidget#7
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:116
 msgid "Remove Nickname"
 msgstr "Borrar apodo"
 
-#: IdentityEditWidget#8
-msgctxt "IdentityEditWidget#8"
-msgid "Remove"
-msgstr "Eliminar"
-
-#: IdentityEditWidget#9
-msgctxt "IdentityEditWidget#9"
-msgid "Rename Identity"
-msgstr "Renombrar identidad"
-
-#: IdentityEditWidget#10
-msgctxt "IdentityEditWidget#10"
-msgid "Re&name..."
-msgstr "Re&nombrar..."
-
-#: IdentityEditWidget#11
-msgctxt "IdentityEditWidget#11"
+#. #-#-#-#-#  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 "Subir en la lista"
-
-#: IdentityEditWidget#12
-msgctxt "IdentityEditWidget#12"
-msgid "..."
-msgstr "..."
-
-#: IdentityEditWidget#13
-msgctxt "IdentityEditWidget#13"
+msgstr "Mover hacia arriba en la lista"
+
+#. #-#-#-#-#  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 "Bajar en la lista"
+msgstr "Mover hacia abajo en la lista"
 
-#: IdentityEditWidget#14
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgid "A&way"
 msgstr "A&usente"
 
-#: IdentityEditWidget#15
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:233
 msgid "Default Away Settings"
 msgstr "Preferencias de ausente por defecto"
 
-#: IdentityEditWidget#16
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:244
 msgid "Nick to be used when being away"
 msgstr "Apodo para ser usado cuando se estÃ¡ ausente"
 
-#: IdentityEditWidget#17
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:254
 msgid "Default away reason"
 msgstr "RazÃ³n de ausencia por defecto"
 
-#: IdentityEditWidget#18
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:261
 msgid "Away Nick:"
 msgstr "Apodo de ausente:"
 
-#: IdentityEditWidget#19
+#. 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 "RazÃ³n de ausencia:"
 
-#: IdentityEditWidget#20
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:280
 msgid "Set away when all clients have detached from the core"
 msgstr ""
 "Establecer ausencia cuando todos los clientes se hayan separado del nÃºcleo"
 
-#: IdentityEditWidget#21
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:283
 msgid "Away On Detach"
 msgstr "Ausencia en separaciÃ³n"
 
-#: IdentityEditWidget#22
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:315
 msgid "Not implemented yet"
 msgstr "Aun no implementado"
 
-#: IdentityEditWidget#23
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:318
 msgid "Away On Idle"
 msgstr "Ausente cuando estÃ© inactivo"
 
-#: IdentityEditWidget#24
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:332
 msgid "Set away after"
 msgstr "Establecer ausente despuÃ©s de"
 
-#: IdentityEditWidget#25
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:342
 msgid "minutes of being idle"
 msgstr "minutos para estar inactivo"
 
-#: IdentityEditWidget#26
-msgctxt "IdentityEditWidget#26"
+#. #-#-#-#-#  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 "Avanzado"
 
-#: IdentityEditWidget#27
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:407
 msgid "Ident:"
 msgstr "Ident"
 
-#: IdentityEditWidget#28
+#. 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."
@@ -2434,30 +3133,36 @@ msgstr ""
 "\"Ident\" forma parte de su hostmask y, junto a su servidor, le identifica "
 "de manera Ãºnica en la red de IRC."
 
-#: IdentityEditWidget#29
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgid "Messages"
 msgstr "Mensajes"
 
-#: IdentityEditWidget#30
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:431
 msgid "Part Reason:"
 msgstr "RazÃ³n de la separaciÃ³n:"
 
-#: IdentityEditWidget#31
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:444
 msgid "Quit Reason:"
 msgstr "RazÃ³n de la salida:"
 
-#: IdentityEditWidget#32
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:454
 msgid "Kick Reason:"
 msgstr "RazÃ³n de expulsiÃ³n:"
 
-#: IdentityEditWidget#33
+#. 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 ""
 "Usted necesita un cliente capaz de manejar SSL para editar su llave y su "
 "certificado internos SSL"
 
-#: IdentityEditWidget#34
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:517
 msgid ""
 "Warning: you are not connected with a secured connection to the Quassel "
 "Core!\n"
@@ -2469,76 +3174,106 @@ msgstr ""
 "Â¡Si procede, provocarÃ¡ una transmisiÃ³n sin encriptar de su llave SSL y su "
 "certificado SSL!"
 
-#: IdentityEditWidget#35
-msgctxt "IdentityEditWidget#35"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IdentityEditWidget
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context MainWin
+#: ../src/qtui/settingspages/identityeditwidget.ui:546
+#: ../src/qtui/mainwin.cpp:1044
 msgid "Continue"
 msgstr "Continuar"
 
-#: IdentityEditWidget#36
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:584
 msgid "Use SSL Key"
 msgstr "Usar llave SSL"
 
-#: IdentityEditWidget#37
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:598
 msgid "Key Type:"
 msgstr "Tipo de llave:"
 
-#: IdentityEditWidget#38
+#. 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 "No hay tecla cargada"
 
-#: IdentityEditWidget#39
+#. 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"
 
-#: IdentityEditWidget#40
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:637
 msgid "Use SSL Certificate"
 msgstr "Usar certificado SSL"
 
-#: IdentityEditWidget#41
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:656
 msgid "Organisation:"
 msgstr "OrganizaciÃ³n"
 
-#: IdentityEditWidget#42
+#. 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 "NingÃºn certificado cargado"
 
-#: IdentityEditWidget#43
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:690
 msgid "CommonName:"
 msgstr "Nombre comÃºn:"
 
-#: IdentityEditWidget#44
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
 msgid "Load a Key"
 msgstr "Cargar una tecla"
 
-#: IdentityEditWidget#45
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:322
 msgid "RSA"
 msgstr "RSA"
 
-#: IdentityEditWidget#46
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:325
 msgid "DSA"
 msgstr "DSA"
 
-#: IdentityEditWidget#47
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:330
+#: ../src/qtui/settingspages/identityeditwidget.cpp:369
 msgid "Clear"
 msgstr "Limpiar"
 
-#: IdentityEditWidget#48
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:340
 msgid "Load a Certificate"
 msgstr "Cargar un certificado"
 
-#: IdentityPage#1
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:107
 msgid "Setup Identity"
 msgstr "Configurar identidad"
 
-#: IdentityPage#2
+#. ts-context IdentityPage
+#: ../src/qtui/ircconnectionwizard.cpp:112
 msgid "Default Identity"
 msgstr "Identidad por defecto"
 
-#: IgnoreListEditDlg#1
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
 msgid "Configure Ignore Rule"
 msgstr "Configurar regla para ignorar"
 
-#: IgnoreListEditDlg#2
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
 msgid ""
 "<p><b>Strictness:</b></p>\n"
 "<p><u>Dynamic:</u></p>\n"
@@ -2557,19 +3292,23 @@ msgstr ""
 "<p>Los mensajes son filtrados antes de que queden almacenados en la base de "
 "datos</p>"
 
-#: IgnoreListEditDlg#3
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
 msgid "Strictness"
 msgstr "PrecisiÃ³n"
 
-#: IgnoreListEditDlg#4
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
 msgid "Dynamic"
 msgstr "DinÃ¡mica"
 
-#: IgnoreListEditDlg#5
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
 msgid "Permanent"
 msgstr "Permanente"
 
-#: 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"
@@ -2585,20 +3324,18 @@ msgstr ""
 "<p><u>Mensaje:</u></p>\n"
 "<p>La regla se ajusta al contenido del mensaje actual</p>"
 
-#: IgnoreListEditDlg#7
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
 msgid "Rule Type"
 msgstr "Tipo de regla"
 
-#: IgnoreListEditDlg#8
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
 msgid "Sender"
 msgstr "Mensajero"
 
-#: IgnoreListEditDlg#9
-msgctxt "IgnoreListEditDlg#9"
-msgid "Message"
-msgstr "Mensaje"
-
-#: IgnoreListEditDlg#10
+#. 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 "
@@ -2631,12 +3368,17 @@ msgstr ""
 "- <i>estÃºpido!.+</i> (RegEx) se ajusta a cualquier mensajero con el apodo "
 "<i>estÃºpido</i> de cualquier servidor</p>"
 
-#: IgnoreListEditDlg#11
-msgctxt "IgnoreListEditDlg#11"
+#. #-#-#-#-#  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 "Ignorar regla"
+msgstr "Regla para ignorar"
 
-#: IgnoreListEditDlg#12
+#. 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"
@@ -2655,11 +3397,13 @@ msgstr ""
 "<br />\n"
 "?: representa \"exactamente un carÃ¡cter\"</p>"
 
-#: IgnoreListEditDlg#13
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
 msgid "Regular expression"
 msgstr "ExpresiÃ³n regular"
 
-#: IgnoreListEditDlg#14
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
@@ -2681,25 +3425,36 @@ msgstr ""
 "<p>La lista de abajo es interpretada como una lista de canales a los cuales "
 "la regla deberÃ­a ajustarse</p>"
 
-#: IgnoreListEditDlg#15
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
 msgid "Scope"
 msgstr "Ãmbito"
 
-#: IgnoreListEditDlg#16
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
 msgid "Global"
 msgstr "Global"
 
-#: IgnoreListEditDlg#17
-msgctxt "IgnoreListEditDlg#17"
+#. #-#-#-#-#  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 "Red"
 
-#: IgnoreListEditDlg#18
-msgctxt "IgnoreListEditDlg#18"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IgnoreListEditDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context IrcListModel
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
+#: ../src/client/irclistmodel.cpp:59
 msgid "Channel"
 msgstr "Canal"
 
-#: IgnoreListEditDlg#19
+#. 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 "
@@ -2720,7 +3475,8 @@ msgstr ""
 "DeberÃ­a ajustarse a #foobar y a cualquier canal que empiece por "
 "<i>#quassel</i></p>"
 
-#: IgnoreListEditDlg#20
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -2733,11 +3489,13 @@ msgstr ""
 "Para reglas dinÃ¡micas, desactivar hace que se vualvan a mostrar los mensajes "
 "filtrados.</p>"
 
-#: IgnoreListEditDlg#21
+#. ts-context IgnoreListEditDlg
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
 msgid "Rule is enabled"
 msgstr "Regla activada"
 
-#: IgnoreListModel#1
+#. 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"
@@ -2746,7 +3504,8 @@ msgstr ""
 "filtradas.<br /> Para reglas dinÃ¡micas, desactivar hace que se vuelvan a "
 "mostrar los mensajes filtrados"
 
-#: IgnoreListModel#2
+#. 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 "
@@ -2766,60 +3525,43 @@ msgstr ""
 "/>    \"estÃºpido!.+\" (RegEx) se ajusta a cualquier mensajero con el apodo "
 "\"estÃºpido\" de cualquier servidor<br />"
 
-#: IgnoreListModel#3
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
 msgid "By Sender"
 msgstr "Por emisor"
 
-#: IgnoreListModel#4
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
 msgid "By Message"
 msgstr "Por mensaje"
 
-#: IgnoreListModel#5
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
 msgid "Enabled"
 msgstr "Activado"
 
-#: IgnoreListModel#6
+#. ts-context IgnoreListModel
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
 msgid "Type"
 msgstr "Tipo"
 
-#: IgnoreListModel#7
-msgctxt "IgnoreListModel#7"
-msgid "Ignore Rule"
-msgstr "Ignorar regla"
-
-#: IgnoreListSettingsPage#1
-msgctxt "IgnoreListSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: IgnoreListSettingsPage#2
-msgctxt "IgnoreListSettingsPage#2"
-msgid "New"
-msgstr "Nuevo"
-
-#: IgnoreListSettingsPage#3
-msgctxt "IgnoreListSettingsPage#3"
-msgid "Delete"
-msgstr "Borrar"
-
-#: IgnoreListSettingsPage#4
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
 msgid "&Edit"
 msgstr "&Editar"
 
-#: IgnoreListSettingsPage#5
-msgctxt "IgnoreListSettingsPage#5"
-msgid "IRC"
-msgstr "IRC"
-
-#: IgnoreListSettingsPage#6
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
 msgid "Ignore List"
 msgstr "Regla para ignorar"
 
-#: IgnoreListSettingsPage#7
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
 msgid "Rule already exists"
 msgstr "La regla ya existe"
 
-#: IgnoreListSettingsPage#8
+#. ts-context IgnoreListSettingsPage
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
@@ -2829,110 +3571,230 @@ msgstr ""
 "Â«%1Â»\n"
 "Escoja otra regla."
 
-#: IndicatorNotificationConfigWidget#1
-msgctxt "IndicatorNotificationConfigWidget#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: IndicatorNotificationConfigWidget#2
-msgid "Show messages in indicator"
-msgstr "Mostrar mensajes en el indicador"
-
-#: InputWidget#1
-msgctxt "InputWidget#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: InputWidget#2
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
+msgid ""
+"This enables support for the Ayatana Project's application indicator "
+"(libindicate)."
+msgstr ""
+"Esto activa el soporte para el proyecto de Ayatana indicador de aplicaciones "
+"(libindicate)."
+
+#. ts-context IndicatorNotificationConfigWidget
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
+msgid "Show messages in application indicator"
+msgstr "Mostrar mensajes en el indicador de aplicaciones"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "White"
+msgstr "Blanco"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Black"
+msgstr "Negro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark blue"
+msgstr "Azul oscuro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark green"
+msgstr "Verde oscuro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Red"
+msgstr "Rojo"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark red"
+msgstr "Rojo oscuro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Dark magenta"
+msgstr "Magenta oscuro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:73
+msgid "Orange"
+msgstr "Naranja"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Yellow"
+msgstr "Amarillo"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Green"
+msgstr "Verde"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Dark cyan"
+msgstr "Cian oscuro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Cyan"
+msgstr "Cian"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Blue"
+msgstr "Azul"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Magenta"
+msgstr "Magenta"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Dark gray"
+msgstr "Gris oscuro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:74
+msgid "Light gray"
+msgstr "Gris claro"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+msgid "Clear Color"
+msgstr "Limpiar color"
+
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:132
 msgid "Focus Input Line"
 msgstr "Enfocar a la lÃ­nea de entrada de texto"
 
-#: InputWidget#3
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-#: InputWidgetSettingsPage#1
-msgctxt "InputWidgetSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: InputWidgetSettingsPage#2
-msgctxt "InputWidgetSettingsPage#2"
+#. #-#-#-#-#  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 "TipografÃ­a personalizada:"
+msgstr "TipografÃ­a personalizada"
 
-#: InputWidgetSettingsPage#3
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgid "Enable spell check"
 msgstr "Activar revisiÃ³n ortogrÃ¡fica"
 
-#: InputWidgetSettingsPage#4
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
+msgid "Enable per chat history"
+msgstr "Activar historial por charla"
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
 msgid "Show nick selector"
 msgstr "Mostrar el selector de apodo"
 
-#: InputWidgetSettingsPage#5
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+msgid "Show style buttons"
+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"
 
-#: InputWidgetSettingsPage#6
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
 msgid "Show at most"
 msgstr "Mostrar por encima"
 
-#: InputWidgetSettingsPage#7
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
 msgid "lines"
 msgstr "LÃ­neas"
 
-#: InputWidgetSettingsPage#8
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
 msgid "Enable scrollbars"
 msgstr "Activar barras de desplazamiento"
 
-#: InputWidgetSettingsPage#9
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
 msgid "Tab Completion"
 msgstr "Autocompletar por Tabulador"
 
-#: InputWidgetSettingsPage#10
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
 msgid "Completion suffix:"
 msgstr "Sufijo para autocompletar:"
 
-#: InputWidgetSettingsPage#11
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
 msgid ": "
 msgstr ": "
 
-#: InputWidgetSettingsPage#12
-msgctxt "InputWidgetSettingsPage#12"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: InputWidgetSettingsPage#13
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
 msgid "Input Widget"
 msgstr "Componente de entrada de texto"
 
-#: IrcConnectionWizard#1
+#. ts-context IrcConnectionWizard
+#: ../src/qtui/ircconnectionwizard.cpp:51
 msgid "Save && Connect"
 msgstr "Guardar && Conectar"
 
-#: IrcListModel#1
-msgctxt "IrcListModel#1"
-msgid "Channel"
-msgstr "Canal"
-
-#: IrcListModel#2
+#. ts-context IrcListModel
+#: ../src/client/irclistmodel.cpp:60
 msgid "Users"
 msgstr "Usuarios"
 
-#: 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 "Tema"
 
-#: 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 ha cambiado el tema del canal de %2 a: \"%3\""
 
-#: IrcServerHandler#2
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:634
 msgid "Received RPL_ISUPPORT (005) without parameters!"
 msgstr "Â¡Recibido RPL_ISUPPORT (005) sin parÃ¡metros!"
 
-#: IrcServerHandler#3
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:642
 msgid ""
 "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
@@ -2940,418 +3802,721 @@ msgstr ""
 "Â¡Recibido RPL_ISUPPORT que no cumple con RFC: esto puede conducir a un "
 "comportamiento inesperado!"
 
-#: IrcServerHandler#4
-msgctxt "IrcServerHandler#4"
+#. #-#-#-#-#  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 estÃ¡ ausente: \"%2\""
 
-#: IrcServerHandler#6
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:724 ../src/core/ircserverhandler.cpp:729
 msgid "%1 is away: \"%2\""
 msgstr "%1 estÃ¡ ausente: \"%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 estÃ¡ %2 (%3)"
 
-#: IrcServerHandler#9
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:820
 msgid "%1 is online via %2 (%3)"
 msgstr "%1 estÃ¡ en lÃ­nea vÃ­a %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 fue %2 (%3)"
 
-#: IrcServerHandler#12
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:864
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Fin de lista /WHO para %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 estÃ¡ conectado desde %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 estÃ¡ inactivo durante %2 (%3)"
 
-#: IrcServerHandler#15
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] mesaje de inactivo: %1"
-
-#: IrcServerHandler#16
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:928
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 es usuario de los canales: %2"
 
-#: IrcServerHandler#17
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:930
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 tiene soporte de voz en los canales: %2"
 
-#: IrcServerHandler#18
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:932
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 es operador de los canales: %2"
 
-#: IrcServerHandler#19
+#. ts-context IrcServerHandler
+#: ../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"
 
-#: IrcServerHandler#20
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:969
 msgid "End of channel list"
 msgstr "Fin de la lista de canales"
 
-#: IrcServerHandler#21
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:987
 msgid "Homepage for %1 is %2"
 msgstr "La pÃ¡gina principal de %1 es %2"
 
-#: IrcServerHandler#22
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1005
 msgid "Channel %1 created on %2"
 msgstr "Canal %1 creado en %2"
 
-#: IrcServerHandler#23
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1019
 msgid "No topic is set for %1."
 msgstr "No hay tema establecido para %1"
 
-#: IrcServerHandler#24
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1039
 msgid "Topic for %1 is \"%2\""
 msgstr "El tema para %1 es \"%2\""
 
-#: IrcServerHandler#25
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1050
 msgid "Topic set by %1 on %2"
 msgstr "Tema establecido por %1 en %2"
 
-#: 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 "El apodo %1 contiene carÃ¡cteres no admitidos."
 
-#: IrcServerHandler#28
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1160
 msgid "Nick already in use: %1"
 msgstr "Este apodo ya estÃ¡ en uso: %1"
 
-#: IrcServerHandler#29
+#. ts-context IrcServerHandler
+#: ../src/core/ircserverhandler.cpp:1177
+msgid "Nick/channel is temporarily unavailable: %1"
+msgstr "El Nick/Canal  no esta disponible temporalmente: %1"
+
+#. ts-context IrcServerHandler
+#: ../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."
 
-#: IrcUserItem#1
-msgctxt "IrcUserItem#1"
+#. ts-context IrcUserItem
+#: ../src/client/networkmodel.cpp:806
+msgid " is away"
+msgstr ""
+
+#. #-#-#-#-#  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 "inactivo desde %1"
+msgstr "Inactivo desde %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 "hora de acceso: %1"
+msgstr "Tiempo de entrada: %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 "servidor: %1"
 
-#: ItemViewSettingsPage#1
-msgctxt "ItemViewSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: ItemViewSettingsPage#2
-msgctxt "ItemViewSettingsPage#2"
-msgid "Custom font:"
-msgstr "TipografÃ­a personalizada:"
-
-#: ItemViewSettingsPage#3
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:50
 msgid "Show icons"
 msgstr "Mostrar iconos"
 
-#: ItemViewSettingsPage#4
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:66
 msgid "Chat List"
 msgstr "Lista de conversaciones"
 
-#: ItemViewSettingsPage#5
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:72
 msgid "Display topic in tooltip"
 msgstr "Mostrar tema en el globo de ayuda"
 
-#: ItemViewSettingsPage#6
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:85
 msgid "Mouse wheel changes selected chat"
 msgstr "La rueda del ratÃ³n cambia la conversaciÃ³n seleccionada"
 
-#: ItemViewSettingsPage#7
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:101
 msgid "Use Custom Colors"
 msgstr "Usar colores personalizados"
 
-#: ItemViewSettingsPage#8
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
 msgid "Standard:"
 msgstr "EstÃ¡ndar"
 
-#: ItemViewSettingsPage#9
-msgctxt "ItemViewSettingsPage#9"
-msgid "..."
-msgstr "..."
-
-#: ItemViewSettingsPage#10
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
 msgid "Inactive:"
 msgstr "Inactivo:"
 
-#: ItemViewSettingsPage#11
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
 msgid "Unread messages:"
 msgstr "Mensajes sin leer:"
 
-#: ItemViewSettingsPage#12
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
 msgid "Highlight:"
 msgstr "Resaltar:"
 
-#: ItemViewSettingsPage#13
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
 msgid "Other activity:"
 msgstr "Otra actividad:"
 
-#: ItemViewSettingsPage#14
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
 msgid "1"
 msgstr "1"
 
-#: ItemViewSettingsPage#15
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 msgid "Custom Nick List Colors"
 msgstr "Colores de la lista de apodos personalizados"
 
-#: ItemViewSettingsPage#16
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
 msgid "Online:"
 msgstr "En lÃ­nea:"
 
-#: ItemViewSettingsPage#17
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
 msgid "Away:"
 msgstr "Ausente:"
 
-#: ItemViewSettingsPage#18
-msgctxt "ItemViewSettingsPage#18"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: ItemViewSettingsPage#19
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
 msgid "Chat & Nick Lists"
 msgstr "Listas de Charlas & Apodos"
 
-#: ItemViewSettingsPage#20
-msgctxt "ItemViewSettingsPage#20"
-msgid "Network"
-msgstr "Red"
-
-#: ItemViewSettingsPage#21
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ItemViewSettingsPage#22
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
 msgid "Normal"
 msgstr "Normal"
 
-#: ItemViewSettingsPage#23
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 
-#: ItemViewSettingsPage#24
-msgctxt "ItemViewSettingsPage#24"
-msgid "Highlight"
-msgstr "Resaltado"
-
-#: ItemViewSettingsPage#25
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
 msgid "Other activity"
 msgstr "Otra actividad"
 
-#: MainWin#1
+#. #-#-#-#-#  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] "%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
+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:314
 msgid "&Connect to Core..."
 msgstr "&Conectar al nÃºcleo..."
 
-#: MainWin#2
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Disconnect from Core"
 msgstr "&Desconectar del nÃºcleo"
 
-#: MainWin#3
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:318
 msgid "Core &Info..."
 msgstr "&InformaciÃ³n del nÃºcleo..."
 
-#: MainWin#4
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:320
 msgid "Configure &Networks..."
 msgstr "Co&nfigurar redes..."
 
-#: MainWin#5
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Quit"
 msgstr "&Salir"
 
-#: MainWin#6
-msgid "Ctrl+Q"
-msgstr "Ctrl+Q"
-
-#: MainWin#7
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:327
 msgid "&Configure Chat Lists..."
 msgstr "&Configurar listas de canales"
 
-#: MainWin#8
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:330
 msgid "&Lock Layout"
 msgstr "B&loquear la distribuciÃ³n de la pantalla"
 
-#: MainWin#9
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show &Search Bar"
 msgstr "Mostrar barra de bÃº&squeda"
 
-#: MainWin#10
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:336
 msgid "Show Away Log"
 msgstr "Mostrar el registro de ausente"
 
-#: MainWin#11
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:338
 msgid "Show &Menubar"
 msgstr "Mostrar la barra de &menÃº"
 
-#: MainWin#12
-msgid "Ctrl+M"
-msgstr "Ctrl+M"
-
-#: MainWin#13
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:341
 msgid "Show Status &Bar"
 msgstr "Mostrar la &barra de estado"
 
-#: 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
+msgid "Configure &Shortcuts..."
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:349
 msgid "&Configure Quassel..."
 msgstr "&Configurar Quassel..."
 
-#: MainWin#15
-msgid "F7"
-msgstr "F7"
-
-#: MainWin#16
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:353
 msgid "&About Quassel"
 msgstr "Sobre Qu&assel"
 
-#: MainWin#17
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:355
 msgid "About &Qt"
 msgstr "Sobre &Qt"
 
-#: MainWin#18
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:357
 msgid "Debug &NetworkModel"
 msgstr "Depurar &NetworkModel"
 
-#: MainWin#19
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:359
 msgid "Debug &BufferViewOverlay"
 msgstr "Depurar &BufferViewOverlay"
 
-#: MainWin#20
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:361
 msgid "Debug &MessageModel"
 msgstr "Depurar &MessageModel"
 
-#: MainWin#21
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:363
 msgid "Debug &HotList"
 msgstr "Depurar &HotList"
 
-#: MainWin#22
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:365
 msgid "Debug &Log"
 msgstr "Depurar &Log"
 
-#: MainWin#23
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:367
 msgid "Reload Stylesheet"
 msgstr "Recargar estilo de hoja"
 
-#: MainWin#24
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:371
+msgid "Navigation"
+msgstr ""
+
+#. 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: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 ""
 
-#: MainWin#25
+#. 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 "&Archivo"
 
-#: MainWin#26
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:454
 msgid "&Networks"
 msgstr "&Redes"
 
-#: MainWin#27
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:460
 msgid "&View"
 msgstr "&Ver"
 
-#: MainWin#28
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:461
 msgid "&Chat Lists"
 msgstr "Listas de &ConversaciÃ³n"
 
-#: MainWin#29
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:463
 msgid "&Toolbars"
 msgstr "Barras de &Herramientas"
 
-#: MainWin#30
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:477
 msgid "&Settings"
 msgstr "Preferencia&s"
 
-#: MainWin#31
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:486
 msgid "&Help"
 msgstr "A&yuda"
 
-#: MainWin#32
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:494
 msgid "Debug"
 msgstr "Depurar"
 
-#: MainWin#33
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:723
 msgid "Nicks"
 msgstr "Apodos"
 
-#: MainWin#34
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:732
 msgid "Show Nick List"
 msgstr "Mostrar lista de apodos"
 
-#: MainWin#35
-msgctxt "MainWin#35"
-msgid "Chat Monitor"
-msgstr "Monitor de charla"
-
-#: MainWin#36
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:755
 msgid "Show Chat Monitor"
 msgstr "Mostrar monitor de conversaciÃ³n"
 
-#: MainWin#37
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:759
 msgid "Inputline"
 msgstr "LÃ­nea de introducciÃ³n de texto"
 
-#: MainWin#38
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:768
 msgid "Show Input Line"
 msgstr "Mostrar lÃ­nea de introducciÃ³n de texto"
 
-#: MainWin#39
-msgctxt "MainWin#39"
-msgid "Topic"
-msgstr "Tema"
-
-#: MainWin#40
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:793
 msgid "Show Topic Line"
 msgstr "Mostrar lÃ­nea del tema"
 
-#: MainWin#41
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:871
 msgid "Main Toolbar"
 msgstr "Barra de herramientas principal"
 
-#: MainWin#42
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:910
 msgid "Connected to core."
 msgstr "Conectado al nÃºcleo"
 
-#: MainWin#43
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1001
 msgid "Not connected to core."
 msgstr "No conectado al nÃºcleo"
 
-#: MainWin#44
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1015 ../src/qtui/mainwin.cpp:1023
 msgid "Unencrypted Connection"
 msgstr "ConexiÃ³n sin encriptar"
 
-#: MainWin#45
+#. ts-context MainWin
+#: ../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>"
 
-#: MainWin#46
+#. 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."
@@ -3359,15 +4524,18 @@ msgstr ""
 "InformaciÃ³n confidencial, como contraseÃ±as, serÃ¡ transmitida sin encriptar a "
 "su nÃºcleo Quassel."
 
-#: MainWin#47
+#. ts-context MainWin
+#: ../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>"
 
-#: MainWin#48
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1060
 msgid "Untrusted Security Certificate"
 msgstr "Certificado de seguridad no confiable"
 
-#: MainWin#49
+#. 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>"
@@ -3375,138 +4543,162 @@ msgstr ""
 "<b>El certificado SSL proporcionado por el nÃºcleo en %1 es inseguro por las "
 "razones siguientes:</b>"
 
-#: MainWin#50
-msgctxt "MainWin#50"
-msgid "Continue"
-msgstr "Continuar"
-
-#: MainWin#51
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1045
 msgid "Show Certificate"
 msgstr "Ver certificado"
 
-#: MainWin#52
+#. ts-context MainWin
+#: ../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?"
 
-#: MainWin#53
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1063
 msgid "Current Session Only"
 msgstr "SÃ³lo sesiÃ³n actual"
 
-#: MainWin#54
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1064
 msgid "Forever"
 msgstr "Para siempre"
 
-#: MainWin#55
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:1073
 msgid "Core Connection Error"
 msgstr "Error de conexiÃ³n de nÃºcleo"
 
-#: MessageModel#1
+#. 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"
 msgstr "Solicitando %1 mensajes del registro para charla %2:%3"
 
-#: MsgProcessorStatusWidget#1
-msgctxt "MsgProcessorStatusWidget#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: MsgProcessorStatusWidget#2
+#. ts-context MsgProcessorStatusWidget
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
 msgid "Receiving Backlog"
 msgstr "Recibiendo registro"
 
-#: MultiLineEdit#1
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:661
 msgid "Do you really want to paste %n lines?"
-msgstr "Â¿Realmente desea pegar %n lÃ­neas?"
+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?"
 
-#: MultiLineEdit#2
+#. ts-context MultiLineEdit
+#: ../src/uisupport/multilineedit.cpp:670
 msgid "Paste Protection"
 msgstr "ProtecciÃ³n contra pegado"
 
-#: 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 "AÃ±adir Red"
+msgstr "Agregar Red"
 
-#: NetworkAddDlg#2
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:22
 msgid "Use preset:"
 msgstr "Usar preprogramado:"
 
-#: NetworkAddDlg#3
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:57
 msgid "Manually specify network settings"
 msgstr "Especificar preferencias de red manualmente"
 
-#: NetworkAddDlg#4
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:67
 msgid "Manual Settings"
 msgstr "Preferencias de forma manual"
 
-#: 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 "Nombre de la red:"
-
-#: NetworkAddDlg#6
-msgctxt "NetworkAddDlg#6"
+msgstr "Nombre de red:"
+
+#. #-#-#-#-#  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 "DirecciÃ³n del servidor:"
 
-#: NetworkAddDlg#7
-msgctxt "NetworkAddDlg#7"
-msgid "Port:"
-msgstr "Puerto:"
-
-#: NetworkAddDlg#8
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:115
 msgid "Server password:"
 msgstr "ContraseÃ±a del servidor:"
 
-#: NetworkAddDlg#9
+#. ts-context NetworkAddDlg
+#: ../src/qtui/settingspages/networkadddlg.ui:131
 msgid "Use secure connection"
 msgstr "Usar conexiÃ³n segura"
 
-#: NetworkEditDlg#1
-msgctxt "NetworkEditDlg#1"
-msgid "Dialog"
-msgstr "DiÃ¡logo"
-
-#: NetworkEditDlg#2
+#. ts-context NetworkEditDlg
+#: ../src/qtui/settingspages/networkeditdlg.ui:21
 msgid "Please enter a network name:"
 msgstr "Por favor, introduzca un nombre de red:"
 
-#: NetworkEditDlg#3
-msgctxt "NetworkEditDlg#3"
-msgid "Add Network"
-msgstr "AÃ±adir red"
-
-#: NetworkItem#1
+#. ts-context NetworkItem
+#: ../src/client/networkmodel.cpp:196
 msgid "Server: %1"
 msgstr "Servidor: %1"
 
-#: 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 "Usuarios: %1"
 
-#: 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 "Demora: %1 ms"
 
-#: NetworkModel#1
+#. ts-context NetworkModel
+#: ../src/client/networkmodel.cpp:852
 msgid "Chat"
 msgstr "Charla"
 
-#: NetworkModel#2
-msgctxt "NetworkModel#2"
-msgid "Topic"
-msgstr "Tema"
-
-#: NetworkModel#3
+#. ts-context NetworkModel
+#: ../src/client/networkmodel.cpp:852
 msgid "Nick Count"
 msgstr "Recuento de apodos"
 
-#: NetworkModelController#1
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:154
 msgid "Do you want to delete the following buffer(s) permanently?"
-msgstr "Â¿Desea borrar los siguientes bÃºfres permanentemente?"
+msgid_plural "Do you want to delete the following buffer(s) permanently?"
+msgstr[0] "Â¿Desea borrar permanentemente los siguientes buffers?"
+msgstr[1] "Â¿Desea borrar permanentemente los siguientes buffers?"
 
-#: NetworkModelController#2
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:167
+msgid "...and <b>%1</b> more<br><br>"
+msgstr "...y <b>%1</b> mÃ¡s<br><br>"
+
+#. 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."
@@ -3514,96 +4706,74 @@ msgstr ""
 "<b>Nota:</b> Esto eliminarÃ¡ toda la informaciÃ³n relacionada, incluyendo toda "
 "la informaciÃ³n del registro del nÃºcleo y es irreversible."
 
-#: NetworkModelController#3
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:170
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 "<br>Los canales en memoria que estÃ¡n con actividad, no pueden ser "
 "eliminados. Por favor, abandone el canal primero."
 
-#: NetworkModelController#4
+#. ts-context NetworkModelController
+#: ../src/uisupport/networkmodelcontroller.cpp:172
 msgid "Remove buffers permanently?"
 msgstr "Â¿Borrar canales en memorÃ­a permanentemente?"
 
-#: NetworkModelController::JoinDlg#1
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:484
 msgid "Join Channel"
 msgstr "Unirse al canal"
 
-#: NetworkModelController::JoinDlg#2
-msgctxt "NetworkModelController::JoinDlg#2"
-msgid "Network:"
-msgstr "Red:"
-
-#: NetworkModelController::JoinDlg#3
+#. ts-context NetworkModelController::JoinDlg
+#: ../src/uisupport/networkmodelcontroller.cpp:489
 msgid "Channel:"
 msgstr "Canal:"
 
-#: NetworkPage#1
+#. ts-context NetworkPage
+#: ../src/qtui/ircconnectionwizard.cpp:148
 msgid "Setup Network Connection"
 msgstr "Configurar conexiÃ³n de red"
 
-#: NetworksSettingsPage#1
-msgctxt "NetworksSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: NetworksSettingsPage#2
-msgctxt "NetworksSettingsPage#2"
-msgid "Re&name..."
-msgstr "Re&nombrar..."
-
-#: NetworksSettingsPage#3
-msgctxt "NetworksSettingsPage#3"
-msgid "&Add..."
-msgstr "&AÃ±adir..."
-
-#: NetworksSettingsPage#4
-msgctxt "NetworksSettingsPage#4"
-msgid "De&lete"
-msgstr "&Borrar"
-
-#: NetworksSettingsPage#5
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgid "Network Details"
 msgstr "Detalles de red"
 
-#: NetworksSettingsPage#6
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:132
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: NetworksSettingsPage#7
-msgctxt "NetworksSettingsPage#7"
-msgid "..."
-msgstr "..."
-
-#: NetworksSettingsPage#8
-msgctxt "NetworksSettingsPage#8"
+#. #-#-#-#-#  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 "Servidores"
 
-#: NetworksSettingsPage#9
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:193
 msgid "Manage servers for this network"
 msgstr "Administrar servidores para esta red"
 
-#: NetworksSettingsPage#10
-msgctxt "NetworksSettingsPage#10"
+#. #-#-#-#-#  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 "&Editar..."
 
-#: NetworksSettingsPage#11
-msgctxt "NetworksSettingsPage#11"
-msgid "Move upwards in list"
-msgstr "Subir en la lista"
-
-#: NetworksSettingsPage#12
-msgctxt "NetworksSettingsPage#12"
-msgid "Move downwards in list"
-msgstr "Bajar en la lista"
-
-#: NetworksSettingsPage#13
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:337
 msgid "Commands"
 msgstr "Comandos"
 
-#: NetworksSettingsPage#14
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:340
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
@@ -3611,11 +4781,13 @@ msgstr ""
 "Configurar identificaciÃ³n automÃ¡tica u otros comandos a ser ejecutados tras "
 "conectar al servidor"
 
-#: NetworksSettingsPage#15
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgid "Commands to execute on connect:"
 msgstr "Comandos a ejecutar al conectarse:"
 
-#: NetworksSettingsPage#16
+#. 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 "
@@ -3625,78 +4797,94 @@ msgstr ""
 "Tenga en cuenta que Quassel IRC recuerda los canales a los que estaba unido, "
 "por lo que, usar /join, raramente serÃ¡ necesario aquÃ­."
 
-#: NetworksSettingsPage#17
-msgctxt "NetworksSettingsPage#17"
-msgid "Connection"
-msgstr "ConexiÃ³n"
-
-#: NetworksSettingsPage#18
-msgid "Control automatic reconnect to the network"
-msgstr "Control de reconexiÃ³n automÃ¡tica a la red"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:383
+msgid "Automatically reconnect to the IRC network after connection failures"
+msgstr ""
+"Reconectar automÃ¡ticamente a la red IRC despuÃ©s de un error en la conexiÃ³n"
 
-#: NetworksSettingsPage#19
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:386
 msgid "Automatic Reconnect"
 msgstr "ReconexiÃ³n automÃ¡tica"
 
-#: NetworksSettingsPage#20
-msgid "Interval:"
-msgstr "Intervalo:"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:397
+msgid "Wait"
+msgstr "Esperar"
 
-#: NetworksSettingsPage#21
-msgctxt "NetworksSettingsPage#21"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:404
 msgid " s"
 msgstr " s"
 
-#: NetworksSettingsPage#22
-msgid "Retries:"
-msgstr "Intentos:"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:420
+msgid "between retries"
+msgstr "entre reintentos"
 
-#: NetworksSettingsPage#23
-msgctxt "NetworksSettingsPage#23"
-msgid "Unlimited"
-msgstr "Ilimitado"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:444
+msgid "Number of retries:"
+msgstr "NÃºmero de reintentos:"
 
-#: NetworksSettingsPage#24
-msgid "Rejoin all channels on reconnect"
-msgstr "Volver a unirse a todos los canales al reconectarse"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:489
+msgid "Rejoin all channels after reconnect"
+msgstr "Reunir todos los canales despuÃ©s de reconectar"
 
-#: NetworksSettingsPage#25
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:516
+#: ../src/qtui/settingspages/networkssettingspage.ui:525
 msgid "Auto Identify"
 msgstr "IdentificaciÃ³n automÃ¡tica"
 
-#: NetworksSettingsPage#26
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:540
 msgid "NickServ"
 msgstr "NickServ"
 
-#: NetworksSettingsPage#27
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:557
 msgid "Service:"
 msgstr "Servicio:"
 
-#: NetworksSettingsPage#28
-msgctxt "NetworksSettingsPage#28"
-msgid "Password:"
-msgstr "ContraseÃ±a:"
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:580
+msgid "Use SASL Authentication"
+msgstr "Usar autenticaciÃ³n SASL"
 
-#: NetworksSettingsPage#29
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:625
+msgid "Account:"
+msgstr "Cuenta:"
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:649
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: NetworksSettingsPage#30
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:652
 msgid ""
 "Configure advanced settings such as message encodings and automatic reconnect"
 msgstr ""
 "Configurar preferencias avanzadas como la codificaciÃ³n de los mensajes y la "
 "reconexiÃ³n automÃ¡tica"
 
-#: NetworksSettingsPage#31
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:661
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Control de codificaciÃ³n para los mensajes entrantes y salientes"
 
-#: NetworksSettingsPage#32
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:664
 msgid "Use Custom Encodings"
 msgstr "Usar codificaciones personalizadas"
 
-#: NetworksSettingsPage#33
+#. 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."
@@ -3704,11 +4892,14 @@ msgstr ""
 "Especificar la codificaciÃ³n con la que serÃ¡n enviados sus mensajes.\n"
 "UTF-8 deberÃ­a ser una buena elecciÃ³n para la mayorÃ­a de las redes."
 
-#: NetworksSettingsPage#34
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:679
 msgid "Send messages in:"
 msgstr "Mnesajes enviados:"
 
-#: NetworksSettingsPage#35
+#. 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."
@@ -3717,11 +4908,14 @@ msgstr ""
 "tales.\n"
 "Esto define la codificaciÃ³n de los mensajes que no estÃ¡n en UTF-8."
 
-#: NetworksSettingsPage#36
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:710
 msgid "Receive fallback:"
 msgstr "Recibir caÃ­da:"
 
-#: NetworksSettingsPage#37
+#. 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!"
@@ -3731,45 +4925,34 @@ msgstr ""
 "Â¡A menos que usted sepa *realmente* lo que estÃ¡ haciendo, deje esto como ISO-"
 "8859-1!"
 
-#: NetworksSettingsPage#38
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.ui:741
 msgid "Server encoding:"
 msgstr "CodificaciÃ³n de Servidor:"
 
-#: NetworksSettingsPage#39
-msgctxt "NetworksSettingsPage#39"
-msgid "IRC"
-msgstr "IRC"
-
-#: NetworksSettingsPage#40
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
 msgid "Networks"
 msgstr "Redes"
 
-#: NetworksSettingsPage#41
-msgctxt "NetworksSettingsPage#41"
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
-msgstr ""
-
-#: NetworksSettingsPage#42
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:168
 msgid "<li>All networks need at least one server defined</li>"
 msgstr ""
 "<li>Todas las redes necesitan tener al menos un servidor definido</li>"
 
-#: NetworksSettingsPage#43
-msgctxt "NetworksSettingsPage#43"
-msgid "</ul>"
-msgstr "</ul>"
-
-#: NetworksSettingsPage#44
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:170
 msgid "Invalid Network Settings"
 msgstr "Preferencias de red no vÃ¡lidas"
 
-#: NetworksSettingsPage#45
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:542
 msgid "Delete Network?"
 msgstr "Â¿Eliminar red?"
 
-#: NetworksSettingsPage#46
+#. 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?"
@@ -3777,15 +4960,18 @@ msgstr ""
 "Â¿EstÃ¡ seguro de que desea eliminar la red \"%1\" y toda la informaciÃ³n "
 "relacionada, inluyendo el registro?"
 
-#: NickEditDlg#1
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgid "Edit Nickname"
 msgstr "Editar apodo"
 
-#: NickEditDlg#2
+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/nickeditdlg.ui:19
 msgid "Please enter a valid nickname:"
 msgstr "Por favor, introduzca un apodo vÃ¡lido:"
 
-#: NickEditDlg#3
+#. 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 -."
@@ -3793,64 +4979,65 @@ msgstr ""
 "Un apodo vÃ¡lido puede contener letras del alfabeto anglosajÃ³n, dÃ­gitos "
 "numÃ©ricos, y los carÃ¡cteres especiales {, }, [, ], \\, |, `, ^, _ and -."
 
-#: NickEditDlg#4
-msgctxt "NickEditDlg#4"
-msgid "Add Nickname"
-msgstr "AÃ±adir el apodo"
-
-#: NotificationsSettingsPage#1
-msgctxt "NotificationsSettingsPage#1"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: NotificationsSettingsPage#2
+#. ts-context NotificationsSettingsPage
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: PhononNotificationBackend::ConfigWidget#1
+#. ts-context PhononNotificationBackend::ConfigWidget
+#: ../src/qtui/phononnotificationbackend.cpp:143
 msgid "Select Audio File"
 msgstr "Seleccionar archivo de sonido"
 
-#: PhononNotificationConfigWidget#1
-msgctxt "PhononNotificationConfigWidget#1"
-msgid "Form"
-msgstr "Formulario"
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
+msgid "Play a sound"
+msgstr "Reproducir un sonido"
 
-#: PhononNotificationConfigWidget#2
-msgid "Audio Notification (via Phonon)"
-msgstr "NotificaciÃ³n con sonido (vÃ­a Phonon)"
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
+msgid "Prelisten to the selected sound"
+msgstr "Pre-escuchar el sonido seleccionado"
 
-#: PhononNotificationConfigWidget#3
-msgid "Play File:"
-msgstr "Reproducir:"
+#. ts-context PhononNotificationConfigWidget
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
+msgid "Select the sound file to play"
+msgstr "Seleccionar el archivo de sonido a reproducir"
 
-#: 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 ""
 "Solicitando un total de %1 mensajes al registro desde %2 canales en memoria"
 
-#: QObject#2
+#. ts-context QObject
+#: ../src/client/backlogrequester.cpp:106
 msgid ""
 "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 "Solicitando hasta %1 de todos los mensajes sin leer del registro (mÃ¡s %2 "
 "adicionales)"
 
-#: 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 ""
 "Solicitando un total de hasta %1 mesnajes sin leer del registro de %2 "
 "canales en memoria"
 
-#: QObject#4
+#. ts-context QObject
+#: ../src/qtui/ircconnectionwizard.cpp:56
 msgid "Welcome to Quassel IRC"
 msgstr "Bienvenido a Quassel IRC"
 
-#: QObject#5
+#. 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 "
@@ -3861,202 +5048,204 @@ msgstr ""
 "cancelar el asistente en cualquier momento y usar el diÃ¡logo para una "
 "configuraciÃ³n mÃ¡s detallada."
 
-#: 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 "Bloque declarado de forma no vÃ¡lida: %1"
 
-#: QssParser#2
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:140
 msgid "Invalid palette role assignment: %1"
 msgstr "AsignaciÃ³n de modo de paleta no vÃ¡lida: %1"
 
-#: QssParser#3
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:156
 msgid "Unknown palette role name: %1"
 msgstr "Nombre de modo de paleta desconocido: %1"
 
-#: QssParser#4
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:192
 msgid "Invalid subelement name in %1"
 msgstr "Nombre de subelemento no vÃ¡lido en %1"
 
-#: QssParser#5
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:236
 msgid "Invalid message type in %1"
 msgstr "Tipo de mensaje no vÃ¡lido en %1"
 
-#: QssParser#6
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:245
 msgid "Invalid condition %1"
 msgstr "CondiciÃ³n no vÃ¡lida %1"
 
-#: QssParser#7
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:257
 msgid "Invalid message label: %1"
 msgstr "Etiqueta del mensaje no vÃ¡lida: %1"
 
-#: QssParser#8
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:268
 msgid "Invalid senderhash specification: %1"
 msgstr "SpecificaciÃ³n de la marca identificadora del mesajero no vÃ¡lida: %1"
 
-#: QssParser#9
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:272
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 "Â¡La marca identificadora del mensajero puede ser como mucho \"0x0f\"!"
 
-#: QssParser#10
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:287
 msgid "Invalid format name: %1"
 msgstr "Formato de nombre no vÃ¡lido: %1"
 
-#: QssParser#11
+#. ts-context QssParser
+#: ../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"
 
-#: QssParser#12
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:302
 msgid "Unhandled condition: %1"
 msgstr "CondiciÃ³n no controlada: %1"
 
-#: QssParser#13
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:331
 msgid "Invalid proplist %1"
-msgstr ""
+msgstr "proplist %1 invÃ¡lida"
 
-#: QssParser#14
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:350
 msgid "Invalid chatlist item type %1"
 msgstr "Tipo de elemento de la lista de conversaciones no vÃ¡lido %1"
 
-#: QssParser#15
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:366
 msgid "Invalid chatlist state %1"
 msgstr "Estado de la lista de conversaciones no vÃ¡lido %1"
 
-#: QssParser#16
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:392
 msgid "Invalid property declaration: %1"
 msgstr "DeclaraciÃ³n de propiedad no vÃ¡lida: %1"
 
-#: QssParser#17
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:416
 msgid "Invalid font property: %1"
 msgstr "Propiedad de fuente no vÃ¡lida: %1"
 
-#: QssParser#18
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:422
 msgid "Unknown ChatLine property: %1"
 msgstr "Propiedad de lÃ­nea de charla desconocida: %1"
 
-#: QssParser#19
+#. ts-context QssParser
+#: ../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"
 
-#: QssParser#20
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:451
 msgid "Unknown palette color role: %1"
 msgstr "Paleta de color desconocida: %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 "DeclaraciÃ³n de gradiente no vÃ¡lida: %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 "Gradiente de lista de paradas no vÃ¡lido: %1"
 
-#: QssParser#23
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:610
 msgid "Invalid font specification: %1"
 msgstr "EspecificaciÃ³n de fuente no valida: %1"
 
-#: QssParser#24
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:649
 msgid "Invalid font style specification: %1"
 msgstr "EspecificaciÃ³n de estilo de fuente no vÃ¡lida: %1"
 
-#: QssParser#25
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:662
 msgid "Invalid font weight specification: %1"
 msgstr "EspecificaciÃ³n de ancho de fuente no vÃ¡lida: %1"
 
-#: QssParser#26
+#. ts-context QssParser
+#: ../src/uisupport/qssparser.cpp:672
 msgid "Invalid font size specification: %1"
 msgstr "EspecificaciÃ³n de tamaÃ±o de fuente no vÃ¡lida: %"
 
-#: Quassel::secondsToString()#1
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:145
 msgid "year"
 msgstr "aÃ±o"
 
-#: Quassel::secondsToString()#2
+#. ts-context Quassel::secondsToString()
+#: ../src/common/util.cpp:146
 msgid "day"
 msgstr "dÃ­a"
 
-#: 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 "seg"
 
-#: QueryBufferItem#1
+#. ts-context QueryBufferItem
+#: ../src/client/networkmodel.cpp:429
 msgid "<b>Query with %1</b>"
 msgstr "<b>Duda con %1</b>"
 
-#: QueryBufferItem#2
-msgctxt "QueryBufferItem#2"
-msgid "idling since %1"
-msgstr "inactivo desde %1"
-
-#: QueryBufferItem#3
-msgctxt "QueryBufferItem#3"
-msgid "login time: %1"
-msgstr "hora de acceso: %1"
-
-#: QueryBufferItem#4
-msgctxt "QueryBufferItem#4"
-msgid "server: %1"
-msgstr "servidor: %1"
-
-#: SaveIdentitiesDlg#1
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgid "Sync With Core"
 msgstr "Sincronizar con el nÃºcleo"
 
-#: SaveIdentitiesDlg#2
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:21
 msgid "Syncing data with core, please wait..."
 msgstr "Sincronizando informaciÃ³n con el nÃºcleo, por favor espere..."
 
-#: SaveIdentitiesDlg#3
+#. ts-context SaveIdentitiesDlg
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:81
 msgid "Abort"
 msgstr "Interrumpir"
 
-#: ServerEditDlg#1
-msgctxt "ServerEditDlg#1"
-msgid "Dialog"
-msgstr "DiÃ¡logo"
-
-#: ServerEditDlg#2
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:30
 msgid "Server Info"
 msgstr "InformaciÃ³n del servidor"
 
-#: ServerEditDlg#3
-msgctxt "ServerEditDlg#3"
-msgid "Server address:"
-msgstr "DirecciÃ³n del servidor:"
-
-#: ServerEditDlg#4
-msgctxt "ServerEditDlg#4"
-msgid "Port:"
-msgstr "Puerto:"
-
-#: ServerEditDlg#5
-msgctxt "ServerEditDlg#5"
-msgid "Password:"
-msgstr "ContraseÃ±a:"
-
-#: ServerEditDlg#6
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:94
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ServerEditDlg#7
-msgctxt "ServerEditDlg#7"
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ServerEditDlg#8
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:140
 msgid "SSL Version:"
 msgstr "VersiÃ³n de SSL:"
 
-#: ServerEditDlg#9
+#. 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!"
@@ -4064,70 +5253,60 @@ msgstr ""
 "Â¡No cambiar, a menos que usted vaya a conectarse a un servidor que no dÃ© "
 "soporte a SSLv3!"
 
-#: ServerEditDlg#10
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:151
 msgid "SSLv3 (default)"
 msgstr "SSLv3 (por defecto)"
 
-#: 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 "Usar un proxy"
-
-#: ServerEditDlg#14
-msgctxt "ServerEditDlg#14"
-msgid "Proxy Type:"
-msgstr "Tipo de proxy:"
-
-#: 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 "Servidor Proxy:"
 
-#: ServerEditDlg#18
-msgctxt "ServerEditDlg#18"
-msgid "localhost"
-msgstr "anfitriÃ³n local"
-
-#: ServerEditDlg#19
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:251
 msgid "Proxy Username:"
 msgstr "Usuario del Proxy:"
 
-#: ServerEditDlg#20
+#. ts-context ServerEditDlg
+#: ../src/qtui/settingspages/servereditdlg.ui:261
 msgid "Proxy Password:"
 msgstr "ContraseÃ±a del Proxy:"
 
-#: 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 "Configurar Quassel"
 
-#: SettingsDlg#2
-msgctxt "SettingsDlg#2"
+#. #-#-#-#-#  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 "ConfiguraciÃ³n"
+msgstr "Preferencias"
 
-#: SettingsDlg#3
+#. ts-context SettingsDlg
+#: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: 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?"
@@ -4135,154 +5314,142 @@ msgstr ""
 "Hay cambios no guardados en la pÃ¡gina de configuraciÃ³n actual. Â¿Le gustarÃ­a "
 "aplicar sus cambios ahora?"
 
-#: SettingsDlg#5
-msgctxt "SettingsDlg#5"
+#. #-#-#-#-#  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 "Configurar %1"
 
-#: SettingsDlg#6
-msgctxt "SettingsDlg#6"
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsDlg
+#. #-#-#-#-#  quassel.po  #-#-#-#-#
+#. ts-context SettingsPageDlg
+#: ../src/qtui/settingsdlg.cpp:193 ../src/qtui/settingspagedlg.cpp:104
 msgid "Reload Settings"
-msgstr "Recargar configuraciÃ³n"
+msgstr "Recargar preferencias"
 
-#: 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 ""
+"Â¿Quiere recargar las preferencias, deshaciendo sus cambios en esta pÃ¡gina?"
 
-#: 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 "Restore Defaults"
-msgstr "Restaurar valores predeterminados"
+msgstr "Restaurar valores por defecto"
 
-#: SettingsDlg#9
-msgctxt "SettingsDlg#9"
+#. #-#-#-#-#  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 ""
+msgstr "Â¿Le gustarÃ­a restaurar los valores por defecto para Ã©sta pÃ¡gina?"
 
-#: SettingsPageDlg#1
-msgctxt "SettingsPageDlg#1"
-msgid "Configure Quassel"
-msgstr "Configurar Quassel"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+msgid "Action"
+msgstr ""
 
-#: SettingsPageDlg#2
-msgctxt "SettingsPageDlg#2"
-msgid "Settings"
-msgstr "Opciones"
+#. ts-context ShortcutsModel
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+msgid "Shortcut"
+msgstr ""
 
-#: SettingsPageDlg#3
-msgctxt "SettingsPageDlg#3"
-msgid "Configure %1"
-msgstr "Configurar %1"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgid "Search:"
+msgstr ""
 
-#: SettingsPageDlg#4
-msgctxt "SettingsPageDlg#4"
-msgid "Reload Settings"
-msgstr "Recargar contrafiguraciÃ³n"
+#. 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 reload the settings, undoing your changes on this page?"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgid "Default:"
 msgstr ""
 
-#: SettingsPageDlg#6
-msgctxt "SettingsPageDlg#6"
-msgid "Restore Defaults"
-msgstr "Restaurar valores predeterminados"
+#. ts-context ShortcutsSettingsPage
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgid "Custom:"
+msgstr ""
 
-#: SettingsPageDlg#7
-msgctxt "SettingsPageDlg#7"
-msgid "Do you like to restore the default values for this page?"
+#. 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 ""
 "Â¡Se tratÃ³ de recibir un paquete mÃ¡s grande que el mÃ¡ximo establecido!"
 
-#: SignalProxy#2
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:885
 msgid "Peer tried to send 0 byte package!"
 msgstr "Â¡Se tratÃ³ de recibir un paquete de 0 bytes!"
 
-#: SignalProxy#3
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:902
 msgid "Peer sent corrupted compressed data!"
 msgstr "Â¡Se recibiÃ³ informaciÃ³n comprimida corrupta!"
 
-#: SignalProxy#4
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:917
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr "Â¡Se enviÃ³ informaciÃ³n corrupta: no se pudo cargar QVariant!"
 
-#: SignalProxy#5
+#. ts-context SignalProxy
+#: ../src/common/signalproxy.cpp:1050
 msgid "Disconnecting"
 msgstr "DesconectÃ¡ndose"
 
-#: SimpleNetworkEditor#1
-msgctxt "SimpleNetworkEditor#1"
-msgid "Network name:"
-msgstr "Nombre de la red:"
-
-#: SimpleNetworkEditor#2
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:35
 msgid "The name of the IRC network you are configuring"
 msgstr "El nombre de la red de IRC que estÃ¡ configurando"
 
-#: SimpleNetworkEditor#3
-msgctxt "SimpleNetworkEditor#3"
-msgid "Servers"
-msgstr "Servidores"
-
-#: SimpleNetworkEditor#4
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:81
 msgid "A list of IRC servers belonging to this network"
 msgstr "Una lista de servidores de IRC pertenecientes a esta red"
 
-#: SimpleNetworkEditor#5
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:96
 msgid "Edit this server entry"
 msgstr "Editar este campo del servidor"
 
-#: SimpleNetworkEditor#6
-msgctxt "SimpleNetworkEditor#6"
-msgid "&Edit..."
-msgstr "&Editar..."
-
-#: SimpleNetworkEditor#7
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:116
 msgid "Add another IRC server"
 msgstr "AÃ±adir otro servidor de IRC"
 
-#: SimpleNetworkEditor#8
-msgctxt "SimpleNetworkEditor#8"
-msgid "&Add..."
-msgstr "&AÃ±adir..."
-
-#: SimpleNetworkEditor#9
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:136
 msgid "Remove this server entry from the list"
 msgstr "Borrar este campo de servidor de la lista"
 
-#: SimpleNetworkEditor#10
-msgctxt "SimpleNetworkEditor#10"
-msgid "De&lete"
-msgstr "&Borrar"
-
-#: SimpleNetworkEditor#11
-msgctxt "SimpleNetworkEditor#11"
-msgid "Move upwards in list"
-msgstr "Subir en la lista"
-
-#: SimpleNetworkEditor#12
-msgctxt "SimpleNetworkEditor#12"
-msgid "..."
-msgstr "..."
-
-#: SimpleNetworkEditor#13
-msgctxt "SimpleNetworkEditor#13"
-msgid "Move downwards in list"
-msgstr "Bajar en la lista"
-
-#: SimpleNetworkEditor#14
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:226
 msgid "Join Channels Automatically"
 msgstr "Unirse a los canales automÃ¡ticamente"
 
-#: SimpleNetworkEditor#15
+#. ts-context SimpleNetworkEditor
+#: ../src/qtui/ui/simplenetworkeditor.ui:250
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
@@ -4290,7 +5457,8 @@ msgstr ""
 "Una lista de los canales de IRC a los que se unirÃ¡ automÃ¡ticamente tras "
 "conectarse a la red"
 
-#: SqliteStorage#1
+#. 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 "
@@ -4304,631 +5472,465 @@ msgstr ""
 "almacenar la informaciÃ³n en la misma mÃ¡quina en la que Quassel se estÃ© "
 "ejecutando, y si cabe esperar que sÃ³lo unos pocos usuarios usen su nÃºcleo."
 
-#: SslInfoDlg#1
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:14
 msgid "Security Information"
 msgstr "InformaciÃ³n de seguridad"
 
-#: SslInfoDlg#2
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:22
 msgid "<b>Hostname:</b>"
 msgstr "<b>Servidor:</b>"
 
-#: SslInfoDlg#3
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:39
 msgid "<b>IP address:</b>"
 msgstr "<b>DirecciÃ³n IP:</b>"
 
-#: SslInfoDlg#4
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:56
 msgid "<b>Encryption:</b>"
 msgstr "<b>EncriptaciÃ³n:</b>"
 
-#: SslInfoDlg#5
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:73
 msgid "<b>Protocol:</b>"
 msgstr "<b>Protocolo:</b>"
 
-#: SslInfoDlg#6
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:90
 msgid "<b>Certificate chain:</b>"
 msgstr "<b>Cadena de certificado:</b>"
 
-#: SslInfoDlg#7
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:120
 msgid "Subject"
 msgstr "Asunto"
 
-#: SslInfoDlg#8
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
 msgid "<b>Common name:</b>"
 msgstr "<b>Nombre de pila</b>"
 
-#: SslInfoDlg#9
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
 msgid "<b>Organization:</b>"
 msgstr "<b>OrganizaciÃ³n:</b>"
 
-#: SslInfoDlg#10
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
 msgid "<b>Organizational unit:</b>"
 msgstr "<b>Unidad organizativa:</b>"
 
-#: SslInfoDlg#11
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
 msgid "<b>Country:</b>"
 msgstr "<b>PaÃ­s:</b>"
 
-#: SslInfoDlg#12
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
 msgid "<b>State or province:</b>"
 msgstr "<b>Estado o provincia:</b>"
 
-#: SslInfoDlg#13
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
 msgid "<b>Locality:</b>"
 msgstr "<b>Localidad:</b>"
 
-#: SslInfoDlg#14
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:242
 msgid "Issuer"
 msgstr "Emisor"
 
-#: SslInfoDlg#15
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:367
 msgid "<b>Validity period:</b>"
 msgstr "<b>Periodo de validez:</b>"
 
-#: SslInfoDlg#16
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:384
 msgid "<b>MD5 digest:</b>"
 msgstr "<b>Resumen MD5:</b>"
 
-#: SslInfoDlg#17
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:401
 msgid "<b>SHA1 digest:</b>"
 msgstr "<b>Resumen SHA1:</b>"
 
-#: SslInfoDlg#18
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:431
 msgid "<b>Trusted:</b>"
 msgstr "<b>Segura:</b>"
 
-#: SslInfoDlg#19
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:69
 msgid "Yes"
 msgstr "SÃ­"
 
-#: SslInfoDlg#20
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:71
 msgid "No, for the following reasons:<ul>"
 msgstr "No, por las siguientes razones:<ul>"
 
-#: SslInfoDlg#21
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:78
 msgid "%1 to %2"
 msgstr "%1 a %2"
 
-#: StatusBufferItem#1
+#. ts-context StatusBufferItem
+#: ../src/client/networkmodel.h:144
 msgid "Status Buffer"
 msgstr "Ãrea de estado"
 
-#: SystrayNotificationBackend::ConfigWidget#1
-msgid "System Tray Icon"
-msgstr "Icono de bandeja del sistema"
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+msgid "&Minimize"
+msgstr "&Minimizar"
 
-#: SystrayNotificationBackend::ConfigWidget#2
-msgid "Animate"
-msgstr "Animar"
+#. ts-context SystemTray
+#: ../src/qtui/systemtray.cpp:94
+msgid "&Restore"
+msgstr "&Restaurar"
 
-#: SystrayNotificationBackend::ConfigWidget#3
-msgid "Show bubble"
-msgstr "Mostrar mensaje emergente"
+#. ts-context SystrayNotificationBackend::ConfigWidget
+#: ../src/qtui/systraynotificationbackend.cpp:135
+msgid "Show a message in a popup"
+msgstr "Mostrar un mensaje en una ventana emergente"
 
-#: TaskbarNotificationBackend::ConfigWidget#1
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/taskbarnotificationbackend.cpp:68
 msgid "Activate dock entry, timeout:"
 msgstr "Activar entrada de anclaje, tiempo de espera:"
 
-#: TaskbarNotificationBackend::ConfigWidget#2
+#. ts-context TaskbarNotificationBackend::ConfigWidget
+#: ../src/qtui/taskbarnotificationbackend.cpp:70
 msgid "Mark taskbar entry, timeout:"
 msgstr "Marcar entrada en barra de tareas, tiempo de espera:"
 
-#: TaskbarNotificationBackend::ConfigWidget#3
-msgctxt "TaskbarNotificationBackend::ConfigWidget#3"
-msgid "Unlimited"
-msgstr "Ilimitado"
-
-#: TaskbarNotificationBackend::ConfigWidget#4
-msgctxt "TaskbarNotificationBackend::ConfigWidget#4"
-msgid " s"
-msgstr " s"
-
-#: ToolBarActionProvider#1
-msgctxt "ToolBarActionProvider#1"
-msgid "Connect"
-msgstr "Conectar"
-
-#: ToolBarActionProvider#2
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgid "Connect to IRC"
 msgstr "Conectarse al IRC"
 
-#: ToolBarActionProvider#3
-msgctxt "ToolBarActionProvider#3"
-msgid "Disconnect"
-msgstr "Desconectar"
-
-#: ToolBarActionProvider#4
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgid "Disconnect from IRC"
 msgstr "Desconectarse del IRC"
 
-#: ToolBarActionProvider#5
-msgctxt "ToolBarActionProvider#5"
-msgid "Part"
-msgstr "Parte"
-
-#: ToolBarActionProvider#6
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:34
 msgid "Leave currently selected channel"
 msgstr "Dejar el canal seleccionado actualmente"
 
-#: ToolBarActionProvider#7
-msgctxt "ToolBarActionProvider#7"
-msgid "Join"
-msgstr "Unirse"
-
-#: ToolBarActionProvider#8
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:35
 msgid "Join a channel"
 msgstr "Unirse a un canal"
 
-#: ToolBarActionProvider#9
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Query"
 msgstr "Pregunta"
 
-#: ToolBarActionProvider#10
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgid "Start a private conversation"
 msgstr "Comenzar una conversaciÃ³n privada"
 
-#: ToolBarActionProvider#11
-msgctxt "ToolBarActionProvider#11"
-msgid "Whois"
-msgstr "QuiÃ©n es"
-
-#: ToolBarActionProvider#12
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:38
 msgid "Request user information"
 msgstr "Solicitar informaciÃ³n de usuario"
 
-#: 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 "Dar al usuario privilegios de operador"
 
-#: 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 "Obtener privilegios de operador del usuario"
 
-#: ToolBarActionProvider#17
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgid "Voice"
 msgstr "Voz"
 
-#: ToolBarActionProvider#18
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgid "Give voice to user"
 msgstr "Proporcionar voz al usuario"
 
-#: ToolBarActionProvider#19
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgid "Devoice"
 msgstr "Retirar voz"
 
-#: ToolBarActionProvider#20
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgid "Take voice from user"
 msgstr "Obtener voz del usuario"
 
-#: ToolBarActionProvider#21
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Kick"
 msgstr "Expulsar"
 
-#: ToolBarActionProvider#22
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgid "Remove user from channel"
 msgstr "Borrar usuario del canal"
 
-#: ToolBarActionProvider#23
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgid "Ban"
 msgstr "Banear"
 
-#: ToolBarActionProvider#24
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgid "Ban user from channel"
 msgstr "Banear usuario del canal"
 
-#: ToolBarActionProvider#25
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Kick/Ban"
 msgstr "Expulsar/Banear"
 
-#: ToolBarActionProvider#26
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgid "Remove and ban user from channel"
 msgstr "Borrar y banear al usuario del canal"
 
-#: ToolBarActionProvider#27
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:51
 msgid "Connect to all"
 msgstr "Conectar a todo"
 
-#: ToolBarActionProvider#28
+#. ts-context ToolBarActionProvider
+#: ../src/uisupport/toolbaractionprovider.cpp:58
 msgid "Disconnect from all"
 msgstr "Desconectarse de todo"
 
-#: TopicWidget#1
-msgctxt "TopicWidget#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: TopicWidget#2
-msgctxt "TopicWidget#2"
-msgid "..."
-msgstr "..."
-
-#: TopicWidgetSettingsPage#1
-msgctxt "TopicWidgetSettingsPage#1"
-msgid "Form"
-msgstr "Formulario"
-
-#: TopicWidgetSettingsPage#2
-msgctxt "TopicWidgetSettingsPage#2"
-msgid "Custom font:"
-msgstr "TipografÃ­a personalizada:"
-
-#: TopicWidgetSettingsPage#3
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
 msgid "Resize dynamically to fit contents"
 msgstr "Redimensionar dinÃ¡micamente para ajustarse al contenido"
 
-#: TopicWidgetSettingsPage#4
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:84
 msgid "On hover only"
 msgstr "SÃ³lo al pasar por encima"
 
-#: TopicWidgetSettingsPage#5
-msgctxt "TopicWidgetSettingsPage#5"
-msgid "Interface"
-msgstr "Interfaz"
-
-#: TopicWidgetSettingsPage#6
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
 msgid "Topic Widget"
 msgstr "Componente del tema"
 
-#: UiStyle::StyledMessage#1
-msgctxt "UiStyle::StyledMessage#1"
-msgid "%1"
-msgstr "%1"
-
-#: 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 "Ahora es usted conocido como %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 es ahora conocido como %DN%2%DN"
 
-#: UiStyle::StyledMessage#5
+#. Mode Message
+#. ts-context UiStyle::StyledMessage
+#: ../src/uisupport/uistyle.cpp:592
 msgid "User mode: %DM%1%DM"
 msgstr "Modo de usuario: %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 "Modo %DM%1%DM por %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 se ha unido a %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 "%DN%1%DN %DH(%2@%3)%DH ha dejado %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 "%DN%1%DN %DH(%2@%3)%DH ha salido"
 
-#: 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 ha sido expulsado %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 "{DÃ­a cambiado a %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 "DivisiÃ³n entre %DH%1%DH y %DH%2%DH finalizada. Usuarios unidos: "
 
-#: 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 mÃ¡s)"
 
-#: 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 "DivisiÃ³n entre %DH%1%DH y %DH%2%DH. Los usuarios salieron: "
 
-#: 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
+msgid "->"
+msgstr ""
+
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:697
 msgid "%n Owner(s)"
-msgstr "%n Propietario(s)"
+msgid_plural "%n Owner(s)"
+msgstr[0] "%n dueÃ±o(s)"
+msgstr[1] "%n dueÃ±o(s)"
 
-#: UserCategoryItem#2
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:698
 msgid "%n Admin(s)"
-msgstr "%n Administrador(es)"
+msgid_plural "%n Admin(s)"
+msgstr[0] "%n Administrador(es)"
+msgstr[1] "%n Administrador(es)"
 
-#: UserCategoryItem#3
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:699
 msgid "%n Operator(s)"
-msgstr "%n Operador(es)"
+msgid_plural "%n Operator(s)"
+msgstr[0] "%n Operador(es)"
+msgstr[1] "%n operador(es)"
 
-#: 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 semiOp(es)"
+msgstr[1] "%n semiOp(es)"
 
-#: UserCategoryItem#5
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:701
 msgid "%n Voiced"
-msgstr ""
+msgid_plural "%n Voiced"
+msgstr[0] "%n con voz"
+msgstr[1] "%n con voz"
 
-#: UserCategoryItem#6
+#. ts-context UserCategoryItem
+#: ../src/client/networkmodel.cpp:702
 msgid "%n User(s)"
-msgstr "%n Usuario(s)"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Form"
-#~ msgstr "Formulario"
-
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgid "Delete"
-#~ msgstr "Eliminar"
-
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Show Network Name"
-#~ msgstr "Mostrar el nombre de la red"
-
-#~ msgid "Show Buffer Name"
-#~ msgstr "Mostrar el nombre del Ã¡rea de conversaciÃ³n"
-
-#~ msgid "Unlimited"
-#~ msgstr "Ilimitado"
-
-#~ msgid "Dialog"
-#~ msgstr "DiÃ¡logo"
-
-#~ msgid "Re&name..."
-#~ msgstr "Re&nombrar..."
-
-#~ msgid "&Add..."
-#~ msgstr "&AÃ±adir..."
-
-#~ msgid "De&lete"
-#~ msgstr "E&liminar"
-
-#~ msgid "Network:"
-#~ msgstr "Red:"
-
-#~ msgid "Highlight"
-#~ msgstr "Resaltar"
-
-#~ msgid "Chat Monitor"
-#~ msgstr "Monitor de conversaciÃ³n"
-
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
-#~ msgid "Connect"
-#~ msgstr "Conectar"
-
-#~ msgid "Disconnect"
-#~ msgstr "Desconectar"
-
-#~ msgid "Join"
-#~ msgstr "Unirse"
-
-#~ msgid "Part"
-#~ msgstr "Retirarse"
-
-#~ msgid "Whois"
-#~ msgstr "Whois"
-
-#~ msgid "Client"
-#~ msgstr "Cliente"
-
-#~ msgid "Internal Core"
-#~ msgstr "NÃºcleo interno"
-
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
-#~ msgid "Password:"
-#~ msgstr "ContraseÃ±a:"
-
-#~ msgid "Use a Proxy"
-#~ msgstr "Utilizar Proxy"
-
-#~ msgid "localhost"
-#~ msgstr "servlocal"
-
-#~ msgid "Proxy Type:"
-#~ msgstr "Tipo de proxy:"
-
-#~ msgid "Socks 5"
-#~ msgstr "Socks 5"
-
-#~ msgid "HTTP"
-#~ msgstr "HTTP"
-
-#~ msgid "Remote Cores"
-#~ msgstr "NÃºcleos remotos"
-
-#~ msgid "Add..."
-#~ msgstr "AÃ±adir..."
-
-#~ msgid "Username:"
-#~ msgstr "Nombre de usuario:"
-
-#~ msgid "Remember password"
-#~ msgstr "Recordar la contraseÃ±a"
-
-#~ msgid "Storage Backend:"
-#~ msgstr "Motor de almacenamiento:"
-
-#~ msgid "Connection"
-#~ msgstr "ConexiÃ³n"
-
-#~ msgctxt "seconds"
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgctxt "milliseconds"
-#~ msgid "ms"
-#~ msgstr "ms"
-
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgid " s"
-#~ msgstr " s"
-
-#~ msgid "Remove"
-#~ msgstr "Borrar"
-
-#~ 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>"
-
-#~ msgid "</ul>"
-#~ msgstr "</ul>"
-
-#~ msgid "Rename Identity"
-#~ msgstr "Renombrar identidad"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgid "Add Nickname"
-#~ msgstr "AÃ±adir apodo"
-
-#~ msgid "Move upwards in list"
-#~ msgstr "Mover hacia arriba en la lista"
-
-#~ msgid "Move downwards in list"
-#~ msgstr "Mover hacia abajo en la lista"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "Ignore Rule"
-#~ msgstr "Regla para ignorar"
-
-#~ msgid "Network"
-#~ msgstr "Red"
-
-#~ msgid "Channel"
-#~ msgstr "Canal"
-
-#~ msgid "Custom font:"
-#~ msgstr "TipografÃ­a personalizada"
-
-#~ msgid "Topic"
-#~ msgstr "Tema"
-
-#~ msgid "%1"
-#~ msgstr "%1"
-
-#~ msgid "idling since %1"
-#~ msgstr "Inactivo desde %1"
-
-#~ msgid "login time: %1"
-#~ msgstr "Tiempo de entrada: %1"
-
-#~ msgid "server: %1"
-#~ msgstr "servidor: %1"
-
-#~ msgid "Add Network"
-#~ msgstr "Agregar Red"
-
-#~ msgid "Network name:"
-#~ msgstr "Nombre de red:"
-
-#~ msgid "Server address:"
-#~ msgstr "DirecciÃ³n del servidor:"
-
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgid "&Edit..."
-#~ msgstr "&Editar..."
-
-#~ msgid "Settings"
-#~ msgstr "Preferencias"
-
-#~ msgid "Configure %1"
-#~ msgstr "Configurar %1"
-
-#~ msgid "Reload Settings"
-#~ msgstr "Recargar preferencias"
+msgid_plural "%n User(s)"
+msgstr[0] "%n Usuario(s)"
+msgstr[1] "%n usuario(s)"
 
-#~ 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?"
+#~ msgid "Finger"
+#~ msgstr "Dedo"
 
-#~ msgid "Restore Defaults"
-#~ msgstr "Restaurar valores por defecto"
+#~ msgid "Add Buffers Automatically:"
+#~ msgstr "AÃ±adir conversaciones automÃ¡ticamente:"
 
-#~ 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?"
+#~ msgid "Hide inactive buffers:"
+#~ msgstr "Ocultar conversaciones inactivas:"
 
-#~ msgid "Configure Quassel"
-#~ msgstr "Configurar Quassel"
+#~ msgid "[Whois] idle message: %1"
+#~ msgstr "[Whois] mesaje de inactivo: %1"
