[smuxi] L10N: update translations from Transifex

From: Mirco M. M. Bauer <mmmbauer src gnome org>
To: commits-list gnome org
Cc:
Subject: [smuxi] L10N: update translations from Transifex
Date: Fri, 1 Feb 2019 13:33:45 +0000 (UTC)
commit 0bfb616cdea941689845ad9f922bca256fe78f62
Author: Mirco Bauer <meebey meebey net>
Date:   Tue Jan 8 03:47:31 2019 +0800

    L10N: update translations from Transifex

 po-Engine-IRC/ca.po              |  243 ++++---
 po-Engine-IRC/fa.po              |  231 +++----
 po-Engine-IRC/ru.po              |  267 ++++----
 po-Engine-MessageBuffer/cs.po    |  109 ++--
 po-Engine-MessageBuffer/da.po    |  103 ++-
 po-Engine-MessageBuffer/de.po    |  116 ++--
 po-Engine-MessageBuffer/es.po    |  116 ++--
 po-Engine-MessageBuffer/lt.po    |  116 ++--
 po-Engine-MessageBuffer/pl.po    |  131 ++--
 po-Engine-MessageBuffer/pt_BR.po |  121 ++--
 po-Engine-MessageBuffer/sv.po    |  105 ++-
 po-Engine-Twitter/fa.po          |  106 +--
 po-Engine-Twitter/ru.po          |  159 +++--
 po-Engine-XMPP/fr.po             |   36 +-
 po-Engine-XMPP/tr.po             |   40 +-
 po-Engine-XMPP/zh_CN.po          |   42 +-
 po-Engine/ca.po                  |  243 +++++--
 po-Engine/ru.po                  |  212 ++++--
 po-Frontend-GNOME-IRC/ru.po      |   81 +--
 po-Frontend-GNOME-XMPP/en_GB.po  |   86 +--
 po-Frontend-GNOME-XMPP/hr.po     |   84 +--
 po-Frontend-GNOME-XMPP/ru.po     |   78 +--
 po-Frontend-GNOME/ca.po          | 1334 ++++++++++++++++++++++----------------
 po-Frontend-GNOME/cs.po          |  415 ++++++------
 po-Frontend-GNOME/da.po          |  483 ++++++--------
 po-Frontend-GNOME/de.po          |  453 ++++++-------
 po-Frontend-GNOME/es.po          |  488 ++++++--------
 po-Frontend-GNOME/fa.po          |  449 +++++++------
 po-Frontend-GNOME/fi.po          |  472 ++++++--------
 po-Frontend-GNOME/fr.po          |  268 ++++----
 po-Frontend-GNOME/lt.po          |  488 ++++++--------
 po-Frontend-GNOME/pl.po          |  435 ++++++-------
 po-Frontend-GNOME/pt_BR.po       |  502 ++++++--------
 po-Frontend-GNOME/ru.po          | 1328 ++++++++++++++++++++++---------------
 po-Frontend-GNOME/sv.po          |  487 ++++++--------
 po-Frontend-GNOME/tr.po          |  268 ++++----
 po-Frontend-GNOME/zh_CN.po       |  270 ++++----
 po-Frontend/fa.po                |   58 +-
 po-Frontend/ru.po                |  100 +--
 po-Server/ru.po                  |   83 ++-
 40 files changed, 5695 insertions(+), 5511 deletions(-)
---
diff --git a/po-Engine-IRC/ca.po b/po-Engine-IRC/ca.po
index 8bee953e..ab29f9e3 100644
--- a/po-Engine-IRC/ca.po
+++ b/po-Engine-IRC/ca.po
@@ -1,237 +1,282 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Xavi Ivars <xavi ivars gmail com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Smuxi\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 15:23+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Siegfried-Angel Gevatter Pujals <rainct ubuntu com>\n"
-"Language-Team: Siegfried-Angel Gevatter Pujals <siegfried gevatter com>\n"
+"POT-Creation-Date: 2015-07-14 19:39+0200\n"
+"PO-Revision-Date: 2017-10-27 13:57+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Catalan (http://www.transifex.com/meebey/smuxi/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
-"X-Poedit-Language: Catalan\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:234
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:255
 #, csharp-format
 msgid "{0} invites you to {1}"
 msgstr "{0} us invita a {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:255
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1468
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:279
+msgid "Accept invite (join room)"
+msgstr "Accepta l'invitaciÃ³ (uneix-te)"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:307
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1770
 msgid "away"
 msgstr "absent"
 
 #. TRANSLATOR: {0} is the amount of seconds
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:261
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:313
 #, csharp-format
 msgid "lag: {0} seconds"
 msgstr "retard: {0} segons"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:267
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:319
 msgid "not connected"
 msgstr "no esteu connectat"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:337
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:379
+#, csharp-format
+msgid "Using proxy: {0}:{1}"
+msgstr "Utilitzant servidor intermediari: {0}:{1}"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:386
 #, csharp-format
 msgid "Connecting to {0} port {1}..."
 msgstr "S'estÃ  connectant a {0} al port {1}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:343
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:438
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:400
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:541
 #, csharp-format
 msgid "Connection to {0} established"
 msgstr "S'ha establert la connexiÃ³ a {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:346
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:409
 msgid "Logging in..."
 msgstr "S'estÃ  iniciant sessiÃ³..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:369
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:449
 msgid "Connection failed!"
 msgstr "Ha fallat la connexiÃ³!"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:370
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:453
 msgid "Connection failed! Reason: "
 msgstr "Ha fallat la connexiÃ³! Motiu:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:379
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:466
 msgid "Disconnecting..."
 msgstr "S'estÃ  desconnectant..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:382
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
 #, csharp-format
 msgid "Disconnecting from {0}..."
 msgstr "S'estÃ  desconnectant de {0}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:387
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:478
 #, csharp-format
 msgid "Disconnected from {0}"
 msgstr "S'ha desconnectat de {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:390
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:484
 msgid "Connection closed"
 msgstr "S'ha tancat la connexiÃ³"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:395
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:452
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:493
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:568
 msgid "Not connected"
 msgstr "No esteu connectat"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:424
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:527
 msgid "Reconnecting..."
 msgstr "S'estÃ  tornant a connectar..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:432
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:535
 #, csharp-format
 msgid "Reconnecting to {0}..."
 msgstr "S'estÃ  tornant a connectar a {0}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:446
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:554
 msgid "Reconnect Error"
 msgstr "Error al tornar a connectar"
 
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:948
+#, csharp-format
+msgid "Sleeping for {0} milliseconds"
+msgstr "S'estÃ  aturant durant {0} milisegons "
+
 #. TRANSLATOR: this line is used as label / category for a
 #. list of commands below
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:816
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1033
 msgid "IrcProtocolManager Commands"
 msgstr "Ordres del protocol IRC"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:887
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1115
 #, csharp-format
 msgid "Invalid port: {0}"
 msgstr "Port invÃ lid: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:997
+#. TRANSLATOR: some IRC networks dislike too many joins in a
+#. short period and thus Smuxi throttles/queues them
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1210
 #, csharp-format
 msgid "Queuing joins: {0}"
 msgstr "S'estan afegint les unions a la cua: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1011
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1231
 #, csharp-format
 msgid "Already joined to channel: {0}. Type /window {0} to switch to it."
 msgstr "Ja esteu a la sala {0}. Escriviu /window {0} per a canviar-hi."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1046
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1265
 #, csharp-format
 msgid "Active joins: {0} - Queued joins: {1}"
 msgstr "Unions actives: {0} - Unions a la cua: {1}"
 
 #. TRANSLATORS: final message will look like this:
 #. Joining: #chan1 - Remaining active joins: #chan2 / queued joins: #chan3
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1069
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1100
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1289
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1319
 #, csharp-format
 msgid "Joining: {0}"
 msgstr "Unint-se a: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1071
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1291
 msgid "Remaining"
 msgstr "En cua:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1076
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1296
 #, csharp-format
 msgid "active joins: {0}"
 msgstr "unions actives: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1085
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1305
 #, csharp-format
 msgid "queued joins: {0}"
 msgstr "unions a la cua: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1455
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1751
 msgid "IRC Op"
 msgstr "Operador d'IRC"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1457
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1753
+msgid "Owner"
+msgstr "Propietari"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1755
+msgid "ChanAdmin"
+msgstr ""
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1757
 msgid "Op"
 msgstr "Op"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1459
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1759
+msgid "Halfop"
+msgstr ""
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1761
 msgid "Voice"
 msgstr "DÃ³na veu"
 
-#. TRANSLATOR: do NOT change the position of {1}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1519
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1824
 #, csharp-format
 msgid "Topic for {0}: {1}"
 msgstr "TÃtol de {0}: {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1524
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1826
 #, csharp-format
 msgid "No topic set for {0}"
 msgstr "No hi ha cap tÃtol a {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1604
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1991
 msgid "ban"
 msgstr "expulsa"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1614
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2002
 msgid "No bans in channel"
 msgstr "No hi ha bandejaments en aquesta sala"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1726
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2039
+msgid "ban exception"
+msgstr ""
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2050
+msgid "No ban exceptions in channel"
+msgstr ""
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2087
+msgid "invite exception"
+msgstr ""
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2098
+msgid "No invite exceptions in channel"
+msgstr ""
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2212
 #, csharp-format
-msgid "Inviting {0} to {1}"
-msgstr "S'estÃ  invitant {0} a {1}"
+msgid "Your user mode is {0}"
+msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1730
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2238
 #, csharp-format
 msgid "{0} is already on {1}"
 msgstr "{0} ja estÃ  a {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1755
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2246
+#, csharp-format
+msgid "Inviting {0} to {1}"
+msgstr "S'estÃ  invitant {0} a {1}"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2269
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1797
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2320
 #, csharp-format
 msgid "Total of {0} users [{1} ops, {2} voices, {3} normal]"
 msgstr "Total de {0} usuaris [{1} operadors, {2} amb veus, {3} normals]"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1928
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2458
 msgid "Connection error! Reason: "
 msgstr "Error de connexiÃ³! Motiu:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1938
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2470
 #, csharp-format
 msgid "Not enough parameters for {0} command"
 msgstr "No heu proporcionat prou parÃ metres per a l'ordre {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1948
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2479
 msgid "Not connected to server"
 msgstr "No esteu connectat al servidor"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2156
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2688
 #, csharp-format
 msgid "{0}: No such nick/channel"
 msgstr "{0}: No existeix aquest usuari o aquesta sala"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2279
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2807
 #, csharp-format
-msgid "Increased send delay to {0}ms to avoid being flooded off the server again."
+msgid ""
+"Increased send delay to {0}ms to avoid being flooded off the server again."
 msgstr "S'ha incrementat el retard de l'enviament a {0}ms per evitar ser expulsat un altre cop pel control 
d'inundacions del servidor."
 
-#. TRANSLATOR: the final line will look like this:
-#. -!- Nick {0} is already in use
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2293
-msgid "Nick"
-msgstr "El nom d'usuari"
-
-#. TRANSLATOR: the final line will look like this:
-#. -!- Nick {0} is already in use
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2303
-msgid "is already in use"
-msgstr "ja estÃ  en Ãºs"
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2822
+#, csharp-format
+msgid "Nick {0} is already in use"
+msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2329
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2838
 msgid "Cannot join to channel:"
 msgstr "No podeu unir-vos a la sala:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2337
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2840
 msgid "You are banned"
 msgstr "Esteu bandejats"
 
@@ -239,94 +284,88 @@ msgstr "Esteu bandejats"
 #. {2}: CTCP command, {3}: own nickname, {4}: CTCP parameter
 #. example:
 #. meebey [meebey example com] requested CTCP VERSION from meebey:
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2413
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2923
 #, csharp-format
 msgid "{0} [{1}] requested CTCP {2} from {3}: {4}"
 msgstr "{0} [{1}] ha enviat una peticiÃ³ CTCP {2} a {3}: {4}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2438
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2950
 #, csharp-format
 msgid "CTCP PING reply from {0}: {1} seconds"
 msgstr "Resposta a CTCP PING de {0}: {1} segons"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2446
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2959
 #, csharp-format
 msgid "CTCP {0} reply from {1}: {2}"
 msgstr "Resposta a CTCP {0} de {1}: {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2643
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3210
 #, csharp-format
 msgid "{0} [{1}] has joined {2}"
 msgstr "{0} [{1}] s'ha unit a {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2769
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3355
 #, csharp-format
 msgid "{0} [{1}] has left {2}"
 msgstr "{0} [{1}] ha deixat {2}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2794
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3380
 #, csharp-format
-msgid "You were kicked from {0} by {1} [{2}]"
-msgstr "Heu estat expulsat de {0} per {1} [{2}]"
+msgid "You were kicked from {0} by {1}"
+msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2802
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3388
 #, csharp-format
-msgid "{0} was kicked from {1} by {2} [{3}]"
-msgstr "{0} ha estat expulsat de {1} per {2} [{3}]"
+msgid "{0} was kicked from {1} by {2}"
+msgstr ""
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2819
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2852
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3406
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3438
 #, csharp-format
 msgid "You're now known as {0}"
 msgstr "El vostre sobrenom ha canviat a {0}"
 
-#. TRANSLATOR: do NOT change the position of {0} or {1}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2857
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3441
 #, csharp-format
 msgid "{0} is now known as {1}"
 msgstr "{0} s'ha canviat el sobrenom per {1}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2894
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3475
 #, csharp-format
 msgid "{0} changed the topic of {1} to: {2}"
 msgstr "{0} ha canviat el tÃtol de {1} a: {2}"
 
-#. TRANSLATOR: do NOT change the position of {1}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2970
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3635
 #, csharp-format
 msgid "Mode change [{0}] for user {1}"
 msgstr "S'ha canviat el mode [{0}] a l'usuari {1}"
 
-#. TRANSLATOR: do NOT change the position of {2}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2980
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3666
 #, csharp-format
 msgid "mode/{0} [{1}] by {2}"
 msgstr "mode/{0} [{1}] per {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3017
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3702
 #, csharp-format
 msgid "{0} [{1}] has quit"
 msgstr "{0} [{1}] ha sortit"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3094
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3801
 #, csharp-format
-msgid "Connection to {0} port {1} has failed (attempt {2}), retrying in {3} seconds..."
+msgid ""
+"Connection to {0} port {1} has failed (attempt {2}), retrying in {3} "
+"seconds..."
 msgstr "La connexiÃ³ a {0} utilitzant el port {1} ha fallat (intent {2}). Es tornarÃ  a intentar en {3} 
segons..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3143
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3851
 #, csharp-format
 msgid "{0} is away: {1}"
 msgstr "{0} estÃ  absent: {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3149
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3861
 msgid "You are no longer marked as being away"
 msgstr "Ja no esteu marcat com a absent"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3155
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3871
 msgid "You have been marked as being away"
 msgstr "Heu estat marcat com a absent"
diff --git a/po-Engine-IRC/fa.po b/po-Engine-IRC/fa.po
index 9d069e72..db013641 100644
--- a/po-Engine-IRC/fa.po
+++ b/po-Engine-IRC/fa.po
@@ -3,366 +3,369 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Behrooz Amoozad <behrooz0az gmail com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 16:59+0100\n"
-"PO-Revision-Date: 2013-11-20 11:27+0000\n"
-"Last-Translator: Mirco Bauer <meebey gmail com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/smuxi/language/fa/)\n"
+"POT-Creation-Date: 2015-07-14 19:39+0200\n"
+"PO-Revision-Date: 2017-09-19 19:12+0000\n"
+"Last-Translator: Behrooz Amoozad <behrooz0az gmail com>\n"
+"Language-Team: Persian (http://www.transifex.com/meebey/smuxi/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:250
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:255
 #, csharp-format
 msgid "{0} invites you to {1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:266
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:279
 msgid "Accept invite (join room)"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:294
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1740
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:307
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1770
 msgid "away"
 msgstr ""
 
 #. TRANSLATOR: {0} is the amount of seconds
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:300
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:313
 #, csharp-format
 msgid "lag: {0} seconds"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:306
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:319
 msgid "not connected"
-msgstr ""
+msgstr "Ù‚Ø·Ø¹"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:366
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:379
 #, csharp-format
 msgid "Using proxy: {0}:{1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:373
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:386
 #, csharp-format
 msgid "Connecting to {0} port {1}..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¨Ù‡ {0} Ø¯Ø±Ú¯Ø§Ù‡ {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:387
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:528
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:400
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:541
 #, csharp-format
 msgid "Connection to {0} established"
-msgstr ""
+msgstr "Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ {0} Ø¨Ø±Ù‚Ø±Ø§Ø± Ø´Ø¯"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:396
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:409
 msgid "Logging in..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ ÙˆØ±ÙˆØ¯..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:436
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:449
 msgid "Connection failed!"
-msgstr ""
+msgstr "Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø´Ú©Ø³Øª Ù…ÙˆØ§Ø¬Ø Ø´Ø¯!"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:440
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:453
 msgid "Connection failed! Reason: "
-msgstr ""
+msgstr "Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø´Ú©Ø³Øª Ù…ÙˆØ§Ø¬Ø Ø´Ø¯! Ø¹Ù„Øª: "
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:453
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:466
 msgid "Disconnecting..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ù‚Ø·Ø¹ Ø´Ø¯Ù†Ø«Ø«Ø«"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:458
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
 #, csharp-format
 msgid "Disconnecting from {0}..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ù‚Ø·Ø¹ Ø´Ø¯Ù† Ø§Ø² {0}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:465
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:478
 #, csharp-format
 msgid "Disconnected from {0}"
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ù‚Ø·Ø¹ Ø´Ø¯Ù† Ø§Ø² {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:484
 msgid "Connection closed"
-msgstr ""
+msgstr "Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø³ØªÙ‡ Ø´Ø¯."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:480
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:555
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:493
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:568
 msgid "Not connected"
-msgstr ""
+msgstr "Ù‚Ø·Ø¹"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:514
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:527
 msgid "Reconnecting..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¯ÙˆØ¨Ø§Ø±Ù‡..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:522
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:535
 #, csharp-format
 msgid "Reconnecting to {0}..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ù‡ {0}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:541
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:554
 msgid "Reconnect Error"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø§ØªØµØ§Ù„ Ø¯ÙˆØ¨Ø§Ø±Ù‡"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:933
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:948
 #, csharp-format
 msgid "Sleeping for {0} milliseconds"
 msgstr ""
 
 #. TRANSLATOR: this line is used as label / category for a
 #. list of commands below
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1018
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1033
 msgid "IrcProtocolManager Commands"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1100
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1115
 #, csharp-format
 msgid "Invalid port: {0}"
-msgstr ""
+msgstr "Ø¯Ø±Ú¯Ø§Ù‡ Ù†Ø§Ø¯Ø±Ø³Øª: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1193
+#. TRANSLATOR: some IRC networks dislike too many joins in a
+#. short period and thus Smuxi throttles/queues them
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1210
 #, csharp-format
 msgid "Queuing joins: {0}"
-msgstr ""
+msgstr "ØµÙØ¨Ù†Ø¯ÛŒ Ø§ØªØµØ§Ù„Ø§Øª: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1213
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1231
 #, csharp-format
 msgid "Already joined to channel: {0}. Type /window {0} to switch to it."
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1247
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1265
 #, csharp-format
 msgid "Active joins: {0} - Queued joins: {1}"
 msgstr ""
 
 #. TRANSLATORS: final message will look like this:
 #. Joining: #chan1 - Remaining active joins: #chan2 / queued joins: #chan3
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1271
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1301
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1289
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1319
 #, csharp-format
 msgid "Joining: {0}"
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¨Ù‡ {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1273
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1291
 msgid "Remaining"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1278
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1296
 #, csharp-format
 msgid "active joins: {0}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1287
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1305
 #, csharp-format
 msgid "queued joins: {0}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1721
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1751
 msgid "IRC Op"
-msgstr ""
+msgstr "Ø¹Ù…Ù„ÛŒØ§Øª IRC"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1723
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1753
 msgid "Owner"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1725
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1755
 msgid "ChanAdmin"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1727
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1757
 msgid "Op"
-msgstr ""
+msgstr "Ø¹Ù…Ù„ÛŒØ§Øª"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1729
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1759
 msgid "Halfop"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1731
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1761
 msgid "Voice"
-msgstr ""
+msgstr "ØµØ¯Ø§"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1794
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1824
 #, csharp-format
 msgid "Topic for {0}: {1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1796
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1826
 #, csharp-format
 msgid "No topic set for {0}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1961
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1991
 msgid "ban"
-msgstr ""
+msgstr "ØªØØ±ÛŒÙ…"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1972
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2002
 msgid "No bans in channel"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2009
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2039
 msgid "ban exception"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2020
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2050
 msgid "No ban exceptions in channel"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2057
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2087
 msgid "invite exception"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2068
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2098
 msgid "No invite exceptions in channel"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2182
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2212
 #, csharp-format
 msgid "Your user mode is {0}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2208
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2238
 #, csharp-format
 msgid "{0} is already on {1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2216
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2246
 #, csharp-format
 msgid "Inviting {0} to {1}"
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø¯Ø¹ÙˆØª Ú©Ø±Ø¯Ù† Ø§Ø² {0} Ø¨Ù‡ {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2239
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2269
 msgid "Users"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2290
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2320
 #, csharp-format
 msgid "Total of {0} users [{1} ops, {2} voices, {3} normal]"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2424
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2458
 msgid "Connection error! Reason: "
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø·! Ø¹Ù„Øª:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2436
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2470
 #, csharp-format
 msgid "Not enough parameters for {0} command"
-msgstr ""
+msgstr "Ù¾Ø§Ø±Ø§Ù…ØªØ± Ù†Ø§Ú©Ø§ÙÛŒ Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªÙˆØ± {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2445
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2479
 msgid "Not connected to server"
-msgstr ""
+msgstr "ØºÛŒØ± Ù…ØªØµÙ„ Ø¨Ù‡ Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡ {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2649
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2688
 #, csharp-format
 msgid "{0}: No such nick/channel"
-msgstr ""
+msgstr "{0}: Ù†Ø§Ù… Ù…Ø³ØªØ¹Ø§Ø±/Ù†Ø§Ù… Ú©Ø§Ù†Ø§Ù„ Ù†Ø§Ù…ÙˆØ¬ÙˆØ¯"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2768
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2807
 #, csharp-format
 msgid ""
 "Increased send delay to {0}ms to avoid being flooded off the server again."
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2783
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2822
 #, csharp-format
 msgid "Nick {0} is already in use"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2799
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2838
 msgid "Cannot join to channel:"
-msgstr ""
+msgstr "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± Ù…Ù„ØÙ‚ Ø´Ø¯Ù† Ø¨Ù‡ Ú©Ø§Ù†Ø§Ù„:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2801
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2840
 msgid "You are banned"
-msgstr ""
+msgstr "Ø´Ù…Ø§ Ù…ØØ±ÙˆÙ… Ø´Ø¯Ù‡ Ø§ÛŒØ¯"
 
 #. TRANSLATOR: {0}: nickname, {1}: ident@host,
 #. {2}: CTCP command, {3}: own nickname, {4}: CTCP parameter
 #. example:
 #. meebey [meebey example com] requested CTCP VERSION from meebey:
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2884
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2923
 #, csharp-format
 msgid "{0} [{1}] requested CTCP {2} from {3}: {4}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2911
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2950
 #, csharp-format
 msgid "CTCP PING reply from {0}: {1} seconds"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2920
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2959
 #, csharp-format
 msgid "CTCP {0} reply from {1}: {2}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3168
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3210
 #, csharp-format
 msgid "{0} [{1}] has joined {2}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3310
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3355
 #, csharp-format
 msgid "{0} [{1}] has left {2}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3335
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3380
 #, csharp-format
 msgid "You were kicked from {0} by {1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3343
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3388
 #, csharp-format
 msgid "{0} was kicked from {1} by {2}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3361
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3393
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3406
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3438
 #, csharp-format
 msgid "You're now known as {0}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3396
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3441
 #, csharp-format
 msgid "{0} is now known as {1}"
-msgstr ""
+msgstr "{0} Ø§Ø² Ø§ÛŒÙ† Ù¾Ø³ Ø¨Ø§ Ù†Ø§Ù… {1} Ø´Ù†Ø§Ø®ØªÙ‡ Ù…ÛŒØ´ÙˆØ¯."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3430
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3475
 #, csharp-format
 msgid "{0} changed the topic of {1} to: {2}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3592
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3635
 #, csharp-format
 msgid "Mode change [{0}] for user {1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3609
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3666
 #, csharp-format
 msgid "mode/{0} [{1}] by {2}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3635
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3702
 #, csharp-format
 msgid "{0} [{1}] has quit"
-msgstr ""
+msgstr "{0} [{1}] Ø®Ø§Ø±Ø¬ Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3712
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3801
 #, csharp-format
 msgid ""
 "Connection to {0} port {1} has failed (attempt {2}), retrying in {3} "
 "seconds..."
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3762
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3851
 #, csharp-format
 msgid "{0} is away: {1}"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3772
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3861
 msgid "You are no longer marked as being away"
 msgstr ""
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3782
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3871
 msgid "You have been marked as being away"
 msgstr ""
diff --git a/po-Engine-IRC/ru.po b/po-Engine-IRC/ru.po
index ac90e646..638d991b 100644
--- a/po-Engine-IRC/ru.po
+++ b/po-Engine-IRC/ru.po
@@ -3,341 +3,370 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Yuri Myasoedov <omerta13 yandex ru>, 2012.
+# VsyachePuz <vsyachepuz gmail com>, 2015
+# Yuri Myasoedov <omerta13 yandex ru>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: http://www.smuxi.org/issues\n";
-"POT-Creation-Date: 2011-12-29 09:20+0100\n"
-"PO-Revision-Date: 2012-01-11 09:36+0000\n"
-"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/smuxi/team/ru/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:39+0200\n"
+"PO-Revision-Date: 2017-09-19 09:04+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) 
? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:245
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:255
 #, csharp-format
 msgid "{0} invites you to {1}"
 msgstr "{0} Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑÐ¸Ð» Ð²Ð°Ñ Ð½Ð° {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:276
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1519
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:279
+msgid "Accept invite (join room)"
+msgstr "ÐŸÑ€Ð¸Ð½ÑÑ‚ÑŒ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ (Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ðº Ñ‡Ð°Ñ‚Ñƒ)"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:307
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1770
 msgid "away"
 msgstr "ÑƒÑˆÑ‘Ð»"
 
 #. TRANSLATOR: {0} is the amount of seconds
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:282
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:313
 #, csharp-format
 msgid "lag: {0} seconds"
 msgstr "Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ°: {0} ÑÐµÐº."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:288
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:319
 msgid "not connected"
 msgstr "Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:351
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:379
+#, csharp-format
+msgid "Using proxy: {0}:{1}"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¿Ñ€Ð¾ÐºÑÐ¸: {0}:{1}"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:386
 #, csharp-format
 msgid "Connecting to {0} port {1}..."
 msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº {0} Ð½Ð° Ð¿Ð¾Ñ€Ñ‚ {1}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:357
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:463
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:400
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:541
 #, csharp-format
 msgid "Connection to {0} established"
 msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº {0} ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:360
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:409
 msgid "Logging in..."
 msgstr "Ð’Ñ…Ð¾Ð´ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:394
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:449
 msgid "Connection failed!"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ!"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:395
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:453
 msgid "Connection failed! Reason: "
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ! ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:404
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:466
 msgid "Disconnecting..."
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:407
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
 #, csharp-format
 msgid "Disconnecting from {0}..."
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¾Ñ‚ {0}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:412
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:478
 #, csharp-format
 msgid "Disconnected from {0}"
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½ Ð¾Ñ‚ {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:415
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:484
 msgid "Connection closed"
 msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:420
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:477
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:493
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:568
 msgid "Not connected"
 msgstr "ÐÐµÑ‚ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:449
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:527
 msgid "Reconnecting..."
 msgstr "Ð’Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:457
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:535
 #, csharp-format
 msgid "Reconnecting to {0}..."
 msgstr "Ð’Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ {0}..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:554
 msgid "Reconnect Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ"
 
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:948
+#, csharp-format
+msgid "Sleeping for {0} milliseconds"
+msgstr "ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ {0} Ð¼Ð¸Ð»Ð»Ð¸ÑÐµÐºÑƒÐ½Ð´."
+
 #. TRANSLATOR: this line is used as label / category for a
 #. list of commands below
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:875
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1033
 msgid "IrcProtocolManager Commands"
 msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ IrcProtocolManager"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:943
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1115
 #, csharp-format
 msgid "Invalid port: {0}"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¿Ð¾Ñ€Ñ‚: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1047
+#. TRANSLATOR: some IRC networks dislike too many joins in a
+#. short period and thus Smuxi throttles/queues them
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1210
 #, csharp-format
 msgid "Queuing joins: {0}"
-msgstr ""
+msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹ Ð² Ð¾Ñ‡ÐµÑ€ÐµÐ´ÑŒ: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1061
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1231
 #, csharp-format
 msgid "Already joined to channel: {0}. Type /window {0} to switch to it."
-msgstr ""
+msgstr "ÐšÐ°Ð½Ð°Ð» {0} ÑƒÐ¶Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ /window {0} Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ð½Ð° Ð¾ÐºÐ½Ð¾ ÐºÐ°Ð½Ð°Ð»Ð°."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1096
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1265
 #, csharp-format
 msgid "Active joins: {0} - Queued joins: {1}"
-msgstr ""
+msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹: {0} - Ð² Ð¾Ñ‡ÐµÑ€ÐµÐ´Ð¸: {1}"
 
 #. TRANSLATORS: final message will look like this:
 #. Joining: #chan1 - Remaining active joins: #chan2 / queued joins: #chan3
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1119
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1150
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1289
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1319
 #, csharp-format
 msgid "Joining: {0}"
 msgstr "Ð’Ñ…Ð¾Ð´ Ð½Ð° ÐºÐ°Ð½Ð°Ð»: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1121
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1291
 msgid "Remaining"
 msgstr "ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1126
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1296
 #, csharp-format
 msgid "active joins: {0}"
-msgstr ""
+msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1135
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1305
 #, csharp-format
 msgid "queued joins: {0}"
-msgstr ""
+msgstr "ÐžÐ¶Ð¸Ð´Ð°ÑŽÑ‰Ð¸Ñ… Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹: {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1506
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1751
 msgid "IRC Op"
-msgstr ""
+msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€ ÐºÐ°Ð½Ð°Ð»Ð°"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1753
+msgid "Owner"
+msgstr "Ð’Ð»Ð°Ð´ÐµÐ»ÐµÑ† ÐºÐ°Ð½Ð°Ð»Ð°"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1508
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1755
+msgid "ChanAdmin"
+msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ ÐºÐ°Ð½Ð°Ð»Ð°"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1757
 msgid "Op"
-msgstr ""
+msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1759
+msgid "Halfop"
+msgstr "ÐŸÐ¾Ð»ÑƒÐ¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1510
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1761
 msgid "Voice"
-msgstr ""
+msgstr "Ð“Ð¾Ð»Ð¾Ñ"
 
-#. TRANSLATOR: do NOT change the position of {1}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1570
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1824
 #, csharp-format
 msgid "Topic for {0}: {1}"
 msgstr "Ð¢ÐµÐ¼Ð° ÐºÐ°Ð½Ð°Ð»Ð° {0}: {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1575
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1826
 #, csharp-format
 msgid "No topic set for {0}"
 msgstr "Ð£ ÐºÐ°Ð½Ð°Ð»Ð° {0} Ð½ÐµÑ‚ Ñ‚ÐµÐ¼Ñ‹"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1655
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1991
 msgid "ban"
-msgstr ""
+msgstr "Ð±Ð°Ð½"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1665
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2002
 msgid "No bans in channel"
-msgstr ""
+msgstr "ÐÐµÑ‚ Ð±Ð°Ð½Ð¾Ð² Ð½Ð° ÐºÐ°Ð½Ð°Ð»Ðµ"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2039
+msgid "ban exception"
+msgstr "Ð˜ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð±Ð°Ð½Ð¾Ð²"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2050
+msgid "No ban exceptions in channel"
+msgstr "ÐÐµÑ‚ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð±Ð°Ð½Ð¾Ð² Ð½Ð° ÐºÐ°Ð½Ð°Ð»Ðµ"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1777
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2087
+msgid "invite exception"
+msgstr "Ð˜ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ð¹"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2098
+msgid "No invite exceptions in channel"
+msgstr "ÐÐµÑ‚ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ð¹ Ð½Ð° ÐºÐ°Ð½Ð°Ð»"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2212
 #, csharp-format
-msgid "Inviting {0} to {1}"
-msgstr ""
+msgid "Your user mode is {0}"
+msgstr "Ð’Ð°Ñˆ Ñ€ÐµÐ¶Ð¸Ð¼ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ = {0}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1781
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2238
 #, csharp-format
 msgid "{0} is already on {1}"
 msgstr "{0} ÑƒÐ¶Ðµ Ð½Ð° {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1806
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2246
+#, csharp-format
+msgid "Inviting {0} to {1}"
+msgstr "ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ {0} Ð½Ð° {1}"
+
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2269
 msgid "Users"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1848
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2320
 #, csharp-format
 msgid "Total of {0} users [{1} ops, {2} voices, {3} normal]"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹: {0} [Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð²: {1}, Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ñ‹Ñ…: {2}, Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ñ…: {3}]"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1979
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2458
 msgid "Connection error! Reason: "
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ! ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°:  "
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1989
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2470
 #, csharp-format
 msgid "Not enough parameters for {0} command"
 msgstr "Ð”Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ {0} Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð²"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1999
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2479
 msgid "Not connected to server"
 msgstr "ÐÐµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½ Ðº ÑÐµÑ€Ð²ÐµÑ€Ñƒ"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2261
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2688
 #, csharp-format
 msgid "{0}: No such nick/channel"
 msgstr "{0}: ÐÐµÑ‚ Ñ‚Ð°ÐºÐ¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð¸Ð»Ð¸ ÐºÐ°Ð½Ð°Ð»Ð°"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2390
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2807
 #, csharp-format
 msgid ""
 "Increased send delay to {0}ms to avoid being flooded off the server again."
-msgstr ""
+msgstr "Ð£Ð²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð° Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ° Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ Ð½Ð° {0} Ð¼Ð¸Ð»Ð¸ÑÐµÐºÑƒÐ½Ð´ Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ Ð·Ð°Ð±Ñ€Ð°ÑÑ‹Ð²Ð°Ð½Ð¸Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°."
 
-#. TRANSLATOR: the final line will look like this:
-#. -!- Nick {0} is already in use
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2404
-msgid "Nick"
-msgstr "Ð˜Ð¼Ñ"
-
-#. TRANSLATOR: the final line will look like this:
-#. -!- Nick {0} is already in use
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2414
-msgid "is already in use"
-msgstr "ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ"
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2822
+#, csharp-format
+msgid "Nick {0} is already in use"
+msgstr "ÐÐ¸ÐºÐ½ÐµÐ¹Ð¼ {0} ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2424
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2838
 msgid "Cannot join to channel:"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð¹Ñ‚Ð¸ Ð½Ð° ÐºÐ°Ð½Ð°Ð»:"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2432
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2840
 msgid "You are banned"
-msgstr ""
+msgstr "Ð’Ñ‹ Ð·Ð°Ð±Ð°Ð½ÐµÐ½Ñ‹"
 
 #. TRANSLATOR: {0}: nickname, {1}: ident@host,
 #. {2}: CTCP command, {3}: own nickname, {4}: CTCP parameter
 #. example:
 #. meebey [meebey example com] requested CTCP VERSION from meebey:
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2508
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2923
 #, csharp-format
 msgid "{0} [{1}] requested CTCP {2} from {3}: {4}"
 msgstr "{0} [{1}] Ð·Ð°Ð¿Ñ€Ð¾ÑÐ¸Ð» CTCP {2} Ñƒ {3}: {4}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2533
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2950
 #, csharp-format
 msgid "CTCP PING reply from {0}: {1} seconds"
 msgstr "ÐžÑ‚Ð²ÐµÑ‚ CTCP PING Ð¾Ñ‚ {0}: {1} ÑÐµÐº."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2541
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2959
 #, csharp-format
 msgid "CTCP {0} reply from {1}: {2}"
 msgstr "ÐžÑ‚Ð²ÐµÑ‚ CTCP {0} Ð¾Ñ‚ {1}: {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2747
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3210
 #, csharp-format
 msgid "{0} [{1}] has joined {2}"
 msgstr "{0} [{1}] Ð·Ð°ÑˆÐµÐ» Ð½Ð° ÐºÐ°Ð½Ð°Ð» {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2873
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3355
 #, csharp-format
 msgid "{0} [{1}] has left {2}"
 msgstr "{0} [{1}] Ð²Ñ‹ÑˆÐµÐ» Ð¸Ð· ÐºÐ°Ð½Ð°Ð»Ð° {2}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2898
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3380
 #, csharp-format
-msgid "You were kicked from {0} by {1} [{2}]"
-msgstr "{1} Ð²Ñ‹Ð³Ð½Ð°Ð» Ð²Ð°Ñ Ð¸Ð· ÐºÐ°Ð½Ð°Ð»Ð° {0} [{2}]"
+msgid "You were kicked from {0} by {1}"
+msgstr "Ð’Ñ‹ Ð²Ñ‹Ð³Ð½Ð°Ð½Ñ‹ Ñ ÐºÐ°Ð½Ð°Ð»Ð° {0} Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2906
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3388
 #, csharp-format
-msgid "{0} was kicked from {1} by {2} [{3}]"
-msgstr "{2} Ð²Ñ‹Ð³Ð½Ð°Ð» {0} Ð¸Ð· ÐºÐ°Ð½Ð°Ð»Ð° {1} [{3}]"
+msgid "{0} was kicked from {1} by {2}"
+msgstr "{0} Ð²Ñ‹Ð³Ð½Ð°Ð½ Ñ ÐºÐ°Ð½Ð°Ð»Ð° {1} Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2923
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2956
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3406
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3438
 #, csharp-format
 msgid "You're now known as {0}"
 msgstr "Ð’Ð°ÑˆÐµ Ð¸Ð¼Ñ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ {0}"
 
-#. TRANSLATOR: do NOT change the position of {0} or {1}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2961
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3441
 #, csharp-format
 msgid "{0} is now known as {1}"
 msgstr "{0} ÑÐ¼ÐµÐ½Ð¸Ð» Ð¸Ð¼Ñ Ð½Ð° {1}"
 
-#. TRANSLATOR: do NOT change the position of {0} and {2}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2998
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3475
 #, csharp-format
 msgid "{0} changed the topic of {1} to: {2}"
 msgstr "{0} Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð» Ñ‚ÐµÐ¼Ñƒ ÐºÐ°Ð½Ð°Ð»Ð° {1} Ð½Ð°: {2}"
 
-#. TRANSLATOR: do NOT change the position of {1}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3075
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3635
 #, csharp-format
 msgid "Mode change [{0}] for user {1}"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½ Ñ€ÐµÐ¶Ð¸Ð¼ [{0}] Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ {1}"
 
-#. TRANSLATOR: do NOT change the position of {2}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3085
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3666
 #, csharp-format
 msgid "mode/{0} [{1}] by {2}"
 msgstr "Ñ€ÐµÐ¶Ð¸Ð¼/{0} [{1}] {2}"
 
-#. TRANSLATOR: do NOT change the position of {0}!
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3122
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3702
 #, csharp-format
 msgid "{0} [{1}] has quit"
 msgstr "{0} [{1}] Ð¿Ð¾ÐºÐ¸Ð½ÑƒÐ» ÐºÐ°Ð½Ð°Ð»"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3199
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3801
 #, csharp-format
 msgid ""
 "Connection to {0} port {1} has failed (attempt {2}), retrying in {3} "
 "seconds..."
-msgstr ""
-"Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ðº {0} Ðº Ð¿Ð¾Ñ€Ñ‚Ñƒ {1} (Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° {2}), Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ "
-"Ñ‡ÐµÑ€ÐµÐ· {3} ÑÐµÐºÑƒÐ½Ð´..."
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ðº {0} Ðº Ð¿Ð¾Ñ€Ñ‚Ñƒ {1} (Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° {2}), Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ñ‡ÐµÑ€ÐµÐ· {3} ÑÐµÐºÑƒÐ½Ð´..."
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3248
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3851
 #, csharp-format
 msgid "{0} is away: {1}"
 msgstr "{0} Ð¾Ñ‚Ð¾ÑˆÐµÐ»: {1}"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3254
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3861
 msgid "You are no longer marked as being away"
-msgstr ""
+msgstr "Ð’Ñ‹ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ñ‹ ÐºÐ°Ðº Ð¾Ñ‚Ð¾ÑˆÐµÐ´ÑˆÐ¸Ð¹"
 
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3260
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3871
 msgid "You have been marked as being away"
-msgstr ""
-
-
+msgstr "Ð’Ñ‹ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ñ‹ ÐºÐ°Ðº Ð¾Ñ‚Ð¾ÑˆÐµÐ´ÑˆÐ¸Ð¹"
diff --git a/po-Engine-MessageBuffer/cs.po b/po-Engine-MessageBuffer/cs.po
index 187b580c..d6bc8a5e 100644
--- a/po-Engine-MessageBuffer/cs.po
+++ b/po-Engine-MessageBuffer/cs.po
@@ -1,132 +1,123 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# RavuAlHemio <ondra hosek gmail com>, 2014
-# Marek ÄŒernockÃ½ <marek manet cz>, 2016.
-#
+# Marek ÄŒernockÃ½ <marek manet cz>, 2016
+# OndÅ™ej HoÅ¡ek <ondra hosek gmail com>, 2014
+# OndÅ™ej HoÅ¡ek <ondra hosek gmail com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:45+0000\n"
-"PO-Revision-Date: 2017-11-05 13:10+0100\n"
-"Last-Translator: Marek ÄŒernockÃ½ <marek manet cz>\n"
-"Language-Team: Czech <gnome-cs-list gnome org>\n"
-"Language: cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-10-27 14:09+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Czech (http://www.transifex.com/meebey/smuxi/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 
!= 0 ) ? 2 : 3;\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Zapnout ladicÃ informace"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Zobrazit tuto nÃ¡povÄ›du"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "NeznÃ¡mÃ¡ akce: â€ž{0}â€œ"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "ChybnÃ½ pÅ™Ãkaz: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
 msgstr "PouÅ¾itÃ: smuxi-message-buffer [volby] akce volby-akce"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "Akce:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Volby:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "NeznÃ¡mÃ¡ akce: â€ž{0}â€œ"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "ChybnÃ½ pÅ™Ãkaz: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "FormÃ¡t databÃ¡ze (povolenÃ© hodnoty: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "NeznÃ¡mÃ¡ volba {0}: â€ž{1}â€œ"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
 msgstr "PouÅ¾itÃ: smuxi-message-buffer {0} [volby-akce] cesta_k_databÃ¡zi"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-msgid "Database path(s)"
-msgstr "Cesta (nebo i vÃce cest) k databÃ¡zi"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "Cesta k databÃ¡zi"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "cesta_k_databÃ¡zi musÃ bÃ½t zadÃ¡na"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "ZdrojovÃ½ formÃ¡t (povolenÃ© hodnoty: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "CÃlovÃ½ formÃ¡t (povolenÃ© hodnoty: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"PouÅ¾itÃ: smuxi-message-buffer {0} [volby-akce] zdrojovÃ¡_databÃ¡ze "
-"cÃlovÃ¡_databÃ¡zeâ€¦"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "PouÅ¾itÃ: smuxi-message-buffer {0} [volby-akce] zdrojovÃ¡_databÃ¡ze cÃlovÃ¡_databÃ¡ze"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-msgid "Source file path(s)"
-msgstr "Cesta (nebo i vÃce cest) ke zdrojovÃ©mu souboru"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "Cesta ke zdrojovÃ©mu souboru"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
 msgstr "Cesta k cÃlovÃ©mu souboru nebo -/empty pro standardnÃ vÃ½stup"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "zdrojovÃ¡_databÃ¡ze a cÃlovÃ¡_databÃ¡ze musÃ bÃ½t zadÃ¡ny"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "ZdrojovÃ½ soubor nesmÃ bÃ½t prÃ¡zdnÃ½."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-msgid "sourceFiles must not be empty."
-msgstr "ZdrojovÃ© soubory nesmÃ bÃ½t prÃ¡zdnÃ©."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "CÃlovÃ¡ databÃ¡ze {0} musÃ bÃ½t prÃ¡zdnÃ¡!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "NeznÃ¡mÃ½ formÃ¡t souboru: â€ž{0}â€œ"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "NepodporovanÃ½ typ vyrovnÃ¡vacÃ pamÄ›ti: â€ž{0}â€œ"
diff --git a/po-Engine-MessageBuffer/da.po b/po-Engine-MessageBuffer/da.po
index 20f88ef1..0b527d12 100644
--- a/po-Engine-MessageBuffer/da.po
+++ b/po-Engine-MessageBuffer/da.po
@@ -1,131 +1,122 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Alan Mortensen <alanmortensen am gmail com>, 2018
 # Joe Hansen <joedalton2 yahoo dk>, 2015
-# Alan Mortensen <alanmortensen am gmail com>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:45+0000\n"
-"PO-Revision-Date: 2018-03-10 10:00+0100\n"
-"Last-Translator: Alan Mortensen <alanmortensen am gmail com>\n"
-"Language-Team: Danish (http://wiki.dansk-gruppen.dk)\n"
-"Language: da\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-09-20 01:00+0000\n"
+"Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
+"Language-Team: Danish (http://www.transifex.com/meebey/smuxi/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Aktiver fejlsÃ¸gningsuddata"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Vis denne hjÃ¦lp"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "Ukendt handling: Â»{0}Â«"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "Kommandolinjefejl: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
 msgstr "Brug: smuxi-message-buffer [tilvalg] handling handling-tilvalg"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "Handlinger:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Tilvalg:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "Ukendt handling: Â»{0}Â«"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "Kommandolinjefejl: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "Databaseformat (gyldige vÃ¦rdier: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "Ukendt {0} tilvalg: Â»{1}"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
 msgstr "Brug: smuxi-message-buffer {0} [handling-tilvalg] db_sti"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-msgid "Database path(s)"
-msgstr "Databasestier"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "Databasesti"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "db_sti er krÃ¦vet"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "Kildeformat (gyldige vÃ¦rdier: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "Destinationsformat (gyldige vÃ¦rdier: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"Brug: smuxi-message-buffer {0} [handling-tilvalg] kilde_db'erâ€¦ "
-"destinations_db"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "Brug: smuxi-message-buffer {0} [handling-tilvalg] source_db destination_db"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-msgid "Source file path(s)"
-msgstr "Kildefilstier"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "Kildefilsti"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
 msgstr "Destinationsfilsti eller /empty for standardud"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "source_db og destination_db er krÃ¦vet"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "kildefil mÃ¥ ikke vÃ¦re tom."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-msgid "sourceFiles must not be empty."
-msgstr "kildefiler mÃ¥ ikke vÃ¦re tomme."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "Destinationsdatabase {0} skal vÃ¦re tom!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "Ukendt filformat: Â»{0}Â«"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "Ikke understÃ¸ttet buffertype: Â»{0}Â«"
diff --git a/po-Engine-MessageBuffer/de.po b/po-Engine-MessageBuffer/de.po
index 2413c6c4..5d493403 100644
--- a/po-Engine-MessageBuffer/de.po
+++ b/po-Engine-MessageBuffer/de.po
@@ -1,134 +1,126 @@
-# German translation for smuxi-Engine-MessageBuffer.
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the smuxi package.
-#
+# This file is distributed under the same license as the PACKAGE package.
+# 
 # Translators:
-# JB, 2014.
-# Mirco Bauer <meebey gmail com>, 2015.
-# Wasilis Mandratzis-Walz, 2015.
-# Mario BlÃ¤ttermann <mario blaettermann gmail com>, 2016, 2017.
-#
+# JB, 2014
+# JB, 2014
+# Mario BlÃ¤ttermann <mario blaettermann gmail com>, 2016-2017
+# Mirco Bauer <meebey gmail com>, 2015
+# Wasilis Mandratzis-Walz, 2015
+# Wasilis Mandratzis-Walz, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:45+0000\n"
-"PO-Revision-Date: 2017-11-16 19:59+0100\n"
-"Last-Translator: Mario BlÃ¤ttermann <mario blaettermann gmail com>\n"
-"Language-Team: German <gnome-de gnome org>\n"
-"Language: de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-10-27 14:09+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: German (http://www.transifex.com/meebey/smuxi/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Aktivieren der Ausgabe zur Fehlerbeseitigung"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "Unbekannte Aktion: Â»{0}Â«"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "Befehlszeilenfehler: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
 msgstr "Aufruf: smuxi-message-buffer [Optionen] Aktion Aktions-Optionen"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "Aktionen:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Optionen:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "Unbekannte Aktion: Â»{0}Â«"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "Befehlszeilenfehler: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "Datenbankformat (gÃ¼ltige Werte: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "Unbekannte {0}-Option: Â»{1}Â«"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
 msgstr "Aufruf: smuxi-message-buffer {0} [Aktions-Optionen] Datenbankpfad"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-msgid "Database path(s)"
-msgstr "Datenbankpfad(e)"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "Datenbankpfad"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "Datenbankpfad wird benÃ¶tigt"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "Quellformat (gÃ¼ltige Werte: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "Zielformat (gÃ¼ltige Werte: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"Aufruf: smuxi-message-buffer {0} [Aktions-Optionen] Quelldatenbank(en)â€¦ "
-"Zieldatenbank"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "Aufruf: smuxi-message-buffer {0} [Aktions-Optionen] Quelldatenbank Zieldatenbank"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-msgid "Source file path(s)"
-msgstr "Pfad(e) zur Quelldatei"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "Pfad der Quelldatei"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
 msgstr "Zieldateipfad oder - / leer fÃ¼r Standardausgabe"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "Quelldatenbank und Zieldatenbank werden benÃ¶tigt"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "Die Quelldatei darf nicht leer sein."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-msgid "sourceFiles must not be empty."
-msgstr "Quelldateien dÃ¼rfen nicht leer sein."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "Die Zieldatenbank {0} muss leer sein!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "Unbekanntes Dateiformat: Â»{0}Â«"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "Nicht unterstÃ¼tzter Puffertyp: Â»{0}Â«"
diff --git a/po-Engine-MessageBuffer/es.po b/po-Engine-MessageBuffer/es.po
index bfdfe987..d806fe0d 100644
--- a/po-Engine-MessageBuffer/es.po
+++ b/po-Engine-MessageBuffer/es.po
@@ -1,139 +1,123 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Daniel Mustieles <daniel mustieles gmail com>, 2018
+# MatÃas Bellone, 2014
 # MatÃas Bellone, 2014
-# Daniel Mustieles <daniel mustieles gmail com>, 2018.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/smuxi/issues\n";
-"POT-Creation-Date: 2018-06-10 18:18+0000\n"
-"PO-Revision-Date: 2018-06-22 11:53+0200\n"
-"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
-"Language-Team: es <gnome-es-list gnome org>\n"
-"Language: es\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-09-20 01:00+0000\n"
+"Last-Translator: MatÃas Bellone\n"
+"Language-Team: Spanish (http://www.transifex.com/meebey/smuxi/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Activar salida de depuraciÃ³n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "AcciÃ³n desconocida: Â«{0}Â»"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "Error de lÃnea de Ã³rdenes: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
 msgstr "Uso: smuxi-message-buffer [opciones] acciÃ³n opciones-de-acciÃ³n"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "Acciones:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Opciones:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "AcciÃ³n desconocida: Â«{0}Â»"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "Error de lÃnea de Ã³rdenes: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "Formato de base de datos (valores vÃ¡lidos: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "OpciÃ³n de {0} desconocida: Â«{1}Â»"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
-msgstr ""
-"Uso: smuxi-message-buffer {0} [opciones-de-acciÃ³n] ruta_a_base_de_datos"
+msgstr "Uso: smuxi-message-buffer {0} [opciones-de-acciÃ³n] ruta_a_base_de_datos"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-#| msgid "Database path"
-msgid "Database path(s)"
-msgstr "Ruta/s a base de datos"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "Ruta a base de datos"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "ruta_a_base_de_datos es obligatorio"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "Formato de origen (valores vÃ¡lidos: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "Formato de destino (valores vÃ¡lidos: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
-#| msgid ""
-#| "Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"Uso: smuxi-message-buffer {0} [opciones-acciÃ³n] basededatos_origen... "
-"basededatos_destino"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "Uso: smuxi-message-buffer {0} [opciones-acciÃ³n] basededatos_origen basededatos_destino"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-#| msgid "Source file path"
-msgid "Source file path(s)"
-msgstr "Ruta/s a archivo de origen"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "Ruta a archivo de origen"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
-msgstr ""
-"Ruta al archivo de destino o utilice Â«-Â» o ningÃºn valor para la salida "
-"estÃ¡ndar"
+msgstr "Ruta al archivo de destino o utilice Â«-Â» o ningÃºn valor para la salida estÃ¡ndar"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "basededatos_origen y basededatos_destino son obligatorios"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "El archivo de origen no puede no puede estar vacÃo."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-#| msgid "sourceFile must not be empty."
-msgid "sourceFiles must not be empty."
-msgstr "El archivo de origen no puede no puede estar vacÃo."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "Â¡La base de datos de destino {0} debe estar vacÃa!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "Formato de archivo desconocido: Â«{0}Â»"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "Tipo de bÃºfer incompatible: Â«{0}Â»"
diff --git a/po-Engine-MessageBuffer/lt.po b/po-Engine-MessageBuffer/lt.po
index 8e3c95aa..0c565c95 100644
--- a/po-Engine-MessageBuffer/lt.po
+++ b/po-Engine-MessageBuffer/lt.po
@@ -1,138 +1,122 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Moo, 2014-2015
-# Aurimas ÄŒernius <aurisc4 gmail com>, 2018.
-#
+# aurisc4 <aurisc4 gmail com>, 2018
+# Moo, 2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/smuxi/issues\n";
-"POT-Creation-Date: 2018-06-10 18:18+0000\n"
-"PO-Revision-Date: 2018-11-25 19:22+0200\n"
-"Last-Translator: Aurimas ÄŒernius <aurisc4 gmail com>\n"
-"Language-Team: LietuviÅ³ <gnome-lt lists akl lt>\n"
-"Language: lt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-10-27 14:09+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/meebey/smuxi/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Gtranslator 3.30.1\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 
10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Ä®jungti derinimo iÅ¡vestÄ¯"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Rodyti Å¡iÄ… pagalbÄ…"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "NeÅ¾inomas veiksmas: '{0}'"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "KomandÅ³ eilutÄ—s klaida: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
-msgstr ""
-"Naudojimas: smuxi-message-buffer [parametrai] veiksmas veiksmo-parametrai"
+msgstr "Naudojimas: smuxi-message-buffer [parametrai] veiksmas veiksmo-parametrai"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "Veiksmai:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Parametrai:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "NeÅ¾inomas veiksmas: '{0}'"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "KomandÅ³ eilutÄ—s klaida: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "DuomenÅ³ bazÄ—s formatas (teisingos reikÅ¡mÄ—s: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "NeÅ¾inomas {0} parametras: '{1}'"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
 msgstr "Naudojimas: smuxi-message-buffer {0} [veiksmo-parametrai] db_kelias"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-#| msgid "Database path"
-msgid "Database path(s)"
-msgstr "DuomenÅ³ bazÄ—s kelias (-iai)"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "DuomenÅ³ bazÄ—s kelias"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "reikalingas db_kelias"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "Å altinio formatas (teisingos reikÅ¡mÄ—s: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "Paskirties formatas (teisingos reikÅ¡mÄ—s: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
-#| msgid ""
-#| "Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"Naudojimas: smuxi-message-buffer {0} [veiksmo-parametrai] Å¡altinio_db(s)... "
-"paskirties_db"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "Naudojimas: smuxi-message-buffer {0} [veiksmo-parametrai] Å¡altinio_db paskirties_db"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-#| msgid "Source file path"
-msgid "Source file path(s)"
-msgstr "Å altinio failo kelias (-iai)"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "Å altinio failo kelias"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
 msgstr "Paskirties failo kelias arba -/empty metodui stdout"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "reikalinga Å¡altinio_db ir paskirties_db"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "Å¡altinioFailas negali bÅ«ti tuÅ¡Äias."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-#| msgid "sourceFile must not be empty."
-msgid "sourceFiles must not be empty."
-msgstr "Å¡altinioFailai negali bÅ«ti tuÅ¡Äias."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "Paskirties duomenÅ³ bazÄ— {0} privalo bÅ«ti tuÅ¡Äia!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "NeÅ¾inomas failo formatas: '{0}'"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "Nepalaikomas buferio tipas: '{0}'"
diff --git a/po-Engine-MessageBuffer/pl.po b/po-Engine-MessageBuffer/pl.po
index 9e2c6c45..7884e032 100644
--- a/po-Engine-MessageBuffer/pl.po
+++ b/po-Engine-MessageBuffer/pl.po
@@ -1,137 +1,122 @@
-# Polish translation for smuxi.
-# Copyright Â© 2015-2017 the smuxi authors.
-# This file is distributed under the same license as the smuxi package.
-# Piotr DrÄ…g <piotrdrag gmail com>, 2015-2017.
-# Aviary.pl <community-poland mozilla org>, 2015-2017.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aviary.pl <gnomepl aviary pl>, 2015
+# Piotr DrÄ…g <piotrdrag gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-05 15:12+0100\n"
-"PO-Revision-Date: 2017-11-05 15:15+0100\n"
-"Last-Translator: Piotr DrÄ…g <piotrdrag gmail com>\n"
-"Language-Team: Polish <community-poland mozilla org>\n"
-"Language: pl\n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-10-27 14:09+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Polish (http://www.transifex.com/meebey/smuxi/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && 
(n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "WÅ‚Ä…cza wyjÅ›cie debugowania"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "WyÅ›wietla tÄ™ pomoc"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "Nieznane dziaÅ‚anie: â€ž{0}â€"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "BÅ‚Ä…d wiersza poleceÅ„: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
 msgstr "UÅ¼ycie: smuxi-message-buffer [opcje] dziaÅ‚anie opcje-dziaÅ‚ania"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "DziaÅ‚ania:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Opcje:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "Nieznane dziaÅ‚anie: â€ž{0}â€"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "BÅ‚Ä…d wiersza poleceÅ„: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
-msgstr ""
-"Format bazy danych (prawidÅ‚owe wartoÅ›ci: â€žautoâ€ (automatycznie), â€ždb4oâ€, "
-"â€žsqliteâ€)"
+msgstr "Format bazy danych (prawidÅ‚owe wartoÅ›ci: â€žautoâ€ (automatycznie), â€ždb4oâ€, â€žsqliteâ€)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "Nieznana opcja {0}: â€ž{1}â€"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
-msgstr ""
-"UÅ¼ycie: smuxi-message-buffer {0} [opcje-dziaÅ‚ania] Å›cieÅ¼ka_do_bazy_danych"
+msgstr "UÅ¼ycie: smuxi-message-buffer {0} [opcje-dziaÅ‚ania] Å›cieÅ¼ka_do_bazy_danych"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-msgid "Database path(s)"
-msgstr "ÅšcieÅ¼ki do baz danych"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "ÅšcieÅ¼ka do bazy danych"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "Å›cieÅ¼ka_do_bazy_danych jest wymagana"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
-msgstr ""
-"Format ÅºrÃ³dÅ‚owy (prawidÅ‚owe wartoÅ›ci: â€žautoâ€ (automatycznie), â€ždb4oâ€, "
-"â€žsqliteâ€)"
+msgstr "Format ÅºrÃ³dÅ‚owy (prawidÅ‚owe wartoÅ›ci: â€žautoâ€ (automatycznie), â€ždb4oâ€, â€žsqliteâ€)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
-msgstr ""
-"Format docelowy (prawidÅ‚owe wartoÅ›ci: â€žautoâ€ (automatycznie), â€ždb4oâ€, "
-"â€žsqliteâ€)"
+msgstr "Format docelowy (prawidÅ‚owe wartoÅ›ci: â€žautoâ€ (automatycznie), â€ždb4oâ€, â€žsqliteâ€)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"UÅ¼ycie: smuxi-message-buffer {0} [opcje-dziaÅ‚ania] ÅºrÃ³dÅ‚owe_bazy_danychâ€¦ "
-"docelowa_baza_danych"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "UÅ¼ycie: smuxi-message-buffer {0} [opcje-dziaÅ‚ania] ÅºrÃ³dÅ‚owa_baza_danych docelowa_baza_danych"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-msgid "Source file path(s)"
-msgstr "ÅšcieÅ¼ki do plikÃ³w ÅºrÃ³dÅ‚owych"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "ÅšcieÅ¼ka do pliku ÅºrÃ³dÅ‚owego"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
-msgstr ""
-"ÅšcieÅ¼ka do pliku docelowego lub â€ž-/emptyâ€, aby uÅ¼yÄ‡ standardowego wyjÅ›cia"
+msgstr "ÅšcieÅ¼ka do pliku docelowego lub â€ž-/emptyâ€, aby uÅ¼yÄ‡ standardowego wyjÅ›cia"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "ÅºrÃ³dÅ‚owa_baza_danych wÂ docelowa_baza_danych sÄ… wymagane"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "Plik ÅºrÃ³dÅ‚owy nie moÅ¼e byÄ‡ pusty."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-msgid "sourceFiles must not be empty."
-msgstr "Pliki ÅºrÃ³dÅ‚owe nie mogÄ… byÄ‡ puste."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "Docelowa baza danych {0} musi byÄ‡ pusta."
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "Nieznany format pliku: â€ž{0}â€"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "NieobsÅ‚ugiwany typ bufora: â€ž{0}â€"
diff --git a/po-Engine-MessageBuffer/pt_BR.po b/po-Engine-MessageBuffer/pt_BR.po
index f48aa606..252a8ab7 100644
--- a/po-Engine-MessageBuffer/pt_BR.po
+++ b/po-Engine-MessageBuffer/pt_BR.po
@@ -1,135 +1,122 @@
-# Brazilian Portuguese translation for smuxi.
-# Copyright (C) 2015 smuxi's COPYRIGHT HOLDER
-# This file is distributed under the same license as the smuxi package.
-# Enrico Nicoletto <liverig gmail com>, 2015.
-# Rafael Fontenelle <rafaelff gnome org>, 2017.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Enrico Nicoletto <liverig gmail com>, 2015
+# Rafael Fontenelle <rafaelff gnome org>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=smuxi&";
-"keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:45+0000\n"
-"PO-Revision-Date: 2017-12-12 06:21-0200\n"
-"Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
-"Language: pt_BR\n"
+"Project-Id-Version: Smuxi - IRC client\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2017-10-27 14:08+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/meebey/smuxi/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
-"X-Project-Style: gnome\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Habilita saÃda de depuraÃ§Ã£o"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Mostra esta ajuda"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "AÃ§Ã£o desconhecida: \"{0}\""
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "Erro na linha de comando: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
 msgstr "Uso: smuxi-message-buffer [opÃ§Ãµes] action aÃ§Ã£o-opÃ§Ãµes"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "AÃ§Ãµes:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "OpÃ§Ãµes:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "AÃ§Ã£o desconhecida: \"{0}\""
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "Erro na linha de comando: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "Formato da base de dados (valores vÃ¡lidos sÃ£o: auto, db4o e sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "OpÃ§Ã£o {0} desconhecida: \"{1}\""
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
 msgstr "Uso: smuxi-message-buffer {0} [aÃ§Ã£o-opÃ§Ãµes] db_path"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-#| msgid "Database path"
-msgid "Database path(s)"
-msgstr "Caminho(s) da base de dados"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "Caminho da base de dados"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "db_path Ã© necessÃ¡rio"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "Formato de origem (valores vÃ¡lidos sÃ£o: auto, db4o e sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "Formato de destino (valores vÃ¡lidos sÃ£o: auto, db4o e sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
-#| msgid ""
-#| "Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"Uso: smuxi-message-buffer {0} [aÃ§Ã£o-opÃ§Ãµes] source_db(s)... destination_db"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "Uso: smuxi-message-buffer {0} [aÃ§Ã£o-opÃ§Ãµes] source_db destination_db"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-#| msgid "Source file path"
-msgid "Source file path(s)"
-msgstr "Caminho(s) do arquivo de origem"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "Caminho do arquivo de origem"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
-msgstr ""
-"Caminho do arquivo de destino ou \"-/empty\" para a saÃda padrÃ£o (stdout)"
+msgstr "Caminho do arquivo de destino ou \"-/empty\" para a saÃda padrÃ£o (stdout)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "source_db e o destination_db sÃ£o necessÃ¡rios"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "Arquivo de origem nÃ£o pode estar vazio."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-#| msgid "sourceFile must not be empty."
-msgid "sourceFiles must not be empty."
-msgstr "Arquivos de origem nÃ£o pode(m) estar vazio(s)."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "A base de dados de destino {0} deve estar vazia!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "Formato de arquivo desconhecido: \"{0}\""
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "NÃ£o hÃ¡ suporte ao tipo de buffer: \"{0}\""
diff --git a/po-Engine-MessageBuffer/sv.po b/po-Engine-MessageBuffer/sv.po
index a6e2bceb..63e3f3ef 100644
--- a/po-Engine-MessageBuffer/sv.po
+++ b/po-Engine-MessageBuffer/sv.po
@@ -1,131 +1,122 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # flugsio <flugsio gmail com>, 2014
+# flugsio <flugsio gmail com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/smuxi/issues\n";
-"POT-Creation-Date: 2018-06-10 18:18+0000\n"
-"PO-Revision-Date: 2018-09-05 23:23+0200\n"
-"Last-Translator: Josef Andersson <l10nl18nsweja gmail com>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/smuxi/language/";
-"sv/)\n"
-"Language: sv\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:38+0200\n"
+"PO-Revision-Date: 2018-12-30 13:08+0000\n"
+"Last-Translator: Mirco Bauer <meebey gmail com>\n"
+"Language-Team: Swedish (http://www.transifex.com/meebey/smuxi/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.1.1\n"
 
 #: ../src/Engine-MessageBuffer/Main.cs:49
 msgid "Enable debug output"
 msgstr "Aktivera felsÃ¶kningsmeddelanden"
 
 #: ../src/Engine-MessageBuffer/Main.cs:55
-#: ../src/Engine-MessageBuffer/Main.cs:141
-#: ../src/Engine-MessageBuffer/Main.cs:205
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
 msgid "Show this help"
 msgstr "Visa den hÃ¤r hjÃ¤lpen"
 
-#: ../src/Engine-MessageBuffer/Main.cs:88
-#, csharp-format
-msgid "Unknown action: '{0}'"
-msgstr "OkÃ¤nd handling: '{0}'"
-
-#: ../src/Engine-MessageBuffer/Main.cs:95
-#, csharp-format
-msgid "Command line error: {0}"
-msgstr "Kommandoradsfel: {0}"
-
-#: ../src/Engine-MessageBuffer/Main.cs:104
+#: ../src/Engine-MessageBuffer/Main.cs:57
 msgid "Usage: smuxi-message-buffer [options] action action-options"
-msgstr ""
-"AnvÃ¤ndning: smuxi-message-buffer [alternativ] handling handlings-alternativ"
+msgstr "AnvÃ¤ndning: smuxi-message-buffer [alternativ] handling handlings-alternativ"
 
-#: ../src/Engine-MessageBuffer/Main.cs:106
+#: ../src/Engine-MessageBuffer/Main.cs:59
 msgid "Actions:"
 msgstr "Handlingar:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:110
-#: ../src/Engine-MessageBuffer/Main.cs:152
-#: ../src/Engine-MessageBuffer/Main.cs:217
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
 msgid "Options:"
 msgstr "Alternativ:"
 
-#: ../src/Engine-MessageBuffer/Main.cs:119
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "OkÃ¤nd handling: '{0}'"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "Kommandoradsfel: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
 msgid "Database format (valid values: auto, db4o, sqlite)"
 msgstr "Databasformat (giltiga vÃ¤rden: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:134
-#: ../src/Engine-MessageBuffer/Main.cs:198
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
 #, csharp-format
 msgid "Unknown {0} option: '{1}'"
 msgstr "OkÃ¤nt alternativ fÃ¶r {0}: '{1}'"
 
-#: ../src/Engine-MessageBuffer/Main.cs:145
+#: ../src/Engine-MessageBuffer/Main.cs:135
 #, csharp-format
 msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
 msgstr "AnvÃ¤ndning: smuxi-message-buffer {0} [handlings-alternativ] db_path"
 
-#: ../src/Engine-MessageBuffer/Main.cs:150
-msgid "Database path(s)"
-msgstr "DatabassÃ¶kvÃ¤g(ar)"
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "DatabassÃ¶kvÃ¤g"
 
-#: ../src/Engine-MessageBuffer/Main.cs:161
+#: ../src/Engine-MessageBuffer/Main.cs:151
 msgid "db_path is required"
 msgstr "db_path Ã¤r nÃ¶dvÃ¤ndig"
 
-#: ../src/Engine-MessageBuffer/Main.cs:175
+#: ../src/Engine-MessageBuffer/Main.cs:165
 msgid "Source format (valid values: auto, db4o, sqlite)"
 msgstr "KÃ¤llformat (giltiga vÃ¤rden: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:183
+#: ../src/Engine-MessageBuffer/Main.cs:173
 msgid "Destination format (valid values: auto, db4o, sqlite)"
 msgstr "MÃ¥lformat (giltiga vÃ¤rden: auto, db4o, sqlite)"
 
-#: ../src/Engine-MessageBuffer/Main.cs:209
+#: ../src/Engine-MessageBuffer/Main.cs:199
 #, csharp-format
 msgid ""
-"Usage: smuxi-message-buffer {0} [action-options] source_db(s)... "
-"destination_db"
-msgstr ""
-"AnvÃ¤ndning: smuxi-message-buffer {0} [handlings-alternativ] "
-"source_db(s)... destination_db"
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "AnvÃ¤nding: smuxi-message-buffer {0} [handlings-alternativ] source_db destination_db"
 
-#: ../src/Engine-MessageBuffer/Main.cs:214
-msgid "Source file path(s)"
-msgstr "KÃ¤llfilssÃ¶kvÃ¤g(ar)"
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "KÃ¤llfilssÃ¶kvÃ¤g"
 
-#: ../src/Engine-MessageBuffer/Main.cs:215
+#: ../src/Engine-MessageBuffer/Main.cs:205
 msgid "Destination file path or -/empty for stdout"
 msgstr "MÃ¥lfilssÃ¶kvÃ¤g eller  -/empty fÃ¶r stdout"
 
-#: ../src/Engine-MessageBuffer/Main.cs:226
+#: ../src/Engine-MessageBuffer/Main.cs:216
 msgid "source_db and destination_db are required"
 msgstr "source_db och destination_db Ã¤r nÃ¶dvÃ¤ndiga"
 
-#: ../src/Engine-MessageBuffer/Main.cs:242
+#: ../src/Engine-MessageBuffer/Main.cs:232
 msgid "sourceFile must not be empty."
 msgstr "sourceFile fÃ¥r inte vara tom."
 
-#: ../src/Engine-MessageBuffer/Main.cs:251
-msgid "sourceFiles must not be empty."
-msgstr "sourceFiles fÃ¥r inte vara tom."
-
-#: ../src/Engine-MessageBuffer/Main.cs:271
+#: ../src/Engine-MessageBuffer/Main.cs:248
 #, csharp-format
 msgid "Destination database {0} must be empty!"
 msgstr "MÃ¥ldatabas {0} mÃ¥ste vara tom!"
 
-#: ../src/Engine-MessageBuffer/Main.cs:340
+#: ../src/Engine-MessageBuffer/Main.cs:298
 #, csharp-format
 msgid "Unknown file format: '{0}'"
 msgstr "OkÃ¤nt filformat: '{0}'"
 
-#: ../src/Engine-MessageBuffer/Main.cs:362
+#: ../src/Engine-MessageBuffer/Main.cs:320
 #, csharp-format
 msgid "Unsupported buffer type: '{0}'"
 msgstr "Buffertypen stÃ¶ds inte: '{0}'"
diff --git a/po-Engine-Twitter/fa.po b/po-Engine-Twitter/fa.po
index 79c16626..99f61864 100644
--- a/po-Engine-Twitter/fa.po
+++ b/po-Engine-Twitter/fa.po
@@ -3,182 +3,198 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Behrooz Amoozad <behrooz0az gmail com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:01+0100\n"
-"PO-Revision-Date: 2013-12-05 19:06+0000\n"
+"POT-Creation-Date: 2015-07-14 19:40+0200\n"
+"PO-Revision-Date: 2017-09-19 19:12+0000\n"
 "Last-Translator: Mirco Bauer <meebey gmail com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/smuxi/language/fa/)\n"
+"Language-Team: Persian (http://www.transifex.com/meebey/smuxi/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:124
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:125
 msgid "Home Timeline"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:135
-msgid "Replies"
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:136
+msgid "Replies & Mentions"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:146
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:147
 msgid "Direct Messages"
-msgstr ""
+msgstr "Ù¾ÛŒØºØ§Ù… Ù‡Ø§ÛŒ Ù…Ø³ØªÙ‚ÛŒÙ…"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:193
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:195
 #, csharp-format
 msgid "Using proxy: {0}:{1}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:212
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:217
 msgid "Connecting to Twitter..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø§ØªØµØ§Ù„ Ø¨Ù‡ ØªÙˆÛŒÛŒØªØ±"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:254
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:259
 msgid "Twitter authorization required."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:261
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:266
 #, csharp-format
 msgid ""
 "Please open the following URL and click \"Allow\" to allow Smuxi to connect "
 "to your Twitter account: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:277
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:282
 msgid ""
 "Once you have allowed Smuxi to access your Twitter account, Twitter will "
 "provide a PIN."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:284
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:289
 msgid "Please type: /pin PIN_FROM_TWITTER"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:292
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:354
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:297
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:359
 msgid "Connection failed!"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:297
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:358
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:302
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:363
 #, csharp-format
 msgid "Connection failed! Reason: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:312
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:317
 msgid "Fetching user details from Twitter, please wait..."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:319
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:324
 msgid "Finished fetching user details."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:325
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:330
 msgid "Successfully connected to Twitter."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:343
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:348
 msgid "Failed to fetch user details from Twitter. Reason: "
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:376
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:381
 msgid "Fetching friends from Twitter, please wait..."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:385
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:390
 msgid "Finished fetching friends."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:389
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:394
 msgid "Failed to fetch friends from Twitter. Reason: "
 msgstr ""
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:703
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:738
 msgid "Twitter Commands"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:749
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:787
 msgid "No pending authorization request!"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:770
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:808
 #, csharp-format
 msgid "Failed to authorize with Twitter: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:778
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:816
 msgid "Twitter did not accept your PIN.  Did you enter it correctly?"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:786
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:824
 #, csharp-format
 msgid ""
 "Please retry by closing this tab and reconnecting to the Twitter \"{0}\" "
 "account."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:827
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:865
 msgid "Migrated Twitter account from basic auth to OAuth."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:841
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:879
 #, csharp-format
 msgid "Successfully authorized Twitter account \"{0}\" for Smuxi"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:864
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:902
 #, csharp-format
 msgid "Could not update status - Reason: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:875
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:913
 msgid "Cannot send message - no target specified. Use: /msg $nick message"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:892
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:987
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:930
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1025
 #, csharp-format
 msgid "Could not send message - Reason: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:912
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:950
 msgid "Other timelines"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:970
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1008
 msgid "Could not send message - the specified user does not exist."
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1081
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1122
 #, csharp-format
 msgid "Search {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1228
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1245
+#, csharp-format
+msgid "Successfully deleted tweet {0}."
+msgstr ""
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1277
+#, csharp-format
+msgid "Successfully favorited tweet {0}."
+msgstr ""
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1309
+#, csharp-format
+msgid "Successfully unfavorited tweet {0}."
+msgstr ""
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1371
 #, csharp-format
 msgid ""
 "An error occurred while fetching the friends timeline from Twitter. Reason: "
 "{0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1340
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1483
 #, csharp-format
 msgid "An error occurred while fetching the replies from Twitter. Reason: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1446
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1589
 #, csharp-format
 msgid ""
 "An error occurred while fetching direct messages from Twitter. Reason: {0}"
 msgstr ""
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1817
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1972
 msgid "Twitter didn't send a valid response, they're probably overloaded"
 msgstr ""
diff --git a/po-Engine-Twitter/ru.po b/po-Engine-Twitter/ru.po
index afbbc635..83e08616 100644
--- a/po-Engine-Twitter/ru.po
+++ b/po-Engine-Twitter/ru.po
@@ -3,174 +3,199 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Yuri Myasoedov <omerta13 yandex ru>, 2012.
+# VsyachePuz <vsyachepuz gmail com>, 2015
+# Yuri Myasoedov <omerta13 yandex ru>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: http://www.smuxi.org/issues\n";
-"POT-Creation-Date: 2011-12-29 09:20+0100\n"
-"PO-Revision-Date: 2012-01-11 09:27+0000\n"
-"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/smuxi/team/ru/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:40+0200\n"
+"PO-Revision-Date: 2017-09-19 09:10+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) 
? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:124
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:125
 msgid "Home Timeline"
-msgstr ""
+msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:135
-msgid "Replies"
-msgstr "ÐžÑ‚Ð²ÐµÑ‚Ñ‹"
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:136
+msgid "Replies & Mentions"
+msgstr "ÐžÑ‚Ð²ÐµÑ‚Ñ‹ Ð¸ ÑƒÐ¿Ð¾Ð¼Ð¸Ð½Ð°Ð½Ð¸Ñ"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:146
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:147
 msgid "Direct Messages"
 msgstr "ÐŸÑ€ÑÐ¼Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:189
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:195
+#, csharp-format
+msgid "Using proxy: {0}:{1}"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¿Ñ€Ð¾ÐºÑÐ¸: {0}:{1}"
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:217
 msgid "Connecting to Twitter..."
 msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº Twitterâ€¦"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:228
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:259
 msgid "Twitter authorization required."
 msgstr "Twitter Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸ÑŽ."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:235
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:266
 #, csharp-format
 msgid ""
 "Please open the following URL and click \"Allow\" to allow Smuxi to connect "
 "to your Twitter account: {0}"
-msgstr ""
-"ÐžÑ‚ÐºÑ€Ð¾Ð¹Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹ URL Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ Â«AllowÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Smuxi Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ"
-" Ðº Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð² Twitter: {0}"
+msgstr "ÐžÑ‚ÐºÑ€Ð¾Ð¹Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹ URL Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ Â«AllowÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Smuxi Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº Ð²Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ 
Ð² Twitter: {0}"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:251
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:282
 msgid ""
 "Once you have allowed Smuxi to access your Twitter account, Twitter will "
 "provide a PIN."
-msgstr ""
-"ÐŸÐ¾ÑÐ»Ðµ Ñ‚Ð¾Ð³Ð¾, ÐºÐ°Ðº Ð²Ñ‹ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚Ðµ Smuxi Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð² "
-"Twitter, Twitter Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸Ñ‚ PIN-ÐºÐ¾Ð´."
+msgstr "ÐŸÐ¾ÑÐ»Ðµ Ñ‚Ð¾Ð³Ð¾, ÐºÐ°Ðº Ð²Ñ‹ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚Ðµ Smuxi Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð² Twitter, Twitter Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸Ñ‚ 
PIN-ÐºÐ¾Ð´."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:258
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:289
 msgid "Please type: /pin PIN_FROM_TWITTER"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ: /pin PIN_ÐšÐžÐ”_TWITTER"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:265
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:305
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:297
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:359
 msgid "Connection failed!"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸!"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:267
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:307
-msgid "Connection failed! Reason: "
-msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸! ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°:  "
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:302
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:363
+#, csharp-format
+msgid "Connection failed! Reason: {0}"
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ! ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:280
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:317
 msgid "Fetching user details from Twitter, please wait..."
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ðµ Ñ Twitter, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµâ€¦"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:285
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:324
 msgid "Finished fetching user details."
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:290
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:330
 msgid "Successfully connected to Twitter."
 msgstr "Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾ Ðº Twitter."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:299
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:348
 msgid "Failed to fetch user details from Twitter. Reason: "
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ðµ. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: "
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:320
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:381
 msgid "Fetching friends from Twitter, please wait..."
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð´Ñ€ÑƒÐ·ÐµÐ¹ Ñ Twitter, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµâ€¦"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:325
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:390
 msgid "Finished fetching friends."
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð´Ñ€ÑƒÐ·ÐµÐ¹ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:328
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:394
 msgid "Failed to fetch friends from Twitter. Reason: "
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð´Ñ€ÑƒÐ·ÐµÐ¹ Ñ Twitter. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: "
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:605
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:738
 msgid "Twitter Commands"
 msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Twitter"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:647
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:787
 msgid "No pending authorization request!"
-msgstr ""
+msgstr "ÐÐµÑ‚ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ¾Ð² Ð½Ð° Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸ÑŽ!"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:668
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:808
 #, csharp-format
 msgid "Failed to authorize with Twitter: {0}"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Twitter: {0}"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:676
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:816
 msgid "Twitter did not accept your PIN.  Did you enter it correctly?"
 msgstr "Twitter Ð½Ðµ Ð¿Ñ€Ð¸Ð½ÑÐ» PIN-ÐºÐ¾Ð´.  ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ, Ñ‡Ñ‚Ð¾ Ð¾Ð½ Ð²Ð²ÐµÐ´Ñ‘Ð½ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:684
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:824
 #, csharp-format
 msgid ""
 "Please retry by closing this tab and reconnecting to the Twitter \"{0}\" "
 "account."
-msgstr ""
-"ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ, Ð·Ð°ÐºÑ€Ñ‹Ð² ÑÑ‚Ñƒ Ð²ÐºÐ»Ð°Ð´ÐºÑƒ Ð¸ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ð²ÑˆÐ¸ÑÑŒ Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Â«{0}Â» Ð² "
-"Twitter."
+msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ, Ð·Ð°ÐºÑ€Ñ‹Ð² ÑÑ‚Ñƒ Ð²ÐºÐ»Ð°Ð´ÐºÑƒ Ð¸ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ð²ÑˆÐ¸ÑÑŒ Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Â«{0}Â» Ð² Twitter."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:725
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:865
 msgid "Migrated Twitter account from basic auth to OAuth."
-msgstr ""
+msgstr "ÐÐºÐºÐ°ÑƒÐ½Ñ‚ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½ Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ basic Ð½Ð° OAuth."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:739
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:879
 #, csharp-format
 msgid "Successfully authorized Twitter account \"{0}\" for Smuxi"
 msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Â«{0}Â» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð° Ð² Twitter"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:761
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:902
 #, csharp-format
 msgid "Could not update status - Reason: {0}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:770
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:913
 msgid "Cannot send message - no target specified. Use: /msg $nick message"
-msgstr ""
-"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ: Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ. Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ: "
-"/msg $Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ"
+msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ: Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ. Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ: /msg $Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ 
ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:783
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:820
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:930
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1025
 #, csharp-format
 msgid "Could not send message - Reason: {0}"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:807
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:950
+msgid "Other timelines"
+msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð»ÑŽÐ´ÐµÐ¹"
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1008
 msgid "Could not send message - the specified user does not exist."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ: ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:896
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1122
+#, csharp-format
+msgid "Search {0}"
+msgstr "Ð˜ÑÐºÐ°Ñ‚ÑŒ {0}"
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1245
+#, csharp-format
+msgid "Successfully deleted tweet {0}."
+msgstr "Ð¢Ð²Ð¸Ñ‚ {0} ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐ´Ð°Ð»Ñ‘Ð½."
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1277
+#, csharp-format
+msgid "Successfully favorited tweet {0}."
+msgstr "Ð¢Ð²Ð¸Ñ‚ {0} Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½ Ð² Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ."
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1309
+#, csharp-format
+msgid "Successfully unfavorited tweet {0}."
+msgstr "Ð¢Ð²Ð¸Ñ‚ {0} ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð¸Ð· Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾."
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1371
+#, csharp-format
 msgid ""
 "An error occurred while fetching the friends timeline from Twitter. Reason: "
-msgstr ""
+"{0}"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð´Ñ€ÑƒÐ·ÐµÐ¹ Ð¾Ñ‚ Twitter. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1001
-msgid "An error occurred while fetching the replies from Twitter. Reason: "
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1483
+#, csharp-format
+msgid "An error occurred while fetching the replies from Twitter. Reason: {0}"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð¾Ñ‚Ð²ÐµÑ‚Ð¾Ð² Ñ Twitter. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°:  "
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1097
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1589
+#, csharp-format
 msgid ""
-"An error occurred while fetching direct messages from Twitter. Reason: "
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð¿Ñ€ÑÐ¼Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ñ Twitter. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°:  "
+"An error occurred while fetching direct messages from Twitter. Reason: {0}"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ð¸ Ð¿Ñ€ÑÐ¼Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ñ Twitter. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0} "
 
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1441
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1972
 msgid "Twitter didn't send a valid response, they're probably overloaded"
 msgstr "Twitter Ð½Ðµ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ð» ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¹ Ð¾Ñ‚Ð²ÐµÑ‚, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¸ Ð¿ÐµÑ€ÐµÐ³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹"
-
-
diff --git a/po-Engine-XMPP/fr.po b/po-Engine-XMPP/fr.po
index 966c245d..cbe97875 100644
--- a/po-Engine-XMPP/fr.po
+++ b/po-Engine-XMPP/fr.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ClÃ©ment Bourgeois <moonpyk gmail com>, 2013,2015
+# ClÃ©ment Bourgeois <moonpyk gmail com>, 2013,2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-03 12:33+0200\n"
-"PO-Revision-Date: 2015-05-03 20:14+0000\n"
+"POT-Creation-Date: 2015-07-14 19:40+0200\n"
+"PO-Revision-Date: 2017-09-23 19:25+0000\n"
 "Last-Translator: ClÃ©ment Bourgeois <moonpyk gmail com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/smuxi/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/meebey/smuxi/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:188
-msgid "The Server has shut down"
-msgstr "Le serveur a Ã©tÃ© coupÃ©"
+msgid "The server has shut down"
+msgstr "Le serveur s'est arretÃ©"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:191
 msgid ""
@@ -34,15 +34,15 @@ msgstr "Authentification Ã©chouÃ©e, mot de passe ou nom d'utilisateur incorrect"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:213
 msgid ""
-"if you want to create an account with the specified user and password, type "
+"If you want to create an account with the specified user and password, type "
 "/register now"
-msgstr "si vous souhaitez crÃ©er un compte avec le nom d'utilisateur et le mot de passe spÃ©cifiÃ©, tapez 
/register maintenant"
+msgstr "Si vous voulez crÃ©er un compte avec le nom d'utilisateur et le mot de passe spÃ©cifiÃ©, tapez 
/register maintenant"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:259
 msgid ""
 "This engine has native Facebook support, you should be using it instead of "
-"connecting to facebook with xmpp"
-msgstr "Ce moteur a un support natif de Facebook, vous devrier l'utiliser directement plutÃ´t que de vous 
connecter Ã  Facebook avec XMPP"
+"connecting to Facebook with XMPP"
+msgstr "Ce moteur a le support natif de Facebook, vous devriez l'utiliser Ã  la place d'une connexion Ã  
Facebook via XMPP"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:328
 msgid "not connected"
@@ -65,8 +65,8 @@ msgstr "{0} n'est pas une ressource connue"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:837
 #, csharp-format
-msgid "Contact's Jid: {0}"
-msgstr "Jid du contact : {0}"
+msgid "Contact's JID: {0}"
+msgstr "JID du contact: {0}"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:841
 msgid "You have a mutual subscription with this contact"
@@ -80,17 +80,17 @@ msgstr "Vous n'avez pas d'abonnement avec ce contact ou ce contact n'est pas abo
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:847
 msgid ""
-"You are subscribed to this contact, but the contact is not subcribed to you"
+"You are subscribed to this contact, but the contact is not subscribed to you"
 msgstr "Vous Ãªtes abonnÃ© Ã  ce contact, mais celui-ci ne s'est pas abonnÃ© Ã  vous"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:850
 msgid ""
-"You are not subscribed to this contact, but the contact is subcribed to you"
+"You are not subscribed to this contact, but the contact is subscribed to you"
 msgstr "Vous n'Ãªtes pas abonnÃ© Ã  ce contact, mais lui est abonnÃ© Ã  vous"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:946
 #, csharp-format
-msgid "Invalid Contact command: {0}"
+msgid "Invalid contact command: {0}"
 msgstr "Commande contact invalide : {0}"
 
 #. TRANSLATOR: this line is used as a label / category for a
@@ -123,7 +123,7 @@ msgstr "La prioritÃ© pour Parti est : {0}"
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1063
 #, csharp-format
 msgid ""
-"Invalid Priority: {0} (valid priorities are between -128 and 127 inclusive)"
+"Invalid priority: {0} (valid priorities are between -128 and 127 inclusive)"
 msgstr "PrioritÃ© {0} invalide (les prioritÃ©s valides sont comprises entre -128 et 127 inclus)"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1633
@@ -257,8 +257,8 @@ msgstr "Chat de groupe \"{0}\" non trouvÃ© sur le serveur."
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1897
 #, csharp-format
-msgid "Muc service is not available for \"{0}\""
-msgstr "Le service Muc n'est pas disponible pour \"{0}\""
+msgid "MUC service is not available for \"{0}\""
+msgstr "Le service MUC n'est pas disponible pour \"{0}\""
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1904
 #, csharp-format
diff --git a/po-Engine-XMPP/tr.po b/po-Engine-XMPP/tr.po
index 6c54f5d3..03367a64 100644
--- a/po-Engine-XMPP/tr.po
+++ b/po-Engine-XMPP/tr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-03 12:33+0200\n"
-"PO-Revision-Date: 2015-05-14 21:36+0000\n"
+"POT-Creation-Date: 2015-07-14 19:40+0200\n"
+"PO-Revision-Date: 2017-09-19 22:25+0000\n"
 "Last-Translator: Åž. Uzun <hashirrrt gmail com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/smuxi/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/meebey/smuxi/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:188
-msgid "The Server has shut down"
+msgid "The server has shut down"
 msgstr "Sunucu kapatÄ±ldÄ±"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:191
@@ -34,15 +34,15 @@ msgstr "Kimlik doÄŸrulama baÅŸarÄ±sÄ±z oldu, kullanÄ±cÄ± adÄ± mevcut deÄŸil ya d
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:213
 msgid ""
-"if you want to create an account with the specified user and password, type "
+"If you want to create an account with the specified user and password, type "
 "/register now"
-msgstr "belirtilen kullanÄ±cÄ± adÄ± ve parola ile hesap oluÅŸturmak istiyorsanÄ±z ÅŸimdi /register yazÄ±n"
+msgstr "Belirtilen kullanÄ±cÄ± ve parola ile bir hesap oluÅŸturmak istiyorsanÄ±z ÅŸimdi /register yazÄ±n"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:259
 msgid ""
 "This engine has native Facebook support, you should be using it instead of "
-"connecting to facebook with xmpp"
-msgstr "Bu motorda zaten yerleÅŸik Facebook desteÄŸi bulunuyor, xmpp ile facebook baÄŸlantÄ±sÄ± kurmak yerine onu 
kullanmalÄ±sÄ±nÄ±z"
+"connecting to Facebook with XMPP"
+msgstr "Bu motorda yerleÅŸik Facebook desteÄŸi bulunuyor, XMPP ile facebook baÄŸlantÄ±sÄ± kurmak yerine onu 
kullanmalÄ±sÄ±nÄ±z"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:328
 msgid "not connected"
@@ -65,8 +65,8 @@ msgstr "{0} bilinen bir kaynak deÄŸil"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:837
 #, csharp-format
-msgid "Contact's Jid: {0}"
-msgstr "KiÅŸi'ye ait Jid: {0}"
+msgid "Contact's JID: {0}"
+msgstr "KiÅŸi'ye ait JID: {0}"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:841
 msgid "You have a mutual subscription with this contact"
@@ -80,18 +80,18 @@ msgstr "Bu kiÅŸiye aboneliÄŸiniz yok ve bu kiÅŸi size abone deÄŸil"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:847
 msgid ""
-"You are subscribed to this contact, but the contact is not subcribed to you"
-msgstr "Bu kiÅŸiye abonesiniz ancak bu kiÅŸi size abone deÄŸil"
+"You are subscribed to this contact, but the contact is not subscribed to you"
+msgstr "Bu kiÅŸiye abonesiniz ancak kiÅŸi size abone deÄŸil"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:850
 msgid ""
-"You are not subscribed to this contact, but the contact is subcribed to you"
-msgstr "Bu kiÅŸiye abone deÄŸilsiniz ancak bu kiÅŸi size abone"
+"You are not subscribed to this contact, but the contact is subscribed to you"
+msgstr "Bu kiÅŸiye abone deÄŸilsiniz ancak kiÅŸi size abone"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:946
 #, csharp-format
-msgid "Invalid Contact command: {0}"
-msgstr "GeÃ§ersiz KiÅŸi komutu: {0}"
+msgid "Invalid contact command: {0}"
+msgstr "GeÃ§ersiz kiÅŸi komutu: {0}"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
@@ -123,8 +123,8 @@ msgstr "Uzakta iÃ§in Ã¶ncelik: {0}"
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1063
 #, csharp-format
 msgid ""
-"Invalid Priority: {0} (valid priorities are between -128 and 127 inclusive)"
-msgstr "GeÃ§ersiz Ã–ncelik: {0} (geÃ§erli Ã¶ncelikler -128 ile 127 - dahil - arasÄ±)"
+"Invalid priority: {0} (valid priorities are between -128 and 127 inclusive)"
+msgstr "GeÃ§ersiz Ã¶ncelik: {0} (geÃ§erli Ã¶ncelikler -128 ile 127 - dahil - arasÄ±)"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1633
 #, csharp-format
@@ -257,8 +257,8 @@ msgstr "\"{0}\" toplu sohbetinin sunucusu bulunamadÄ±."
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1897
 #, csharp-format
-msgid "Muc service is not available for \"{0}\""
-msgstr "\"{0}\" iÃ§in Muc hizmeti mevcut deÄŸil"
+msgid "MUC service is not available for \"{0}\""
+msgstr "\"{0}\" iÃ§in MUC hizmeti mevcut deÄŸil"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1904
 #, csharp-format
diff --git a/po-Engine-XMPP/zh_CN.po b/po-Engine-XMPP/zh_CN.po
index 2ffbf19c..a632379f 100644
--- a/po-Engine-XMPP/zh_CN.po
+++ b/po-Engine-XMPP/zh_CN.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dean Lee <xslidian gmail com>, 2013-2015
+# Dian Li <xslidian gmail com>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-03 12:33+0200\n"
-"PO-Revision-Date: 2015-05-03 19:53+0000\n"
-"Last-Translator: Dean Lee <xslidian gmail com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
+"POT-Creation-Date: 2015-07-14 19:40+0200\n"
+"PO-Revision-Date: 2017-09-23 19:25+0000\n"
+"Last-Translator: Dian Li <xslidian gmail com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/meebey/smuxi/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:188
-msgid "The Server has shut down"
+msgid "The server has shut down"
 msgstr "æœåŠ¡å™¨å·²å…³é—"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:191
@@ -34,15 +34,15 @@ msgstr "èº«ä»½è®¤è¯å¤±è´¥ï¼Œç”¨æˆ·åä¸å˜åœ¨æˆ–å¯†ç æ— æ•ˆ"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:213
 msgid ""
-"if you want to create an account with the specified user and password, type "
+"If you want to create an account with the specified user and password, type "
 "/register now"
-msgstr "å¦‚æžœæ‚¨å¸Œæœ›æŒ‡å®šç”¨æˆ·åä¸Žå¯†ç åˆ›å»ºè´¦å·ï¼Œè¯·è¾“å…¥ /register"
+msgstr "å¦‚æžœæ‚¨å¸Œæœ›ä»¥æŒ‡å®šçš„ç”¨æˆ·åä¸Žå¯†ç åˆ›å»ºè´¦å·ï¼Œè¯·è¾“å…¥ /register"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:259
 msgid ""
 "This engine has native Facebook support, you should be using it instead of "
-"connecting to facebook with xmpp"
-msgstr "æœ¬å¼•æ“ŽåŽŸç”Ÿæ”¯æŒ Facebookï¼Œæ‚¨åº”è¯¥ä½¿ç”¨åŽŸç”ŸåŠŸèƒ½ï¼Œä¸å¿…  xmpp è¿žæŽ¥åˆ° facebook"
+"connecting to Facebook with XMPP"
+msgstr "è¯¥å¼•æ“Žæœ‰åŽŸç”Ÿçš„ Facebook æ”¯æŒï¼Œæ‚¨åº”ä½¿ç”¨è¯¥å¼•æ“Žï¼Œè€Œéžé€šè¿‡ XMPP è¿žæŽ¥åˆ° Facebook"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:328
 msgid "not connected"
@@ -65,8 +65,8 @@ msgstr "{0} ä¸æ˜¯å·²çŸ¥èµ„æº"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:837
 #, csharp-format
-msgid "Contact's Jid: {0}"
-msgstr "è”ç³»äººçš„ Jid: {0}"
+msgid "Contact's JID: {0}"
+msgstr "è”ç³»äººçš„ JID: {0}"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:841
 msgid "You have a mutual subscription with this contact"
@@ -80,18 +80,18 @@ msgstr "æ‚¨æœªè®¢é˜…è¯¥è”ç³»äººï¼Œè¯¥è”ç³»äººä¹Ÿæœªè®¢é˜…æ‚¨"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:847
 msgid ""
-"You are subscribed to this contact, but the contact is not subcribed to you"
+"You are subscribed to this contact, but the contact is not subscribed to you"
 msgstr "æ‚¨å·²è®¢é˜…è¯¥è”ç³»äººï¼Œä½†è¯¥è”ç³»äººæœªè®¢é˜…æ‚¨"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:850
 msgid ""
-"You are not subscribed to this contact, but the contact is subcribed to you"
-msgstr "æ‚¨æœªè®¢é˜…è¯¥è”ç³»äººï¼Œä½†è¯¥è”ç³»äººè®¢é˜…äº†æ‚¨"
+"You are not subscribed to this contact, but the contact is subscribed to you"
+msgstr "æ‚¨æœªè®¢é˜…è¯¥è”ç³»äººï¼Œä½†è¯¥è”ç³»äººå·²è®¢é˜…æ‚¨"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:946
 #, csharp-format
-msgid "Invalid Contact command: {0}"
-msgstr "æ— æ•ˆè”ç³»äººå‘½ä»¤: {0}"
+msgid "Invalid contact command: {0}"
+msgstr "æ— æ•ˆçš„è”ç³»äººå‘½ä»¤: {0}"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
@@ -123,8 +123,8 @@ msgstr "ç¦»å¼€ä¼˜å…ˆçº§ä¸º: {0}"
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1063
 #, csharp-format
 msgid ""
-"Invalid Priority: {0} (valid priorities are between -128 and 127 inclusive)"
-msgstr "ä¼˜å…ˆçº§æ— æ•ˆ: {0} (æœ‰æ•ˆçš„ä¼˜å…ˆçº§ä»Ž -128 åˆ° 127)"
+"Invalid priority: {0} (valid priorities are between -128 and 127 inclusive)"
+msgstr "æ— æ•ˆçš„ä¼˜å…ˆçº§: {0} (æœ‰æ•ˆçš„ä¼˜å…ˆçº§ä»‹äºŽ -128 ä¸Ž 127 ä¹‹é—´ï¼ŒåŒ…å«è¾¹ç•Œå€¼)"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1633
 #, csharp-format
@@ -257,8 +257,8 @@ msgstr "æœªæ‰¾åˆ°ç¾¤èŠâ€œ{0}â€çš„æœåŠ¡å™¨ã€‚"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1897
 #, csharp-format
-msgid "Muc service is not available for \"{0}\""
-msgstr "Muc æœåŠ¡å¯¹â€œ{0}â€ä¸å¯ç”¨"
+msgid "MUC service is not available for \"{0}\""
+msgstr "MUC æœåŠ¡å¯¹äºŽâ€œ{0}â€ä¸å¯ç”¨"
 
 #: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1904
 #, csharp-format
diff --git a/po-Engine/ca.po b/po-Engine/ca.po
index 572fa883..80ac8d85 100644
--- a/po-Engine/ca.po
+++ b/po-Engine/ca.po
@@ -1,135 +1,248 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Xavi Ivars <xavi ivars gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Smuxi\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 15:23+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Siegfried-Angel Gevatter Pujals <rainct ubuntu com>\n"
-"Language-Team: Siegfried Gevatter <siegfried gevatter com>\n"
+"POT-Creation-Date: 2015-07-14 19:37+0200\n"
+"PO-Revision-Date: 2017-09-19 09:12+0000\n"
+"Last-Translator: Xavi Ivars <xavi ivars gmail com>\n"
+"Language-Team: Catalan (http://www.transifex.com/meebey/smuxi/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"X-Poedit-Language: Catalan\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/Engine/FrontendManager.cs:230
+#: ../src/Engine/FrontendManager.cs:218
 msgid "No network connections"
 msgstr "No hi ha connexions de xarxa"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:161
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:263
+#, csharp-format
+msgid "Optimizing: {0}..."
+msgstr "S'estÃ  optimitzant: {0}..."
+
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:281
+#, csharp-format
+msgid "Failed to optimize: {0}. Reason: {1}"
+msgstr "No s'ha pogut optimitzar:{0}. Motiu: {1}"
+
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:315
+msgid ""
+"Your chat history is no longer available because of an error but will be "
+"preserved from now on."
+msgstr "La vostra histÃ²ria del xat no es troba disponible a causa d'un error, perÃ² es preservarÃ  d'ara 
endavant."
+
+#: ../src/Engine/Messages/MessageBuilder.cs:771
+#, csharp-format
+msgid "{0} is typing..."
+msgstr "{0} estÃ  escrivint..."
+
+#: ../src/Engine/Messages/MessageBuilder.cs:777
+#, csharp-format
+msgid "{0} has stopped typing..."
+msgstr "{0} ha deixat d'escriure...."
+
+#: ../src/Engine/Messages/MessageBuilder.cs:820
+#, csharp-format
+msgid "{0} is away"
+msgstr "{0} estÃ  absent"
+
+#: ../src/Engine/Messages/MessageBuilder.cs:826
+#, csharp-format
+msgid "{0} is offline"
+msgstr "{0} estÃ  desconnectat"
+
+#: ../src/Engine/Messages/MessageBuilder.cs:832
+#, csharp-format
+msgid "{0} is online"
+msgstr "{0} estÃ  connectat"
+
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:162
+msgid "not connected"
+msgstr "no estÃ  connectat"
+
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:193
 msgid "Not connected to server"
 msgstr "No esteu connectat al servidor."
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:173
-#: ../src/Engine/Session.cs:751
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:201
+#: ../src/Engine/Session.cs:1067
 #, csharp-format
 msgid "Not enough parameters for {0} command"
 msgstr "No heu proporcionat suficients parÃ metres per a l'ordre {0}"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:189
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:212
 #, csharp-format
 msgid "Connected to {0}"
 msgstr "S'ha connectat amb {0}"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:213
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:242
 #, csharp-format
 msgid "Disconnected from {0}"
 msgstr "S'ha desconnectat de {0}"
 
-#: ../src/Engine/Session.cs:154
-msgid "Welcome to Smuxi"
-msgstr "Benvinguts a l'Smuxi!"
-
-#: ../src/Engine/Session.cs:160
-msgid "Type /help to get a list of available commands."
-msgstr "Escriviu /help per a obtenir un llistat d'ordres disponibles."
-
-#: ../src/Engine/Session.cs:163
-msgid "After you have made a connection the list of available commands changes. Use the /help command again 
to see the extended command list."
-msgstr "Un cop s'ha establert una connexiÃ³, la llista d'ordres disponibles canvia. Utilitzeu l'ordre /help 
per a veure la llista ampliada."
+#: ../src/Engine/Session.cs:247
+#, csharp-format
+msgid "Automatically connecting to {0}..."
+msgstr "S'estÃ  connectant automÃ ticament a {0}.."
 
-#: ../src/Engine/Session.cs:216
+#: ../src/Engine/Session.cs:278
 #, csharp-format
 msgid "Automatic connect to {0} failed!"
 msgstr "La connexiÃ³ automÃ tica a {0} ha fallat."
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Engine/Session.cs:411
+#: ../src/Engine/Session.cs:505
 msgid "Engine Commands"
 msgstr "Ordres del motor"
 
-#: ../src/Engine/Session.cs:514
+#: ../src/Engine/Session.cs:634
 msgid "Connect failed!"
 msgstr "No s'ha pogut connectar!"
 
-#: ../src/Engine/Session.cs:544
+#: ../src/Engine/Session.cs:657
 #, csharp-format
 msgid "Disconnect failed - could not find server: {0}"
 msgstr "Ha fallat la desconnexiÃ³ - no s'ha pogut trobar el servidor: {0}"
 
-#: ../src/Engine/Session.cs:583
+#: ../src/Engine/Session.cs:699
 msgid "Reconnect failed!"
 msgstr "No s'ha pogut completar l'intent de reconnexiÃ³"
 
-#: ../src/Engine/Session.cs:602
+#: ../src/Engine/Session.cs:723
 msgid "Configuration reloaded"
 msgstr "S'ha tornat a carregar la connexiÃ³"
 
-#: ../src/Engine/Session.cs:607
+#: ../src/Engine/Session.cs:727
 msgid "Configuration saved"
 msgstr "S'ha desat la configuraciÃ³"
 
-#: ../src/Engine/Session.cs:611
-msgid "Invalid parameter for config; use load or save"
-msgstr "ParÃ metre invÃ lid per a config; utilitzeu load o save"
+#: ../src/Engine/Session.cs:754
+msgid "Invalid key/value format."
+msgstr "El format de clau/valor Ã©s invalid."
+
+#: ../src/Engine/Session.cs:778
+#, csharp-format
+msgid "Invalid config key: '{0}'"
+msgstr "El valor de la clau de configuraciÃ³ Ã©s invÃ lida: {0}"
+
+#: ../src/Engine/Session.cs:794 ../src/Engine/Session.cs:800
+#, csharp-format
+msgid "Could not convert config value: '{0}' to type: {1}"
+msgstr "No s'ha pogut convertir el valor de configuraciÃ³ '{0}' al tipus {1}"
+
+#: ../src/Engine/Session.cs:814
+#, csharp-format
+msgid ""
+"Invalid config remove key: '{0}'. Valid remove keys: MessagePatterns/{{ID}}."
+msgstr ""
+
+#: ../src/Engine/Session.cs:827
+#, csharp-format
+msgid "Message pattern with ID: '{0}' does not exist."
+msgstr ""
 
-#: ../src/Engine/Session.cs:641
+#: ../src/Engine/Session.cs:834
+#, csharp-format
+msgid "Message pattern with ID: '{0}' removed."
+msgstr ""
+
+#: ../src/Engine/Session.cs:842
+msgid "Invalid parameter for config; use load, save, get or set."
+msgstr ""
+
+#: ../src/Engine/Session.cs:919
 msgid "Invalid parameter for network; use list, switch, or close"
 msgstr "ParÃ metre invÃ lid per a network; utilitzeu list, switch o close"
 
-#: ../src/Engine/Session.cs:652
-msgid "Networks"
-msgstr "Xarxes"
+#. TRANSLATOR: this line is used as a label / category for a
+#. list of networks below
+#: ../src/Engine/Session.cs:949
+msgid "Connected Networks"
+msgstr "Xarxes connectades"
 
-#: ../src/Engine/Session.cs:656
-msgid "Type"
-msgstr "Tipus"
+#: ../src/Engine/Session.cs:954 ../src/Engine/Session.cs:978
+msgid "Network"
+msgstr "Xarxa"
 
-#: ../src/Engine/Session.cs:657
+#: ../src/Engine/Session.cs:955
+msgid "Protocol"
+msgstr "Protocol"
+
+#: ../src/Engine/Session.cs:956
 msgid "Host"
 msgstr "MÃ quina"
 
-#: ../src/Engine/Session.cs:658
+#: ../src/Engine/Session.cs:957
 msgid "Port"
 msgstr "Port"
 
-#: ../src/Engine/Session.cs:680
+#. TRANSLATOR: no connected networks
+#. TRANSLATOR: no available networks
+#: ../src/Engine/Session.cs:963 ../src/Engine/Session.cs:984
+msgid "None"
+msgstr "Cap"
+
+#. TRANSLATOR: this line is used as a label / category for a
+#. list of networks below
+#: ../src/Engine/Session.cs:970
+msgid "Available Networks"
+msgstr "Xarxes disponibles"
+
+#: ../src/Engine/Session.cs:998
 #, csharp-format
-msgid "Network close failed - could not find network with host: {0}"
-msgstr "Ha fallat la desconnexiÃ³ de la xarxa - no s'ha pogut trobar la mÃ quina: {0}"
+msgid "Network close failed - could not find network: {0}"
+msgstr ""
 
-#: ../src/Engine/Session.cs:725
+#: ../src/Engine/Session.cs:1042
 #, csharp-format
-msgid "Network switch failed - could not find network with host: {0}"
-msgstr "Ha fallat el canvi de xarxa - no s'ha pogut trobar la mÃ quina: {0}"
+msgid "Network switch failed - could not find network: {0}"
+msgstr ""
 
-#: ../src/Engine/Session.cs:740
+#: ../src/Engine/Session.cs:1060
 msgid "Not connected to any network"
 msgstr "No esteu connectat a cap xarxa"
 
+#: ../src/Engine/Session.cs:1317
+#, csharp-format
+msgid ""
+"Failed to write to chat history. Your chat history will not be preserved. "
+"Reason: {0}"
+msgstr "No s'ha pogut escriure la histÃ²ria del xat. No es preservarÃ . Motiu: {0}"
+
 #. just in case the ProtocolManager is not setting the
 #. protocol chat
-#: ../src/Engine/Session.cs:1067
+#: ../src/Engine/Session.cs:1550
 msgid "Connect failed."
 msgstr "No s'ha pogut connectar."
 
-#: ../src/Engine/Session.cs:1098
+#: ../src/Engine/Session.cs:1564
 #, csharp-format
 msgid "No protocol manager found for the protocol: {0}"
 msgstr "No s'ha trobat cap gestor de protocol per al protocol: {0}"
 
+#: ../src/Engine/Session.cs:1896
+msgid "Welcome to Smuxi"
+msgstr "Benvinguts a l'Smuxi!"
+
+#: ../src/Engine/Session.cs:1903
+msgid "Type /help to get a list of available commands."
+msgstr "Escriviu /help per a obtenir un llistat d'ordres disponibles."
+
+#: ../src/Engine/Session.cs:1909
+msgid ""
+"After you have made a connection the list of available commands changes. Go "
+"to the newly opened connection tab and use the /help command again to see "
+"the extended command list."
+msgstr ""
+
 #: ../src/Engine/Config/UserListController.cs:117
 msgid "Username must not be empty."
 msgstr "El nom d'usuari no pot estar buit."
@@ -148,15 +261,33 @@ msgstr "L'usuari Â«{0}Â» no existeix."
 msgid "User \"{0}\" already exists."
 msgstr "L'usuari Â«{0}Â» ja existeix."
 
-#: ../src/Engine/Config/ServerListController.cs:131
+#: ../src/Engine/Config/ServerListController.cs:118
+msgid "Network must not be empty."
+msgstr "La xarxa no pot estar buida"
+
+#: ../src/Engine/Config/ServerListController.cs:138
 msgid "Server hostname must not be empty."
 msgstr "El nom del servidor no pot estar buit."
 
-#: ../src/Engine/Config/ServerListController.cs:134
+#: ../src/Engine/Config/ServerListController.cs:141
 msgid "Server hostname contains invalid characters (newline)."
 msgstr "El nom del servidor contÃ© carÃ cters invÃ lids (salt de lÃnia)."
 
-#: ../src/Engine/Config/ServerListController.cs:140
+#: ../src/Engine/Config/ServerListController.cs:148
 #, csharp-format
-msgid "Server '{0}' already exists."
-msgstr "El servidor Â«{0}Â» ja existeix."
+msgid "Server ID '{0}' already exists."
+msgstr ""
+
+#: ../src/Engine/Chats/ChatModel.cs:106
+#, csharp-format
+msgid ""
+"Failed to load chat history. Your chat history will not be preserved. "
+"Reason: {0}"
+msgstr ""
+
+#: ../src/Engine/Chats/ChatModel.cs:322
+#, csharp-format
+msgid ""
+"Failed to open chat history for writing. Your chat history will not be "
+"preserved. Reason: {0}"
+msgstr ""
diff --git a/po-Engine/ru.po b/po-Engine/ru.po
index c84edbcf..f78afc71 100644
--- a/po-Engine/ru.po
+++ b/po-Engine/ru.po
@@ -3,174 +3,246 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Yuri Myasoedov <omerta13 yandex ru>, 2012.
+# VsyachePuz <vsyachepuz gmail com>, 2015
+# Yuri Myasoedov <omerta13 yandex ru>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: http://www.smuxi.org/issues\n";
-"POT-Creation-Date: 2012-01-01 18:47+0100\n"
-"PO-Revision-Date: 2012-01-07 14:55+0000\n"
-"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/smuxi/team/ru/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:37+0200\n"
+"PO-Revision-Date: 2017-09-19 09:12+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) 
? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../src/Engine/FrontendManager.cs:233
+#: ../src/Engine/FrontendManager.cs:218
 msgid "No network connections"
 msgstr "ÐÐµÑ‚ ÑÐµÑ‚ÐµÐ²Ñ‹Ñ… ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹"
 
-#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:295
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:263
 #, csharp-format
 msgid "Optimizing: {0}..."
 msgstr "ÐžÐ¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ñ: {0}â€¦"
 
-#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:313
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:281
 #, csharp-format
 msgid "Failed to optimize: {0}. Reason: {1}"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ð¸: {0}. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {1}"
 
-#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:347
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:315
 msgid ""
 "Your chat history is no longer available because of an error but will be "
 "preserved from now on."
-msgstr ""
-"Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð° Ð¸Ð·-Ð·Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ¸, Ð½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒÑÑ "
-"Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð°."
+msgstr "Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð° Ð¸Ð·-Ð·Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ¸, Ð½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒÑÑ Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð°."
+
+#: ../src/Engine/Messages/MessageBuilder.cs:771
+#, csharp-format
+msgid "{0} is typing..."
+msgstr "{0} Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÐµÑ‚..."
+
+#: ../src/Engine/Messages/MessageBuilder.cs:777
+#, csharp-format
+msgid "{0} has stopped typing..."
+msgstr "{0} Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚Ð¸Ð»/Ð° Ð¿ÐµÑ‡Ð°Ñ‚Ð°Ñ‚ÑŒ"
+
+#: ../src/Engine/Messages/MessageBuilder.cs:820
+#, csharp-format
+msgid "{0} is away"
+msgstr "{0} Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚"
+
+#: ../src/Engine/Messages/MessageBuilder.cs:826
+#, csharp-format
+msgid "{0} is offline"
+msgstr "{0} Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½"
+
+#: ../src/Engine/Messages/MessageBuilder.cs:832
+#, csharp-format
+msgid "{0} is online"
+msgstr "{0} Ð² ÑÐµÑ‚Ð¸"
+
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:162
+msgid "not connected"
+msgstr "Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:170
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:193
 msgid "Not connected to server"
 msgstr "ÐÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ€Ð²ÐµÑ€Ñƒ"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:178
-#: ../src/Engine/Session.cs:778
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:201
+#: ../src/Engine/Session.cs:1067
 #, csharp-format
 msgid "Not enough parameters for {0} command"
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ {0}"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:189
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:212
 #, csharp-format
 msgid "Connected to {0}"
 msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½ Ðº {0}"
 
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:207
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:242
 #, csharp-format
 msgid "Disconnected from {0}"
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ñ‘Ð½ Ð¾Ñ‚ {0}"
 
-#: ../src/Engine/Session.cs:218
+#: ../src/Engine/Session.cs:247
+#, csharp-format
+msgid "Automatically connecting to {0}..."
+msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÑÐµÐ¼ÑÑ Ñ {0}..."
+
+#: ../src/Engine/Session.cs:278
 #, csharp-format
 msgid "Automatic connect to {0} failed!"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº {0}!"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Engine/Session.cs:416
+#: ../src/Engine/Session.cs:505
 msgid "Engine Commands"
 msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ ÑÐ´Ñ€Ð°"
 
-#: ../src/Engine/Session.cs:527
+#: ../src/Engine/Session.cs:634
 msgid "Connect failed!"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸!"
 
-#: ../src/Engine/Session.cs:550
+#: ../src/Engine/Session.cs:657
 #, csharp-format
 msgid "Disconnect failed - could not find server: {0}"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ñ€Ð°Ð·Ñ€Ñ‹Ð²Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ. ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ ÑÐµÑ€Ð²ÐµÑ€: {0}"
 
-#: ../src/Engine/Session.cs:589
+#: ../src/Engine/Session.cs:699
 msgid "Reconnect failed!"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ð¼ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸!"
 
-#: ../src/Engine/Session.cs:608
+#: ../src/Engine/Session.cs:723
 msgid "Configuration reloaded"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹"
 
-#: ../src/Engine/Session.cs:613
+#: ../src/Engine/Session.cs:727
 msgid "Configuration saved"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ñ‹"
 
-#: ../src/Engine/Session.cs:617
-msgid "Invalid parameter for config; use load or save"
-msgstr "ÐÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ð¹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ð´Ð»Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº; Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ load Ð¸Ð»Ð¸ save"
+#: ../src/Engine/Session.cs:754
+msgid "Invalid key/value format."
+msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ ÐºÐ»ÑŽÑ‡/Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ."
+
+#: ../src/Engine/Session.cs:778
+#, csharp-format
+msgid "Invalid config key: '{0}'"
+msgstr "{0} - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
+
+#: ../src/Engine/Session.cs:794 ../src/Engine/Session.cs:800
+#, csharp-format
+msgid "Could not convert config value: '{0}' to type: {1}"
+msgstr "ÐÐµ Ð¿Ð¾Ð»ÑƒÑ‡Ð°ÐµÑ‚ÑÑ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ '{0}' Ðº Ñ‚Ð¸Ð¿Ñƒ '{1}'"
+
+#: ../src/Engine/Session.cs:814
+#, csharp-format
+msgid ""
+"Invalid config remove key: '{0}'. Valid remove keys: MessagePatterns/{{ID}}."
+msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð»ÑŒÐ½Ñ‹Ð¹ config remove key: '{0}'. ÐŸÑ€Ð°Ð²Ð»ÑŒÐ½Ñ‹Ðµ ÑƒÐ´Ð°Ð»ÑÑŽÑ‰Ð¸Ðµ ÐºÐ»ÑŽÑ‡Ð¸: MessagePatterns/{{ID}}."
 
-#: ../src/Engine/Session.cs:676
+#: ../src/Engine/Session.cs:827
+#, csharp-format
+msgid "Message pattern with ID: '{0}' does not exist."
+msgstr "ÐžÐ±Ñ€Ð°Ð·ÐµÑ† ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð¼ '{0}' Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
+
+#: ../src/Engine/Session.cs:834
+#, csharp-format
+msgid "Message pattern with ID: '{0}' removed."
+msgstr "ÐžÐ±Ñ€Ð°Ð·ÐµÑ† ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð¼ '{0}' ÑƒÐ´Ð°Ð»Ñ‘Ð½."
+
+#: ../src/Engine/Session.cs:842
+msgid "Invalid parameter for config; use load, save, get or set."
+msgstr "ÐÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ð¹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸; Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ save, get Ð¸Ð»Ð¸ set"
+
+#: ../src/Engine/Session.cs:919
 msgid "Invalid parameter for network; use list, switch, or close"
 msgstr "ÐÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ð¹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ð´Ð»Ñ ÑÐµÑ‚Ð¸; Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ list, switch Ð¸Ð»Ð¸ close"
 
-#: ../src/Engine/Session.cs:687
-msgid "Networks"
-msgstr "Ð¡ÐµÑ‚Ð¸"
-
-#: ../src/Engine/Session.cs:691
-msgid "Protocol"
-msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
+#. TRANSLATOR: this line is used as a label / category for a
+#. list of networks below
+#: ../src/Engine/Session.cs:949
+msgid "Connected Networks"
+msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ðµ ÑÐµÑ‚Ð¸"
 
-#: ../src/Engine/Session.cs:692
+#: ../src/Engine/Session.cs:954 ../src/Engine/Session.cs:978
 msgid "Network"
 msgstr "Ð¡ÐµÑ‚ÑŒ"
 
-#: ../src/Engine/Session.cs:693
+#: ../src/Engine/Session.cs:955
+msgid "Protocol"
+msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
+
+#: ../src/Engine/Session.cs:956
 msgid "Host"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: ../src/Engine/Session.cs:694
+#: ../src/Engine/Session.cs:957
 msgid "Port"
 msgstr "ÐŸÐ¾Ñ€Ñ‚"
 
-#: ../src/Engine/Session.cs:709
+#. TRANSLATOR: no connected networks
+#. TRANSLATOR: no available networks
+#: ../src/Engine/Session.cs:963 ../src/Engine/Session.cs:984
+msgid "None"
+msgstr "ÐÐ¸ÐºÐ°ÐºÐ¸Ñ…"
+
+#. TRANSLATOR: this line is used as a label / category for a
+#. list of networks below
+#: ../src/Engine/Session.cs:970
+msgid "Available Networks"
+msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ðµ ÑÐµÑ‚Ð¸"
+
+#: ../src/Engine/Session.cs:998
 #, csharp-format
 msgid "Network close failed - could not find network: {0}"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸. ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ ÑÐµÑ‚ÑŒ: {0}"
 
-#: ../src/Engine/Session.cs:748
+#: ../src/Engine/Session.cs:1042
 #, csharp-format
 msgid "Network switch failed - could not find network: {0}"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸. ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ ÑÐµÑ‚ÑŒ: {0}"
 
-#: ../src/Engine/Session.cs:767
+#: ../src/Engine/Session.cs:1060
 msgid "Not connected to any network"
 msgstr "ÐÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚ÑÐ¼"
 
-#: ../src/Engine/Session.cs:1013
+#: ../src/Engine/Session.cs:1317
 #, csharp-format
 msgid ""
 "Failed to write to chat history. Your chat history will not be preserved. "
 "Reason: {0}"
-msgstr ""
-"Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð½Ðµ "
-"Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: 
{0}"
 
 #. just in case the ProtocolManager is not setting the
 #. protocol chat
-#: ../src/Engine/Session.cs:1185
+#: ../src/Engine/Session.cs:1550
 msgid "Connect failed."
 msgstr "Ð¡Ð±Ð¾Ð¹ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ."
 
-#: ../src/Engine/Session.cs:1216
+#: ../src/Engine/Session.cs:1564
 #, csharp-format
 msgid "No protocol manager found for the protocol: {0}"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸Ðº Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð°: {0}"
 
-#: ../src/Engine/Session.cs:1448
+#: ../src/Engine/Session.cs:1896
 msgid "Welcome to Smuxi"
 msgstr "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Smuxi"
 
-#: ../src/Engine/Session.cs:1455
+#: ../src/Engine/Session.cs:1903
 msgid "Type /help to get a list of available commands."
 msgstr "Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÑÐ¿Ð¸ÑÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ /help"
 
-#: ../src/Engine/Session.cs:1461
+#: ../src/Engine/Session.cs:1909
 msgid ""
 "After you have made a connection the list of available commands changes. Go "
 "to the newly opened connection tab and use the /help command again to see "
 "the extended command list."
-msgstr ""
-"ÐšÐ°Ðº Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ, ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑÑ. "
-"ÐŸÐµÑ€ÐµÐ¹Ð´Ð¸Ñ‚Ðµ Ð½Ð° Ð½Ð¾Ð²ÑƒÑŽ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑƒÑŽ Ð²ÐºÐ»Ð°Ð´ÐºÑƒ Ð¸ ÑÐ½Ð¾Ð²Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ /help, Ñ‡Ñ‚Ð¾Ð±Ñ‹"
-" Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´. "
+msgstr "ÐšÐ°Ðº Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ, ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑÑ. ÐŸÐµÑ€ÐµÐ¹Ð´Ð¸Ñ‚Ðµ Ð½Ð° Ð½Ð¾Ð²ÑƒÑŽ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑƒÑŽ 
Ð²ÐºÐ»Ð°Ð´ÐºÑƒ Ð¸ ÑÐ½Ð¾Ð²Ð° Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ /help, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´. "
 
 #: ../src/Engine/Config/UserListController.cs:117
 msgid "Username must not be empty."
@@ -190,35 +262,33 @@ msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ \"{0}\" Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
 msgid "User \"{0}\" already exists."
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ \"{0}\" ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
 
-#: ../src/Engine/Config/ServerListController.cs:131
+#: ../src/Engine/Config/ServerListController.cs:118
+msgid "Network must not be empty."
+msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐµÑ‚ÑŒ."
+
+#: ../src/Engine/Config/ServerListController.cs:138
 msgid "Server hostname must not be empty."
 msgstr "Ð¢Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°."
 
-#: ../src/Engine/Config/ServerListController.cs:134
+#: ../src/Engine/Config/ServerListController.cs:141
 msgid "Server hostname contains invalid characters (newline)."
 msgstr "Ð˜Ð¼Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ ÑÑ‚Ñ€Ð¾ÐºÐ¸."
 
-#: ../src/Engine/Config/ServerListController.cs:140
+#: ../src/Engine/Config/ServerListController.cs:148
 #, csharp-format
-msgid "Server '{0}' already exists."
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ '{0}' ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
+msgid "Server ID '{0}' already exists."
+msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ ÑÐµÑ€Ð²ÐµÑ€Ð° '{0}' ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
 
-#: ../src/Engine/Chats/ChatModel.cs:105
+#: ../src/Engine/Chats/ChatModel.cs:106
 #, csharp-format
 msgid ""
 "Failed to load chat history. Your chat history will not be preserved. "
 "Reason: {0}"
-msgstr ""
-"Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð½Ðµ "
-"Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: 
{0}"
 
-#: ../src/Engine/Chats/ChatModel.cs:290
+#: ../src/Engine/Chats/ChatModel.cs:322
 #, csharp-format
 msgid ""
 "Failed to open chat history for writing. Your chat history will not be "
 "preserved. Reason: {0}"
-msgstr ""
-"Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ "
-"ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
-
-
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. Ð’Ð°ÑˆÐ° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ 
ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
diff --git a/po-Frontend-GNOME-IRC/ru.po b/po-Frontend-GNOME-IRC/ru.po
index 78e36406..0e1acaa4 100644
--- a/po-Frontend-GNOME-IRC/ru.po
+++ b/po-Frontend-GNOME-IRC/ru.po
@@ -1,87 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# VsyachePuz <vsyachepuz gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi 0.8\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 15:23+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Urmas <davian818 gmail com>\n"
-"Language-Team: None <->\n"
-"Language: ru\n"
+"POT-Creation-Date: 2015-07-14 19:43+0200\n"
+"PO-Revision-Date: 2017-09-19 09:12+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n%10==1 && n%100!=11 ? 3 : n%10>=2 && n%10<=4 && (n%100<10 
|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:390
+msgid "Query"
+msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:340
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:396
 msgid "Op"
 msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:344
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:400
 msgid "Deop"
 msgstr "Ð£Ð±Ñ€Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð°"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:348
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:404
 msgid "Voice"
-msgstr ""
+msgstr "Ð”Ð°Ñ‚ÑŒ Ð³Ð¾Ð»Ð¾Ñ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:352
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:408
 msgid "Devoice"
-msgstr ""
+msgstr "ÐžÑ‚Ð½ÑÑ‚ÑŒ Ð³Ð¾Ð»Ð¾Ñ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:356
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:412
 msgid "Kick"
 msgstr "Ð’Ñ‹Ð³Ð½Ð°Ñ‚ÑŒ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:360
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:416
 msgid "Kick + Ban"
 msgstr "Ð’Ñ‹Ð³Ð½Ð°Ñ‚ÑŒ Ð¸ Ð·Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:364
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:420
 msgid "Ban"
 msgstr "Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:368
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:424
 msgid "Unban"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:374
-msgid "Query"
-msgstr ""
-
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:378
-#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:61
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:430
+#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:92
 msgid "Whois"
-msgstr ""
+msgstr "Whois"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:382
-#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:65
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:434
+#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:96
 msgid "CTCP"
 msgstr "CTCP"
 
-#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:391
-#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:72
+#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:443
+#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:103
 msgid "Invite to"
 msgstr "ÐŸÑ€Ð¸Ð³Ð»Ð°ÑÐ¸Ñ‚ÑŒ"
 
-#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:72
+#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:73
 msgid "Ping"
-msgstr ""
+msgstr "ping"
 
-#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:77
+#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:78
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
 
-#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:82
+#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:83
 msgid "Time"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ"
 
-#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:87
+#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:88
 msgid "Finger"
-msgstr ""
+msgstr "Finger"
 
-#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:92
+#: ../src/Frontend-GNOME-IRC/CtcpMenu.cs:93
 msgid "Userinfo"
-msgstr ""
-
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ðµ"
diff --git a/po-Frontend-GNOME-XMPP/en_GB.po b/po-Frontend-GNOME-XMPP/en_GB.po
index 619c33d5..cec0b5be 100644
--- a/po-Frontend-GNOME-XMPP/en_GB.po
+++ b/po-Frontend-GNOME-XMPP/en_GB.po
@@ -1,76 +1,46 @@
-# Smuxi - IRC client for sophisticated users
-# Copyright (C) 2005-2009 Mirco Bauer <meebey meebey net>
-# This file is distributed under the same license as the Smuxi package.
-# Ryan Smith-Evans <Kimera Kimera gmail com>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ryan Smith-Evans <Kimera Kimera gmail com>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi 0.6.4\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-19 12:23+0200\n"
-"PO-Revision-Date: 2010-01-09 00:20+0100\n"
-"Last-Translator: Ryan Smith-Evans <Kimera Kimera gmail com>\n"
-"Language-Team: English (British)\n"
-"Language: en_GB\n"
+"POT-Creation-Date: 2015-07-14 19:43+0200\n"
+"PO-Revision-Date: 2017-10-27 14:08+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/meebey/smuxi/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:220
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:51
-msgid "Whois"
-msgstr "Whois"
-
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:224
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:247
 msgid "Query"
 msgstr "Query"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:229
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:55
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:255
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:215
+msgid "Whois"
+msgstr "Whois"
+
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:261
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:221
 msgid "Add To Contacts"
 msgstr ""
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:234
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:59
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:267
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:227
 msgid "Invite to"
 msgstr ""
 
-#~ msgid "Op"
-#~ msgstr "Op"
-
-#~ msgid "Deop"
-#~ msgstr "Deop"
-
-#~ msgid "Voice"
-#~ msgstr "Voice"
-
-#~ msgid "Devoice"
-#~ msgstr "Devoice"
-
-#~ msgid "Kick"
-#~ msgstr "Kick"
-
-#~ msgid "Kick + Ban"
-#~ msgstr "Kick + Ban"
-
-#~ msgid "Ban"
-#~ msgstr "Ban"
-
-#~ msgid "Unban"
-#~ msgstr "Unban"
-
-#~ msgid "CTCP"
-#~ msgstr "CTCP"
-
-#~ msgid "Ping"
-#~ msgstr "Ping"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Time"
-#~ msgstr "Time"
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:285
+msgid "Rename"
+msgstr ""
 
-#~ msgid "Finger"
-#~ msgstr "Finger"
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:297
+msgid "Remove"
+msgstr ""
diff --git a/po-Frontend-GNOME-XMPP/hr.po b/po-Frontend-GNOME-XMPP/hr.po
index 04448593..9c650fc0 100644
--- a/po-Frontend-GNOME-XMPP/hr.po
+++ b/po-Frontend-GNOME-XMPP/hr.po
@@ -1,82 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-#   <tty live nl>, 2012.
+# tty, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-19 12:23+0200\n"
-"PO-Revision-Date: 2012-01-08 08:23+0000\n"
-"Last-Translator: Matias M. <tty live nl>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/smuxi/team/";
-"hr/)\n"
-"Language: hr\n"
+"POT-Creation-Date: 2015-07-14 19:43+0200\n"
+"PO-Revision-Date: 2017-10-27 14:08+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Croatian (http://www.transifex.com/meebey/smuxi/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:220
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:51
-msgid "Whois"
-msgstr "Whois naredba"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 
1 : 2;\n"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:224
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:247
 msgid "Query"
 msgstr "Upit"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:229
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:55
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:255
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:215
+msgid "Whois"
+msgstr "Whois naredba"
+
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:261
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:221
 msgid "Add To Contacts"
 msgstr ""
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:234
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:59
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:267
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:227
 msgid "Invite to"
 msgstr "Pozovi u"
 
-#~ msgid "Op"
-#~ msgstr "Dodijeli Op"
-
-#~ msgid "Deop"
-#~ msgstr "Oduzmi Op"
-
-#~ msgid "Voice"
-#~ msgstr "Dodijeli Voice"
-
-#~ msgid "Devoice"
-#~ msgstr "Oduzmi Voice"
-
-#~ msgid "Kick"
-#~ msgstr "Izbaci"
-
-#~ msgid "Kick + Ban"
-#~ msgstr "Izbaci + zabrani"
-
-#~ msgid "Ban"
-#~ msgstr "Zabrani"
-
-#~ msgid "Unban"
-#~ msgstr "Skini zabranu"
-
-#~ msgid "CTCP"
-#~ msgstr "CTCP"
-
-#~ msgid "Ping"
-#~ msgstr "Ping"
-
-#~ msgid "Version"
-#~ msgstr "InaÄica"
-
-#~ msgid "Time"
-#~ msgstr "Vrijeme"
-
-#~ msgid "Finger"
-#~ msgstr "Finger naredba"
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:285
+msgid "Rename"
+msgstr ""
 
-#~ msgid "Userinfo"
-#~ msgstr "Userinfo naredba"
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:297
+msgid "Remove"
+msgstr ""
diff --git a/po-Frontend-GNOME-XMPP/ru.po b/po-Frontend-GNOME-XMPP/ru.po
index 3bfa6c5f..2d961502 100644
--- a/po-Frontend-GNOME-XMPP/ru.po
+++ b/po-Frontend-GNOME-XMPP/ru.po
@@ -1,62 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# VsyachePuz <vsyachepuz gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi 0.8\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-19 12:23+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Urmas <davian818 gmail com>\n"
-"Language-Team: None <->\n"
-"Language: ru\n"
+"POT-Creation-Date: 2015-07-14 19:43+0200\n"
+"PO-Revision-Date: 2017-09-19 22:25+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n%10==1 && n%100!=11 ? 3 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:220
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:51
-msgid "Whois"
-msgstr ""
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:224
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:247
 msgid "Query"
-msgstr ""
+msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ"
+
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:255
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:215
+msgid "Whois"
+msgstr "Whois"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:229
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:55
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:261
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:221
 msgid "Add To Contacts"
-msgstr ""
+msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð² ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ‹"
 
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:234
-#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:59
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:267
+#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:227
 msgid "Invite to"
 msgstr "ÐŸÑ€Ð¸Ð³Ð»Ð°ÑÐ¸Ñ‚ÑŒ"
 
-#~ msgid "Op"
-#~ msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼"
-
-#~ msgid "Deop"
-#~ msgstr "Ð£Ð±Ñ€Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð°"
-
-#~ msgid "Kick"
-#~ msgstr "Ð’Ñ‹Ð³Ð½Ð°Ñ‚ÑŒ"
-
-#~ msgid "Kick + Ban"
-#~ msgstr "Ð’Ñ‹Ð³Ð½Ð°Ñ‚ÑŒ Ð¸ Ð·Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ"
-
-#~ msgid "Ban"
-#~ msgstr "Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ"
-
-#~ msgid "Unban"
-#~ msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ"
-
-#~ msgid "CTCP"
-#~ msgstr "CTCP"
-
-#~ msgid "Version"
-#~ msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:285
+msgid "Rename"
+msgstr "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#~ msgid "Time"
-#~ msgstr "Ð’Ñ€ÐµÐ¼Ñ"
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:297
+msgid "Remove"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
diff --git a/po-Frontend-GNOME/ca.po b/po-Frontend-GNOME/ca.po
index 109aded5..8fd76a4b 100644
--- a/po-Frontend-GNOME/ca.po
+++ b/po-Frontend-GNOME/ca.po
@@ -1,631 +1,625 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Xavi Ivars <xavi ivars gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Smuxi\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 15:23+0200\n"
-"PO-Revision-Date: 2010-07-18 19:35+0100\n"
-"Last-Translator: Siegfried-Angel Gevatter Pujals <rainct ubuntu com>\n"
-"Language-Team: Siegfried-Angel Gevatter Pujals <siegfried gevatter com>\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Catalan (http://www.transifex.com/meebey/smuxi/language/ca/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
-"X-Poedit-Language: Catalan\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
-msgid "<b> Chat </b>"
-msgstr "<b> Xat </b>"
+msgid "Smuxi Preferences"
+msgstr "ParÃ metres del Smuxi"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:2
-msgid "<b> Color </b>"
-msgstr "<b> Color </b>"
+msgid ""
+"The nickname to use. You can specify extra nicknames (separated by spaces) "
+"which will be used as fallbacks when the first choice is not available. By "
+"default $nick_ and $nick__ will be used as fallbacks."
+msgstr "El sobrenom a utilitzar. Podeu especificar sobrenoms addicionals (separats per comes) a utilitzar 
alternativament en cas que la primera tria no estigui disponible. Per omissiÃ³, s'utilitza $nick_ i $nick__ 
com a sobrenoms alternatius."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1364
-msgid "<b> Entry Field </b>"
-msgstr "<b> Camp d'entrada </b>"
+msgid "Nickname(s):"
+msgstr "Sobrenom(s):"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:4
-msgid "<b> Font </b>"
-msgstr "<b> Tipus de lletra </b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:315
+msgid "Username:"
+msgstr "Nom d'usuari:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:5
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1694
-msgid "<b> Highlighting </b>"
-msgstr "<b> Ressaltat </b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:147
+msgid "Realname:"
+msgstr "Nom real:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:6
-msgid "<b> Notification Area Icon </b>"
-msgstr "<b> Icona a l'Ã rea de notificaciÃ³ </b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:359
+msgid "Encoding:"
+msgstr "CodificaciÃ³:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:7
-msgid "<b> Person List Position </b>"
-msgstr "<b> PosiciÃ³ de la llista de persones </b>"
+msgid "Automatically convert UTF-8 characters"
+msgstr "Converteix automÃ ticament els carÃ cters UTF-8"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:8
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1201
-msgid "<b> Tab Colors </b>"
-msgstr "<b> Colors de les pestanyes </b>"
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:9
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1102
-msgid "<b> Tabs Position </b>"
-msgstr "<b> PosiciÃ³ de les pestanyes </b>"
+msgid "Type:"
+msgstr "Tipus:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:10
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1507
-msgid "<b> Topic Position </b>"
-msgstr "<b> PosiciÃ³ del tÃtol </b>"
+msgid "Host:"
+msgstr "MÃ quina:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:11
-msgid "<b>General</b>"
-msgstr "<b>General</b>"
+msgid "Password:"
+msgstr "Contrasenya:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:12
-msgid "<b>Global Commands</b>"
-msgstr "<b>Ordres globals</b>"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:13
-msgid "<b>Messaging Menu</b>"
-msgstr "<b>Indicator de missatges</b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
+msgid "Show Password"
+msgstr "Mostra la contrasenya"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:14
 msgid "<b>Network Proxy</b>"
 msgstr "<b>Servidor intermediari</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:15
-msgid "<b>Notification Popups</b>"
-msgstr "<b>Notificacions</b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:381
+msgid "On Connect Commands:"
+msgstr "Ordres al connectar:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:16
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1153
-msgid "Activity"
-msgstr "Activitat"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:427
+msgid "On Startup Commands:"
+msgstr "Ordres a l'inici:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:17
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:235
-msgid "Automatically connect to server at startup"
-msgstr "Connecta't automÃ ticament al servidor a l'inici"
+msgid "<b>Global Commands</b>"
+msgstr "<b>Ordres globals</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:18
-msgid "Background"
-msgstr "Fons"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:471
+msgid "C_onnection"
+msgstr "_ConnexiÃ³"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:19
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1352
-msgid "Bash-Style Completion"
-msgstr "Completat semblant al del Bash"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:526
+msgid "Timestamp Format:"
+msgstr "Format de les marques horÃ ries:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:20
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1682
-msgid "Beep on highlight"
-msgstr "Fes un avÃs sonor en ressaltar una paraula"
-
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox11.Gtk.Box+BoxChild
-#: ../glade/smuxi-frontend-gnome.glade.h:21
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:972
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:994
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1453
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1478
-msgid "Bottom"
-msgstr "A baix"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:22
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:738
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:546
 msgid "Buffer Lines:"
 msgstr "LÃnies a la memÃ²ria intermediÃ ria:"
 
-#: ../glade/smuxi-frontend-gnome.glade.h:23
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:663
-msgid "C_onnection"
-msgstr "_ConnexiÃ³"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:24
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1304
-msgid "Command Character:"
-msgstr "CarÃ cter d'ordre:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:25
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1327
-msgid "Command History Size:"
-msgstr "Mida de l'historial d'ordres:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:26
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1284
-msgid "Completion Character:"
-msgstr "CarÃ cter de completat:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:27
-msgid "Enable"
-msgstr "Habilita"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:28
-msgid "Enabled"
-msgstr "Habilitat"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:29
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:551
-msgid "Encoding:"
-msgstr "CodificaciÃ³:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:30
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:761
+#: ../glade/smuxi-frontend-gnome.glade.h:21
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:569
 msgid "Engine Buffer Lines:"
 msgstr "LÃnies a la memÃ²ria intermediÃ ria del motor:"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:22
+msgid ""
+"ss = seconds\n"
+"mm = minutes\n"
+"hh = hours (01 - 12)\n"
+"HH = hours (00 - 23)\n"
+"tt = AM/PM\n"
+"\n"
+"dd = day\n"
+"MM = month\n"
+"yy/yyyy = year"
+msgstr "ss = segons\nmm = minuts\nhh = hores (01 - 12)\nHH = hores (00 - 23)\ntt = AM/PM\n\ndd = dia\nMM = 
mes\nyy/yyyy = any"
+
 #: ../glade/smuxi-frontend-gnome.glade.h:31
-msgid "Foreground"
-msgstr "Primer pla"
+msgid "Persistency Type:"
+msgstr "Tipus de persistÃ¨ncia"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:32
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:917
-msgid "General"
-msgstr "General"
+msgid "Volatile Buffer Lines:"
+msgstr "LÃnies de la memÃ²ria intermÃ¨dia volÃ til:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:33
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1173
-msgid "Highlight"
-msgstr "Ressaltat"
+msgid "Persistent Buffer Lines:"
+msgstr "LÃnies de la memÃ²ria intermÃ¨dia persistent:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:34
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1658
-msgid "Highlight words:"
-msgstr "Paraules a ressaltar:"
+msgid "<b>Message Buffer</b>"
+msgstr "<b>MemÃ²ria intermÃ¨dia de missatges</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:35
-msgid "Host:"
-msgstr "MÃ quina:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:628
+msgid "Strip Colors"
+msgstr "Elimina els colors"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:36
-msgid "Hostname:"
-msgstr "Nom de la mÃ quina:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:667
+msgid "Strip Formattings"
+msgstr "Elimina el format"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:37
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1373
-msgid "Input"
-msgstr "Entrada"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:707
+msgid "Strip UTF-8"
+msgstr "Elimina carÃ cters UTF-8"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:38
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1163
-msgid "Join/Part/Mode"
-msgstr "Entra/Surt/Mode"
+msgid "Show Advanced Settings"
+msgstr "Mostra les opcions avanÃ§ades"
 
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:39
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1008
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1033
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1527
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1553
-msgid "Left"
-msgstr "A l'esquerra"
+msgid "<b>Advanced</b>"
+msgstr "<b>AvanÃ§at</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:40
-msgid "Log Filtered Messages"
-msgstr "Enregistra els missatges filtrats"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:725
+msgid "General"
+msgstr "General"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox11.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:41
-msgid "Network:"
-msgstr "Xarxa:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:743
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:767
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1220
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1246
+msgid "Top"
+msgstr "A dalt"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox11.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:42
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1394
-msgid "Nick Colors"
-msgstr "Colors dels sobrenoms"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:780
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:802
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1261
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1286
+msgid "Bottom"
+msgstr "A baix"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:43
-msgid "Nickname(s):"
-msgstr "Sobrenom(s):"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:816
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:841
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1335
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1361
+msgid "Left"
+msgstr "A l'esquerra"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:44
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1145
-msgid "No Activity"
-msgstr "Sense activitat"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:856
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:881
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1376
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1401
+msgid "Right"
+msgstr "A la dreta"
 
 #. Container child vbox6.Gtk.Box+BoxChild
 #. Container child vbox11.Gtk.Box+BoxChild
 #. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:45
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1088
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1493
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1608
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:896
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1301
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1416
 msgid "None"
 msgstr "Enlloc"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:46
-msgid "Notification"
-msgstr "NotificaciÃ³"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:910
+msgid "<b> Tabs Position </b>"
+msgstr "<b> PosiciÃ³ de les pestanyes </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:47
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:573
-msgid "On Connect Commands:"
-msgstr "Ordres al connectar:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:981
+msgid "Highlight"
+msgstr "Ressaltat"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:48
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:619
-msgid "On Startup Commands:"
-msgstr "Ordres a l'inici:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:961
+msgid "Activity"
+msgstr "Activitat"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:49
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1706
-msgid "Output"
-msgstr "Sortida"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:953
+msgid "No Activity"
+msgstr "Sense activitat"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:50
-msgid "Override"
-msgstr "Sobreescriu"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:971
+msgid "Join/Part/Mode"
+msgstr "Entra/Surt/Mode"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:51
-msgid "Password:"
-msgstr "Contrasenya:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1009
+msgid "<b> Tab Colors </b>"
+msgstr "<b> Colors de les pestanyes </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:52
-msgid "Port:"
-msgstr "Port:"
+msgid "Automatically switch to newly opened person chats"
+msgstr "Canvia automÃ ticament a la finestra de conversa individual acabada d'obrir"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:53
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "Automatically switch to newly opened group chats"
+msgstr "Canvia automÃ ticament a la finestra de conversa de grup acabada d'obrir"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:54
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:530
-msgid "Realname:"
-msgstr "Nom real:"
+msgid "Tree"
+msgstr "Arbre"
 
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:55
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1048
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1073
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1568
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1593
-msgid "Right"
-msgstr "A la dreta"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1092
+msgid "Completion Character:"
+msgstr "CarÃ cter de completat:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:56
-msgid "Show Advanced Settings"
-msgstr "Mostra les opcions avanÃ§ades"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1112
+msgid "Command Character:"
+msgstr "CarÃ cter d'ordre:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:57
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:196
-msgid "Show Password"
-msgstr "Mostra la contrasenya"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1135
+msgid "Command History Size:"
+msgstr "Mida de l'historial d'ordres:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:58
-msgid "Show Smuxi in the messaging menu"
-msgstr "Mostra el Smuxi a l'indicador de missatges"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1160
+msgid "Bash-Style Completion"
+msgstr "Completat semblant al del Bash"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:59
-msgid "Show always"
-msgstr "Sempre visible"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1172
+msgid "<b> Entry Field </b>"
+msgstr "<b> Camp d'entrada </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:60
-msgid "Show notification popups"
-msgstr "Mostra notificacions emergents"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1181
+msgid "Input"
+msgstr "Entrada"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:61
-msgid "Show when window is closed"
-msgstr "Visible quan la finestra estÃ  tancada"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1202
+msgid "Nick Colors"
+msgstr "Colors dels sobrenoms"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:62
-msgid "Show when window is minimized"
-msgstr "Visible quan la finestra estÃ  minimitzada"
+msgid "<b> Person List Position </b>"
+msgstr "<b> PosiciÃ³ de la llista de persones </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:63
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:398
-msgid "Smuxi - Preferences"
-msgstr "Smuxi - PreferÃ¨ncies"
+msgid "Override"
+msgstr "Sobreescriu"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:64
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:18
-msgid "Smuxi - Server"
-msgstr "Smuxi - Servidor"
+msgid "<b> Font </b>"
+msgstr "<b> Tipus de lletra </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:65
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:820
-msgid "Strip Colors"
-msgstr "Elimina els colors"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1315
+msgid "<b> Topic Position </b>"
+msgstr "<b> PosiciÃ³ del tÃtol </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:66
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:859
-msgid "Strip Formattings"
-msgstr "Elimina el format"
+msgid "Foreground"
+msgstr "Primer pla"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:67
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:899
-msgid "Strip UTF-8"
-msgstr "Elimina carÃ cters UTF-8"
+msgid "Background"
+msgstr "Fons"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:68
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1214
-msgid "Tabs"
-msgstr "Pestanyes"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:69
-msgid "The nickname to use. You can specify extra nicknames (separated by spaces) which will be used as 
fallbacks when the first choice is not available. By default $nick_ and $nick__ will be used as fallbacks."
-msgstr "El sobrenom a utilitzar. Podeu especificar sobrenoms addicionals (separats per comes) a utilitzar 
alternativament en cas que la primera tria no estigui disponible. Per omissiÃ³, s'utilitza $nick_ i $nick__ 
com a sobrenoms alternatius."
+msgid "<b> Color </b>"
+msgstr "<b> Color </b>"
 
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:718
-msgid "Timestamp Format:"
-msgstr "Format de les marques horÃ ries:"
+msgid "_Wrap Mode:"
+msgstr "_Ajustament de lÃnia:"
 
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox11.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:71
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:935
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:959
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1412
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1438
-msgid "Top"
-msgstr "A dalt"
+msgid "<b> Chat </b>"
+msgstr "<b> Xat </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:72
-msgid "Type:"
-msgstr "Tipus:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1466
+msgid "Highlight words:"
+msgstr "Paraules a ressaltar:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:73
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:507
-msgid "Username:"
-msgstr "Nom d'usuari:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1490
+msgid "Beep on highlight"
+msgstr "Fes un avÃs sonor en ressaltar una paraula"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:74
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1873
-msgid "_Filters"
-msgstr "_Filtres"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1502
+msgid "<b> Highlighting </b>"
+msgstr "<b> Ressaltat </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:75
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1715
-msgid "_Interface"
-msgstr "_InterfÃcie"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1514
+msgid "Output"
+msgstr "Sortida"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:76
-msgid "_Logging"
-msgstr "_Registre"
+msgid "Enable"
+msgstr "Habilita"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:77
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1781
-msgid "_Servers"
-msgstr "_Servidors"
+msgid "Show always"
+msgstr "Sempre visible"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:78
+msgid "Show when window is minimized"
+msgstr "Visible quan la finestra estÃ  minimitzada"
 
-#. This is a setting for character based line wrapping vs word based when
-#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:79
-msgid "_Wrap Mode:"
-msgstr "_Ajustament de lÃnia:"
+msgid "Show when window is closed"
+msgstr "Visible quan la finestra estÃ  tancada"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:80
-msgid ""
-"ss = seconds\n"
-"mm = minutes\n"
-"hh = hours (01 - 12)\n"
-"HH = hours (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = day\n"
-"MM = month\n"
-"yy/yyyy = year"
-msgstr ""
-"ss = segons\n"
-"mm = minuts\n"
-"hh = hores (01 - 12)\n"
-"HH = hores (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = dia\n"
-"MM = mes\n"
-"yy/yyyy = any"
+msgid "<b> Notification Area Icon </b>"
+msgstr "<b> Icona a l'Ã rea de notificaciÃ³ </b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:81
+msgid "Show Smuxi in the messaging menu"
+msgstr "Mostra el Smuxi a l'indicador de missatges"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:82
+msgid "<b>Messaging Menu</b>"
+msgstr "<b>Indicator de missatges</b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:83
+msgid "Show notification popups"
+msgstr "Mostra notificacions emergents"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:84
+msgid "<b>Notification Popups</b>"
+msgstr "<b>Notificacions</b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:85
+msgid "Notification"
+msgstr "NotificaciÃ³"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:86
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1523
+msgid "_Interface"
+msgstr "_InterfÃcie"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1589
+msgid "_Servers"
+msgstr "_Servidors"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1681
+msgid "_Filters"
+msgstr "_Filtres"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:89
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:90
+msgid "Log Filtered Messages"
+msgstr "Enregistra els missatges filtrats"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:91
+msgid "_Logging"
+msgstr "_Registre"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Servidor"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Connecta't automÃ ticament al servidor a l'inici"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protocol:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Xarxa:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Nom de la mÃ quina:"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
+msgid "Smuxi"
+msgstr "Smuxi"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:2
+msgid "IRC Chat"
+msgstr "_Xat a l'IRC"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:3
+msgid "Smuxi IRC Client"
+msgstr "Client d'IRC Smuxi"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:4
 msgid "Chat with other people on IRC"
 msgstr "Xategeu amb altres persones a l'IRC"
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:2
-msgid "IRC Chat"
-msgstr "_Xat a l'IRC"
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
+msgid ""
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+msgid ""
+"Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
+"Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
+msgstr "Smuxi Ã©s un client de xat de codi obert, distribuit i intuÃ¯tiu per a IRC, Twitter, Jabber/XMPP, 
Campfir i el JabbR de SignalR."
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:3
-msgid "Smuxi IRC Client"
-msgstr "Client d'IRC Smuxi"
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
+msgid ""
+"Inspired by the combination of screen and irssi, Smuxi has a detachable "
+"server (or like a \"normal\" client) that stays connected when you aren't, "
+"and can allow multiple Smuxi frontends to be connected and in sync. This is "
+"similar to screen+irssi or IRC bouncers, but more elegant and powerful."
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
+msgid "The main window showing an IRC channel"
+msgstr ""
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:58
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
 msgstr "Siegfried-Angel Gevatter Pujals <rainct ubuntu com>"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:61
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "PÃ gina web del Smuxi"
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:44
+#: ../src/Frontend-GNOME/CrashDialog.cs:46
 msgid "Oops, I did it again..."
 msgstr "Ups, ho he tornat a fer..."
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:57
+#: ../src/Frontend-GNOME/CrashDialog.cs:59
 msgid "Smuxi crashed because an unhandled exception was thrown!"
 msgstr "El Smuxi ha petat perquÃ¨ s'ha produÃ¯t una excepciÃ³ imprevista."
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:61
+#: ../src/Frontend-GNOME/CrashDialog.cs:63
 msgid "Here is the stacktrace, please report this bug!"
 msgstr "AquÃ teniu el traÃ§at de la pila. Si us plau, informeu d'aquest error!"
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:81
+#: ../src/Frontend-GNOME/CrashDialog.cs:83
 msgid "_Report Bug"
 msgstr "_Informeu d'un error"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:61
+msgid "Engine not found."
+msgstr "No s'ha trobat el motor."
+
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:77
 msgid "Engine Manager"
 msgstr "Gestor de motors"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:68
-msgid "_Connect"
-msgstr "_Connecta"
-
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:84
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:96
 msgid "Select which Smuxi engine you want to connect to"
 msgstr "Trieu a quin motor del Smuxi us voleu connectar"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:90
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:102
 msgid "Engine:"
 msgstr "Motor:"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:116
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:176
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:353
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:113
+msgid "Use Low Bandwidth Mode"
+msgstr "Utilitza el mode de baix ample de banda."
+
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:137
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:197
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:382
 msgid "Local Engine"
 msgstr "Motor local"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:168
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:189
 msgid "Please select an engine!"
 msgstr "Trieu un motor!"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:189
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:212
 #, csharp-format
-msgid "Your frontend version ({0}) does not match the engine version ({1})!"
-msgstr "La versiÃ³ del frontal ({0}) no coincideix amb la versiÃ³ del motor ({1})."
+msgid ""
+"Your frontend is not compatible with the engine!\n"
+"Engine Version: {0} Frontend Version: {1}\n"
+"Engine Protocol: {2} Frontend Protocol: {3}"
+msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:216
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
 msgstr "S'ha produÃ¯t un error al intentar connectar al motor."
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:217
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:246
 #, csharp-format
 msgid "Engine URL: {0}"
 msgstr "URL del motor: {0}"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:220
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:249
 #, csharp-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:290
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:319
 #, csharp-format
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Esteu segur que voleu esborrar el motor Â«{0}Â»?"
 
-#: ../src/Frontend-GNOME/Entry.cs:421
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Esteu a punt d'enganxar {0} lÃnies. Voleu continuar?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:524
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Ordres del frontal"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:222
-msgid "_File"
-msgstr "_Fitxer"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:238
-msgid "_Server"
-msgstr "_Servidor"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:242
-msgid "_Quick Connect"
-msgstr "_ConnexiÃ³ rÃ pida"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:253
-msgid "_Manage"
-msgstr "_Gestiona"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:260
-msgid "_Chat"
-msgstr "_Xat"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:264
-msgid "Open / Join Chat"
-msgstr "Obre / Uneix-te a una sala de xat"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:269
-msgid "_Find Group Chat"
-msgstr "_Troba sales de xat en grup"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:274
-msgid "C_lear All Activity"
-msgstr "_Neteja totes les activitats"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:281
-msgid "_Next Chat"
-msgstr "Xat _segÃ¼ent"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:291
-msgid "_Previous Chat"
-msgstr "Xat _anterior"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:341
-msgid "Open Log"
-msgstr "Obre el registre"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:355
-msgid "_Engine"
-msgstr "_Motor"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:359
-msgid "_Use Local Engine"
-msgstr "_Utilitza el motor local"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:365
-msgid "_Add Remote Engine"
-msgstr "_Afegeix un motor remot"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:370
-msgid "_Switch Remote Engine"
-msgstr "_Canvia el motor remot"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:377
-msgid "_View"
-msgstr "_Mostra"
+#: ../src/Frontend-GNOME/Main.cs:49
+msgid "Enable debug output"
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:381
-msgid "_Caret Mode"
-msgstr "Navega amb el _cursor"
+#: ../src/Frontend-GNOME/Main.cs:56
+msgid "Show this help"
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:389
-msgid "_Browse Mode"
-msgstr "Mode d'_exploraciÃ³"
+#: ../src/Frontend-GNOME/Main.cs:60
+msgid "Options:"
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:403
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:586
-msgid "Show _Menubar"
-msgstr "Mostra la barra de _menÃº"
+#: ../src/Frontend-GNOME/Main.cs:67
+msgid "Connect to engine"
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:430
-msgid "_Help"
-msgstr "_Ajuda"
+#: ../src/Frontend-GNOME/Main.cs:74
+msgid "Opens the specified link in Smuxi"
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:691
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:225
-msgid "Unable to add server: "
-msgstr "No s'ha pogut afegir el servidor:"
+#: ../src/Frontend-GNOME/Main.cs:81
+msgid "Starts a new Smuxi instance and ignores an existing one"
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:742
-#, csharp-format
-msgid "Unknown ChatType: {0}"
-msgstr "Tipus de xat desconegut: {0}"
+#: ../src/Frontend-GNOME/Main.cs:109
+msgid "Passing link to already running Smuxi instance..."
+msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:971
-msgid ""
-"Switching to local engine will disconnect you from the current engine!\n"
-"Are you sure you want to do this?"
+#: ../src/Frontend-GNOME/Main.cs:117
+msgid "Bringing already running Smuxi instance to foreground..."
 msgstr ""
-"Si canvieu al motor local us desconnectareu del vostre motor actual!\n"
-"Esteu segur que voleu fer aixÃ²?"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:1013
-msgid ""
-"Switching the remote engine will disconnect you from the current engine!\n"
-"Are you sure you want to do this?"
+#: ../src/Frontend-GNOME/MainWindow.cs:374
+#, csharp-format
+msgid "{0} Users"
 msgstr ""
-"Si canvieu el motor remot us desconnectareu del vostre motor actual!\n"
-"Esteu segur que voleu fer aixÃ²?"
 
 #: ../src/Frontend-GNOME/NotImplementedMessageDialog.cs:40
 msgid "Sorry, not implemented yet!"
@@ -640,348 +634,607 @@ msgstr "CarÃ cter"
 msgid "Word"
 msgstr "Paraula"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:198
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
 msgid "No Proxy"
 msgstr "Sense servidor intermediari"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:139
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Predeterminat del sistema"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
 msgid "Connection"
 msgstr "ConnexiÃ³"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
 msgid "Interface"
 msgstr "InterfÃcie"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:220
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:227
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
 msgid "Filters"
 msgstr "Filtres"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:231
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
 msgid "Logging"
 msgstr "Registre"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:281
-msgid "System Default"
-msgstr "Predeterminat del sistema"
-
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:588
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
 msgid "Nicknames(s) field must not be empty."
 msgstr "Cal indicar un o mÃ©s sobrenoms."
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:748
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
 #, csharp-format
 msgid "Invalid highlight regex: '{0}'. Reason: {1}"
 msgstr "ExpressiÃ³ regular de ressaltat no vÃ lida: '{0}'. Motiu: {1}"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:69
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:105
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:271
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:74
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:86
 msgid "Topic"
 msgstr "Tema"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:102
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
 "Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"No es recomana cercar sales de xat en grup sense un filtre. AixÃ² pot trigar una estona, o pot ser que no 
funcioni.\n"
-"Voleu continuar?"
+msgstr "No es recomana cercar sales de xat en grup sense un filtre. AixÃ² pot trigar una estona, o pot ser 
que no funcioni.\nVoleu continuar?"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:143
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "S'ha produÃ¯t un error en recuperar la llista de xats en grup del servidor."
 
-#: ../src/Frontend-GNOME/Frontend.cs:399
+#: ../src/Frontend-GNOME/Frontend.cs:388
+msgid "Disconnected from engine."
+msgstr ""
+
+#: ../src/Frontend-GNOME/Frontend.cs:431
+#, csharp-format
+msgid "Reconnecting to engine... (attempt {0})"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Motiu: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:469
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"El frontal ha perdut la connexiÃ³ amb el servidor.\n"
-"Voleu tornar a connectar-hi?"
+msgstr "El frontal ha perdut la connexiÃ³ amb el servidor.\nVoleu tornar a connectar-hi?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:484
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"L'intent de reconnexiÃ³ amb el servidor ha fallat.\n"
-"Voleu tornar-ho a intentar?"
+msgstr "L'intent de reconnexiÃ³ amb el servidor ha fallat.\nVoleu tornar-ho a intentar?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:585
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"El servidor ha perdut la connexiÃ³ al frontal.\n"
-"Voleu tornar a connectar-hi?"
+msgstr "El servidor ha perdut la connexiÃ³ al frontal.\nVoleu tornar a connectar-hi?"
 
-#: ../src/Frontend-GNOME/NotifyManager.cs:229
+#: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Mostra"
 
-#: ../src/Frontend-GNOME/QuickConnectDialog.cs:62
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:238
+#: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/Frontend-GNOME/QuickConnectDialog.cs:63
+#: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Nom de la mÃ quina"
 
-#: ../src/Frontend-GNOME/QuickConnectDialog.cs:166
+#: ../src/Frontend-GNOME/QuickConnectDialog.cs:162
 msgid "Unable to load server: "
 msgstr "No s'ha pogut carregar el servidor:"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:244
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Persona / Privat"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:245
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Grup / PÃºblic"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:70
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Assistent de configuraciÃ³ de motors - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "Afegeix un motor Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:94
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Edita un motor Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:203
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Credencials"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:265
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Ara podeu utilitzar el motor Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:268
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "GrÃ cies"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:285
-msgid "An engine with this name already exists! Please specify a different one."
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
+msgid ""
+"An engine with this name already exists! Please specify a different one."
 msgstr "Ja existeix un motor amb aquest nom! Especifiqueu-ne un altre."
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:198
+#: ../src/Frontend-GNOME/Views/JoinWidget.cs:89
+msgid "Enter which chat to join"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:153
+msgid "About Smuxi"
+msgstr ""
+
+#. TODO: add cmd+, accelerator
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:157
+msgid "Preferences"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
+msgid "Unable to add server: "
+msgstr "No s'ha pogut afegir el servidor:"
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
+msgid ""
+"Switching to local engine will disconnect you from the current engine!\n"
+"Are you sure you want to do this?"
+msgstr "Si canvieu al motor local us desconnectareu del vostre motor actual!\nEsteu segur que voleu fer 
aixÃ²?"
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
+msgid ""
+"Switching the remote engine will disconnect you from the current engine!\n"
+"Are you sure you want to do this?"
+msgstr "Si canvieu el motor remot us desconnectareu del vostre motor actual!\nEsteu segur que voleu fer 
aixÃ²?"
+
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
+#, csharp-format
+msgid "Day changed from {0} to {1}"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "El dia ha canviat a {0}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:123
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:133
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:120
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:130
 #, csharp-format
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "ExpressiÃ³ regular de filtre no vÃ lida: '{0}'. Motiu: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:200
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Esteu segur que voleu eliminar el filtre seleccionat?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:246
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protocol / Servidor"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:253
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Tipus de xat"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:287
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:288
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:295
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "_Tipus"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:321
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "PatrÃ³"
 
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:242
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
+msgid "Low Bandwidth Mode is active: no messages synced."
+msgstr ""
+
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
+msgid "Show _Menubar"
+msgstr "Mostra la barra de _menÃº"
+
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:321
 #, csharp-format
 msgid "Retrieving user list for {0}..."
 msgstr "S'estÃ  obtenint el llistat d'usuari per a {0}..."
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:289
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "fet."
 
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:304
-msgid "Person"
-msgstr "Persones"
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
+msgid "Reconnect"
+msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:68
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Si tanqueu la pestanya del protocol es tancaran tambÃ© totes les sales de xat que en depenen.\n"
-"Esteu segur que voleu fer aixÃ²?"
+msgstr "Si tanqueu la pestanya del protocol es tancaran tambÃ© totes les sales de xat que en depenen.\nEsteu 
segur que voleu fer aixÃ²?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:187
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Esteu segur que voleu eliminar el servidor seleccionat?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:243
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:277
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "No es pot modificar el servidor:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:34
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:24
 msgid "Find"
 msgstr "Troba"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:44
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:83
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:73
 msgid "_Match Case"
 msgstr "Sensible a _majÃºscules"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:95
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:85
 msgid "Search _Backwards"
 msgstr "Cerca cap endarrere"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:107
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:97
 msgid "_Wrap Around"
 msgstr "_Torna a comenÃ§ar pel principi en arribar al final"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:110
 msgid "Use _Regular Expressions"
 msgstr "Utilitza expressions _regulars"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:32
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
 msgid "Smuxi - Find Group Chat"
 msgstr "Smuxi - Troba sales de xat"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:56
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.QuickConnectDialog.cs:24
-msgid "Smuxi - Quick Connect"
-msgstr "Smuxi - ConnexiÃ³ rÃ pida"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.JoinWidget.cs:69
+msgid "Join"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
+msgid "_Smuxi"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
+msgid "_Server"
+msgstr "_Servidor"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
+msgid "_Chat"
+msgstr "_Xat"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
+msgid "_Engine"
+msgstr "_Motor"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
+msgid "_View"
+msgstr "_Mostra"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
+msgid "Connect"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
+msgid "Open Log"
+msgstr "Obre el registre"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
+msgid "_Preferences"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
+msgid "_Quit"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
+msgid "_Connect"
+msgstr "_Connecta"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
+msgid "_Add"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
+msgid "_Manage"
+msgstr "_Gestiona"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
+msgid "_Open / Join Chat"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
+msgid "_Find Group Chat"
+msgstr "_Troba sales de xat en grup"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
+msgid "C_lear All Activity"
+msgstr "_Neteja totes les activitats"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
+msgid "_Next Chat"
+msgstr "Xat _segÃ¼ent"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
+msgid "_Previous Chat"
+msgstr "Xat _anterior"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
+msgid "_Close"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
+msgid "_Use Local Engine"
+msgstr "_Utilitza el motor local"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
+msgid "_Add Remote Engine"
+msgstr "_Afegeix un motor remot"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
+msgid "Switch Remote Engine"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
+msgid "_Caret Mode"
+msgstr "Navega amb el _cursor"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
+msgid "_Browse Mode"
+msgstr "Mode d'_exploraciÃ³"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
+msgid "Show _Statusbar"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
+msgid "_Fullscreen"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
+msgid "_About"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
+msgid "Find Group Chat"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
+msgid "_Website"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
+msgid "Show _Toolbar"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.QuickConnectDialog.cs:19
+msgid "Smuxi - Connect"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:206
+msgid "Smuxi - Preferences"
+msgstr "Smuxi - PreferÃ¨ncies"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:487
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:295
 msgid "Nicknames:"
 msgstr "Sobrenoms:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1622
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1022
+msgid "Tabs"
+msgstr "Pestanyes"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1430
 msgid "<b> User List Position </b>"
 msgstr "<b> PosiciÃ³ de la llista d'usuaris </b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1633
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1441
 msgid "<b> Channel </b>"
 msgstr "<b> Sala </b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1844
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1652
 msgid "<b>Channel Filters</b>"
 msgstr "<b>Filtres de canal</b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1861
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1669
 msgid "<b>User Filters</b>"
 msgstr "<b>Filtres d'usuari</b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:56
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:42
 msgid "Use _SSH Tunnel"
 msgstr "Utilitza un _tÃºnel SSH"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:70
-msgid "<span size=\"small\">Enables the use of SSH for the connection.  This has a small performance impact, 
but is more secure and required when using NAT or port-based firewalls</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:56
+msgid ""
+"<span size=\"small\">Enables the use of SSH for the connection.  This has a "
+"small performance impact, but is more secure and required when using NAT or "
+"port-based firewalls</span>"
 msgstr "<span size=\"small\">Habilita l'Ãºs de l'SSH per a la connexiÃ³. AixÃ² afectarÃ  lleugerament el 
rendiment, perÃ² Ã©s mÃ©s segur i Ã©s necessari quan s'utilitza NAT o tallafocs que bloquegin certs ports.</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:149
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "S_ervidor SSH:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:160
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
 msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
 msgstr "<span size=\"small\">DNS o adreÃ§a IP i port del servidor SSH</span>"
 
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:187
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:155
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:183
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:200
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
 msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
 msgstr "<span size=\"small\">DNS o adreÃ§a IP i port del servidor del Smuxi</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:213
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "Servidor _Smuxi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:68
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "Nom d'usuari de l'SSH: (opcional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:91
-msgid "<span size=\"small\">Username which will be used to log into the SSH server</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
+msgid ""
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
 msgstr "<span size=\"small\">Nom d'usuari que s'utilitzarÃ  per iniciar sessiÃ³ al servidor SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "Contrasenya de l'SSH: (opcional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:135
-msgid "<span size=\"small\">Password which will be used to log into the SSH server. The password is optional 
if SSH key authorization is used (via Pageant from the PuTTY tools).</span>"
-msgstr "<span size=\"small\">Contrasenya que s'utilitzarÃ  per iniciar sessiÃ³ al servidor SSH. La contrasenya 
Ã©s opcional si s'utilitza autenticaciÃ³ via claus SSH (mitjanÃ§ant Pageant, de les eines PuTTY).</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
+msgid ""
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
+msgid "_SSH Keyfile: (optional)"
+msgstr ""
+
+#. Container child vbox17.Gtk.Box+BoxChild
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
+msgid "Select a File"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
+msgid ""
+"<span size=\"small\">SSH private keyfile which will be used to log into the "
+"SSH server</span>"
+msgstr ""
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:156
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:214
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_Sobrenom:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:179
-msgid "<span size=\"small\">Username which will be used to log into the Smuxi server</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
+msgid ""
+"<span size=\"small\">Username which will be used to log into the Smuxi "
+"server</span>"
 msgstr "<span size=\"small\">Nom d'usuari que s'utilitzarÃ  per iniciar sessiÃ³ al servidor del Smuxi.</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:199
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:113
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:223
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">Contrasenya de l'usuari</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:243
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_Repetiu la contrasenya:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:267
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Repetiu la contrasenya per assegurar que l'heu escrita correctament</span>"
 
@@ -991,89 +1244,66 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Benvingut a l'assistent de configuraciÃ³ de motors dels Smuxi.\n"
-"Cal que introduÃ¯u una mica d'informaciÃ³ abans de comenÃ§ar a utilitzar el motor. Premeu Â«EndavantÂ» per a 
comenÃ§ar."
+msgstr "Benvingut a l'assistent de configuraciÃ³ de motors dels Smuxi.\nCal que introduÃ¯u una mica 
d'informaciÃ³ abans de comenÃ§ar a utilitzar el motor. Premeu Â«EndavantÂ» per a comenÃ§ar."
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:44
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
 msgstr "Nom del _motor:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:59
 msgid "<span size=\"small\">Profile name of the new engine</span>"
 msgstr "<span size=\"small\">Nom per al nou perfil de motor</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:80
 msgid "_Default Engine:"
 msgstr "_Motor predeterminat:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:91
 msgid "Use as new default engine"
 msgstr "Utilitza'l com a nou motor predeterminat"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:112
-msgid "<span size=\"small\">If enabled, the current engine will be the default next time Smuxi is 
started</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
+msgid ""
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
 msgstr "<span size=\"small\">Si marqueu la casella, la propera vegada que inicieu l'Smuxi el motor que esteu 
configurant s'utilitzarÃ  de forma predeterminada.</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:26
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
 msgstr "Smuxi - Obre un xat"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:69
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:63
 msgid "_Type:"
 msgstr "_Tipus:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:80
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Nom de la mÃ quina:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:101
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:79
 msgid "_Network:"
 msgstr "_Xarxa:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:105
+msgid "Nickname:"
+msgstr ""
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:252
 msgid "_Protocol:"
 msgstr "_Protocol:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:248
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Utilitza xifratge"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:260
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:288
 msgid "Validate Server Certificate"
 msgstr "Valida el certificat del servidor"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:280
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:308
 msgid "_On Connect Commands:"
 msgstr "_Ordres al connectar:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:291
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_Ignora les ordres"
-
-#~ msgid "German"
-#~ msgstr "Alemany"
-
-#~ msgid "Spanish"
-#~ msgstr "CastellÃ "
-
-#~ msgid "British English"
-#~ msgstr "AnglÃ¨s britÃ nic"
-
-#~ msgid "French"
-#~ msgstr "FrancÃ¨s"
-
-#~ msgid "Italian"
-#~ msgstr "ItaliÃ "
-
-#~ msgid "_Edit"
-#~ msgstr "_Modifica"
-
-#~ msgid "Joins"
-#~ msgstr "Entrades"
-
-#~ msgid "Parts"
-#~ msgstr "Sortides"
-
-#~ msgid "Quits"
-#~ msgstr "Desconnexions"
diff --git a/po-Frontend-GNOME/cs.po b/po-Frontend-GNOME/cs.po
index 1a68264d..ba48efa7 100644
--- a/po-Frontend-GNOME/cs.po
+++ b/po-Frontend-GNOME/cs.po
@@ -1,26 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# RavuAlHemio <ondra hosek gmail com>, 2013-2015
-# Marek ÄŒernockÃ½ <marek manet cz>, 2016, 2017.
-#
+# Marek ÄŒernockÃ½ <marek manet cz>, 2016-2017
+# OndÅ™ej HoÅ¡ek <ondra hosek gmail com>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:46+0000\n"
-"PO-Revision-Date: 2017-11-05 13:19+0100\n"
-"Last-Translator: Marek ÄŒernockÃ½ <marek manet cz>\n"
-"Language-Team: ÄeÅ¡tina <gnome-cs-list gnome org>\n"
-"Language: cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Czech (http://www.transifex.com/meebey/smuxi/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 
!= 0 ) ? 2 : 3;\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -31,11 +28,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"PouÅ¾Ãt tuto pÅ™ezdÃvku. MÅ¯Å¾ete zvolit vÃce pÅ™ezdÃvek (oddÄ›lenÃ½ch mezerami), "
-"kterÃ© se pouÅ¾ijÃ jako nÃ¡hradnÃ v pÅ™ÃpadÄ›, Å¾e prvnÃ pÅ™ezdÃvka nebude "
-"dostupnÃ¡. Ve vÃ½chozÃm nastavenÃ budou pouÅ¾ity nÃ¡hradnÃ pÅ™ezdÃvky $nick_ a "
-"$nick__."
+msgstr "PouÅ¾Ãt tuto pÅ™ezdÃvku. MÅ¯Å¾ete zvolit vÃce pÅ™ezdÃvek (oddÄ›lenÃ½ch mezerami), kterÃ© se pouÅ¾ijÃ jako 
nÃ¡hradnÃ v pÅ™ÃpadÄ›, Å¾e prvnÃ pÅ™ezdÃvka nebude dostupnÃ¡. Ve vÃ½chozÃm nastavenÃ budou pouÅ¾ity nÃ¡hradnÃ 
pÅ™ezdÃvky $nick_ a $nick__."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -135,16 +128,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = sekundy\n"
-"mm = minuty\n"
-"hh = hodiny (01â€¯â€“â€¯12)\n"
-"HH = hodiny (00â€¯â€“â€¯23)\n"
-"tt = dop./odp.\n"
-"\n"
-"dd = den\n"
-"MM = mÄ›sÃc\n"
-"yy/yyyy = rok"
+msgstr "ss = sekundy\nmm = minuty\nhh = hodiny (01â€¯â€“â€¯12)\nHH = hodiny (00â€¯â€“â€¯23)\ntt = dop./odp.\n\ndd = 
den\nMM = mÄ›sÃc\nyy/yyyy = rok"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -346,7 +330,8 @@ msgstr "PozadÃ"
 msgid "<b> Color </b>"
 msgstr "<b> Barva </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_ReÅ¾im zalamovÃ¡nÃ:"
@@ -442,6 +427,28 @@ msgstr "ZaznamenÃ¡vat filtrovanÃ© zprÃ¡vy"
 msgid "_Logging"
 msgstr "PÅ™ih_laÅ¡ovÃ¡nÃ"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi â€“ Server"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Po spuÅ¡tÄ›nÃ se automaticky pÅ™ipojit k serveru"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "SÃÅ¥:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Hostitel:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -461,11 +468,8 @@ msgstr "Pokecejte si s dalÅ¡Ãmi lidmi na IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"chat;pokec;diskuze;zprÃ¡vy;rychlÃ© sprÃ¡vy;im;gnome;gtk;irc;twitter;facebook;"
-"gtalk;xmpp;jabber;campfire;jabber;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "chat;pokec;diskuze;zprÃ¡vy;rychlÃ© 
sprÃ¡vy;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabber;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -475,9 +479,7 @@ msgstr "Pokecejte si s dalÅ¡Ãmi lidmi na IRC, Twitteru, Jabberu a Campfiru"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi je distribuovanÃ½, uÅ¾ivatelsky pÅ™ÃvÄ›tivÃ½ klient s otevÅ™enÃ½m zdrojovÃ½m "
-"kÃ³dem pro pokec pÅ™es IRC, Twitter, Jabber/XMPP, Campfire a JabbR od SignalR."
+msgstr "Smuxi je distribuovanÃ½, uÅ¾ivatelsky pÅ™ÃvÄ›tivÃ½ klient s otevÅ™enÃ½m zdrojovÃ½m kÃ³dem pro pokec pÅ™es IRC, 
Twitter, Jabber/XMPP, Campfire a JabbR od SignalR."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -485,24 +487,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"InspirovÃ¡n kombinacÃ screenu a irssi, mÃ¡ Smuxi oddÄ›litelnÃ½ server (nebo jako "
-"â€žnormÃ¡lnÃâ€œ klient), kterÃ½ zÅ¯stÃ¡vÃ¡ pÅ™ipojen, i kdyÅ¾ uÅ¾ivatel zrovna pÅ™ipojen "
-"nenÃ, a dovoluje pÅ™ipojenÃ a synchronizaci nÄ›kolika uÅ¾ivatelskÃ½ch rozhranÃ "
-"Smuxi najednou. ChovÃ¡ se tedy podobnÄ› jako screen+irssi nebo vyhazovaÄ IRC, "
-"ale elegantnÄ›ji a mocnÄ›ji."
+msgstr "InspirovÃ¡n kombinacÃ screenu a irssi, mÃ¡ Smuxi oddÄ›litelnÃ½ server (nebo jako â€žnormÃ¡lnÃâ€œ klient), 
kterÃ½ zÅ¯stÃ¡vÃ¡ pÅ™ipojen, i kdyÅ¾ uÅ¾ivatel zrovna pÅ™ipojen nenÃ, a dovoluje pÅ™ipojenÃ a synchronizaci nÄ›kolika 
uÅ¾ivatelskÃ½ch rozhranÃ Smuxi najednou. ChovÃ¡ se tedy podobnÄ› jako screen+irssi nebo vyhazovaÄ IRC, ale 
elegantnÄ›ji a mocnÄ›ji."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "HlavnÃ okno s kanÃ¡lem IRC"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"Michal Simunek <michal simunek gmail com>\n"
-"Marek ÄŒernockÃ½ <marek manet cz>"
+msgstr "Michal Simunek <michal simunek gmail com>\nMarek ÄŒernockÃ½ <marek manet cz>"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "WebovÃ© strÃ¡nky Smuxi"
 
@@ -558,10 +553,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"VaÅ¡e uÅ¾ivatelskÃ© rozhranÃ nenÃ kompatibilnÃ s vÃ½konnou ÄÃ¡stÃ!\n"
-"Verze vÃ½konnÃ© ÄÃ¡sti: {0} Verze uÅ¾ivatelskÃ©ho rozhranÃ: {1}\n"
-"Protokol vÃ½konnÃ© ÄÃ¡sti: {2} Protokol uÅ¾ivatelskÃ©ho rozhranÃ: {3}"
+msgstr "VaÅ¡e uÅ¾ivatelskÃ© rozhranÃ nenÃ kompatibilnÃ s vÃ½konnou ÄÃ¡stÃ!\nVerze vÃ½konnÃ© ÄÃ¡sti: {0} Verze 
uÅ¾ivatelskÃ©ho rozhranÃ: {1}\nProtokol vÃ½konnÃ© ÄÃ¡sti: {2} Protokol uÅ¾ivatelskÃ©ho rozhranÃ: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -582,14 +574,14 @@ msgstr "Chyba: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Opravdu si pÅ™ejete odstranit vÃ½konnou ÄÃ¡sti â€ž{0}â€œ?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "ChystÃ¡te se vloÅ¾it {0} Å™Ã¡dkÅ¯. Chcete pokraÄovat?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "PÅ™Ãkazy uÅ¾ivatelskÃ© ÄÃ¡sti"
 
@@ -634,9 +626,81 @@ msgstr "{0} uÅ¾ivatelÅ¯"
 msgid "Sorry, not implemented yet!"
 msgstr "Litujeme, ale zatÃm nenÃ podporovÃ¡no!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Znak"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Slovo"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Toto nastavenÃ urÄuje, jestli mÃ¡ Smuxi uklÃ¡dat zprÃ¡vy do operaÄnÃ pamÄ›ti (doÄasnÄ›) nebo na disk 
(trvale).\nPro trvalÃ© uloÅ¾enÃ mÅ¯Å¾ete zvolit objektovou databÃ¡zi Db4o nebo relaÄnÃ databÃ¡zi SQLite.\nModul 
Db4o mÃ¡ nÄ›kolik znÃ¡mÃ½ch problÃ©mÅ¯ jako vysokÃ© vyuÅ¾itÃ pamÄ›ti a procesoru, a nÄ›kdy dokonce i pÃ¡dy programu. 
Jeho pouÅ¾itÃ jiÅ¾ nenÃ doporuÄovÃ¡no.\nU modulu SQLite nejsou Å¾Ã¡dnÃ© problÃ©my s vÃ½konem Äi stabilitou znÃ¡my, ale 
zatÃm je jen volitelnÃ½ a experimentÃ¡lnÃ."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Trvale: SQLite (experimentÃ¡lnÃ)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Trvale: Db4o (zavrÅ¾eno)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Trvale (ukÃ¡zka)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "DoÄasnÄ›"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "NepouÅ¾Ãvat proxy"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Podle systÃ©mu"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "PÅ™ipojenÃ"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "RozhranÃ"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Servery"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filtry"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "PÅ™ihlaÅ¡ovÃ¡nÃ"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "Pole pro pÅ™ezdÃvku nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ©."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "NeplatnÃ½ vÃ½raz pro zvÃ½raznÄ›nÃ: '{0}'. PÅ™ÃÄina: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "NÃ¡zev"
 
@@ -646,86 +710,58 @@ msgstr "TÃ©ma"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"VyhledÃ¡vÃ¡nÃ skupinovÃ½ch pokecÅ¯ bez filtru nenÃ doporuÄeno. NemusÃ vÅ¾dy "
-"fungovat, nebo zabere hodnÄ› Äasu.\n"
-"PÅ™ejete si pokraÄovat?"
+msgstr "VyhledÃ¡vÃ¡nÃ skupinovÃ½ch pokecÅ¯ bez filtru nenÃ doporuÄeno. NemusÃ vÅ¾dy fungovat, nebo zabere hodnÄ› 
Äasu.\nPÅ™ejete si pokraÄovat?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Chyba pÅ™i pÅ™ijmu seznamu skupinovÃ½ch pokecÅ¯ ze serveru."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Odpojen od vÃ½konnÃ© ÄÃ¡sti."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Obnovuje se pÅ™ipojenÃ k vÃ½konnÃ© ÄÃ¡stiâ€¦ (pokus {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "ZpÅ¯sobeno: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Byla zjiÅ¡tÄ›na kritickÃ¡ chyba kvÅ¯li nekompatibilitÄ› protokolu se serverem "
-"Smuxi!\n"
-"\n"
-"Nainstalujte prosÃm na klientskou ÄÃ¡st Mono, kterÃ© vyhovuje serveru Smuxi.\n"
-"\n"
-"VÃce informacÃ o tomto problÃ©mu mÅ¯Å¾ete najÃt zde:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"UÅ¾ivatelskÃ¡ ÄÃ¡st ztratila spojenÃ se serverem.\n"
-"Chcete se nynÃ znovu pÅ™ipojit?"
+msgstr "UÅ¾ivatelskÃ¡ ÄÃ¡st ztratila spojenÃ se serverem.\nChcete se nynÃ znovu pÅ™ipojit?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"OpÄ›tovnÃ© pÅ™ipojenÃ k serveru selhalo.\n"
-"Chcete to zkusit znovu?"
+msgstr "OpÄ›tovnÃ© pÅ™ipojenÃ k serveru selhalo.\nChcete to zkusit znovu?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Server ztratil spojenÃ s uÅ¾ivatelskou ÄÃ¡stÃ.\n"
-"Chcete se nynÃ znovu pÅ™ipojit?"
+msgstr "Server ztratil spojenÃ s uÅ¾ivatelskou ÄÃ¡stÃ.\nChcete se nynÃ znovu pÅ™ipojit?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Zobrazit"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protokol"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Hostitel"
 
@@ -734,44 +770,40 @@ msgid "Unable to load server: "
 msgstr "Nelze naÄÃst server: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "OsobnÃâ€¯/â€¯soukromÃ½"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "SkupinovÃ½â€¯/â€¯veÅ™ejnÃ½"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "PrÅ¯vodce vÃ½konnou ÄÃ¡stÃ â€“ Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "PÅ™idat vÃ½konnou ÄÃ¡st Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Upravit vÃ½konnou ÄÃ¡st Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "PÅ™ipojenÃ"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "PovÄ›Å™enÃ"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "NynÃ mÅ¯Å¾ete pouÅ¾Ãvat tento vÃ½konnou ÄÃ¡st Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "DÄ›kujeme"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "VÃ½konnÃ¡ ÄÃ¡st s tÃmto nÃ¡zvem jiÅ¾ existuje. Zadejte prosÃm jinÃ½ nÃ¡zev."
@@ -789,33 +821,29 @@ msgstr "O Smuxi"
 msgid "Preferences"
 msgstr "PÅ™edvolby"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "Nelze pÅ™idat server: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"PÅ™epnutÃm na mÃstnÃ vÃ½konnou ÄÃ¡st se odpojÃte od aktuÃ¡lnÃho serveru!\n"
-"Opravdu si pÅ™ejete pokraÄovat?"
+msgstr "PÅ™epnutÃm na mÃstnÃ vÃ½konnou ÄÃ¡st se odpojÃte od aktuÃ¡lnÃho serveru!\nOpravdu si pÅ™ejete pokraÄovat?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"PÅ™epnutÃm na vzdÃ¡lenÃ½ server ÄÃ¡st se odpojÃte od aktuÃ¡lnÃ vÃ½konnÃ© ÄÃ¡sti!\n"
-"Opravdu si pÅ™ejete pokraÄovat?"
+msgstr "PÅ™epnutÃm na vzdÃ¡lenÃ½ server ÄÃ¡st se odpojÃte od aktuÃ¡lnÃ vÃ½konnÃ© ÄÃ¡sti!\nOpravdu si pÅ™ejete 
pokraÄovat?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "Den se zmÄ›nil z {0} na {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "Den se zmÄ›nil na {0}"
@@ -826,63 +854,39 @@ msgstr "Den se zmÄ›nil na {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "NeplatnÃ½ regulÃ¡rnÃ vÃ½raz pro filtr: â€ž{0}â€œ. PÅ™ÃÄina: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Opravdu si pÅ™ejete smazat vybranÃ½ filtr?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-msgid "Network"
-msgstr "SÃÅ¥"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protokolâ€¯/â€¯server"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Typ pokecu"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "NormÃ¡lnÃ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "UdÃ¡lost"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "Vzor"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "NepouÅ¾Ãvat proxy"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "Podle systÃ©mu"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "UloÅ¾it"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-msgid "Add"
-msgstr "PÅ™idat"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "NepodporovÃ¡no"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "ReÅ¾im pomalÃ©ho spojenÃ je aktivnÃ: nesynchronizuji zprÃ¡vy."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -894,29 +898,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "ZÃskÃ¡vÃ¡ se seznamu uÅ¾ivatelÅ¯ pro {0}â€¦"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "hotovo."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Znovu se pÅ™ipojit"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"ZavÅ™enÃ tohoto pokecovÃ©ho protokolu zavÅ™e takÃ© vÅ¡echny otevÅ™enÃ© pokecy na "
-"nÄ›m pÅ™ipojenÃ©!\n"
-"Opravdu si pÅ™ejete pokraÄovat?"
+msgstr "ZavÅ™enÃ tohoto pokecovÃ©ho protokolu zavÅ™e takÃ© vÅ¡echny otevÅ™enÃ© pokecy na nÄ›m pÅ™ipojenÃ©!\nOpravdu si 
pÅ™ejete pokraÄovat?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Opravdu si pÅ™ejete smazat vybranÃ½ server?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "Nelze upravit server: "
 
@@ -1150,18 +1151,14 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">PovolÃ pouÅ¾ÃvÃ¡nÃ SSH pro toto pÅ™ipojenÃ. Na vÃ½kon to mÃ¡ "
-"malÃ½ dopad, ale je to mnohem bezpeÄnÄ›jÅ¡Ã a potÅ™ebnÃ©, pokud pouÅ¾ÃvÃ¡te NAT "
-"nebo firewally zaloÅ¾enÃ© na portech</span>"
+msgstr "<span size=\"small\">PovolÃ pouÅ¾ÃvÃ¡nÃ SSH pro toto pÅ™ipojenÃ. Na vÃ½kon to mÃ¡ malÃ½ dopad, ale je to 
mnohem bezpeÄnÄ›jÅ¡Ã a potÅ™ebnÃ©, pokud pouÅ¾ÃvÃ¡te NAT nebo firewally zaloÅ¾enÃ© na portech</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "_Hostitel SSH:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
 msgstr "<span size=\"small\">DNS nebo adresa IP a port serveru SSH</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
@@ -1171,80 +1168,74 @@ msgid "_Port:"
 msgstr "_Port:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
 msgstr "<span size=\"small\">DNS nebo adresa IP a port serveru Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "Hostitel _Smuxi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no pro _SSH: (volitelnÃ©)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">UÅ¾ivatelskÃ© jmÃ©no pro pÅ™ihlÃ¡Å¡enÃ k serveru SSH</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">UÅ¾ivatelskÃ© jmÃ©no pro pÅ™ihlÃ¡Å¡enÃ k serveru SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "Heslo pro _SSH: (volitelnÃ©)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">Heslo pro pÅ™ipojenÃ k serveru SSH. NenÃ nutnÃ© jej "
-"zadat, kdyÅ¾ se ovÄ›Å™uje pomocÃ klÃÄe SSH (viz nÃÅ¾e).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">Heslo pro pÅ™ipojenÃ k serveru SSH. NenÃ nutnÃ© jej zadat, kdyÅ¾ se ovÄ›Å™uje pomocÃ 
klÃÄe SSH (viz nÃÅ¾e).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "Soubor s klÃÄem _SSH: (nepovinnÃ½)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "VÃ½bÄ›r souboru"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Soubor se soukromÃ½m klÃÄem SSH, kterÃ½ se bude pouÅ¾Ãvat "
-"pÅ™i spojovÃ¡nÃ se serverem SSH</span>"
+msgstr "<span size=\"small\">Soubor se soukromÃ½m klÃÄem SSH, kterÃ½ se bude pouÅ¾Ãvat pÅ™i spojovÃ¡nÃ se 
serverem SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_UÅ¾ivatelskÃ© jmÃ©no:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">UÅ¾ivatelskÃ© jmÃ©no pro pÅ™ihlÃ¡Å¡enÃ k serveru Smuxi</span>"
+msgstr "<span size=\"small\">UÅ¾ivatelskÃ© jmÃ©no pro pÅ™ihlÃ¡Å¡enÃ k serveru Smuxi</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">Heslo uÅ¾ivatele</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_OvÄ›Å™it heslo:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Zopakujte heslo pro ovÄ›Å™enÃ</span>"
 
@@ -1254,11 +1245,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"VÃtejte v prÅ¯vodci nastavenÃ vÃ½konnÃ© ÄÃ¡sti Smuxi.\n"
-"PÅ™ed pouÅ¾itÃm vÃ½konnÃ© ÄÃ¡sti bude tÅ™eba, aby jste zadali nÄ›kterÃ© informace.\n"
-"\n"
-"ZaÄnÄ›te kliknutÃm na â€žPokraÄovatâ€œ."
+msgstr "VÃtejte v prÅ¯vodci nastavenÃ vÃ½konnÃ© ÄÃ¡sti Smuxi.\nPÅ™ed pouÅ¾itÃm vÃ½konnÃ© ÄÃ¡sti bude tÅ™eba, aby jste 
zadali nÄ›kterÃ© informace.\n\nZaÄnÄ›te kliknutÃm na â€žPokraÄovatâ€œ."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1278,11 +1265,9 @@ msgstr "PouÅ¾Ãt jako novou vÃ½chozÃ vÃ½konnou ÄÃ¡st"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Pokud je zaÅ¡krtnuto, aktuÃ¡lnÃ vÃ½konnÃ¡ ÄÃ¡st bude pouÅ¾ita "
-"jako vÃ½chozÃ pÅ™i pÅ™ÃÅ¡tÃm spuÅ¡tÄ›nÃ Smuxi</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Pokud je zaÅ¡krtnuto, aktuÃ¡lnÃ vÃ½konnÃ¡ ÄÃ¡st bude pouÅ¾ita jako vÃ½chozÃ pÅ™i 
pÅ™ÃÅ¡tÃm spuÅ¡tÄ›nÃ Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1292,10 +1277,6 @@ msgstr "Smuxi â€“ otevÅ™enÃ pokecu"
 msgid "_Type:"
 msgstr "_Typ"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi â€“ Server"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Hostitel:"
@@ -1312,10 +1293,6 @@ msgstr "PÅ™ezdÃvka:"
 msgid "_Protocol:"
 msgstr "P_rotokol:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Po spuÅ¡tÄ›nÃ se automaticky pÅ™ipojit k serveru"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "PouÅ¾Ãvat Å¡ifrovÃ¡nÃ"
diff --git a/po-Frontend-GNOME/da.po b/po-Frontend-GNOME/da.po
index 82b72299..46dd0e69 100644
--- a/po-Frontend-GNOME/da.po
+++ b/po-Frontend-GNOME/da.po
@@ -1,26 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Alan Mortensen <alanmortensen am gmail com>, 2017
 # Joe Hansen <joedalton2 yahoo dk>, 2011-2015
-# Alan Mortensen <alanmortensen am gmail com>, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:46+0000\n"
-"PO-Revision-Date: 2018-03-08 17:36+0100\n"
-"Last-Translator: Alan Mortensen <alanmortensen am gmail com>\n"
-"Language-Team: Danish (http://wiki.dansk-gruppen.dk)\n"
-"Language: da\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Danish (http://www.transifex.com/meebey/smuxi/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -31,10 +28,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"Brugernavnet. Du kan angive yderligere brugernavne (adskilt af mellemrum) "
-"som vil blive brugt hvis det fÃ¸rste valg ikke er tilgÃ¦ngeligt. Som standard "
-"vil $nick_ og $nick__ blive anvendt."
+msgstr "Brugernavnet. Du kan angive yderligere brugernavne (adskilt af mellemrum) som vil blive brugt hvis 
det fÃ¸rste valg ikke er tilgÃ¦ngeligt. Som standard vil $nick_ og $nick__ blive anvendt."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -134,16 +128,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = sekunder\n"
-"mm = minutter\n"
-"hh = timer (01 - 12)\n"
-"HH = timer (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = dag\n"
-"MM = mÃ¥ned\n"
-"yy/yyyy = Ã¥r"
+msgstr "ss = sekunder\nmm = minutter\nhh = timer (01 - 12)\nHH = timer (00 - 23)\ntt = AM/PM\n\ndd = dag\nMM 
= mÃ¥ned\nyy/yyyy = Ã¥r"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -345,7 +330,8 @@ msgstr "Baggrund"
 msgid "<b> Color </b>"
 msgstr "<b> Farve </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_Ombrydningstilstand:"
@@ -441,6 +427,28 @@ msgstr "Logfiltrerede beskeder"
 msgid "_Logging"
 msgstr "_Logning"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi â€” Server"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Tilslut automatisk til server ved opstart"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "NetvÃ¦rk:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "VÃ¦rtsnavn:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -460,11 +468,8 @@ msgstr "Chat med andre via IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;beskeder;meddelelser;samtale;snak;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr 
"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;beskeder;meddelelser;samtale;snak;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -474,9 +479,7 @@ msgstr "Chat med andre pÃ¥ IRC, Twitter, Jabber og Campfire"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi er en distribueret og brugervenlig chatklient til IRC, Twitter, Jabber/"
-"XMPP, Campfire og SignalR's JabbR, som er udviklet i Ã¥ben kildekode."
+msgstr "Smuxi er en distribueret og brugervenlig chatklient til IRC, Twitter, Jabber/XMPP, Campfire og 
SignalR's JabbR, som er udviklet i Ã¥ben kildekode."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -484,27 +487,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Inspireret af kombinationen af skÃ¦rm og irssi, Smuxi har en aftagelig server "
-"(eller som en Â»normalÂ« klient), som forbliver forbundet, nÃ¥r du ikke er det, "
-"og som kan give mulighed for at flere Smuxi-brugerflader er forbundet og "
-"synkroniseret. Dette svarer til screen+irssi eller IRC bouncers, men mere "
-"elegant og funktionsrigt."
+msgstr "Inspireret af kombinationen af skÃ¦rm og irssi, Smuxi har en aftagelig server (eller som en Â»normalÂ« 
klient), som forbliver forbundet, nÃ¥r du ikke er det, og som kan give mulighed for at flere 
Smuxi-brugerflader er forbundet og synkroniseret. Dette svarer til screen+irssi eller IRC bouncers, men mere 
elegant og funktionsrigt."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "Hovedvinduet der viser en IRC-kanal"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"Joe Hansen <joedalton2 yahoo dk>\n"
-"Alan Mortensen <alanmortensen am gmail com>\n"
-"\n"
-"Dansk-gruppen <dansk dansk-gruppen dk>\n"
-"Mere info: http://www.dansk-gruppen.dk";
+msgstr "Joe Hansen <joedalton2 yahoo dk>\nAlan Mortensen <alanmortensen am gmail com>\n\nDansk-gruppen 
<dansk dansk-gruppen dk>\nMere info: http://www.dansk-gruppen.dk";
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Smuxis hjemmeside"
 
@@ -560,10 +553,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"Din brugerflade er ikke kompatibel med motoren!\n"
-"Motorversion: {0} Brugerfladeversion: {1}\n"
-"Motorprotokol: {2} Brugerfladeprotokol: {3}"
+msgstr "Din brugerflade er ikke kompatibel med motoren!\nMotorversion: {0} Brugerfladeversion: 
{1}\nMotorprotokol: {2} Brugerfladeprotokol: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -584,14 +574,14 @@ msgstr "Fejl: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Er du sikker pÃ¥, at du Ã¸nsker at slette motoren Â»{0}Â«?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Du er ved at indsÃ¦tte {0} linjer. Ã˜nsker du at fortsÃ¦tte?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "GrÃ¦nsefladekommandoer"
 
@@ -636,9 +626,81 @@ msgstr "{0} Brugere"
 msgid "Sorry, not implemented yet!"
 msgstr "Beklager, ikke implementeret endnu!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Tegn"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Ord"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Denne indstilling specificerer, om Smuxi skal lagre chatbeskeder i hukommelsen (flygtigt) eller pÃ¥ 
disk (vedvarende).\nFor vedvarende kan du vÃ¦lge mellem Db4o, en objektdatabase eller SQLite, en 
relationsdatabase.\nDb4o-motoren har kendte problemstillinger sÃ¥som hÃ¸j hukommelses- og CPU-forbrug og kan 
endda fÃ¸re til nedbrud og er derfor forÃ¦ldet.\nSQLite-motoren har ingen kendte ydelses- eller 
stabilitetsproblemer og er den anbefalede indstilling."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Vedvarende: SQLite (anbefalet)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Vedvarende: Db4o (forÃ¦ldet)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Vedvarende (prÃ¸ve)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "Ustabile"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Ingen proxy"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Systemstandard"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "Tilslutning"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "GrÃ¦nseflade"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Servere"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filtre"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Logning"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "Brugernavnsfelter mÃ¥ ikke vÃ¦re tomme."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "Ugyldigt fremhÃ¦vet regulÃ¦rt udtryk: '{0}'. Ã…rsag: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Navn"
 
@@ -648,86 +710,58 @@ msgstr "Emne"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"SÃ¸gning efter gruppechat uden et filter kan ikke anbefales. Det kan tage "
-"lang tid eller slet ikke virke.\n"
-"Ã˜nsker du at fortsÃ¦tte?"
+msgstr "SÃ¸gning efter gruppechat uden et filter kan ikke anbefales. Det kan tage lang tid eller slet ikke 
virke.\nÃ˜nsker du at fortsÃ¦tte?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Kunne ikke hente listen over gruppechat fra serveren."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Afbrudt fra motor."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Forbinder til motor igen â€¦ (forsÃ¸g {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Ã…rsag: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Der opstid en fatal fejl pga. en protokolinkompatibilitet med smuxi-"
-"serveren!\n"
-"\n"
-"InstallÃ©r Mono pÃ¥ grÃ¦nsefladesiden, sÃ¥ den matcher smuxi-serveren.\n"
-"\n"
-"Flere detaljer om dette problem kan findes her:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"GrÃ¦nsefladen har mistet forbindelsen til serveren.\n"
-"Ã˜nsker du at tilslutte nu?"
+msgstr "GrÃ¦nsefladen har mistet forbindelsen til serveren.\nÃ˜nsker du at tilslutte nu?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"Gentilslutning til serveren mislykkedes.\n"
-"Ã˜nsker du at forsÃ¸ge igen?"
+msgstr "Gentilslutning til serveren mislykkedes.\nÃ˜nsker du at forsÃ¸ge igen?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Serveren har mistet forbindelsen til grÃ¦nsefladen.\n"
-"Ã˜nsker du at tilslutte igen?"
+msgstr "Serveren har mistet forbindelsen til grÃ¦nsefladen.\nÃ˜nsker du at tilslutte igen?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Vis"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protokol"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "VÃ¦rtsnavn"
 
@@ -736,44 +770,40 @@ msgid "Unable to load server: "
 msgstr "Kunne ikke indlÃ¦se server: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Person / privat"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Gruppe / offenlig"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Motorassistent â€” Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "TilfÃ¸j Smuximotor"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Rediger Smuximotor"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "Tilslutning"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Akkreditiver"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Nu kan du bruge Smuximotoren"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "Mange tak"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "En motor med dette navn findes allerede! Angiv venligst et andet."
@@ -791,33 +821,29 @@ msgstr "Om Smuxi"
 msgid "Preferences"
 msgstr "PrÃ¦ferencer"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "Kunne ikke tilfÃ¸je server: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Skift til lokal motor vil afbryde dig fra den aktuelle motor!\n"
-"Er du sikker pÃ¥, at du Ã¸nsker at gÃ¸re dette?"
+msgstr "Skift til lokal motor vil afbryde dig fra den aktuelle motor!\nEr du sikker pÃ¥, at du Ã¸nsker at gÃ¸re 
dette?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Skift af den eksterne motor vil afbryde dig fra den aktuelle motor!\n"
-"Er du sikker pÃ¥, at du Ã¸nsker at gÃ¸re dette?"
+msgstr "Skift af den eksterne motor vil afbryde dig fra den aktuelle motor!\nEr du sikker pÃ¥, at du Ã¸nsker 
at gÃ¸re dette?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "Dag Ã¦ndret fra {0} til {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "Dag Ã¦ndret til {0}"
@@ -828,63 +854,39 @@ msgstr "Dag Ã¦ndret til {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "Ugyldig filter for regulÃ¦rt udtryk: '{0}'. Ã…rsag: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Er du sikker pÃ¥, at du Ã¸nsker at slette det valgte filter?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-msgid "Network"
-msgstr "NetvÃ¦rk"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protokol / server"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Chattype"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Begivenhed"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Type"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "MÃ¸nster"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Ingen proxy"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "Systemstandard"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Gem"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-msgid "Add"
-msgstr "TilfÃ¸j"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "Ikke-understÃ¸ttet"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "Tilstand for lav bÃ¥ndbredde er aktiv: Ingen beskeder synkroniseret."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -896,29 +898,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Henter brugerlsite for {0} â€¦"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "fÃ¦rdig."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Genforbind"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Lukning af protokolsamtalen vil ogsÃ¥ lukke alle Ã¥bne samtalerum der er "
-"forbundet til den!\n"
-"Er du sikker pÃ¥, at du Ã¸nsker at gÃ¸re dette?"
+msgstr "Lukning af protokolsamtalen vil ogsÃ¥ lukke alle Ã¥bne samtalerum der er forbundet til den!\nEr du 
sikker pÃ¥, at du Ã¸nsker at gÃ¸re dette?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Er du sikker pÃ¥, at du Ã¸nsker at slette den valgte server?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "Kunne ikke redigere server: "
 
@@ -1152,20 +1151,15 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Aktiverer brugen af SSH til forbindelsen. Dette har en "
-"mindre ydelsespÃ¥virkning, men er mere sikker og krÃ¦vet med brug af NAT- "
-"eller portbaserede brandmure (firewalls)</span>"
+msgstr "<span size=\"small\">Aktiverer brugen af SSH til forbindelsen. Dette har en mindre 
ydelsespÃ¥virkning, men er mere sikker og krÃ¦vet med brug af NAT- eller portbaserede brandmure 
(firewalls)</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "SSH-_vÃ¦rt:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
-msgstr ""
-"<span size=\"small\">DNS- eller IP-adresse og port pÃ¥ SSH-serveren</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgstr "<span size=\"small\">DNS- eller IP-adresse og port pÃ¥ SSH-serveren</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
@@ -1174,84 +1168,74 @@ msgid "_Port:"
 msgstr "_Port:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">DNS- eller IP-adresse og port pÃ¥ Smuxiserveren</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">DNS- eller IP-adresse og port pÃ¥ Smuxiserveren</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_SmuxivÃ¦rt:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "_SSH-brugernavn: (valgfri)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">Brugernavn som vil blive brugt til at logge ind pÃ¥ SSH-"
-"serveren</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Brugernavn som vil blive brugt til at logge ind pÃ¥ SSH-serveren</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "_SSH-adgangskode: (valgfri)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">Adgangskode vil blive brugt til at logge ind pÃ¥ SSH-"
-"serveren. Adgangskoden er valgfri hvis SSH-nÃ¸glegodkendelse anvendes (se "
-"nedenfor).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">Adgangskode vil blive brugt til at logge ind pÃ¥ SSH-serveren. Adgangskoden er 
valgfri hvis SSH-nÃ¸glegodkendelse anvendes (se nedenfor).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_SSH-nÃ¸glefil: (valgfri)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "VÃ¦lg en fil"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">SSH-privatnÃ¸glefil vil blive brugt til at logge ind pÃ¥ "
-"SSH-serveren</span>"
+msgstr "<span size=\"small\">SSH-privatnÃ¸glefil vil blive brugt til at logge ind pÃ¥ SSH-serveren</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_Brugernavn:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">Brugernavn som vil blive brugt til at logge ind til "
-"Smuxiserveren</span>"
+msgstr "<span size=\"small\">Brugernavn som vil blive brugt til at logge ind til Smuxiserveren</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">Brugerens adgangskode</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_BekrÃ¦ft adgangskode:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Gentag adgangskoden for bekrÃ¦ftelse</span>"
 
@@ -1261,11 +1245,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Velkommen til konfigurationsassistenten til Smuximotoren.\n"
-"Det er nÃ¸dvendigt at indtaste nogle informationer fÃ¸r du kan bruge motoren.\n"
-"\n"
-"Klik Â»FremadÂ« for at begynde."
+msgstr "Velkommen til konfigurationsassistenten til Smuximotoren.\nDet er nÃ¸dvendigt at indtaste nogle 
informationer fÃ¸r du kan bruge motoren.\n\nKlik Â»FremadÂ« for at begynde."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1285,11 +1265,9 @@ msgstr "Brug som ny standardmotor"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Hvis aktiveret, vil den aktuelle motor vÃ¦re standard "
-"nÃ¦ste gang Smuxi startes</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Hvis aktiveret, vil den aktuelle motor vÃ¦re standard nÃ¦ste gang Smuxi 
startes</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1299,10 +1277,6 @@ msgstr "Smuxi â€” Ã¥ben chat"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi â€” Server"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_VÃ¦rtsnavn:"
@@ -1319,10 +1293,6 @@ msgstr "Brugernavn:"
 msgid "_Protocol:"
 msgstr "_Protokol:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Tilslut automatisk til server ved opstart"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Brug kryptering"
@@ -1338,64 +1308,3 @@ msgstr "Kommandoer _ved tilslutning:"
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_Ignorer kommandoer"
-
-#~ msgid "Character"
-#~ msgstr "Tegn"
-
-#~ msgid "Word"
-#~ msgstr "Ord"
-
-#~ msgid ""
-#~ "This setting specifies if Smuxi should store chat messages in memory "
-#~ "(volatile) or to disk (persistent).\n"
-#~ "For persistent you can choose between Db4o, an object database or SQLite, "
-#~ "a relational database.\n"
-#~ "The Db4o backend has known issues like high memory and CPU usage and can "
-#~ "even lead to crashes and thus it is deprecated.\n"
-#~ "The SQLite backend has no known performance or stability issues and is "
-#~ "the recommended setting."
-#~ msgstr ""
-#~ "Denne indstilling specificerer, om Smuxi skal lagre chatbeskeder i "
-#~ "hukommelsen (flygtigt) eller pÃ¥ disk (vedvarende).\n"
-#~ "For vedvarende kan du vÃ¦lge mellem Db4o, en objektdatabase eller SQLite, "
-#~ "en relationsdatabase.\n"
-#~ "Db4o-motoren har kendte problemstillinger sÃ¥som hÃ¸j hukommelses- og CPU-"
-#~ "forbrug og kan endda fÃ¸re til nedbrud og er derfor forÃ¦ldet.\n"
-#~ "SQLite-motoren har ingen kendte ydelses- eller stabilitetsproblemer og er "
-#~ "den anbefalede indstilling."
-
-#~ msgid "Persistent: SQLite (Recommended)"
-#~ msgstr "Vedvarende: SQLite (anbefalet)"
-
-#~ msgid "Persistent: Db4o (Deprecated)"
-#~ msgstr "Vedvarende: Db4o (forÃ¦ldet)"
-
-#~ msgid "Persistent (Preview)"
-#~ msgstr "Vedvarende (prÃ¸ve)"
-
-#~ msgid "Volatile"
-#~ msgstr "Ustabile"
-
-#~ msgid "Interface"
-#~ msgstr "GrÃ¦nseflade"
-
-#~ msgid "Servers"
-#~ msgstr "Servere"
-
-#~ msgid "Filters"
-#~ msgstr "Filtre"
-
-#~ msgid "Logging"
-#~ msgstr "Logning"
-
-#~ msgid "Nicknames(s) field must not be empty."
-#~ msgstr "Brugernavnsfelter mÃ¥ ikke vÃ¦re tomme."
-
-#~ msgid "Invalid highlight regex: '{0}'. Reason: {1}"
-#~ msgstr "Ugyldigt fremhÃ¦vet regulÃ¦rt udtryk: '{0}'. Ã…rsag: {1}"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protokol:"
-
-#~ msgid "Hostname:"
-#~ msgstr "VÃ¦rtsnavn:"
diff --git a/po-Frontend-GNOME/de.po b/po-Frontend-GNOME/de.po
index 31db31ee..80109f75 100644
--- a/po-Frontend-GNOME/de.po
+++ b/po-Frontend-GNOME/de.po
@@ -1,30 +1,30 @@
-# German translation for smuxi-Frontend-GNOME.
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the smuxi package.
-#
+# This file is distributed under the same license as the PACKAGE package.
+# 
 # Translators:
-# Bianca Mix <heavydemon freenet de>, 2011-2013.
-# JB, 2015.
-# JB, 2014.
-# Mirco Bauer <meebey gmail com>, 2013, 2015.
-# Wasilis Mandratzis-Walz, 2015.
-# Mario BlÃ¤ttermann <mario blaettermann gmail com>, 2016, 2017.
-#
+# Bianca Mix <heavydemon freenet de>, 2011-2013
+# JB, 2014-2015
+# JB, 2015
+# JB, 2014
+# Mario BlÃ¤ttermann <mario blaettermann gmail com>, 2016-2017
+# Mirco Bauer <meebey gmail com>, 2013,2015
+# Vincent Bermel <palob users noreply github com>, 2016
+# Wasilis Mandratzis-Walz, 2015
+# Wasilis Mandratzis-Walz, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:46+0000\n"
-"PO-Revision-Date: 2017-11-16 20:08+0100\n"
-"Last-Translator: Mario BlÃ¤ttermann <mario blaettermann gmail com>\n"
-"Language-Team: German <gnome-de gnome org>\n"
-"Language: de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2018-12-30 13:05+0000\n"
+"Last-Translator: Mirco Bauer <meebey gmail com>\n"
+"Language-Team: German (http://www.transifex.com/meebey/smuxi/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -35,11 +35,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"Der Spitzname, der verwendet werden soll. Sie kÃ¶nnen mehr als einen "
-"Spitznamen angeben, indem Sie Leerzeichen als Trenner verwenden. Diese "
-"werden als AusweichmÃ¶glichkeit benutzt, wenn der Spitzname nicht verfÃ¼gbar "
-"ist. StandardmÃ¤ÃŸig wird $nick_ und $nick__ als AusweichmÃ¶glichkeit verwendet."
+msgstr "Der Spitzname, der verwendet werden soll. Sie kÃ¶nnen mehr als einen Spitznamen angeben, indem Sie 
Leerzeichen als Trenner verwenden. Diese werden als AusweichmÃ¶glichkeit benutzt, wenn der Spitzname nicht 
verfÃ¼gbar ist. StandardmÃ¤ÃŸig wird $nick_ und $nick__ als AusweichmÃ¶glichkeit verwendet."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -139,16 +135,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = Sekunden\n"
-"mm = Minuten\n"
-"hh = Stunden (01 - 12)\n"
-"HH = Stunden (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = Tag\n"
-"MM = Monat\n"
-"yy/yyyy = Jahr"
+msgstr "ss = Sekunden\nmm = Minuten\nhh = Stunden (01 - 12)\nHH = Stunden (00 - 23)\ntt = AM/PM\n\ndd = 
Tag\nMM = Monat\nyy/yyyy = Jahr"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -350,7 +337,8 @@ msgstr "Hintergrund"
 msgid "<b> Color </b>"
 msgstr "<b> Farbe </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_Umbruch-Modus:"
@@ -446,6 +434,28 @@ msgstr "Protokollierung gefilterter Nachrichten"
 msgid "_Logging"
 msgstr "_GeprÃ¤chsprotokollierung"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Server"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Beim Start automatisch zu diesem Server verbinden"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Netzwerk:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Hostname:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -465,11 +475,8 @@ msgstr "Mit anderen Leuten im IRC kommunizieren"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"chat;messaging;sofortnachrichten;im;gnome;gtk;irc;twitter;facebook;gtalk;"
-"xmpp;jabber;campfire;jabbr;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "chat;messaging;sofortnachrichten;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -479,9 +486,7 @@ msgstr "Mit anderen Leuten im IRC, Twitter, Jabber und Campfire kommunizieren"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi ist ein quelloffener, frei verteilter und benutzerfreundlicher Chat-"
-"Client fÃ¼r IRC, Twitter, Jabber/XMPP, Campfire und SignalR's JabbR."
+msgstr "Smuxi ist ein quelloffener, frei verteilter und benutzerfreundlicher Chat-Client fÃ¼r IRC, Twitter, 
Jabber/XMPP, Campfire und SignalR's JabbR."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -489,25 +494,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Inspiriert von der Kombination aus Screen und Irssi hat Smuxi einen "
-"Â»ausklinkbarenÂ« Server (oder wie ein Â»normalerÂ« Client), der in Verbindung "
-"bleibt, wenn Sie getrennt sind, und erlaubt mehrere gleichzeitig verbundene "
-"und aktualisierte Smuxi-Frontends. Dies Ã¤hnelt Screen+Irssi oder IRC "
-"Bouncers, aber eleganter und mÃ¤chtiger."
+msgstr "Inspiriert von der Kombination aus Screen und Irssi hat Smuxi einen Â»ausklinkbarenÂ« Server (oder wie 
ein Â»normalerÂ« Client), der in Verbindung bleibt, wenn Sie getrennt sind, und erlaubt mehrere gleichzeitig 
verbundene und aktualisierte Smuxi-Frontends. Dies Ã¤hnelt Screen+Irssi oder IRC Bouncers, aber eleganter und 
mÃ¤chtiger."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "Das Hauptfenster mit einem IRC-Kanal"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"Mirco Bauer <meebey meebey net>\n"
-"Bianca Mix <heavydemon freenet de>\n"
-"Mario BlÃ¤ttermann <mario blaettermann gmail com>"
+msgstr "Mirco Bauer <meebey meebey net>\nBianca Mix <heavydemon freenet de>\nMario BlÃ¤ttermann <mario 
blaettermann gmail com>"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Smuxi-Webseite"
 
@@ -517,8 +514,7 @@ msgstr "Ups, ich habe es wieder getan â€¦"
 
 #: ../src/Frontend-GNOME/CrashDialog.cs:59
 msgid "Smuxi crashed because an unhandled exception was thrown!"
-msgstr ""
-"Smuxi ist abgestÃ¼rtzt, weil eine unbehandelte Ausnahme aufgetreten ist!"
+msgstr "Smuxi ist abgestÃ¼rtzt, weil eine unbehandelte Ausnahme aufgetreten ist!"
 
 #: ../src/Frontend-GNOME/CrashDialog.cs:63
 msgid "Here is the stacktrace, please report this bug!"
@@ -564,10 +560,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"Ihr Frontend ist nicht zur Engine kompatibel!\n"
-"Engine-Version: {0} Frontend-Version: {1}\n"
-"Engine-Protokoll: {2} Frontend-Protokoll: {3}"
+msgstr "Ihr Frontend ist nicht zur Engine kompatibel!\nEngine-Version: {0} Frontend-Version: 
{1}\nEngine-Protokoll: {2} Frontend-Protokoll: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -588,14 +581,14 @@ msgstr "Fehler: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "MÃ¶chten Sie wirklich die Engine Â»{0}Â« lÃ¶schen?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Sie sind dabei, {0} Zeilen einzufÃ¼gen. MÃ¶chten Sie fortfahren?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Frontend-Befehle"
 
@@ -621,8 +614,7 @@ msgstr "Ã–ffnet den angegebenen Link in Smuxi"
 
 #: ../src/Frontend-GNOME/Main.cs:81
 msgid "Starts a new Smuxi instance and ignores an existing one"
-msgstr ""
-"Startet eine neue Smuxi-Instanz und ignoriert eine existierende Instanz"
+msgstr "Startet eine neue Smuxi-Instanz und ignoriert eine existierende Instanz"
 
 #: ../src/Frontend-GNOME/Main.cs:109
 msgid "Passing link to already running Smuxi instance..."
@@ -641,9 +633,81 @@ msgstr "{0} Benutzer"
 msgid "Sorry, not implemented yet!"
 msgstr "Tut mir leid, das ist noch nicht implementiert!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Zeichen"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Wort"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Legt fest, ob Smuxi Chat-Nachrichten im Speicher (flÃ¼chtig) oder auf der Festplatte (persistent) 
ablegen soll.\nFÃ¼r die persistente Speicherung kÃ¶nnen Sie zwischen Db4o, einer Objektdatenbank, oder SQLite, 
einer relationalen Datenbank.\nDas Db4o-Backend hat bekannte Fehler, wie hohe Speicher- und Prozessorlast. 
Das kann zu AbstÃ¼rzen fÃ¼hren, daher raten wir davon ab.\nDas SQLite-Backend hat keine bekannten Leistungs- 
oder StabilitÃ¤tsprobleme. Es ist die empfohlene Einstellung."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Persistent: SQLite (empfohlen)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Persistent: Db4o (veraltet)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Persistent (Vorschau)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "Volatil"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Kein Proxy"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "System-Standard"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "Verbindung"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "Anzeige"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Server"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filter"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "GeprÃ¤chsprotokollierung"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "Das Spitzname(n)-Feld darf nicht leer sein."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "UngÃ¼ltiger Highlight-Regex: Â»{0}Â«. Ursache: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Name"
 
@@ -653,86 +717,58 @@ msgstr "Thema"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"Vom Suchen nach Gruppen-Chats ohne einen Filter wird abgeraten. Es kÃ¶nnte "
-"eine Weile dauern, oder es funktioniert gar nicht.\n"
-"MÃ¶chten Sie fortfahren?"
+msgstr "Vom Suchen nach Gruppen-Chats ohne einen Filter wird abgeraten. Es kÃ¶nnte eine Weile dauern, oder es 
funktioniert gar nicht.\nMÃ¶chten Sie fortfahren?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Fehler beim Abrufen der Liste fÃ¼r Gruppen-Chats vom Server."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Von der Engine getrennt."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Wiederverbinden zur Engine â€¦ (Versuch {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Grund: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Ein schwerwiegender Fehler ist aufgetreten, der auf eine InkompatibilitÃ¤t "
-"des Protokolls mit dem Smuxi-Server zurÃ¼ckzufÃ¼hren ist!\n"
-"\n"
-"Bitte installieren Sie Mono im Frontend passend zum Smuxi-Server.\n"
-"\n"
-"Weitere Details zu diesem Problem finden Sie hier:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Der Server hat die Verbindung zum Frontend verloren.\n"
-"MÃ¶chten Sie diese nun erneut aufbauen?"
+msgstr "Der Server hat die Verbindung zum Frontend verloren.\nMÃ¶chten Sie diese nun erneut aufbauen?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"Erneute Verbindung zum Server ist fehlgeschlagen.\n"
-"MÃ¶chten Sie es nochmals versuchen?"
+msgstr "Erneute Verbindung zum Server ist fehlgeschlagen.\nMÃ¶chten Sie es nochmals versuchen?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Der Server hat die Verbindung zum Frontend verloren.\n"
-"MÃ¶chten Sie diese nun erneut aufbauen?"
+msgstr "Der Server hat die Verbindung zum Frontend verloren.\nMÃ¶chten Sie diese nun erneut aufbauen?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Anzeigen"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -741,49 +777,43 @@ msgid "Unable to load server: "
 msgstr "Laden des Servers nicht mÃ¶glich: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Person / Privat"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Gruppe / Ã–ffentlich"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Engine-Assistent - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "Smuxi-Engine hinzufÃ¼gen"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Smuxi-Engine bearbeiten"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "Verbindung"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Nun kÃ¶nnen Sie die Smuxi-Engine verwenden"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "Vielen Dank"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
-msgstr ""
-"Es existiert bereits eine Engine mit diesem Namen! Bitte geben Sie einen "
-"anderen an."
+msgstr "Es existiert bereits eine Engine mit diesem Namen! Bitte geben Sie einen anderen an."
 
 #: ../src/Frontend-GNOME/Views/JoinWidget.cs:89
 msgid "Enter which chat to join"
@@ -798,34 +828,29 @@ msgstr "Info zu Smuxi"
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "Fehler beim HinzufÃ¼gen des Servers: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Das Wechseln zur lokalen Engine wird Sie von der jetzigen Engine trennen!\n"
-"MÃ¶chten Sie fortfahren?"
+msgstr "Das Wechseln zur lokalen Engine wird Sie von der jetzigen Engine trennen!\nMÃ¶chten Sie fortfahren?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Das Wechseln zur entfernten Engine wird Sie von der jetzigen Engine "
-"trennen!\n"
-"MÃ¶chten Sie fortfahren?"
+msgstr "Das Wechseln zur entfernten Engine wird Sie von der jetzigen Engine trennen!\nMÃ¶chten Sie 
fortfahren?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "Tag wechselte vom {0} zum {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "Tageswechsel: {0}"
@@ -836,63 +861,39 @@ msgstr "Tageswechsel: {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "UngÃ¼ltiger Filter-Regex: Â»{0}Â«. Ursache: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "MÃ¶chten Sie den ausgewÃ¤hlten Filter wirklich lÃ¶schen?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-msgid "Network"
-msgstr "Netzwerk"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protokoll / Server"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "GesprÃ¤chstyp"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "Muster"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Kein Proxy"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "System-Standard"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Speichern"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-msgid "Add"
-msgstr "HinzufÃ¼gen"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "Nicht unterstÃ¼tzt"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "Geringe-Bandbreite-Modus ist aktiviert: Keine Nachrichten abgeglichen."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -904,29 +905,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Benutzer-Liste fÃ¼r {0} wird abgerufen â€¦"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "abgeschlossen."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Wiederverbinden"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Das SchlieÃŸen des Protokoll-Chats wird alle dazugehÃ¶rigen Chats ebenfalls "
-"schlieÃŸen!\n"
-"MÃ¶chten Sie fortfahren?"
+msgstr "Das SchlieÃŸen des Protokoll-Chats wird alle dazugehÃ¶rigen Chats ebenfalls schlieÃŸen!\nMÃ¶chten Sie 
fortfahren?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "MÃ¶chten Sie den ausgewÃ¤hlten Server wirklich lÃ¶schen?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "Bearbeiten des Servers nicht mÃ¶glich: "
 
@@ -1160,20 +1158,15 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Aktiviert die Verwendung von SSH fÃ¼r die Verbindung. "
-"Dies hat Einfluss auf die Leistung, ist jedoch sicherer und notwendig, wenn "
-"NAT oder Port-basierte Firewalls verwendet werden.</span>"
+msgstr "<span size=\"small\">Aktiviert die Verwendung von SSH fÃ¼r die Verbindung. Dies hat Einfluss auf die 
Leistung, ist jedoch sicherer und notwendig, wenn NAT oder Port-basierte Firewalls verwendet werden.</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "SSH-_Host:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
-msgstr ""
-"<span size=\"small\">DNS oder IP-Adresse und Port des SSH-Servers</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgstr "<span size=\"small\">DNS oder IP-Adresse und Port des SSH-Servers</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
@@ -1182,87 +1175,76 @@ msgid "_Port:"
 msgstr "_Port:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">DNS oder IP-Adresse und Port des Smuxi-Servers</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">DNS oder IP-Adresse und Port des Smuxi-Servers</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_Smuxi-Host:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "_SSH-Benutzername: (optional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">Benutzername, welcher zur Anmeldung beim SSH-Server "
-"verwendet werden soll</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Benutzername, welcher zur Anmeldung beim SSH-Server verwendet werden 
soll</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "_SSH-Passwort: (optional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">Passwort, welches zur Anmeldung am SSH-Server benutzt "
-"wird. Das Passwort ist optional, wenn Autorisierung mit SSH-SchlÃ¼sseln "
-"benutzt wird (siehe unten).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">Passwort, welches zur Anmeldung am SSH-Server benutzt wird. Das Passwort ist 
optional, wenn Autorisierung mit SSH-SchlÃ¼sseln benutzt wird (siehe unten).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_SSH-SchlÃ¼ssel-Datei: (optional)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "Datei auswÃ¤hlen"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Geheime SSH-SchlÃ¼ssel-Datei, die fÃ¼r die Anmeldung am "
-"SSH-Server verwendet wird</span>"
+msgstr "<span size=\"small\">Geheime SSH-SchlÃ¼ssel-Datei, die fÃ¼r die Anmeldung am SSH-Server verwendet 
wird</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">Benutzername, welcher zur Anmeldung beim Smuxi-Server "
-"verwendet werden soll</span>"
+msgstr "<span size=\"small\">Benutzername, welcher zur Anmeldung beim Smuxi-Server verwendet werden 
soll</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">Passwort des Benutzers</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "Passwort _bestÃ¤tigen:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
-msgstr ""
-"<span size=\"small\">Wiederholen Sie das Passwort zur ÃœberprÃ¼fung</span>"
+msgstr "<span size=\"small\">Wiederholen Sie das Passwort zur ÃœberprÃ¼fung</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantIntroWidget.cs:19
 msgid ""
@@ -1270,12 +1252,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Willkommen beim Engine-Konfigurations-Assistenten von Smuxi.\n"
-"Sie mÃ¼ssen einige Informationen eingeben, bevor Sie diese Engine nutzen "
-"kÃ¶nnen.\n"
-"\n"
-"Klicken Sie auf Â»WeiterÂ«, um zu beginnen."
+msgstr "Willkommen beim Engine-Konfigurations-Assistenten von Smuxi.\nSie mÃ¼ssen einige Informationen 
eingeben, bevor Sie diese Engine nutzen kÃ¶nnen.\n\nKlicken Sie auf Â»WeiterÂ«, um zu beginnen."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1295,11 +1272,9 @@ msgstr "Als neue Standard-Engine verwenden"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Wenn dies aktiviert ist, wird die Engine standardmÃ¤ÃŸig "
-"beim nÃ¤chsten Start von Smuxi verwendet</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Wenn dies aktiviert ist, wird die Engine standardmÃ¤ÃŸig beim nÃ¤chsten Start von 
Smuxi verwendet</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1309,10 +1284,6 @@ msgstr "Smuxi - Chat Ã¶ffnen"
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi - Server"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Hostname:"
@@ -1329,10 +1300,6 @@ msgstr "Spitzname:"
 msgid "_Protocol:"
 msgstr "_Protokoll:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Beim Start automatisch zu diesem Server verbinden"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "VerschlÃ¼sselung verwenden"
diff --git a/po-Frontend-GNOME/es.po b/po-Frontend-GNOME/es.po
index d54a4c33..d6618c17 100644
--- a/po-Frontend-GNOME/es.po
+++ b/po-Frontend-GNOME/es.po
@@ -1,27 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Daniel Mustieles <daniel mustieles gmail com>, 2015,2018
 # Diego Garcia Mendoza <diegogarciamendoza gmail com>, 2015
 # MatÃas Bellone, 2013-2014
 # Ricardo A. Hermosilla Carrillo <inactive+rahermosillac transifex com>, 2012
-# Daniel Mustieles <daniel mustieles gmail com>, 2015, 2018.
-#
+# Ricardo A. Hermosilla Carrillo <inactive+rahermosillac transifex com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/smuxi/issues\n";
-"POT-Creation-Date: 2018-06-10 18:19+0000\n"
-"PO-Revision-Date: 2018-06-22 11:55+0200\n"
-"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
-"Language-Team: es <gnome-es-list gnome org>\n"
-"Language: es\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 13:27+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Spanish (http://www.transifex.com/meebey/smuxi/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -32,11 +31,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"El nick que usar. Puede especificar nicks adicionales (separados por "
-"espacios) que serÃ¡n usados como opciones de respaldo cuando la primera no "
-"estÃ© disponible. De forma predeterminada se utilizarÃ¡ $nick_ y $nick__ como "
-"respaldos."
+msgstr "El nick que usar. Puede especificar nicks adicionales (separados por espacios) que serÃ¡n usados como 
opciones de respaldo cuando la primera no estÃ© disponible. De forma predeterminada se utilizarÃ¡ $nick_ y 
$nick__ como respaldos."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -136,16 +131,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = segundos\n"
-"mm = minutos\n"
-"hh = hora (01 - 12)\n"
-"HH = hora (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = dÃa\n"
-"MM = mes\n"
-"yy/yyyy = aÃ±o"
+msgstr "ss = segundos\nmm = minutos\nhh = hora (01 - 12)\nHH = hora (00 - 23)\ntt = AM/PM\n\ndd = dÃa\nMM = 
mes\nyy/yyyy = aÃ±o"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -347,7 +333,8 @@ msgstr "Fondo"
 msgid "<b> Color </b>"
 msgstr "<b> Color </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_Modo de alineaciÃ³n"
@@ -443,6 +430,28 @@ msgstr "Registrar mensajes filtrados"
 msgid "_Logging"
 msgstr "_Registros"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Servidor"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Conectar automÃ¡ticamente al servidor al iniciar"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Red:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Nombre del equipo:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -462,11 +471,8 @@ msgstr "Charla con otras personas en IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"chat;mensajerÃa;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "chat;mensajerÃa;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -476,9 +482,7 @@ msgstr "Charla con otras personas en IRC, Twitter, Jabber and Campfire"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi es un cliente de chat de software libre, distribuÃdo y amigable para "
-"IRC, Twitter, Jabber/XMPP, Campfire y SignalR's JabbR."
+msgstr "Smuxi es un cliente de chat de software libre, distribuÃdo y amigable para IRC, Twitter, 
Jabber/XMPP, Campfire y SignalR's JabbR."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -486,25 +490,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Inspirado en la combinaciÃ³n de Â«screenÂ» e Â«irssiÂ», Smuxi tiene un servidor "
-"desacoplable (o como un cliente Â«normalÂ») que sigue conectado cuando el "
-"usuario no estÃ¡, y que permite varios que Â«frontendÂ» de Smuxi se conecten y "
-"se sincronicen. Esto es similar a screen+irssi o balanceadores IRC, pero mÃ¡s "
-"elegante y potente."
+msgstr "Inspirado en la combinaciÃ³n de Â«screenÂ» e Â«irssiÂ», Smuxi tiene un servidor desacoplable (o como un 
cliente Â«normalÂ») que sigue conectado cuando el usuario no estÃ¡, y que permite varios que Â«frontendÂ» de Smuxi 
se conecten y se sincronicen. Esto es similar a screen+irssi o balanceadores IRC, pero mÃ¡s elegante y 
potente."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "La ventana principal mostrando un canal de IRC"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"Daniel Mustieles <daniel mustieles gmail com>, 2015\n"
-"Juan Miguel Carrero <streinleght gmail com>,\n"
-"MatÃas Bellone <matiasbellone+l10n gmail com>"
+msgstr "Daniel Mustieles <daniel mustieles gmail com>, 2015\nJuan Miguel Carrero <streinleght gmail 
com>,\nMatÃas Bellone <matiasbellone+l10n gmail com>"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Sitio web de Smuxi"
 
@@ -560,10 +556,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"Su Â«frontendÂ» con es compatible con el motor.\n"
-"VersiÃ³n del motor: {0} VersiÃ³n del Â«frontendÂ»: {1}\n"
-"Protocolo del motor: {2} Protocolo del Â«frontendÂ»: {3}"
+msgstr "Su Â«frontendÂ» con es compatible con el motor.\nVersiÃ³n del motor: {0} VersiÃ³n del Â«frontendÂ»: 
{1}\nProtocolo del motor: {2} Protocolo del Â«frontendÂ»: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -584,14 +577,14 @@ msgstr "Error: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Â¿Seguro que desea borrar el motor Â«{0}Â»?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Va a pegar {0} lÃneas Â¿desea continuar?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Ã“rdenes de interfaz"
 
@@ -625,8 +618,7 @@ msgstr "Pasando enlace a una instancia de Smuxi que ya estÃ¡ en ejecuciÃ³n..."
 
 #: ../src/Frontend-GNOME/Main.cs:117
 msgid "Bringing already running Smuxi instance to foreground..."
-msgstr ""
-"Mostrando en primer plano una instancia de Smuxi que ya esta corriendo..."
+msgstr "Mostrando en primer plano una instancia de Smuxi que ya esta corriendo..."
 
 #: ../src/Frontend-GNOME/MainWindow.cs:374
 #, csharp-format
@@ -637,9 +629,81 @@ msgstr "{0} Usuarios"
 msgid "Sorry, not implemented yet!"
 msgstr "AÃºn no estÃ¡ implementado"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "CarÃ¡cter"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Palabra"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Esta opciÃ³n de configuraciÃ³n especifica si Smuxi debe guardar los mensajes de chat en la memoria 
(volÃ¡til) o en el disco (persistente).\nPara que sea persistente puede elegir enre Db4o, una base de datos de 
objetos, o SQLite, una base de datos relacional.\nEl Â«backendÂ» de Db4o tiene problemas conocidos como un alto 
uso de memoria y de CPU e incluso que puede falla, y por esto estÃ¡ obsoleto.\nEl Â«backendÂ» de SQLite no tiene 
problemas de estabilidad o rendimiento conocidos y es la opciÃ³n recomendada."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Persistente: SQLite (recomendado)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Persistente: Db4o (obsoleto)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Persistente (vista previa)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "VolÃ¡til"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Sin proxy"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Predeterminado del sistema"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "ConexiÃ³n"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "Interfaz"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filtros"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Registros"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "El campo Nick(s) no debe estar vacÃo."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "ExpresiÃ³n regular para resaltado no vÃ¡lida: Â«{0}Â». RazÃ³n: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Nombre"
 
@@ -649,87 +713,58 @@ msgstr "Topic"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"No se recomienda buscar chats de grupo sin un filtro. Esto puede tardar "
-"bastante o puede no funcionar.\n"
-"Â¿Desea continuar?"
+msgstr "No se recomienda buscar chats de grupo sin un filtro. Esto puede tardar bastante o puede no 
funcionar.\nÂ¿Desea continuar?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
-msgstr ""
-"OcurriÃ³ un error durante la carga de la lista de chats de grupo del servidor."
+msgstr "OcurriÃ³ un error durante la carga de la lista de chats de grupo del servidor."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Desconectado del motor."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Reconectando al motor... (intento {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Motivo: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Se ha detectado un error grave debido a la incompatibilidad del protocolo "
-"con smuxi-server!\n"
-"\n"
-"Instale Mono en el frontal para que coincida con smuxi-server.\n"
-"\n"
-"Puede obtener mÃ¡s detalles sobre este problema aquÃ:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"La interfaz perdiÃ³ la conexiÃ³n con el servidor.\n"
-"Â¿Desea volver a conectarse ahora?"
+msgstr "La interfaz perdiÃ³ la conexiÃ³n con el servidor.\nÂ¿Desea volver a conectarse ahora?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"FallÃ³ la reconexiÃ³n con el servidor.\n"
-"Â¿Desea volver a intentarlo?"
+msgstr "FallÃ³ la reconexiÃ³n con el servidor.\nÂ¿Desea volver a intentarlo?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"El servidor perdiÃ³ la conexiÃ³n con la interfaz.\n"
-"Â¿Desea reconectar ahora?"
+msgstr "El servidor perdiÃ³ la conexiÃ³n con la interfaz.\nÂ¿Desea reconectar ahora?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Mostrar"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Nombre del equipo"
 
@@ -738,44 +773,40 @@ msgid "Unable to load server: "
 msgstr "No se pudo cargar el servidor:"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Persona / Privado"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Grupo / PÃºblico"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Smuxi - Asistente de motores"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "Agregar motor a Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Editar motor de Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "ConexiÃ³n"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Ahora puede utilizar el motor de Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "Gracias"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "Â¡Ya existe un motor con ese nombre! Especifique uno diferente."
@@ -793,33 +824,29 @@ msgstr "Sobre Smuxi"
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "No se pudo agregar el servidor: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Â¡Cambiar al motor local lo desconectarÃ¡ del motor actual!\n"
-"Â¿Seguro que desea continuar?"
+msgstr "Â¡Cambiar al motor local lo desconectarÃ¡ del motor actual!\nÂ¿Seguro que desea continuar?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Â¡Cambiar al motor remoto lo desconectarÃ¡ del motor actual!\n"
-"Â¿Seguro que desea continuar?"
+msgstr "Â¡Cambiar al motor remoto lo desconectarÃ¡ del motor actual!\nÂ¿Seguro que desea continuar?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "CambiÃ³ el dÃa de {0} a {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "CambiÃ³ el dÃa a {0}"
@@ -830,65 +857,39 @@ msgstr "CambiÃ³ el dÃa a {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "ExpresiÃ³n regularde filtro no vÃ¡lida: Â«{0}Â». RazÃ³n: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Â¿Seguro que desea borrar el filtro seleccionado?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-#| msgid "Network:"
-msgid "Network"
-msgstr "Red"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protocolo / Servidor"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Tipo de chat"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Tipo:"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "PatrÃ³n"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Sin proxy"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "Predeterminado del sistema"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Guardar"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-#| msgid "_Add"
-msgid "Add"
-msgstr "AnÌƒadir"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "No soportado"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "Modo de bajo ancho de banda activado: no se sincronizaron mensajes."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -900,28 +901,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Obteniendo la lista de usuarios para {0}"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "hecho."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Â¡Cerrar el protocolo tambiÃ©n cerrarÃ¡ todos los chats abiertos en Ã©l!\n"
-"Â¿Seguro que desea continuar?"
+msgstr "Â¡Cerrar el protocolo tambiÃ©n cerrarÃ¡ todos los chats abiertos en Ã©l!\nÂ¿Seguro que desea continuar?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Â¿Seguro que desea borrar el servidor seleccionado?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "No se puede editar el servidor:"
 
@@ -1155,20 +1154,15 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Permite el uso de SSH para la conexiÃ³n. Esto conlleva a "
-"una pequeÃ±a baja en el rendimiento , pero se aumenta la seguridad y es un "
-"requisito cuando utiliza NAT o un cortafuegos basado en puertos</span>"
+msgstr "<span size=\"small\">Permite el uso de SSH para la conexiÃ³n. Esto conlleva a una pequeÃ±a baja en el 
rendimiento , pero se aumenta la seguridad y es un requisito cuando utiliza NAT o un cortafuegos basado en 
puertos</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "_Servidor SSH:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
-msgstr ""
-"<span size=\"small\">DNS o direcciÃ³n IP y puerto del servidor SSH</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgstr "<span size=\"small\">DNS o direcciÃ³n IP y puerto del servidor SSH</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
@@ -1177,83 +1171,74 @@ msgid "_Port:"
 msgstr "_Puerto:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">DNS o direcciÃ³n IP y puerto del servidor Smuxi</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">DNS o direcciÃ³n IP y puerto del servidor Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_Servidor Smuxi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "Nombre de _usuario SSH: (opcional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">Nombre de usuario para iniciar sesiÃ³n en el servidor "
-"SSH</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Nombre de usuario para iniciar sesiÃ³n en el servidor SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "ContraseÃ±a _SSH: (opcional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">ContraseÃ±a para iniciar sesiÃ³n el servidor SSH. La "
-"contraseÃ±a es opcional utiliza una clave SSH (revise mÃ¡s abajo).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">ContraseÃ±a para iniciar sesiÃ³n el servidor SSH. La contraseÃ±a es opcional 
utiliza una clave SSH (revise mÃ¡s abajo).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "Archivo de claves _SSH: (opcional)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Archivo privaod de claves SSH para iniciar sesiÃ³n en el "
-"servidor SSH</span>"
+msgstr "<span size=\"small\">Archivo privaod de claves SSH para iniciar sesiÃ³n en el servidor SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">Nombre de usuario para iniciar sesiÃ³n en el servidor "
-"Smuxi</span>"
+msgstr "<span size=\"small\">Nombre de usuario para iniciar sesiÃ³n en el servidor Smuxi</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_ContraseÃ±a:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">ContraseÃ±a del usuario</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_Verificar contraseÃ±a:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Repita la contraseÃ±a para verificaciÃ³n</span>"
 
@@ -1263,11 +1248,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Bienvenido al asistente de configuraciÃ³n del motor de Smuxi.\n"
-"Necesita ingresar alguna informaciÃ³n antes de poder utilizar el motor.\n"
-"\n"
-"Pulse en Â«AvanzarÂ» para empezar."
+msgstr "Bienvenido al asistente de configuraciÃ³n del motor de Smuxi.\nNecesita ingresar alguna informaciÃ³n 
antes de poder utilizar el motor.\n\nPulse en Â«AvanzarÂ» para empezar."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1287,11 +1268,9 @@ msgstr "Utilizar como nuevo motor predeterminado"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Si estÃ¡ habilitada, el motor actual serÃ¡ utilizado como "
-"predeterminado por Smuxi la prÃ³xima vez que inicie</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Si estÃ¡ habilitada, el motor actual serÃ¡ utilizado como predeterminado por 
Smuxi la prÃ³xima vez que inicie</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1301,10 +1280,6 @@ msgstr "Smuxi - Chat abierto"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi - Servidor"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "Nombre del _equipo:"
@@ -1321,10 +1296,6 @@ msgstr "Apodo:"
 msgid "_Protocol:"
 msgstr "_Protocolo:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Conectar automÃ¡ticamente al servidor al iniciar"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Usar cifrado"
@@ -1340,64 +1311,3 @@ msgstr "_Ã“rdenes al conectar:"
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_Ignorar Ã³rdenes"
-
-#~ msgid "Character"
-#~ msgstr "CarÃ¡cter"
-
-#~ msgid "Word"
-#~ msgstr "Palabra"
-
-#~ msgid ""
-#~ "This setting specifies if Smuxi should store chat messages in memory "
-#~ "(volatile) or to disk (persistent).\n"
-#~ "For persistent you can choose between Db4o, an object database or SQLite, "
-#~ "a relational database.\n"
-#~ "The Db4o backend has known issues like high memory and CPU usage and can "
-#~ "even lead to crashes and thus it is deprecated.\n"
-#~ "The SQLite backend has no known performance or stability issues and is "
-#~ "the recommended setting."
-#~ msgstr ""
-#~ "Esta opciÃ³n de configuraciÃ³n especifica si Smuxi debe guardar los "
-#~ "mensajes de chat en la memoria (volÃ¡til) o en el disco (persistente).\n"
-#~ "Para que sea persistente puede elegir enre Db4o, una base de datos de "
-#~ "objetos, o SQLite, una base de datos relacional.\n"
-#~ "El Â«backendÂ» de Db4o tiene problemas conocidos como un alto uso de "
-#~ "memoria y de CPU e incluso que puede falla, y por esto estÃ¡ obsoleto.\n"
-#~ "El Â«backendÂ» de SQLite no tiene problemas de estabilidad o rendimiento "
-#~ "conocidos y es la opciÃ³n recomendada."
-
-#~ msgid "Persistent: SQLite (Recommended)"
-#~ msgstr "Persistente: SQLite (recomendado)"
-
-#~ msgid "Persistent: Db4o (Deprecated)"
-#~ msgstr "Persistente: Db4o (obsoleto)"
-
-#~ msgid "Persistent (Preview)"
-#~ msgstr "Persistente (vista previa)"
-
-#~ msgid "Volatile"
-#~ msgstr "VolÃ¡til"
-
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgid "Filters"
-#~ msgstr "Filtros"
-
-#~ msgid "Logging"
-#~ msgstr "Registros"
-
-#~ msgid "Nicknames(s) field must not be empty."
-#~ msgstr "El campo Nick(s) no debe estar vacÃo."
-
-#~ msgid "Invalid highlight regex: '{0}'. Reason: {1}"
-#~ msgstr "ExpresiÃ³n regular para resaltado no vÃ¡lida: Â«{0}Â». RazÃ³n: {1}"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protocolo:"
-
-#~ msgid "Hostname:"
-#~ msgstr "Nombre del equipo:"
diff --git a/po-Frontend-GNOME/fa.po b/po-Frontend-GNOME/fa.po
index 6f25807f..182c1dd5 100644
--- a/po-Frontend-GNOME/fa.po
+++ b/po-Frontend-GNOME/fa.po
@@ -8,19 +8,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:04+0100\n"
-"PO-Revision-Date: 2013-12-05 19:06+0000\n"
-"Last-Translator: Mirco Bauer <meebey gmail com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/smuxi/language/fa/)\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Persian (http://www.transifex.com/meebey/smuxi/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Smuxi"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:2
 msgid ""
@@ -40,6 +40,7 @@ msgstr ""
 
 #: ../glade/smuxi-frontend-gnome.glade.h:5
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:147
 msgid "Realname:"
 msgstr "Ù†Ø§Ù… ØÙ‚ÛŒÙ‚ÛŒ:"
 
@@ -50,7 +51,7 @@ msgstr "Ø§Ù†Ú©ÙˆØ¯ÛŒÙ†Ú¯:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:7
 msgid "Automatically convert UTF-8 characters"
-msgstr ""
+msgstr "ØªØ¨Ø¯ÛŒÙ„ Ø®ÙˆØ¯Ú©Ø§Ø± ØØ±ÙˆÙ UTF-8"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:8
 msgid "<b>General</b>"
@@ -73,7 +74,7 @@ msgid "Port:"
 msgstr "Ø¯Ø±Ú¯Ø§Ù‡:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:13
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:170
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
 msgid "Show Password"
 msgstr "Ù†Ù…Ø§ÛŒØ´ Ø±Ù…Ø²"
 
@@ -262,7 +263,7 @@ msgstr ""
 
 #: ../glade/smuxi-frontend-gnome.glade.h:54
 msgid "Tree"
-msgstr ""
+msgstr "Ø¯Ø±Ø®Øª"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:55
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1092
@@ -431,7 +432,7 @@ msgid "Smuxi - Server"
 msgstr ""
 
 #: ../glade/smuxi-frontend-gnome.glade.h:93
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:209
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
 msgid "Automatically connect to server at startup"
 msgstr "ÙˆØµÙ„ Ø´Ø¯Ù† Ø®ÙˆØ¯Ú©Ø§Ø± Ø¨Ù‡ Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ø´Ø±ÙˆØ¹"
 
@@ -448,8 +449,9 @@ msgid "Hostname:"
 msgstr "Ù†Ø§Ù… Ù…ÛŒØ²Ø¨Ø§Ù†:"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
-msgstr ""
+msgstr "Smuxi"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:2
 msgid "IRC Chat"
@@ -463,11 +465,38 @@ msgstr ""
 msgid "Chat with other people on IRC"
 msgstr ""
 
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
+msgid ""
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+msgid ""
+"Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
+"Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
+msgid ""
+"Inspired by the combination of screen and irssi, Smuxi has a detachable "
+"server (or like a \"normal\" client) that stays connected when you aren't, "
+"and can allow multiple Smuxi frontends to be connected and in sync. This is "
+"similar to screen+irssi or IRC bouncers, but more elegant and powerful."
+msgstr ""
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
+msgid "The main window showing an IRC channel"
+msgstr ""
+
 #: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:73
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr ""
 
@@ -487,133 +516,189 @@ msgstr ""
 msgid "_Report Bug"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:66
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:61
 msgid "Engine not found."
-msgstr ""
+msgstr "Ù…ÙˆØªÙˆØ± ÛŒØ§ÙØª Ù†Ø´Ø¯"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:81
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:77
 msgid "Engine Manager"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:100
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:96
 msgid "Select which Smuxi engine you want to connect to"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:106
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:102
 msgid "Engine:"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:117
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:113
 msgid "Use Low Bandwidth Mode"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØØ§Ù„Øª Ù¾Ù‡Ù†Ø§ÛŒ Ø¨Ø§Ù†Ø¯ Ú©Ù…"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:141
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:201
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:383
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:137
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:197
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:382
 msgid "Local Engine"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:193
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:189
 msgid "Please select an engine!"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:219
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:212
 #, csharp-format
-msgid "Your frontend version ({0}) does not match the engine version ({1})!"
+msgid ""
+"Your frontend is not compatible with the engine!\n"
+"Engine Version: {0} Frontend Version: {1}\n"
+"Engine Protocol: {2} Frontend Protocol: {3}"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:246
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:247
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:246
 #, csharp-format
 msgid "Engine URL: {0}"
 msgstr ""
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:250
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:249
 #, csharp-format
 msgid "Error: {0}"
-msgstr ""
+msgstr "Ø®Ø·Ø§: {0}"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:320
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:319
 #, csharp-format
 msgid "Are you sure you want to delete the engine \"{0}\"?"
-msgstr ""
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ Ú©Ù‡ Ù…ÛŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù…ÙˆØªÙˆØ± {0} Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
-#: ../src/Frontend-GNOME/Entry.cs:484
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
-msgstr ""
+msgstr "Ø´Ù…Ø§ Ø¯Ø± Ø¬Ø§Ù„ Ø¬Ø§ÛŒÚ¯Ø²Ø§Ø±ÛŒ {0} Ø®Ø· Ù†ÙˆØ´ØªÙ‡ Ù‡Ø³ØªÛŒØ¯.Ø¢ÛŒØ§ Ù…ÛŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§Ø¯Ø§Ù…Ù‡ Ø¯Ù‡ÛŒØ¯ØŸ"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:601
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr ""
 
+#: ../src/Frontend-GNOME/Main.cs:49
+msgid "Enable debug output"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:56
+msgid "Show this help"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:60
+msgid "Options:"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:67
+msgid "Connect to engine"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:74
+msgid "Opens the specified link in Smuxi"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:81
+msgid "Starts a new Smuxi instance and ignores an existing one"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:109
+msgid "Passing link to already running Smuxi instance..."
+msgstr ""
+
+#: ../src/Frontend-GNOME/Main.cs:117
+msgid "Bringing already running Smuxi instance to foreground..."
+msgstr ""
+
+#: ../src/Frontend-GNOME/MainWindow.cs:374
+#, csharp-format
+msgid "{0} Users"
+msgstr ""
+
 #: ../src/Frontend-GNOME/NotImplementedMessageDialog.cs:40
 msgid "Sorry, not implemented yet!"
-msgstr ""
+msgstr "Ù…ØªØ§Ø³ÙÛŒÙ…, Ù‡Ù†ÙˆØ² Ù¾ÛŒØ§Ø¯Ù‡ Ø³Ø§Ø²ÛŒ Ù†Ø´Ø¯Ù‡!"
 
 #. fill ListStore
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:185
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
 msgid "Character"
-msgstr ""
+msgstr "ØØ±Ù"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:186
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
 msgid "Word"
+msgstr "ÙˆØ§Ú˜Ù‡"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
 msgstr ""
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:203
-msgid "Volatile"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:205
-msgid "Persistent"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:228
-msgid "No Proxy"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:230
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:326
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "ÙØ±Ø§Ø±"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Ø¨Ø¯ÙˆÙ† ÙˆØ§Ø³Ø·Ù‡"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
 msgid "System Default"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:140
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
 msgid "Connection"
-msgstr ""
+msgstr "Ø§Ø±ØªØ¨Ø§Ø·"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:248
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
 msgid "Interface"
-msgstr ""
+msgstr "Ø±Ø§Ø¨Ø·"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:252
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
 msgid "Servers"
-msgstr ""
+msgstr "Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡ Ù‡Ø§"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:259
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
 msgid "Filters"
-msgstr ""
+msgstr "ÙÛŒÙ„ØªØ± Ù‡Ø§"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:263
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
 msgid "Logging"
-msgstr ""
+msgstr "Ø«Ø¨Øª ØµÙˆØ±Øª Ø¹Ù…Ù„ÛŒØ§Øª"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:682
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
 msgid "Nicknames(s) field must not be empty."
 msgstr ""
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:878
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
 #, csharp-format
 msgid "Invalid highlight regex: '{0}'. Reason: {1}"
 msgstr ""
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:106
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr ""
@@ -630,35 +715,35 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± Ú¯Ø±ÙØªÙ† Ù„ÛŒØ³Øª Ú†Øª Ù‡Ø§ÛŒ Ú¯Ø±ÙˆÙ‡ÛŒ Ø§Ø² Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡."
 
-#: ../src/Frontend-GNOME/Frontend.cs:401
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
-msgstr ""
+msgstr "Ø§Ø² Ù…ÙˆØªÙˆØ± Ù‚Ø·Ø¹ Ø´Ø¯."
 
-#: ../src/Frontend-GNOME/Frontend.cs:443
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
-msgstr ""
+msgstr "Ø§ØªØµØ§Ù„ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ù‡ Ù…ÙˆØªÙˆØ±... (Ú©ÙˆØ´Ø´ {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:548
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Frontend.cs:680
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Frontend.cs:699
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Frontend.cs:1007
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
@@ -681,7 +766,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:162
 msgid "Unable to load server: "
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
@@ -693,31 +778,31 @@ msgstr ""
 msgid "Group / Public"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:71
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:93
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:95
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:204
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:284
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:287
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr ""
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:304
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr ""
@@ -728,39 +813,39 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/Views/MenuWidget.cs:153
 msgid "About Smuxi"
-msgstr ""
+msgstr "Ø¯Ø±Ø¨Ø§Ø±Ù‡ Smuxi"
 
 #. TODO: add cmd+, accelerator
 #: ../src/Frontend-GNOME/Views/MenuWidget.cs:157
 msgid "Preferences"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:251
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
-msgstr ""
+msgstr "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:372
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
+msgstr "Ø±Ø§Ù‡ Ú¯Ø²ÛŒÙ†ÛŒ Ø¨Ù‡ Ù…ÙˆØªÙˆØ± Ù…ØÙ„ÛŒ Ø¨Ø§Ø¹Ø« Ù…ÛŒØ´ÙˆØ¯ Ú©Ù‡ Ø§Ø² Ù…ÙˆØªÙˆØ± ÙØ¹Ù„ÛŒ Ù‚Ø·Ø¹ Ø´ÙˆÛŒØ¯!Ø¢ÛŒØ§ Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ†Ø¬Ø§Ù… Ø§ÛŒÙ† Ú©Ø§Ø± Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ØŸ"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:416
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
+msgstr "Ø±Ø§Ù‡ Ú¯Ø²ÛŒÙ†ÛŒ Ø¨Ù‡ Ù…ÙˆØªÙˆØ± Ø¯ÙˆØ± Ø¨Ø§Ø¹Ø« Ù…ÛŒØ´ÙˆØ¯ Ú©Ù‡ Ø§Ø² Ù…ÙˆØªÙˆØ± ÙØ¹Ù„ÛŒ Ù‚Ø·Ø¹ Ø´ÙˆÛŒØ¯!Ø¢ÛŒØ§ Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ†Ø¬Ø§Ù… Ø§ÛŒÙ† Ú©Ø§Ø± Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ØŸ"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:288
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
-msgstr ""
+msgstr "ØªØ§Ø±ÛŒØ® Ø§Ø² {0} Ø¨Ù‡ {1} ØªØºÛŒÛŒØ± Ú©Ø±Ø¯."
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:292
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
-msgstr ""
+msgstr "ØªØ§Ø±ÛŒØ® Ø¨Ù‡ {0} ØªØºÛŒÛŒØ± Ú©Ø±Ø¯."
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:120
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:130
@@ -770,7 +855,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
-msgstr ""
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ Ú©Ù‡ Ù…ÛŒØ®ÙˆØ§Ù‡ÛŒØ¯ ÙÛŒÙ„ØªØ± {0} Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
@@ -782,49 +867,45 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
-msgstr ""
+msgstr "Ù…Ø¹Ù…ÙˆÙ„ÛŒ"
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
-msgstr ""
+msgstr "Ø±ÙˆÛŒØ¯Ø§Ø¯"
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
-msgstr ""
+msgstr "Ù†ÙˆØ¹"
 
 #: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
-msgstr ""
+msgstr "Ø·Ø±Ø"
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:548
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
-msgstr ""
+msgstr "ØØ§Ù„Øª Ù¾Ù‡Ù†Ø§ÛŒ Ù¾Ø§Ù†Ø¯ Ú©Ù… ÙØ¹Ø§Ù„ Ø§Ø³Øª: Ù‡ÛŒÚ† Ù¾ÛŒØºØ§Ù…ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:792
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
-msgstr ""
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù†ÙˆØ§Ø± Ù…Ù†Ùˆ"
 
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:321
 #, csharp-format
 msgid "Retrieving user list for {0}..."
-msgstr ""
+msgstr "Ø¯Ø± ØØ§Ù„ Ø¨Ù‡ Ø¯Ø±Ø³Øª Ø¢ÙˆØ±Ø¯Ù† Ù„ÛŒØ³Øª Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ {0}"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:366
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
-msgstr ""
+msgstr "Ù¾Ø§ÛŒØ§Ù† ÛŒØ§ÙØª"
 
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:398
-msgid "Person"
-msgstr ""
-
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:131
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
-msgstr ""
+msgstr "Ø§ØªØµØ§Ù„ Ø¯ÙˆØ¨Ø§Ø±Ù‡"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:180
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
@@ -832,156 +913,156 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
-msgstr ""
+msgstr "Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ Ú©Ù‡ Ù…ÛŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø³Ø±ÙˆÛŒØ³ Ø¯Ø³Ù‡Ù†Ø¯Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ø±Ùˆ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
-msgstr ""
+msgstr "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± ÙˆÛŒØ±Ø§ÛŒØ´ Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:24
 msgid "Find"
-msgstr ""
+msgstr "ÛŒØ§ÙØªÙ†"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:44
 msgid "_Search for:"
-msgstr ""
+msgstr "Ø¬Ø³Øª Ùˆ Ø¬Ùˆ Ø¨Ø±Ø§ÛŒ:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:73
 msgid "_Match Case"
-msgstr ""
+msgstr "ØªØ·Ø§Ø¨Ù‚ Ø¨Ø²Ø±Ú¯ÛŒ Ùˆ Ú©ÙˆÚ†Ú©ÛŒ ØØ±ÙˆÙ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:85
 msgid "Search _Backwards"
-msgstr ""
+msgstr "Ø¬Ø³Øª Ùˆ Ø¬Ùˆ Ø§Ø² Ø§Ù†ØªÙ‡Ø§"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:97
 msgid "_Wrap Around"
-msgstr ""
+msgstr "Ú†Ø±Ø®Ø´"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:110
 msgid "Use _Regular Expressions"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø¹Ø¨Ø§Ø±Ø§Øª Ø¨Ø§Ù‚Ø§Ø¹Ø¯Ù‡"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
 msgid "Smuxi - Find Group Chat"
-msgstr ""
+msgstr "Smuxi - ÛŒØ§ÙØªÙ† Ú†Øª Ú¯Ø±ÙˆÙ‡ÛŒ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
 msgid "_Name:"
-msgstr ""
+msgstr "Ù†Ø§Ù…:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.JoinWidget.cs:69
 msgid "Join"
-msgstr ""
+msgstr "Ù…Ù„ØÙ‚ Ø´Ø¯Ù†"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
 msgid "_Smuxi"
-msgstr ""
+msgstr "Smuxi"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
 msgid "_Server"
-msgstr ""
+msgstr "Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
 msgid "_Chat"
-msgstr ""
+msgstr "Ú†Øª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
 msgid "_Engine"
-msgstr ""
+msgstr "Ù…ÙˆØªÙˆØ±"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
 msgid "_View"
-msgstr ""
+msgstr "Ù†Ù…Ø§ÛŒØ´"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
 msgid "_Help"
-msgstr ""
+msgstr "Ø±Ø§Ù‡Ù†Ù…Ø§"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
 msgid "Connect"
-msgstr ""
+msgstr "Ø§ØªØµØ§Ù„"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
 msgid "Open Log"
-msgstr ""
+msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† ØµÙˆØ±Øª Ø¹Ù…Ù„ÛŒØ§Øª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
 msgid "_Preferences"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
 msgid "_Quit"
-msgstr ""
+msgstr "Ø®Ø±ÙˆØ¬"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
 msgid "_Connect"
-msgstr ""
+msgstr "Ø§ØªØµØ§Ù„"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
 msgid "_Add"
-msgstr ""
+msgstr "Ø§ÙØ²ÙˆØ¯Ù†"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
 msgid "_Manage"
-msgstr ""
+msgstr "Ù…Ø¯ÛŒØ±ÛŒØª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
 msgid "_Open / Join Chat"
-msgstr ""
+msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† / Ù…Ù„ØÙ‚ Ø´Ø¯Ù† Ø¨Ù‡ Ú†Øª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
 msgid "_Find Group Chat"
-msgstr ""
+msgstr "Ø¬Ø³Øª Ùˆ Ø¬ÙˆÛŒ Ú†Øª Ú¯Ø±ÙˆÙ‡ÛŒ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
 msgid "C_lear All Activity"
-msgstr ""
+msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† ØªÙ…Ø§Ù… ÙØ¹Ø§Ù„ÛŒØªÙ‡Ø§"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
 msgid "_Next Chat"
-msgstr ""
+msgstr "Ú†Øª Ø¨Ø¹Ø¯ÛŒ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
 msgid "_Previous Chat"
-msgstr ""
+msgstr "Ú†Øª Ù‚Ø¨Ù„ÛŒ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
 msgid "_Close"
-msgstr ""
+msgstr "Ø¨Ø³ØªÙ†"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
 msgid "_Use Local Engine"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù…ÙˆØªÙˆØ± Ù…ØÙ„ÛŒ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
 msgid "_Add Remote Engine"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù…ÙˆØªÙˆØ± Ø¯ÙˆØ±"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
@@ -991,46 +1072,46 @@ msgstr ""
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
 msgid "_Caret Mode"
-msgstr ""
+msgstr "Ø³Ø¨Ú© Ù†Ø´Ø§Ù†"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
 msgid "_Browse Mode"
-msgstr ""
+msgstr "Ø³Ø¨Ú© Ù…Ø±ÙˆØ±Ú¯Ø±"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
 msgid "Show _Statusbar"
-msgstr ""
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù†ÙˆØ§Ø± ÙˆØ¶Ø¹ÛŒØª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
 msgid "_Fullscreen"
-msgstr ""
+msgstr "ØªÙ…Ø§Ù… ØµÙØÙ‡"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
 msgid "_About"
-msgstr ""
+msgstr "Ø¯Ø±Ø¨Ø§Ø±Ù‡"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
 msgid "Find Group Chat"
-msgstr ""
+msgstr "ÛŒØ§ÙØªÙ† Ú†Øª Ú¯Ø±ÙˆÙ‡ÛŒ"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
 msgid "_Website"
-msgstr ""
+msgstr "ÙˆØ¨Ø³Ø§ÛŒØª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
 msgid "Show _Toolbar"
-msgstr ""
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù†ÙˆØ§Ø± Ø§Ø¨Ø²Ø§Ø±"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.QuickConnectDialog.cs:19
 msgid "Smuxi - Connect"
-msgstr ""
+msgstr "Smuxi - Ø§ØªØµØ§Ù„"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:206
 msgid "Smuxi - Preferences"
@@ -1038,7 +1119,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:295
 msgid "Nicknames:"
-msgstr ""
+msgstr "Ù†Ø§Ù…Ù‡Ø§ÛŒ Ù…Ø³ØªØ¹Ø§Ø±:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1022
 msgid "Tabs"
@@ -1062,7 +1143,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:42
 msgid "Use _SSH Tunnel"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙˆÙ†Ù„ SSH"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:56
 msgid ""
@@ -1073,7 +1154,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
-msgstr ""
+msgstr "Ø¯Ø±Ú¯Ø§Ù‡ SSH:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
 msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
@@ -1081,9 +1162,9 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:183
 msgid "_Port:"
-msgstr ""
+msgstr "Ø¯Ø±Ú¯Ø§Ù‡:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
 msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
@@ -1091,11 +1172,11 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
-msgstr ""
+msgstr "Ù…ÛŒØ²Ø¨Ø§Ù† Smuxi:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ SSH: (Ø¯Ù„Ø®ÙˆØ§Ù‡)"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
@@ -1105,7 +1186,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± SSH: (Ø¯Ù„Ø®ÙˆØ§Ù‡)"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
@@ -1116,12 +1197,12 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„ Ú©Ù„ÛŒØ¯ SSH: (Ø¯Ù„Ø®ÙˆØ§Ù‡)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
-msgstr ""
+msgstr "ÛŒÚ© ÙØ§ÛŒÙ„ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
@@ -1130,9 +1211,9 @@ msgid ""
 msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:188
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
@@ -1141,9 +1222,9 @@ msgid ""
 msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
-msgstr ""
+msgstr "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
@@ -1151,7 +1232,7 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
-msgstr ""
+msgstr "ØªÚ©Ø±Ø§Ø± Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
@@ -1175,11 +1256,11 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:80
 msgid "_Default Engine:"
-msgstr ""
+msgstr "Ù…ÙˆØªÙˆØ± Ù¾ÛŒØ´ÙØ±Ø¶:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:91
 msgid "Use as new default engine"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…ÙˆØªÙˆØ± Ù¾ÛŒØ´ÙØ±Ø¶ Ø¬Ø¯ÛŒØ¯"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
@@ -1189,36 +1270,40 @@ msgstr ""
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
-msgstr ""
+msgstr "Smuxi - Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ú†Øª"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:63
 msgid "_Type:"
-msgstr ""
+msgstr "Ù†ÙˆØ¹:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ù…ÛŒØ²Ø¨Ø§Ù†:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:75
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:79
 msgid "_Network:"
+msgstr "Ø´Ø¨Ú©Ù‡:"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:105
+msgid "Nickname:"
 msgstr ""
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:198
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:252
 msgid "_Protocol:"
-msgstr ""
+msgstr "Ù¾Ø±ÙˆØªÙˆÚ©Ù„:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:222
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:234
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:288
 msgid "Validate Server Certificate"
-msgstr ""
+msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ú¯ÙˆØ§Ù‡ÛŒÙ†Ø§Ù…Ù‡ Ø³Ø±ÙˆÛŒØ³ Ø¯Ù‡Ù†Ø¯Ù‡"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:254
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:308
 msgid "_On Connect Commands:"
-msgstr ""
+msgstr "Ø¯Ø³ØªÙˆØ±Ø§Øª Ù…ÙˆÙ‚Ø¹ Ø§ØªØµØ§Ù„"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:265
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
-msgstr ""
+msgstr "Ú†Ø´Ù… Ù¾ÙˆØ´ÛŒ Ø§Ø² Ø¯Ø³ØªÙˆØ±Ø§Øª"
diff --git a/po-Frontend-GNOME/fi.po b/po-Frontend-GNOME/fi.po
index 154ba800..0ede8325 100644
--- a/po-Frontend-GNOME/fi.po
+++ b/po-Frontend-GNOME/fi.po
@@ -1,25 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kalle Kaitala <cobrian cobrian net>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=smuxi&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:46+0000\n"
-"PO-Revision-Date: 2018-02-11 17:47+0200\n"
-"Last-Translator: Jiri GrÃ¶nroos <jiri gronroos+l10n iki fi>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/smuxi/language/";
-"fi/)\n"
-"Language: fi\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2018-12-30 13:06+0000\n"
+"Last-Translator: Mirco Bauer <meebey gmail com>\n"
+"Language-Team: Finnish (http://www.transifex.com/meebey/smuxi/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -30,10 +27,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"KÃ¤ytettÃ¤vÃ¤ lempinimi. Voit mÃ¤Ã¤ritellÃ¤ ylimÃ¤Ã¤rÃ¤isiÃ¤ lempinimiÃ¤ (eroteltuna "
-"vÃ¤lilyÃ¶nnillÃ¤) joita kÃ¤ytetÃ¤Ã¤n varalla jos ensimmÃ¤inen vaihtoehto ei ole "
-"saatavilla. Oletuksena varalla kÃ¤ytetÃ¤Ã¤n $nick_ ja $nick__."
+msgstr "KÃ¤ytettÃ¤vÃ¤ lempinimi. Voit mÃ¤Ã¤ritellÃ¤ ylimÃ¤Ã¤rÃ¤isiÃ¤ lempinimiÃ¤ (eroteltuna vÃ¤lilyÃ¶nnillÃ¤) joita 
kÃ¤ytetÃ¤Ã¤n varalla jos ensimmÃ¤inen vaihtoehto ei ole saatavilla. Oletuksena varalla kÃ¤ytetÃ¤Ã¤n $nick_ ja 
$nick__."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -133,16 +127,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = sekunnit\n"
-"mm = minuutit\n"
-"hh = tunnit (01 - 12)\n"
-"HH = tunnit (00-23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = pÃ¤ivÃ¤\n"
-"MM = kuukausi\n"
-"yy/yyyy = vuosi"
+msgstr "ss = sekunnit\nmm = minuutit\nhh = tunnit (01 - 12)\nHH = tunnit (00-23)\ntt = AM/PM\n\ndd = 
pÃ¤ivÃ¤\nMM = kuukausi\nyy/yyyy = vuosi"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -344,7 +329,8 @@ msgstr "Tausta"
 msgid "<b> Color </b>"
 msgstr "<b> VÃ¤ri </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_Kietaisumoodi:"
@@ -440,6 +426,28 @@ msgstr "Kirjoita suodatetut viestit lokiin"
 msgid "_Logging"
 msgstr "_Loki"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Palvelin"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "YhdistÃ¤ palvelimeen automaattisesti kÃ¤ynnistyksen yhteydessÃ¤"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protokolla:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Verkko:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "IsÃ¤ntÃ¤nimi:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -459,11 +467,8 @@ msgstr "Juttele muiden kanssa IRC:ssÃ¤"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;keskustelu;viestintÃ¤;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr 
"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;keskustelu;viestintÃ¤;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -473,10 +478,7 @@ msgstr "Juttele muiden kanssa IRC:ssÃ¤, TwitterissÃ¤, Jabberissa ja CampfiressÃ¤
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi on avoimen lÃ¤hdekoodin, jaetun kuorman malliin perustuva ja "
-"kÃ¤yttÃ¤jÃ¤ystÃ¤vÃ¤llinen asiakasohjelma IRC, Twitter, Jabber/XMPP, Campfire ja "
-"SignalR:n JabbR -protokollille."
+msgstr "Smuxi on avoimen lÃ¤hdekoodin, jaetun kuorman malliin perustuva ja kÃ¤yttÃ¤jÃ¤ystÃ¤vÃ¤llinen 
asiakasohjelma IRC, Twitter, Jabber/XMPP, Campfire ja SignalR:n JabbR -protokollille."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -484,22 +486,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Inspiroituneena yhdistelmÃ¤stÃ¤ screen ja irssi, Smuxi:ssa on irroitettava "
-"palvelin (tai normaalissa ohjelmassa \"asiakasohjelma\") joka pystyy "
-"yhteydessÃ¤ vaikka sinÃ¤ et olisi, ja mahdollistaa useamman Smuxi-"
-"asiakasohjelman yhteyden ja synkronoinnin. TÃ¤mÃ¤ vastaa screen+irssi -"
-"yhdistelmÃ¤Ã¤ tai IRC-bounceria, mutta elegantimmin ja vahvemmin."
+msgstr "Inspiroituneena yhdistelmÃ¤stÃ¤ screen ja irssi, Smuxi:ssa on irroitettava palvelin (tai normaalissa 
ohjelmassa \"asiakasohjelma\") joka pystyy yhteydessÃ¤ vaikka sinÃ¤ et olisi, ja mahdollistaa useamman 
Smuxi-asiakasohjelman yhteyden ja synkronoinnin. TÃ¤mÃ¤ vastaa screen+irssi -yhdistelmÃ¤Ã¤ tai IRC-bounceria, 
mutta elegantimmin ja vahvemmin."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "PÃ¤Ã¤ikkuna joka nÃ¤yttÃ¤Ã¤ IRC-kanavan"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
 msgstr "kÃ¤Ã¤ntÃ¤jien tiedot"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Smuxi Web-sivu"
 
@@ -555,10 +552,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"KÃ¤yttÃ¶liittymÃ¤si ei ole yhteensopiva moottorin kanssa!\n"
-"Moottorin versio: {0} KÃ¤yttÃ¶liittymÃ¤n versio: {1}\n"
-"Moottorin protokolla: {2} KÃ¤yttÃ¶liittymÃ¤n protokolla: {3}"
+msgstr "KÃ¤yttÃ¶liittymÃ¤si ei ole yhteensopiva moottorin kanssa!\nMoottorin versio: {0} KÃ¤yttÃ¶liittymÃ¤n 
versio: {1}\nMoottorin protokolla: {2} KÃ¤yttÃ¶liittymÃ¤n protokolla: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -579,14 +573,14 @@ msgstr "Virhe: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Haluatko varmasti poistaa moottorin \"{0}\"?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Aiot liittÃ¤Ã¤ {0} riviÃ¤. Haluatko varmasti jatkaa?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "KÃ¤yttÃ¶liittymÃ¤n komennot"
 
@@ -615,10 +609,8 @@ msgid "Starts a new Smuxi instance and ignores an existing one"
 msgstr ""
 
 #: ../src/Frontend-GNOME/Main.cs:109
-#, fuzzy
-#| msgid "Bringing already running Smuxi instance to foreground..."
 msgid "Passing link to already running Smuxi instance..."
-msgstr "Tuodaan jo kÃ¤ynnissÃ¤ oleva Smuxi-instanssi etualalle..."
+msgstr ""
 
 #: ../src/Frontend-GNOME/Main.cs:117
 msgid "Bringing already running Smuxi instance to foreground..."
@@ -633,9 +625,81 @@ msgstr "{0} kÃ¤yttÃ¤jÃ¤Ã¤"
 msgid "Sorry, not implemented yet!"
 msgstr "Sori, tÃ¤tÃ¤ ei ole vielÃ¤ sisÃ¤llytetty!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Merkki"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Sana"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr ""
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "PysyvÃ¤: Db4o (vanhentunut)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "PysyvÃ¤ (esikatselu)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "EpÃ¤vakaa"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Ei vÃ¤lityspalvelinta"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "KÃ¤yttÃ¶jÃ¤rjestelmÃ¤n oletus"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "Yhteys"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "KÃ¤yttÃ¶liittymÃ¤"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Palvelimet"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Suodattimet"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Loki"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "Lempinimi-kenttÃ¤ ei saa olla tyhjÃ¤."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "EpÃ¤kelpo korostuksen regex: '{0}'. Syy: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Nimi"
 
@@ -645,78 +709,58 @@ msgstr "Aihe"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"RyhmÃ¤keskusteluiden etsintÃ¤Ã¤ ilman suodatinta ei suositella. TÃ¤mÃ¤ voi kestÃ¤Ã¤ "
-"hetken, tai ei vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi ollenkaan. Haluatko jatkaa?"
+msgstr "RyhmÃ¤keskusteluiden etsintÃ¤Ã¤ ilman suodatinta ei suositella. TÃ¤mÃ¤ voi kestÃ¤Ã¤ hetken, tai ei 
vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi ollenkaan. Haluatko jatkaa?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Virhe haettaessa ryhmÃ¤keskusteluiden listaa palvelimelta."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Yhteys moottoriin katkaistu."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "YhdistetÃ¤Ã¤n uudelleen moottoriin... (yritys {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Syy: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"KÃ¤yttÃ¶liittymÃ¤ on menettÃ¤nyt yhteyden palvelimeen. Haluatko yhdistÃ¤Ã¤ "
-"uudelleen nyt?"
+msgstr "KÃ¤yttÃ¶liittymÃ¤ on menettÃ¤nyt yhteyden palvelimeen. Haluatko yhdistÃ¤Ã¤ uudelleen nyt?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"UudelleenyhdistÃ¤minen palvelimeen on epÃ¤onnistunut. Haluatko yrittÃ¤Ã¤ "
-"uudelleen?"
+msgstr "UudelleenyhdistÃ¤minen palvelimeen on epÃ¤onnistunut. Haluatko yrittÃ¤Ã¤ uudelleen?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Palvelin on menettÃ¤nyt yhteyden kÃ¤yttÃ¶liittymÃ¤Ã¤n. Haluatko yhdistÃ¤Ã¤ "
-"uudelleen nyt?"
+msgstr "Palvelin on menettÃ¤nyt yhteyden kÃ¤yttÃ¶liittymÃ¤Ã¤n. Haluatko yhdistÃ¤Ã¤ uudelleen nyt?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "NÃ¤ytÃ¤"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protokolla"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "IsÃ¤ntÃ¤nimi"
 
@@ -725,44 +769,40 @@ msgid "Unable to load server: "
 msgstr "Palvelinta ei voitu ladata:"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "HenkilÃ¶ / Yksityinen"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "RyhmÃ¤ / Julkinen"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Moottoriavustaja - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "LisÃ¤Ã¤ Smuxi-moottori"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Muokkaa Smuxi-moottoria"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "Yhteys"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Todennustiedot"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Voit nyt kÃ¤yttÃ¤Ã¤ Smuxi-moottoria"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "Kiitos"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "TÃ¤mÃ¤n niminen moottori on jo olemassa! MÃ¤Ã¤ritÃ¤ toinen nimi."
@@ -780,33 +820,29 @@ msgstr "Tietoja Smuxista"
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "Palvelinta ei voitu lisÃ¤tÃ¤:"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Paikalliseen moottoriin vaihto katkaisee yhteytesi nykyiseen moottoriin! "
-"Haluatko varmasti tehdÃ¤ tÃ¤mÃ¤n?"
+msgstr "Paikalliseen moottoriin vaihto katkaisee yhteytesi nykyiseen moottoriin! Haluatko varmasti tehdÃ¤ 
tÃ¤mÃ¤n?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"EtÃ¤moottorin vaihto katkaisee yhteyden nykyiseen moottoriin! Haluatko "
-"varmasti tehdÃ¤ tÃ¤mÃ¤n?"
+msgstr "EtÃ¤moottorin vaihto katkaisee yhteyden nykyiseen moottoriin! Haluatko varmasti tehdÃ¤ tÃ¤mÃ¤n?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "PÃ¤ivÃ¤ vaihtui pÃ¤ivÃ¤stÃ¤ {0} pÃ¤ivÃ¤Ã¤n {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "PÃ¤ivÃ¤ vaihtui, {0}"
@@ -817,63 +853,39 @@ msgstr "PÃ¤ivÃ¤ vaihtui, {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "EpÃ¤kelpo suodatuksen regex: '{0}'. Syy: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Haluatko varmasti poistaa valitun suodattimen?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-msgid "Network"
-msgstr "Verkko"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protokolla / Palvelin"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Keskustelutyyppi"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "Kuvio"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Ei vÃ¤lityspalvelinta"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "KÃ¤yttÃ¶jÃ¤rjestelmÃ¤n oletus"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Tallenna"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-msgid "Add"
-msgstr "LisÃ¤Ã¤"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "Ei tuettu"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "Alhaisen kaistan tila on pÃ¤Ã¤llÃ¤: ViestejÃ¤ ei ole synkronoitu."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -885,28 +897,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Noudetaan kÃ¤yttÃ¤jÃ¤listaa {0}:lle..."
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "Valmis."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "YhdistÃ¤ uudelleen"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Protokollakeskustelun sulkeminen sulkee myÃ¶s kaikki siihen liitetyt "
-"keskustelut! Haluatko varmasti tehdÃ¤ tÃ¤mÃ¤n?"
+msgstr "Protokollakeskustelun sulkeminen sulkee myÃ¶s kaikki siihen liitetyt keskustelut! Haluatko varmasti 
tehdÃ¤ tÃ¤mÃ¤n?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Haluatko varmasti poistaa valitun palvelimen?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "Palvelinta ei voitu muokata:"
 
@@ -1140,20 +1150,15 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Mahdollistaa SSH:n kÃ¤ytÃ¶n yhteydessÃ¤. TÃ¤llÃ¤ on pieni "
-"suorituskykyvaikutus, mutta tarjoaa lisÃ¤turvaa ja on pakollinen kÃ¤ytettÃ¤essÃ¤ "
-"NAT:ia tai porttiperustaisia palomuureja</span>"
+msgstr "<span size=\"small\">Mahdollistaa SSH:n kÃ¤ytÃ¶n yhteydessÃ¤. TÃ¤llÃ¤ on pieni suorituskykyvaikutus, 
mutta tarjoaa lisÃ¤turvaa ja on pakollinen kÃ¤ytettÃ¤essÃ¤ NAT:ia tai porttiperustaisia palomuureja</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "SSH-_IsÃ¤ntÃ¤:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
-msgstr ""
-"<span size=\"small\">DNS tai IP-osoite ja portti SSH-palvelimelle</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgstr "<span size=\"small\">DNS tai IP-osoite ja portti SSH-palvelimelle</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
@@ -1162,84 +1167,74 @@ msgid "_Port:"
 msgstr "_Portti:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">DNS tai IP-osoite ja portti Smuxi-palvelimeen</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">DNS tai IP-osoite ja portti Smuxi-palvelimeen</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_Smuxi-isÃ¤ntÃ¤:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "_SSH-kÃ¤yttÃ¤jÃ¤nimi: (valinnainen)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">KÃ¤yttÃ¤jÃ¤nimi jolla kirjaudutaan sisÃ¤Ã¤n SSH-palvelimeen</"
-"span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">KÃ¤yttÃ¤jÃ¤nimi jolla kirjaudutaan sisÃ¤Ã¤n SSH-palvelimeen</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "_SSH-salasana: (valinnainen)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">Salasana jota kÃ¤ytetÃ¤Ã¤n SSH-palvelimelle "
-"kirjautumiseen. TÃ¤mÃ¤ salasana on valinnainen jos SSH-avaintunnistautumista "
-"kÃ¤ytetÃ¤Ã¤n (katso alempaa).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">Salasana jota kÃ¤ytetÃ¤Ã¤n SSH-palvelimelle kirjautumiseen. TÃ¤mÃ¤ salasana on 
valinnainen jos SSH-avaintunnistautumista kÃ¤ytetÃ¤Ã¤n (katso alempaa).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_SSH-avaintiedosto: (valinnainen)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Yksityinen SSH-avaintiedosto jota kÃ¤ytetÃ¤Ã¤n SSH-"
-"palvelimelle kirjautumiseen</span>"
+msgstr "<span size=\"small\">Yksityinen SSH-avaintiedosto jota kÃ¤ytetÃ¤Ã¤n SSH-palvelimelle 
kirjautumiseen</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_KÃ¤yttÃ¤jÃ¤nimi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">KÃ¤yttÃ¤jÃ¤nimi jolla kirjaudutaan sisÃ¤Ã¤n Smuxi-"
-"palvelimeen</span>"
+msgstr "<span size=\"small\">KÃ¤yttÃ¤jÃ¤nimi jolla kirjaudutaan sisÃ¤Ã¤n Smuxi-palvelimeen</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">KÃ¤yttÃ¤jÃ¤n salasana</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_Vahvista salasana:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Toista salasana sen varmentamiseksi</span>"
 
@@ -1249,12 +1244,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Tervetuloa Smuxi-moottorin sÃ¤Ã¤tÃ¶avustajaan.\n"
-"Sinun tulee syÃ¶ttÃ¤Ã¤ muutamia tietoja ennen kuin pÃ¤Ã¤set kÃ¤yttÃ¤mÃ¤Ã¤n "
-"moottoria.\n"
-"\n"
-"Valitse \"EteenpÃ¤in\" aloittaaksesi."
+msgstr "Tervetuloa Smuxi-moottorin sÃ¤Ã¤tÃ¶avustajaan.\nSinun tulee syÃ¶ttÃ¤Ã¤ muutamia tietoja ennen kuin pÃ¤Ã¤set 
kÃ¤yttÃ¤mÃ¤Ã¤n moottoria.\n\nValitse \"EteenpÃ¤in\" aloittaaksesi."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1274,11 +1264,9 @@ msgstr "KÃ¤ytÃ¤ uutena oletusmoottorina"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Jos valittu, nykyinen moottori on oletuksena kÃ¤ytÃ¶ssÃ¤ "
-"seuraavalla Smuxin kÃ¤ynnistyskerralla</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Jos valittu, nykyinen moottori on oletuksena kÃ¤ytÃ¶ssÃ¤ seuraavalla Smuxin 
kÃ¤ynnistyskerralla</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1288,10 +1276,6 @@ msgstr "Smuxi - Avaa keskustelu"
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi - Palvelin"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_IsÃ¤ntÃ¤nimi:"
@@ -1308,10 +1292,6 @@ msgstr "Nimimerkki:"
 msgid "_Protocol:"
 msgstr "_Protokolla:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "YhdistÃ¤ palvelimeen automaattisesti kÃ¤ynnistyksen yhteydessÃ¤"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "KÃ¤ytÃ¤ salausta"
@@ -1327,65 +1307,3 @@ msgstr "_Yhdistyksenaikaiset komennot:"
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_JÃ¤tÃ¤ komennot suorittamatta"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protokolla:"
-
-#~ msgid "Hostname:"
-#~ msgstr "IsÃ¤ntÃ¤nimi:"
-
-#~ msgid "Character"
-#~ msgstr "Merkki"
-
-#~ msgid "Word"
-#~ msgstr "Sana"
-
-#~ msgid ""
-#~ "This setting specifies if Smuxi should store chat messages in memory "
-#~ "(volatile) or to disk (persistent).\n"
-#~ "For persistent you can choose between Db4o, an object database or SQLite, "
-#~ "a relational database.\n"
-#~ "The Db4o backend has known issues like high memory and CPU usage and can "
-#~ "even lead to crashes and thus it is deprecated.\n"
-#~ "The SQLite backend has no known performance or stability issues but is "
-#~ "still an optional preview feature."
-#~ msgstr ""
-#~ "TÃ¤mÃ¤ asetus mÃ¤Ã¤rÃ¤Ã¤ tallentaako Smuxi keskusteluviestit muistiin "
-#~ "(epÃ¤vakaa) tai levylle (pysyvÃ¤).\n"
-#~ "PysyvÃ¤Ã¤n tallennukseen voit valita Db4o:n, objektitietokannan, tai "
-#~ "SQLiten, relaatiotietokannan, vÃ¤liltÃ¤.\n"
-#~ "Db4o-taustajÃ¤rjestelmÃ¤ssÃ¤ on tunnettuja ongelmia, kuten korkea muistin ja "
-#~ "prosessorin kÃ¤yttÃ¶, jotka voivat johtaa jopa kaatuiluun, joten tÃ¤tÃ¤ ei "
-#~ "enÃ¤Ã¤ pÃ¤ivitetÃ¤.\n"
-#~ "SQLite-taustajÃ¤rjestelmÃ¤ssÃ¤ ei ole tunnettuja toimivuusongelmia mutta se "
-#~ "on edelleen valinnainen esikatseluversioinen toiminto."
-
-#~ msgid "Volatile"
-#~ msgstr "EpÃ¤vakaa"
-
-#~ msgid "Persistent (Preview)"
-#~ msgstr "PysyvÃ¤ (esikatselu)"
-
-#~ msgid "Persistent: Db4o (Deprecated)"
-#~ msgstr "PysyvÃ¤: Db4o (vanhentunut)"
-
-#~ msgid "Persistent: SQLite (Preview)"
-#~ msgstr "PysyvÃ¤: SQLite (esikatselu)"
-
-#~ msgid "Interface"
-#~ msgstr "KÃ¤yttÃ¶liittymÃ¤"
-
-#~ msgid "Servers"
-#~ msgstr "Palvelimet"
-
-#~ msgid "Filters"
-#~ msgstr "Suodattimet"
-
-#~ msgid "Logging"
-#~ msgstr "Loki"
-
-#~ msgid "Nicknames(s) field must not be empty."
-#~ msgstr "Lempinimi-kenttÃ¤ ei saa olla tyhjÃ¤."
-
-#~ msgid "Invalid highlight regex: '{0}'. Reason: {1}"
-#~ msgstr "EpÃ¤kelpo korostuksen regex: '{0}'. Syy: {1}"
diff --git a/po-Frontend-GNOME/fr.po b/po-Frontend-GNOME/fr.po
index 703dbbac..143c80cd 100644
--- a/po-Frontend-GNOME/fr.po
+++ b/po-Frontend-GNOME/fr.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ClÃ©ment Bourgeois <moonpyk gmail com>, 2011-2013,2015
+# ClÃ©ment Bourgeois <moonpyk gmail com>, 2011-2013,2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-03 12:34+0200\n"
-"PO-Revision-Date: 2015-05-03 20:02+0000\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-09-23 18:02+0000\n"
 "Last-Translator: ClÃ©ment Bourgeois <moonpyk gmail com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/smuxi/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/meebey/smuxi/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,7 +40,7 @@ msgstr "Nom d'utilisateur :"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:5
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:177
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:147
 msgid "Realname:"
 msgstr "Nom rÃ©el :"
 
@@ -74,7 +74,7 @@ msgid "Port:"
 msgstr "Port :"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:13
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:254
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
 msgid "Show Password"
 msgstr "Afficher le mot de passe"
 
@@ -432,7 +432,7 @@ msgid "Smuxi - Server"
 msgstr "Smuxi - Serveur"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:93
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:293
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
 msgid "Automatically connect to server at startup"
 msgstr "Se connecter automatiquement au serveur Ã  chaque dÃ©marrage"
 
@@ -449,6 +449,7 @@ msgid "Hostname:"
 msgstr "Nom d'hÃ´te"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
 msgstr "Smuxi"
 
@@ -464,13 +465,22 @@ msgstr "Client IRC Smuxi"
 msgid "Chat with other people on IRC"
 msgstr "Chatter sur IRC avec d'autres gens"
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
+msgid ""
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "chat;mÃ©ssagerie;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
+msgstr "Chatter avec d'autres gens sur IRC, Twitter, Jabber et Campfire"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
 msgstr "Smuxi est un client de chat distribuÃ© et open-source pour IRC, Twitter, Jabber/XMPP, Campfire et 
JabbR SignalR."
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
 "Inspired by the combination of screen and irssi, Smuxi has a detachable "
 "server (or like a \"normal\" client) that stays connected when you aren't, "
@@ -478,7 +488,7 @@ msgid ""
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
 msgstr "Smuxi est inspirÃ© de la combinaison de screen et irssi, il dispose d'un serveur dÃ©tachable (comme un 
client \"normal\") qui reste connectÃ© quand vous ne l'Ãªtes pas. Il est capable d'accepter plusieurs frontaux 
Smuxi qui restent connectÃ©s et synchrones. Tout ceci tres similaire au couple screen+irssi ou un bouncer IRC, 
de faÃ§on plus Ã©lÃ©gante et puissante."
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "La fenÃªtre principale affichant un canal IRC"
 
@@ -563,18 +573,46 @@ msgstr "Erreur : {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "ÃŠtes vous sÃ»r(e) de vouloir supprimer le moteur \"{0}\" ?"
 
-#: ../src/Frontend-GNOME/Entry.cs:484
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Vous vous apprÃªtez Ã  coller {0} lignes de texte, Ãªtes vous sÃ»r(e) de vouloir continuer ?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:601
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Commandes Frontend"
 
-#: ../src/Frontend-GNOME/Main.cs:80
+#: ../src/Frontend-GNOME/Main.cs:49
+msgid "Enable debug output"
+msgstr "Activer la sortie dÃ©boggage"
+
+#: ../src/Frontend-GNOME/Main.cs:56
+msgid "Show this help"
+msgstr "Affiche cette aide"
+
+#: ../src/Frontend-GNOME/Main.cs:60
+msgid "Options:"
+msgstr "Options :"
+
+#: ../src/Frontend-GNOME/Main.cs:67
+msgid "Connect to engine"
+msgstr "Se connecter au moteur"
+
+#: ../src/Frontend-GNOME/Main.cs:74
+msgid "Opens the specified link in Smuxi"
+msgstr "Ouvre le lien sÃ©lÃ©ctionnÃ© dans Smuxi"
+
+#: ../src/Frontend-GNOME/Main.cs:81
+msgid "Starts a new Smuxi instance and ignores an existing one"
+msgstr "DÃ©marre une nouvelle instance de Smuxi en ignorant une instance existante"
+
+#: ../src/Frontend-GNOME/Main.cs:109
+msgid "Passing link to already running Smuxi instance..."
+msgstr "Passage du lien Ã  l'instance de Smuxi dÃ©ja existante..."
+
+#: ../src/Frontend-GNOME/Main.cs:117
 msgid "Bringing already running Smuxi instance to foreground..."
 msgstr "Retour de l'instance existante de Smuxi au premier plan..."
 
@@ -601,60 +639,60 @@ msgid ""
 "This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
 "For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
 "The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
-"The SQLite backend has no known performance or stability issues but is still an optional preview feature."
-msgstr "Ce paramÃ¨tre dÃ©finit si Smuxi doit sauvegarder les messages en mÃ©moire (volatile) ou sur le disque 
(persistant).\nPour la persistance vous pouvez choisir parmi Db4o, une base de donnÃ©es objet, ou SQLite, une 
base de donnÃ©es relationnelle.\nLe moteur Db4o a des problemes connus comme une utilisation importante de la 
mÃ©moire et du CPU allant jusqu'a des plantages, il est dÃ©conseillÃ©.\nLe moteur SQLite n'a pas de probleme de 
performance ou de stabilitÃ© connu mais est toujours en developpement."
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Ce paramÃ¨tre dÃ©finit si Smuxi doit sauvegarder les messages en mÃ©moire (volatile) ou sur le disque 
(persistant). \nPour la persistance vous pouvez choisir parmi Db4o, une base de donnÃ©es objet ou SQLite, une 
base de donnÃ©es relationnelle. \nLe moteur Db4o a des problemes connus comme une utilisation importante de la 
mÃ©moire et du CPU allant jusqu'a des plantages, il est dÃ©prÃ©ciÃ©.\nLe moteur SQLite n'a pas de probleme de 
performance ou de stabilitÃ© connu et est recommandÃ©."
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:207
-msgid "Volatile"
-msgstr "Volatile"
-
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:209
-msgid "Persistent (Preview)"
-msgstr "Persitant (developpement)"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Persistant : SQLite (recommandÃ©)"
 
 #: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
 msgid "Persistent: Db4o (Deprecated)"
 msgstr "Persistant : Db4o (dÃ©prÃ©ciÃ©)"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:214
-msgid "Persistent: SQLite (Preview)"
-msgstr "Persistant : SQLite (dÃ©veloppement)"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Persitant (developpement)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "Volatile"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:238
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
 msgid "No Proxy"
 msgstr "Pas de proxy"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:240
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:336
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
 msgid "System Default"
 msgstr "DÃ©faut du systÃ¨me"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:254
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
 #: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
 msgid "Connection"
 msgstr "Connexion"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
 msgid "Interface"
 msgstr "Interface"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:269
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
 msgid "Filters"
 msgstr "Filtres"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
 msgid "Logging"
 msgstr "Journalisation"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:692
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
 msgid "Nicknames(s) field must not be empty."
 msgstr "Le champ surnom(s) ne doit pas Ãªtre vide."
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:888
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
 #, csharp-format
 msgid "Invalid highlight regex: '{0}'. Reason: {1}"
 msgstr "Expression rÃ©guliÃ¨re de surlignage invalide '{0}'. Raison : {1} "
@@ -679,11 +717,11 @@ msgstr "Chercher des groupes de discussion"
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Erreur durant la rÃ©cupÃ©ration de la liste des groupes de discussion du serveur."
 
-#: ../src/Frontend-GNOME/Frontend.cs:398
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "DÃ©connectÃ© du moteur."
 
-#: ../src/Frontend-GNOME/Frontend.cs:440
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Reconnexion au moteur... (essai {0})"
@@ -847,9 +885,9 @@ msgstr "Motif"
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "Mode faible bande passante activÃ© : aucun message synchronisÃ©."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:839
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:174
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:175
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
 msgstr "Afficher la barre de _menus"
 
@@ -906,11 +944,11 @@ msgstr "Recherche _cyclique"
 msgid "Use _Regular Expressions"
 msgstr "Utiliser des _expression rÃ©guliÃ¨res"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:32
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
 msgid "Smuxi - Find Group Chat"
 msgstr "Smuxi - Trouver un groupe de discussion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:56
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
 msgid "_Name:"
 msgstr "_Nom :"
@@ -919,155 +957,155 @@ msgstr "_Nom :"
 msgid "Join"
 msgstr "Rejoindre"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:95
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
 msgid "_Smuxi"
 msgstr "_Smuxi"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:98
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
 msgid "_Server"
 msgstr "_Serveur"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:101
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
 msgid "_Chat"
 msgstr "_Discussion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:104
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
 msgid "_Engine"
 msgstr "_Moteur"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:107
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
 msgid "_View"
 msgstr "_Vue"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:110
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
 msgid "Connect"
 msgstr "Connexion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:116
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:186
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:187
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
 msgid "Open Log"
 msgstr "Ouvrir le journal"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
 msgid "_Preferences"
 msgstr "_PrÃ©fÃ©rences"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
 msgid "_Connect"
 msgstr "Connexion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
 msgid "_Manage"
 msgstr "_Gestion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
 msgid "_Open / Join Chat"
 msgstr "_Ouvrir / Rejoindre chat"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
 msgid "_Find Group Chat"
 msgstr "_Rechercher le groupe de discussion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
 msgid "C_lear All Activity"
 msgstr "_Supprimer toute activitÃ©"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:151
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
 msgid "_Next Chat"
 msgstr "Discussion _suivante"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:153
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
 msgid "_Previous Chat"
 msgstr "Discussion _prÃ©cÃ©dente"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:156
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:159
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:160
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
 msgid "_Use Local Engine"
 msgstr "_Utiliser le moteur local"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:162
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
 msgid "_Add Remote Engine"
 msgstr "_Ajouter un moteur distant"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:165
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:166
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
 msgid "Switch Remote Engine"
 msgstr "Changer de moteur distant"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:168
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:169
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
 msgid "_Caret Mode"
 msgstr "Mode _curseur"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:171
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:172
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
 msgid "_Browse Mode"
 msgstr "Mode _navigateur"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:177
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:178
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
 msgid "Show _Statusbar"
 msgstr "Afficher la barre de status"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:180
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:181
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
 msgid "_Fullscreen"
 msgstr "_Plein Ã©cran"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:183
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:184
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
 msgid "_About"
 msgstr "_Ã€ propos"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:189
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:191
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
 msgid "Find Group Chat"
 msgstr "Rechercher le groupe de discussion"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:193
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:194
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
 msgid "_Website"
 msgstr "Site web de Smuxi"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:196
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:197
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
 msgid "Show _Toolbar"
 msgstr "Afficher la barre d'ou_tils"
 
@@ -1124,7 +1162,7 @@ msgstr "<span size=\"small\">Adresse IP ou DNS et port du serveur SSH</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:213
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:183
 msgid "_Port:"
 msgstr "_Port"
 
@@ -1173,7 +1211,7 @@ msgid ""
 msgstr "<span size=\"small\">Le fichier de clÃ© SSH sera utilisÃ© pour l'authentification sur le serveur 
SSH</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:272
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_Nom d'utilisateur :"
 
@@ -1184,7 +1222,7 @@ msgid ""
 msgstr "<span size=\"small\">Nom d'utilisateur qui sera utilisÃ© pour l'enregistrement auprÃ¨s du moteur 
Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:146
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
@@ -1238,34 +1276,34 @@ msgstr "Smuxi - Ouvrir un chat"
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Nom d'hÃ´te :"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:109
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:79
 msgid "_Network:"
 msgstr "_RÃ©seau :"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:105
 msgid "Nickname:"
 msgstr "Surnom :"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:282
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:252
 msgid "_Protocol:"
 msgstr "_Protocole :"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:306
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Utiliser le chiffrement"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:318
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:288
 msgid "Validate Server Certificate"
 msgstr "Valider le certificat du serveur"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:308
 msgid "_On Connect Commands:"
 msgstr "Commandes de _connexion :"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:349
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_Ignorer les commandes"
diff --git a/po-Frontend-GNOME/lt.po b/po-Frontend-GNOME/lt.po
index 78b48569..2130c36a 100644
--- a/po-Frontend-GNOME/lt.po
+++ b/po-Frontend-GNOME/lt.po
@@ -1,26 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Moo, 2014-2015
-# Aurimas ÄŒernius <aurisc4 gmail com>, 2018.
-#
+# aurisc4 <aurisc4 gmail com>, 2018
+# Moo, 2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/smuxi/issues\n";
-"POT-Creation-Date: 2018-06-10 18:19+0000\n"
-"PO-Revision-Date: 2018-11-25 19:19+0200\n"
-"Last-Translator: Aurimas ÄŒernius <aurisc4 gmail com>\n"
-"Language-Team: LietuviÅ³ <gnome-lt lists akl lt>\n"
-"Language: lt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/meebey/smuxi/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Gtranslator 3.30.1\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 
10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -31,11 +28,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"Naudojamas slapyvardis. Galite nurodyti papildomus slapyvardÅ¾ius, "
-"(atskirdami juos tarpais) kurie bus naudojami kaip atsarginiai variantai, "
-"kuomet pirmasis pasirinkimas nebus prieinamas. Pagal numatymÄ… $nick_ ir "
-"$nick__ bus naudojami kaip atsarginiai variantai."
+msgstr "Naudojamas slapyvardis. Galite nurodyti papildomus slapyvardÅ¾ius, (atskirdami juos tarpais) kurie 
bus naudojami kaip atsarginiai variantai, kuomet pirmasis pasirinkimas nebus prieinamas. Pagal numatymÄ… 
$nick_ ir $nick__ bus naudojami kaip atsarginiai variantai."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -135,16 +128,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = sekundÄ—s\n"
-"mm = minutÄ—s\n"
-"hh = valandos (01 - 12)\n"
-"HH = valandos (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = diena\n"
-"MM = mÄ—nuo\n"
-"yy/yyyy = metai"
+msgstr "ss = sekundÄ—s\nmm = minutÄ—s\nhh = valandos (01 - 12)\nHH = valandos (00 - 23)\ntt = AM/PM\n\ndd = 
diena\nMM = mÄ—nuo\nyy/yyyy = metai"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -346,7 +330,8 @@ msgstr "Fonas"
 msgid "<b> Color </b>"
 msgstr "<b> Spalva </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_LauÅ¾ymo Veiksena:"
@@ -442,6 +427,28 @@ msgstr "Protokoluoti Filtruotus PraneÅ¡imus"
 msgid "_Logging"
 msgstr "_Protokolavimas"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Serveris"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Paleidus programa, automatiÅ¡kai jungtis prie serverio"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protokolas:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Tinklas:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Kompiuterio vardas:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -461,11 +468,8 @@ msgstr "KalbÄ—kite su kitais Å¾monÄ—mis per IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"pokalbiai;susiraÅ¡inÄ—jimai;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;"
-"jabber;campfire;jabbr;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "pokalbiai;susiraÅ¡inÄ—jimai;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -475,9 +479,7 @@ msgstr "KalbÄ—kite su kitais Å¾monÄ—mis per IRC, Twitter, Jabber ir Campfire"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi yra atviro kodo, platinama ir patogi pokalbiÅ³ kliento programa, skirta "
-"IRC, Twitter, Jabber/XMPP, Campfire ir SignalR JabbR."
+msgstr "Smuxi yra atviro kodo, platinama ir patogi pokalbiÅ³ kliento programa, skirta IRC, Twitter, 
Jabber/XMPP, Campfire ir SignalR JabbR."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -485,22 +487,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Ä®kvÄ—pta screen ir irssi kombinacijos, Smuxi turi atskiriamÄ… serverÄ¯ (arba "
-"tokiÄ… kaip \"normaliÄ…\" kliento programÄ…), kuris, jums nesant, iÅ¡lieka "
-"prisijungÄ™s ir leidÅ¾ia prisijungti ir likti sinchronizuotoms kelioms "
-"naudotojo sÄ…sajoms. Tai yra panaÅ¡u kaip screen+irssi arba IRC bouncers, tik "
-"yra elegantiÅ¡kiau ir galingiau."
+msgstr "Ä®kvÄ—pta screen ir irssi kombinacijos, Smuxi turi atskiriamÄ… serverÄ¯ (arba tokiÄ… kaip \"normaliÄ…\" 
kliento programÄ…), kuris, jums nesant, iÅ¡lieka prisijungÄ™s ir leidÅ¾ia prisijungti ir likti sinchronizuotoms 
kelioms naudotojo sÄ…sajoms. Tai yra panaÅ¡u kaip screen+irssi arba IRC bouncers, tik yra elegantiÅ¡kiau ir 
galingiau."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "Pagrindinis langas, rodantis IRC kanalÄ…"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
 msgstr "Moo"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Smuxi Tinklalapis"
 
@@ -556,10 +553,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"JÅ«sÅ³ vartotojo sÄ…saja nesuderinama su moduliu!\n"
-"Modulio Versija: {0} Vartotojo SÄ…sajos Versija: {1}\n"
-"Modulio Protokolas: {2} Vartotojo SÄ…sajos Protokolas: {3}"
+msgstr "JÅ«sÅ³ vartotojo sÄ…saja nesuderinama su moduliu!\nModulio Versija: {0} Vartotojo SÄ…sajos Versija: 
{1}\nModulio Protokolas: {2} Vartotojo SÄ…sajos Protokolas: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -580,14 +574,14 @@ msgstr "Klaida: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Ar tikrai norite iÅ¡trinti modulÄ¯ \"{0}\"?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "JÅ«s bandote Ä¯dÄ—ti {0} eilutes. Ar norite tÄ™sti?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Vartotojo sÄ…sajos Komandos"
 
@@ -632,9 +626,81 @@ msgstr "{0} VartotojÅ³"
 msgid "Sorry, not implemented yet!"
 msgstr "Atleiskite, dar neÄ¯gyvendinta!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Simbolis"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Å½odis"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Å is nustatymas nurodo ar Smuxi turÄ—tÅ³ laikyti pokalbiÅ³ praneÅ¡imus atmintyje (neiÅ¡liekamas) ar diske 
(ilgalaikis).\nIlgalaikiam laikymui galite rinktis tarp Db4o, objektinÄ—s duomenÅ³ bazÄ—s arba SQLite, sÄ…ryÅ¡inÄ—s 
duomenÅ³ bazÄ—s.\nDb4o vidinÄ— pusÄ— turi Å¾inomÅ³ problemÅ³, tokiÅ³ kaip didelis atminties ir procesoriaus 
naudojimas, ir gali sÄ…lygoti strigtis, todÄ—l ji yra pasenusi.\nSQLite vidinÄ— pusÄ— neturi Å¾inomÅ³ naÅ¡umo ar 
stabilumo problemÅ³ ir yra rekomenduojamas nustatymas."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Ilgalaikis: SQLite (Rekomenduojamas)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Ilgalaikis: Db4o (PasenÄ™s)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Ilgalaikis (PerÅ¾iÅ«ra)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "NeiÅ¡liekamas"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "NÄ—ra Ä®galiotojo Serverio"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Pagal Sistemos NumatymÄ…"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "RyÅ¡ys"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "SÄ…saja"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Serveriai"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filtrai"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Derinimas"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "SlapyvardÅ¾io(-iÅ³) laukas negali bÅ«ti tuÅ¡Äias."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "Neteisingas paryÅ¡kinimo reguliarusis reiÅ¡kinys: '{0}'. PrieÅ¾astis: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Pavadinimas"
 
@@ -644,85 +710,58 @@ msgstr "Tema"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"GrupÄ—s pokalbiÅ³ paieÅ¡ka be filtro yra nerekomenduojama. Tai gali Å¡iek tiek "
-"uÅ¾trukti arba visai nesuveikti.\n"
-"Ar norite tÄ™sti?"
+msgstr "GrupÄ—s pokalbiÅ³ paieÅ¡ka be filtro yra nerekomenduojama. Tai gali Å¡iek tiek uÅ¾trukti arba visai 
nesuveikti.\nAr norite tÄ™sti?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Klaida, gaunant grupÄ—s pokalbiÅ³ sÄ…raÅ¡Ä… iÅ¡ serverio."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Atsijungta nuo modulio."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "IÅ¡ naujo jungiamasi prie modulio... (bandymas {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "PrieÅ¾astis: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Buvo aptikta lemtinga klaida dÄ—l protokolo nesuderinamumo su smuxi-server!\n"
-"\n"
-"Ä®diekite Mono kliento pusÄ—je, kad ji sutaptÅ³ su smuxi-server.\n"
-"\n"
-"Daugiau informacijos rasite adresu:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Vartotojo sÄ…saja prarado ryÅ¡Ä¯ su serveriu.\n"
-"Ar norite jungtis iÅ¡ naujo dabar?"
+msgstr "Vartotojo sÄ…saja prarado ryÅ¡Ä¯ su serveriu.\nAr norite jungtis iÅ¡ naujo dabar?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"Jungimasis iÅ¡ naujo prie serverio nepavyko.\n"
-"Ar norite bandyti dar kartÄ…?"
+msgstr "Jungimasis iÅ¡ naujo prie serverio nepavyko.\nAr norite bandyti dar kartÄ…?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Serveris prarado ryÅ¡i su vartotojo sÄ…saja.\n"
-"Ar norite jungtis iÅ¡ naujo dabar?"
+msgstr "Serveris prarado ryÅ¡i su vartotojo sÄ…saja.\nAr norite jungtis iÅ¡ naujo dabar?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Rodyti"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protokolas"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Kompiuterio vardas"
 
@@ -731,44 +770,40 @@ msgid "Unable to load server: "
 msgstr "Nepavyko Ä¯kelti serverio:"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Asmuo / Privatus"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "GrupÄ— / VieÅ¡as"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "ModuliÅ³ Pagelbiklis - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "PridÄ—ti Smuxi ModulÄ¯"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Redaguoti Smuxi modulÄ¯"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "RyÅ¡ys"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Kredencialai"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Dabar galite naudoti Smuxi modulÄ¯"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "AÄiÅ«"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "Modulis tokiu pavadinimu jau yra! PraÅ¡ome nurodyti kitÄ… pavadinimÄ…."
@@ -786,33 +821,29 @@ msgstr "Apie Smuxi"
 msgid "Preferences"
 msgstr "Nuostatos"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "NeÄ¯manoma pridÄ—ti serverio:"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Persijungimas Ä¯ vietinÄ¯ modulÄ¯, atjungs jus nuo dabartinio modulio!\n"
-"Ar tikrai norite tai padaryti?"
+msgstr "Persijungimas Ä¯ vietinÄ¯ modulÄ¯, atjungs jus nuo dabartinio modulio!\nAr tikrai norite tai padaryti?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Persijungimas Ä¯ nuotolinÄ¯ modulÄ¯, atjungs jus nuo dabartinio modulio!\n"
-"Ar tikrai norite tai padaryti?"
+msgstr "Persijungimas Ä¯ nuotolinÄ¯ modulÄ¯, atjungs jus nuo dabartinio modulio!\nAr tikrai norite tai 
padaryti?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "Diena pasikeitÄ— iÅ¡ {0} Ä¯ {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "Diena pasikeitÄ— Ä¯ {0}"
@@ -823,66 +854,39 @@ msgstr "Diena pasikeitÄ— Ä¯ {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "Neteisingas filtro reguliarusis reiÅ¡kinys: '{0}'. PrieÅ¾astis: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "JÅ«s tikri, kad norite iÅ¡trinti pasirinktÄ… filtrÄ…?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-#| msgid "Network:"
-msgid "Network"
-msgstr "Tinklas"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protokolas / Serveris"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Pokalbio Tipas"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normalus"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Ä®vykis"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Tipas"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "Å ablonas"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "NÄ—ra Ä®galiotojo Serverio"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "Pagal Sistemos NumatymÄ…"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Ä®raÅ¡yti"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-#| msgid "_Add"
-msgid "Add"
-msgstr "PridÄ—ti"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "Nepalaikoma"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
-msgstr ""
-"Å½emos Spartos Veiksena yra aktyvi: nebuvo sinchronizuota jokiÅ³ praneÅ¡imÅ³."
+msgstr "Å½emos Spartos Veiksena yra aktyvi: nebuvo sinchronizuota jokiÅ³ praneÅ¡imÅ³."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -894,29 +898,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Gaunamas vartotojÅ³ sÄ…raÅ¡as kanalui {0}..."
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "uÅ¾baigta."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Jungtis iÅ¡ naujo"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"UÅ¾darius protokolo pokalbÄ¯, bus uÅ¾daryti ir visi atverti, prie Å¡io protokolo "
-"prijungti, pokalbiai!\n"
-"Ar tikrai norite tai padaryti?"
+msgstr "UÅ¾darius protokolo pokalbÄ¯, bus uÅ¾daryti ir visi atverti, prie Å¡io protokolo prijungti, 
pokalbiai!\nAr tikrai norite tai padaryti?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "JÅ«s tikri, kad norite iÅ¡trinti pasirinktÄ… serverÄ¯?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "NeÄ¯manoma redaguoti serverio:"
 
@@ -1150,20 +1151,15 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Ä®jungia ryÅ¡iui SSH naudojimÄ…. Tai truputÄ¯ sumaÅ¾ina "
-"greitÄ¯, taÄiau yra saugiau ir yra reikalaujama, naudojant NAT ar prievadais "
-"pagrÄ¯stas uÅ¾kardas</span>"
+msgstr "<span size=\"small\">Ä®jungia ryÅ¡iui SSH naudojimÄ…. Tai truputÄ¯ sumaÅ¾ina greitÄ¯, taÄiau yra saugiau 
ir yra reikalaujama, naudojant NAT ar prievadais pagrÄ¯stas uÅ¾kardas</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "SSH S_erveris:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
-msgstr ""
-"<span size=\"small\">SSH serverio DNS arba IP adresas ir prievadas</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgstr "<span size=\"small\">SSH serverio DNS arba IP adresas ir prievadas</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
@@ -1172,84 +1168,74 @@ msgid "_Port:"
 msgstr "_Prievadas:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">Smuxi serverio DNS arba IP adresas ir prievadas</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">Smuxi serverio DNS arba IP adresas ir prievadas</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_Smuxi Serveris:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "_SSH Vartotojo vardas: (nebÅ«tina)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">Vartotojo vardas, kuris bus naudojamas prisijungimui Ä¯ "
-"SSH serverÄ¯</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Vartotojo vardas, kuris bus naudojamas prisijungimui Ä¯ SSH serverÄ¯</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "_SSH SlaptaÅ¾odis: (nebÅ«tina)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">SlaptaÅ¾odis, kuris bus naudojamas, prisijungimui prie "
-"SSH serverio. SlaptaÅ¾odis nÄ—ra bÅ«tinas jei naudojamas SSH prieigos teisÄ—s "
-"raktas (Å¾r. Å¾emiau).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">SlaptaÅ¾odis, kuris bus naudojamas, prisijungimui prie SSH serverio. SlaptaÅ¾odis 
nÄ—ra bÅ«tinas jei naudojamas SSH prieigos teisÄ—s raktas (Å¾r. Å¾emiau).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_SSH Rakto failas: (nebÅ«tina)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "Pasirinkti failÄ…"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">SSH privatus rakto failas, kuris bus naudojamas "
-"prisijungimui prie SSH serverio</span>"
+msgstr "<span size=\"small\">SSH privatus rakto failas, kuris bus naudojamas prisijungimui prie SSH 
serverio</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_Vartotojo vardas:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">Vartotojo vardas, kuris bus naudojamas prisijungimui "
-"prie Smuxi serverio</span>"
+msgstr "<span size=\"small\">Vartotojo vardas, kuris bus naudojamas prisijungimui prie Smuxi serverio</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "Sla_ptaÅ¾odis:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">Vartotojo slaptaÅ¾odis</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_Patvirtinkite SlaptaÅ¾odÄ¯:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Pakartokite slaptaÅ¾odÄ¯, kad patvirtinti</span>"
 
@@ -1259,12 +1245,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Sveiki atvykÄ™ Ä¯ Smuxi ModuliÅ³ KonfigÅ«racijos PagelbiklÄ¯.\n"
-"PrieÅ¡ tai, kuomet galÄ—site naudotis varikliuku, turite Ä¯vesti kai kuriÄ… "
-"informacijÄ….\n"
-"\n"
-"NorÄ—dami pradÄ—ti, spustelÄ—kite \"Pirmyn\"."
+msgstr "Sveiki atvykÄ™ Ä¯ Smuxi ModuliÅ³ KonfigÅ«racijos PagelbiklÄ¯.\nPrieÅ¡ tai, kuomet galÄ—site naudotis 
varikliuku, turite Ä¯vesti kai kuriÄ… informacijÄ….\n\nNorÄ—dami pradÄ—ti, spustelÄ—kite \"Pirmyn\"."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1284,11 +1265,9 @@ msgstr "Naudoti kaip naujÄ…jÄ¯ numatytÄ…jÄ¯ modulÄ¯"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Jei Ä¯jungta, kitÄ… kartÄ… paleidus Smuxi, dabartinis "
-"modulis taps numatytuoju</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Jei Ä¯jungta, kitÄ… kartÄ… paleidus Smuxi, dabartinis modulis taps 
numatytuoju</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1298,10 +1277,6 @@ msgstr "Smuxi - Atidaryti PokalbÄ¯"
 msgid "_Type:"
 msgstr "_Tipas:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi - Serveris"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Serveris:"
@@ -1318,10 +1293,6 @@ msgstr "Slapyvardis:"
 msgid "_Protocol:"
 msgstr "_Protokolas:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Paleidus programa, automatiÅ¡kai jungtis prie serverio"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Naudoti Å ifravimÄ…"
@@ -1337,66 +1308,3 @@ msgstr "K_omandos, prisijungus:"
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_Nepaisyti KomandÅ³"
-
-#~ msgid "Character"
-#~ msgstr "Simbolis"
-
-#~ msgid "Word"
-#~ msgstr "Å½odis"
-
-#~ msgid ""
-#~ "This setting specifies if Smuxi should store chat messages in memory "
-#~ "(volatile) or to disk (persistent).\n"
-#~ "For persistent you can choose between Db4o, an object database or SQLite, "
-#~ "a relational database.\n"
-#~ "The Db4o backend has known issues like high memory and CPU usage and can "
-#~ "even lead to crashes and thus it is deprecated.\n"
-#~ "The SQLite backend has no known performance or stability issues and is "
-#~ "the recommended setting."
-#~ msgstr ""
-#~ "Å is nustatymas nurodo ar Smuxi turÄ—tÅ³ laikyti pokalbiÅ³ praneÅ¡imus "
-#~ "atmintyje (neiÅ¡liekamas) ar diske (ilgalaikis).\n"
-#~ "Ilgalaikiam laikymui galite rinktis tarp Db4o, objektinÄ—s duomenÅ³ bazÄ—s "
-#~ "arba SQLite, sÄ…ryÅ¡inÄ—s duomenÅ³ bazÄ—s.\n"
-#~ "Db4o vidinÄ— pusÄ— turi Å¾inomÅ³ problemÅ³, tokiÅ³ kaip didelis atminties ir "
-#~ "procesoriaus naudojimas, ir gali sÄ…lygoti strigtis, todÄ—l ji yra "
-#~ "pasenusi.\n"
-#~ "SQLite vidinÄ— pusÄ— neturi Å¾inomÅ³ naÅ¡umo ar stabilumo problemÅ³ ir yra "
-#~ "rekomenduojamas nustatymas."
-
-#~ msgid "Persistent: SQLite (Recommended)"
-#~ msgstr "Ilgalaikis: SQLite (Rekomenduojamas)"
-
-#~ msgid "Persistent: Db4o (Deprecated)"
-#~ msgstr "Ilgalaikis: Db4o (PasenÄ™s)"
-
-#~ msgid "Persistent (Preview)"
-#~ msgstr "Ilgalaikis (PerÅ¾iÅ«ra)"
-
-#~ msgid "Volatile"
-#~ msgstr "NeiÅ¡liekamas"
-
-#~ msgid "Interface"
-#~ msgstr "SÄ…saja"
-
-#~ msgid "Servers"
-#~ msgstr "Serveriai"
-
-#~ msgid "Filters"
-#~ msgstr "Filtrai"
-
-#~ msgid "Logging"
-#~ msgstr "Derinimas"
-
-#~ msgid "Nicknames(s) field must not be empty."
-#~ msgstr "SlapyvardÅ¾io(-iÅ³) laukas negali bÅ«ti tuÅ¡Äias."
-
-#~ msgid "Invalid highlight regex: '{0}'. Reason: {1}"
-#~ msgstr ""
-#~ "Neteisingas paryÅ¡kinimo reguliarusis reiÅ¡kinys: '{0}'. PrieÅ¾astis: {1}"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protokolas:"
-
-#~ msgid "Hostname:"
-#~ msgstr "Kompiuterio vardas:"
diff --git a/po-Frontend-GNOME/pl.po b/po-Frontend-GNOME/pl.po
index 17a348b6..bfb8fa83 100644
--- a/po-Frontend-GNOME/pl.po
+++ b/po-Frontend-GNOME/pl.po
@@ -1,25 +1,27 @@
-# Polish translation for smuxi.
-# Copyright Â© 2012-2017 the smuxi authors.
-# This file is distributed under the same license as the smuxi package.
-# <lukasznaw gmail com>, 2012.
-# <okwell gmail com>, 2012.
-# Piotr DrÄ…g <piotrdrag gmail com>, 2015-2017.
-# Aviary.pl <community-poland mozilla org>, 2015-2017.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aviary.pl <gnomepl aviary pl>, 2015
+# lukasznaw <lukasznaw gmail com>, 2012
+# lukasznaw <lukasznaw gmail com>, 2012
+# OkweL <okwell gmail com>, 2012
+# OkweL <okwell gmail com>, 2012
+# Piotr DrÄ…g <piotrdrag gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-05 15:12+0100\n"
-"PO-Revision-Date: 2017-11-05 15:21+0100\n"
-"Last-Translator: Piotr DrÄ…g <piotrdrag gmail com>\n"
-"Language-Team: Polish <community-poland mozilla org>\n"
-"Language: pl\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2018-12-30 13:06+0000\n"
+"Last-Translator: Mirco Bauer <meebey gmail com>\n"
+"Language-Team: Polish (http://www.transifex.com/meebey/smuxi/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && 
(n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -30,10 +32,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"UÅ¼ywane pseudonimy. MoÅ¼na podaÄ‡ dodatkowe (oddzielone spacjami), ktÃ³re bÄ™dÄ… "
-"uÅ¼ywane jako zapasowe, jeÅ›li pierwszy pseudonim jest niedostÄ™pny. DomyÅ›lnie "
-"â€ž$pseudonim_â€ iÂ â€ž$pseudonim__â€ bÄ™dÄ… uÅ¼ywane jako zapasowe."
+msgstr "UÅ¼ywane pseudonimy. MoÅ¼na podaÄ‡ dodatkowe (oddzielone spacjami), ktÃ³re bÄ™dÄ… uÅ¼ywane jako zapasowe, 
jeÅ›li pierwszy pseudonim jest niedostÄ™pny. DomyÅ›lnie â€ž$pseudonim_â€ iÂ â€ž$pseudonim__â€ bÄ™dÄ… uÅ¼ywane jako 
zapasowe."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -133,16 +132,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = sekundy\n"
-"mm = minuty\n"
-"hh = godziny (01-12)\n"
-"HH = godziny (00-23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = dzieÅ„\n"
-"MM = miesiÄ…c\n"
-"yy/yyyy = rok"
+msgstr "ss = sekundy\nmm = minuty\nhh = godziny (01-12)\nHH = godziny (00-23)\ntt = AM/PM\n\ndd = dzieÅ„\nMM 
= miesiÄ…c\nyy/yyyy = rok"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -344,7 +334,8 @@ msgstr "TÅ‚o"
 msgid "<b> Color </b>"
 msgstr "<b> Kolor </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_Tryb zawijania:"
@@ -440,6 +431,28 @@ msgstr "Zapisywanie filtrowanych wiadomoÅ›ci wÂ dzienniku"
 msgid "_Logging"
 msgstr "Zapisywanie wÂ _dzienniku"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi â€” serwer"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Automatyczne Å‚Ä…czenie zÂ serwerem podczas uruchamiania"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "ProtokÃ³Å‚:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "SieÄ‡:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Nazwa serwera:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -459,11 +472,8 @@ msgstr "Rozmawianie wÂ sieci IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"rozmowa;rozmawianie;czat;czatowanie;chat;komunikator;wiadomoÅ›Ä‡;wiadomoÅ›ci;"
-"messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr 
"rozmowa;rozmawianie;czat;czatowanie;chat;komunikator;wiadomoÅ›Ä‡;wiadomoÅ›ci;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -473,10 +483,7 @@ msgstr "Rozmawianie przez protokoÅ‚y IRC, Twitter, Jabber iÂ Campfire"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi jest rozproszonym, przyjaznym uÅ¼ytkownikowi klientem rozmÃ³w open "
-"source obsÅ‚ugujÄ…cym protokoÅ‚y IRC, Twitter, Jabber/XMPP, Campfire oraz JabbR "
-"przez SignalR."
+msgstr "Smuxi jest rozproszonym, przyjaznym uÅ¼ytkownikowi klientem rozmÃ³w open source obsÅ‚ugujÄ…cym protokoÅ‚y 
IRC, Twitter, Jabber/XMPP, Campfire oraz JabbR przez SignalR."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -484,26 +491,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Zainspirowany przez poÅ‚Ä…czenie programÃ³w screen iÂ irssi, program Smuxi ma "
-"odÅ‚Ä…czalny serwer (lub jako â€žzwykÅ‚yâ€ klient), ktÃ³ry utrzymuje poÅ‚Ä…czenie "
-"iÂ umoÅ¼liwia Å‚Ä…czenie wielu interfejsÃ³w Smuxi wÂ tym samym czasie. Jest to "
-"podobne do programÃ³w screen+irssi czy bramek IRC, ale jest bardziej "
-"eleganckie iÂ ma wiÄ™ksze moÅ¼liwoÅ›ci."
+msgstr "Zainspirowany przez poÅ‚Ä…czenie programÃ³w screen iÂ irssi, program Smuxi ma odÅ‚Ä…czalny serwer (lub 
jako â€žzwykÅ‚yâ€ klient), ktÃ³ry utrzymuje poÅ‚Ä…czenie iÂ umoÅ¼liwia Å‚Ä…czenie wielu interfejsÃ³w Smuxi wÂ tym samym 
czasie. Jest to podobne do programÃ³w screen+irssi czy bramek IRC, ale jest bardziej eleganckie iÂ ma wiÄ™ksze 
moÅ¼liwoÅ›ci."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "GÅ‚Ã³wne okno wyÅ›wietlajÄ…ce kanaÅ‚ IRC"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"<lukasznaw gmail com>, 2012\n"
-"<okwell gmail com>, 2012\n"
-"Piotr DrÄ…g <piotrdrag gmail com>, 2015-2017\n"
-"Aviary.pl <community-poland mozilla org>, 2015-2017"
+msgstr "<lukasznaw gmail com>, 2012\n<okwell gmail com>, 2012\nPiotr DrÄ…g <piotrdrag gmail com>, 
2015-2017\nAviary.pl <community-poland mozilla org>, 2015-2017"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Witryna programu Smuxi"
 
@@ -559,10 +557,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"Interfejs nie jest zgodny zÂ tym mechanizmem.\n"
-"Wersja mechanizmu: {0}, wersja interfejsu: {1}\n"
-"ProtokÃ³Å‚ mechanizmu: {2}, protokÃ³Å‚ interfejsu: {3}"
+msgstr "Interfejs nie jest zgodny zÂ tym mechanizmem.\nWersja mechanizmu: {0}, wersja interfejsu: 
{1}\nProtokÃ³Å‚ mechanizmu: {2}, protokÃ³Å‚ interfejsu: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -583,14 +578,14 @@ msgstr "BÅ‚Ä…d: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Na pewno usunÄ…Ä‡ mechanizm â€ž{0}â€?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Wklejane wiersze: {0}. KontynuowaÄ‡?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Polecenia interfejsu"
 
@@ -635,9 +630,81 @@ msgstr "UÅ¼ytkownicy: {0}"
 msgid "Sorry, not implemented yet!"
 msgstr "Jeszcze niezaimplementowane."
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Znak"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "SÅ‚owo"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "To ustawienie okreÅ›la, czy program Smuxi powinien przechowywaÄ‡ wiadomoÅ›ci rozmÃ³w wÂ pamiÄ™ci 
(tymczasowo) czy na dysku (trwale).\nDo trwaÅ‚ego przechowywania moÅ¼na wybraÄ‡ obiektowÄ… bazÄ™ danych Db4o lub 
relacyjnÄ… bazÄ™ danych SQLite.\nMechanizm Db4o ma znane problemy, takie jak wysokie zuÅ¼ycie pamiÄ™ci iÂ 
procesora, co moÅ¼e prowadziÄ‡ do awarii, iÂ dlatego jest przestarzaÅ‚y.\nMechanizm SQLite nie ma znanych 
problemÃ³w zÂ wydajnoÅ›ciÄ… iÂ stabilnoÅ›ciÄ…, wiÄ™c jest zalecanym ustawieniem."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Trwale: SQLite (zalecane)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Trwale: Db4o (przestarzaÅ‚e)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Trwale (podglÄ…d)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "Tymczasowo"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Brak poÅ›rednika"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "DomyÅ›lne systemu"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "PoÅ‚Ä…czenie"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "Interfejs"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Serwery"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filtry"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Zapisywanie wÂ dzienniku"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "Pole pseudonimÃ³w nie moÅ¼e byÄ‡ puste."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "NieprawidÅ‚owe wyraÅ¼enie regularne wyrÃ³Å¼niania: â€ž{0}â€. PowÃ³d: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Nazwa"
 
@@ -647,86 +714,58 @@ msgstr "Temat"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"Wyszukiwanie rozmÃ³w grupowych bez filtra nie jest zalecane. MoÅ¼e to chwilÄ™ "
-"zajÄ…Ä‡ lub wÂ ogÃ³le nie dziaÅ‚aÄ‡.\n"
-"KontynuowaÄ‡?"
+msgstr "Wyszukiwanie rozmÃ³w grupowych bez filtra nie jest zalecane. MoÅ¼e to chwilÄ™ zajÄ…Ä‡ lub wÂ ogÃ³le nie 
dziaÅ‚aÄ‡.\nKontynuowaÄ‡?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "BÅ‚Ä…d podczas pobierania listy rozmÃ³w grupowych zÂ serwera."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "RozÅ‚Ä…czono zÂ mechanizmu."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Ponowne Å‚Ä…czenie zÂ mechanizmemâ€¦ (prÃ³ba: {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "PowÃ³d: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Wykryto krytyczny bÅ‚Ä…d zÂ powodu niezgodnoÅ›ci protokoÅ‚u zÂ smuxi-server.\n"
-"\n"
-"ProszÄ™ zainstalowaÄ‡ pakiet Mono po stronie interfejsu, aby pasowaÅ‚ do smuxi-"
-"server.\n"
-"\n"
-"WiÄ™cej informacji oÂ tym problemie (wÂ jÄ™zyku angielskim):\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Interfejs utraciÅ‚ poÅ‚Ä…czenie zÂ serwerem.\n"
-"PoÅ‚Ä…czyÄ‡ ponownie?"
+msgstr "Interfejs utraciÅ‚ poÅ‚Ä…czenie zÂ serwerem.\nPoÅ‚Ä…czyÄ‡ ponownie?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"Ponowne poÅ‚Ä…czenie zÂ serwerem siÄ™ nie powiodÅ‚o.\n"
-"SprÃ³bowaÄ‡ ponownie?"
+msgstr "Ponowne poÅ‚Ä…czenie zÂ serwerem siÄ™ nie powiodÅ‚o.\nSprÃ³bowaÄ‡ ponownie?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Serwer utraciÅ‚ poÅ‚Ä…czenie zÂ interfejsem.\n"
-"PoÅ‚Ä…czyÄ‡ ponownie?"
+msgstr "Serwer utraciÅ‚ poÅ‚Ä…czenie zÂ interfejsem.\nPoÅ‚Ä…czyÄ‡ ponownie?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "WyÅ›wietl"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "ProtokÃ³Å‚"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Nazwa serwera"
 
@@ -735,44 +774,40 @@ msgid "Unable to load server: "
 msgstr "Nie moÅ¼na wczytaÄ‡ serwera: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Osoba/prywatne"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Grupa/publiczne"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Asystent mechanizmÃ³w â€” Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "Dodaj mechanizm Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Modyfikuj mechanizm Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "PoÅ‚Ä…czenie"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Dane uwierzytelniajÄ…ce"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Teraz moÅ¼na uÅ¼ywaÄ‡ mechanizmu Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "DziÄ™kujemy"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "Mechanizm oÂ tej nazwie juÅ¼ istnieje. ProszÄ™ podaÄ‡ innÄ…."
@@ -790,33 +825,29 @@ msgstr "OÂ programie Smuxi"
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "Nie moÅ¼na dodaÄ‡ serwera: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"PrzeÅ‚Ä…czenie na lokalny mechanizm rozÅ‚Ä…czy zÂ obecnego mechanizmu.\n"
-"Na pewno przeÅ‚Ä…czyÄ‡?"
+msgstr "PrzeÅ‚Ä…czenie na lokalny mechanizm rozÅ‚Ä…czy zÂ obecnego mechanizmu.\nNa pewno przeÅ‚Ä…czyÄ‡?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"PrzeÅ‚Ä…czenie na zdalny mechanizm rozÅ‚Ä…czy zÂ obecnego mechanizmu.\n"
-"Na pewno przeÅ‚Ä…czyÄ‡?"
+msgstr "PrzeÅ‚Ä…czenie na zdalny mechanizm rozÅ‚Ä…czy zÂ obecnego mechanizmu.\nNa pewno przeÅ‚Ä…czyÄ‡?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:455
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "DzieÅ„ zostaÅ‚ zmieniony zÂ {0} na {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:459
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "DzieÅ„ zmieniono na {0}"
@@ -827,63 +858,39 @@ msgstr "DzieÅ„ zmieniono na {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "NieprawidÅ‚owe wyraÅ¼enie regularne filtru: â€ž{0}â€. PowÃ³d: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Na pewno usunÄ…Ä‡ zaznaczony filtr?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-msgid "Network"
-msgstr "SieÄ‡"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "ProtokÃ³Å‚/serwer"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Typ rozmowy"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "ZwykÅ‚a"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Wydarzenie"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "WzÃ³r"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Brak poÅ›rednika"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "DomyÅ›lne systemu"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Zapisz"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "NieobsÅ‚ugiwane"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "Tryb wolnego Å‚Ä…cza jest aktywny: brak zsynchronizowanych wiadomoÅ›ci."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -895,29 +902,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Pobieranie listy uÅ¼ytkownikÃ³w dla {0}â€¦"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "gotowe."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "PoÅ‚Ä…cz ponownie"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"ZamkniÄ™cie rozmowy protokoÅ‚u zamknie takÅ¼e wszystkie poÅ‚Ä…czone zÂ niÄ… otwarte "
-"rozmowy.\n"
-"ZamknÄ…Ä‡?"
+msgstr "ZamkniÄ™cie rozmowy protokoÅ‚u zamknie takÅ¼e wszystkie poÅ‚Ä…czone zÂ niÄ… otwarte rozmowy.\nZamknÄ…Ä‡?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Na pewno usunÄ…Ä‡ zaznaczony serwer?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "Nie moÅ¼na modyfikowaÄ‡ serwera: "
 
@@ -1151,18 +1155,14 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">WÅ‚Ä…cza uÅ¼ywanie SSH dla poÅ‚Ä…czenia. Ma to maÅ‚y wpÅ‚yw na "
-"wydajnoÅ›Ä‡, ale jest bezpieczniejsze iÂ wymagane podczas uÅ¼ywania NAT lub "
-"zapÃ³r sieciowych opartych na portach</span>"
+msgstr "<span size=\"small\">WÅ‚Ä…cza uÅ¼ywanie SSH dla poÅ‚Ä…czenia. Ma to maÅ‚y wpÅ‚yw na wydajnoÅ›Ä‡, ale jest 
bezpieczniejsze iÂ wymagane podczas uÅ¼ywania NAT lub zapÃ³r sieciowych opartych na portach</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "S_erwer SSH:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
 msgstr "<span size=\"small\">DNS lub adres IP iÂ port serwera SSH</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
@@ -1172,87 +1172,76 @@ msgid "_Port:"
 msgstr "_Port:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
 msgstr "<span size=\"small\">DNS lub adres IP iÂ port serwera Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_Serwer Smuxi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "Nazwa uÅ¼ytkownika _SSH (opcjonalna):"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">Nazwa uÅ¼ytkownika uÅ¼ywana do logowania wÂ serwerze SSH</"
-"span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Nazwa uÅ¼ytkownika uÅ¼ywana do logowania wÂ serwerze SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "_HasÅ‚o SSH (opcjonalne):"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">HasÅ‚o uÅ¼ywane do logowania wÂ serwerze SSH. HasÅ‚o jest "
-"opcjonalne, jeÅ›li uÅ¼ywane jest upowaÅ¼nienie kluczem SSH (proszÄ™ zobaczyÄ‡ "
-"niÅ¼ej)</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">HasÅ‚o uÅ¼ywane do logowania wÂ serwerze SSH. HasÅ‚o jest opcjonalne, jeÅ›li uÅ¼ywane 
jest upowaÅ¼nienie kluczem SSH (proszÄ™ zobaczyÄ‡ niÅ¼ej)</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_Plik klucza SSH (opcjonalny):"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "WybÃ³r pliku"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Plik klucza prywatnego SSH uÅ¼ywanego do logowania "
-"wÂ serwerze SSH</span>"
+msgstr "<span size=\"small\">Plik klucza prywatnego SSH uÅ¼ywanego do logowania wÂ serwerze SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "Nazwa _uÅ¼ytkownika:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">Nazwa uÅ¼ytkownika uÅ¼ywana do logowania wÂ serwerze "
-"Smuxi</span>"
+msgstr "<span size=\"small\">Nazwa uÅ¼ytkownika uÅ¼ywana do logowania wÂ serwerze Smuxi</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_HasÅ‚o:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">HasÅ‚o uÅ¼ytkownika</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_Sprawdzenie hasÅ‚a:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
-msgstr ""
-"<span size=\"small\">PowtÃ³rzenie hasÅ‚a wÂ celu sprawdzenia jego poprawnoÅ›ci</"
-"span>"
+msgstr "<span size=\"small\">PowtÃ³rzenie hasÅ‚a wÂ celu sprawdzenia jego poprawnoÅ›ci</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantIntroWidget.cs:19
 msgid ""
@@ -1260,11 +1249,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Witamy wÂ asystencie konfiguracji mechanizmu Smuxi.\n"
-"Przed uÅ¼yciem mechanizmu naleÅ¼y podaÄ‡ kilka informacji.\n"
-"\n"
-"KlikniÄ™cie przycisku â€žDalejâ€ rozpocznie."
+msgstr "Witamy wÂ asystencie konfiguracji mechanizmu Smuxi.\nPrzed uÅ¼yciem mechanizmu naleÅ¼y podaÄ‡ kilka 
informacji.\n\nKlikniÄ™cie przycisku â€žDalejâ€ rozpocznie."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1284,11 +1269,9 @@ msgstr "UÅ¼ycie jako domyÅ›lnego mechanizmu"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">JeÅ›li wÅ‚Ä…czono, to obecny mechanizm bÄ™dzie domyÅ›lnym "
-"podczas nastÄ™pnego uruchomienia programu Smuxi</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">JeÅ›li wÅ‚Ä…czono, to obecny mechanizm bÄ™dzie domyÅ›lnym podczas nastÄ™pnego 
uruchomienia programu Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1298,10 +1281,6 @@ msgstr "Smuxi â€” otwarcie rozmowy"
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi â€” serwer"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Nazwa serwera:"
@@ -1318,10 +1297,6 @@ msgstr "Pseudonim:"
 msgid "_Protocol:"
 msgstr "_ProtokÃ³Å‚:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Automatyczne Å‚Ä…czenie zÂ serwerem podczas uruchamiania"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Szyfrowanie"
diff --git a/po-Frontend-GNOME/pt_BR.po b/po-Frontend-GNOME/pt_BR.po
index 1d95fbc2..d6d594e7 100644
--- a/po-Frontend-GNOME/pt_BR.po
+++ b/po-Frontend-GNOME/pt_BR.po
@@ -1,25 +1,25 @@
-# Brazilian Portuguese for smuxi-Frontend-GNOME
-# Copyright (C) 2017 THE smuxi'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the smuxi package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
 # Translators:
-# Leonardopf <leonardo piresfelix com>, 2013
-# Rafael Fontenelle <rafaelff gnome org>, 2016, 2017.
+# Leonardo Pires Felix <leonardo piresfelix com>, 2013
+# Leonardo Pires Felix <leonardo piresfelix com>, 2013
+# Rafael Fontenelle <rafaelff gnome org>, 2016-2017
+# Rafael Fontenelle <rffontenelle gmail com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=smuxi&";
-"keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-11-04 05:46+0000\n"
-"PO-Revision-Date: 2017-12-12 06:15-0200\n"
-"Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
-"Language: pt_BR\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/meebey/smuxi/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
-"X-Project-Style: gnome\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -30,10 +30,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"O apelido a ser usado. VocÃª pode especificar vÃ¡rios apelidos (separados por "
-"espaÃ§os) que serÃ£o usados quando o apelido nÃ£o estiver disponÃvel. Por "
-"padrÃ£o $nick_ e $nick__ serÃ£o usados em caso de erros."
+msgstr "O apelido a ser usado. VocÃª pode especificar vÃ¡rios apelidos (separados por espaÃ§os) que serÃ£o 
usados quando o apelido nÃ£o estiver disponÃvel. Por padrÃ£o $nick_ e $nick__ serÃ£o usados em caso de erros."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -133,16 +130,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = segundos\n"
-"mm = minutos\n"
-"hh = horas(01-12)\n"
-"HH = horas(00-23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = dia\n"
-"MM = mÃªs\n"
-"yy/yyyy = ano"
+msgstr "ss = segundos\nmm = minutos\nhh = horas(01-12)\nHH = horas(00-23)\ntt = AM/PM\n\ndd = dia\nMM = 
mÃªs\nyy/yyyy = ano"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -344,8 +332,8 @@ msgstr "Plano de fundo"
 msgid "<b> Color </b>"
 msgstr "<b> Cor </b>"
 
-# Relacionado a quebra de linha/palavras
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_Modo de quebra:"
@@ -441,6 +429,28 @@ msgstr "Mensagens de log filtradas"
 msgid "_Logging"
 msgstr "_Logging"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Servidor"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Conectar automaticamente ao servidor na inicializaÃ§Ã£o"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Rede:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Servidor:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -460,50 +470,36 @@ msgstr "Converse com outras pessoas no IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"bate-papo;chat;mensagem;;instantÃ¢nea;messaging;im;gnome;gtk;irc;twitter;"
-"facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr 
"bate-papo;chat;mensagem;;instantÃ¢nea;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
 msgstr "Converse com outras pessoas no IRC, Twitter, Jabber e Campfire"
 
-# JabbR nÃ£o propriedade do SignalR, e sim criado com ASP.NET usando SignalR
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi Ã© um cliente de bate-papo cÃ³digo aberto, distribuÃdo e amigÃ¡vel para "
-"IRC, Twitter, Jabber/XMPP, Campfire e JabbR (com SignalR)."
+msgstr "Smuxi Ã© um cliente de bate-papo cÃ³digo aberto, distribuÃdo e amigÃ¡vel para IRC, Twitter, 
Jabber/XMPP, Campfire e JabbR (com SignalR)."
 
-# screen e irssi sÃ£o nomes prÃ³prios e tÃ©cnicos, nÃ£o traduzir.
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
 "Inspired by the combination of screen and irssi, Smuxi has a detachable "
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Inspirado pela combinaÃ§Ã£o de screen e irssi, Smuxi possui um servidor "
-"desvinculÃ¡vel (ou como um cliente \"normal\") que fica conectado quando vocÃª "
-"nÃ£o estÃ¡, e pode permitir mÃºltiplos frontends (interface grÃ¡fica) do Smuxi "
-"ficarem conectados e em sincronia. Isso Ã© similar ao screen+irssi ou "
-"replicadores IRC, porÃ©m muitos elegante e poderoso."
+msgstr "Inspirado pela combinaÃ§Ã£o de screen e irssi, Smuxi possui um servidor desvinculÃ¡vel (ou como um 
cliente \"normal\") que fica conectado quando vocÃª nÃ£o estÃ¡, e pode permitir mÃºltiplos frontends (interface 
grÃ¡fica) do Smuxi ficarem conectados e em sincronia. Isso Ã© similar ao screen+irssi ou replicadores IRC, 
porÃ©m muitos elegante e poderoso."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "A janela principal mostrando um canal IRC"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"Leonardopf <leonardo piresfelix com>, 2013\n"
-"Rafael Fontenelle <rffontenelle gmail com>, 2016"
+msgstr "Leonardopf <leonardo piresfelix com>, 2013\nRafael Fontenelle <rffontenelle gmail com>, 2016"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Site do Smuxi"
 
@@ -559,10 +555,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"Seu frontend nÃ£o Ã© compatÃvel com este motor!\n"
-"VersÃ£o do motor: {0} VersÃ£o do frontend: {1}\n"
-"Protocolo do motor: {2} Protocolo do frontend: {3}"
+msgstr "Seu frontend nÃ£o Ã© compatÃvel com este motor!\nVersÃ£o do motor: {0} VersÃ£o do frontend: 
{1}\nProtocolo do motor: {2} Protocolo do frontend: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -583,14 +576,14 @@ msgstr "Erro: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Tem certeza que deseja excluir o motor \"{0}\"?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "VocÃª estÃ¡ colando {0} linhas. Deseja continuar?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Comandos do frontend"
 
@@ -635,9 +628,81 @@ msgstr "{0} usuÃ¡rios"
 msgid "Sorry, not implemented yet!"
 msgstr "Desculpe, nÃ£o implementado ainda!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Caractere"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Palavra"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Essa configuraÃ§Ã£o especifica se o Smuxi deveria armazenar mensagens de bate-papo na memÃ³ria 
(volÃ¡til) ou no disco (persistente).\nPara persistente, vocÃª pode escolher entre Db4o, um banco de dados 
orientado a objeto e um banco de dados relacional.\nO backend Db4o possui problemas conhecidos, como o alto 
uso de memÃ³ria e de CPU e pode ainda levar a travamentos e, portanto, Ã© obsoleto.\nO backend SQLite nÃ£o 
possui problemas de desempenho e estabilidade conhecidos e Ã© a configuraÃ§Ã£o recomendada."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Persistente: SQLite (Recomendado)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Persistente: Db4o (Obsoleto)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "Persistente (visualizaÃ§Ã£o)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "VolÃ¡til"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Sem proxy"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "PadrÃ£o do sistema"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "ConexÃ£o"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filtros"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Registrando log"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "Campo de apelido(s) nÃ£o pode estar vazio."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "ExpressÃ£o regular de realce invÃ¡lida: \"{0}\". Motivo: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Nome"
 
@@ -647,87 +712,58 @@ msgstr "TÃ³pico"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"Pesquisar por grupo de bate-papo sem um filtro nÃ£o Ã© recomendado. Isso pode "
-"levar muito tempo ou nÃ£o funcionar.\n"
-"Deseja continuar?"
+msgstr "Pesquisar por grupo de bate-papo sem um filtro nÃ£o Ã© recomendado. Isso pode levar muito tempo ou nÃ£o 
funcionar.\nDeseja continuar?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Erro ao baixar lista com grupos de chat do servidor."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Desconectado do motor."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Reconectando ao motor... (tentativa {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Causa: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Um erro fatal foi detectado de uma incompatibilidade de protocolo com o "
-"smuxi-server!\n"
-"\n"
-"Por favor, instale Mono no lado do front-end, de forma que ele combine com o "
-"smuxi-server.\n"
-"\n"
-"Mais detalhes sobre essa questÃ£o podem ser localizados aqui:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"O frontend perdeu a conexÃ£o com o servidor.\n"
-"Deseja reconectar agora?"
+msgstr "O frontend perdeu a conexÃ£o com o servidor.\nDeseja reconectar agora?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"ReconexÃ£o ao servidor falhou.\n"
-"Deseja tentar novamente?"
+msgstr "ReconexÃ£o ao servidor falhou.\nDeseja tentar novamente?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"O servidor perdeu a conexÃ£o com o programa.\n"
-"Deseja reconectar agora?"
+msgstr "O servidor perdeu a conexÃ£o com o programa.\nDeseja reconectar agora?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Mostrar"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Nome do servidor"
 
@@ -736,44 +772,40 @@ msgid "Unable to load server: "
 msgstr "NÃ£o foi possÃvel carregar servidor:"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Pessoa / Privado"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Grupo / PÃºblico"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Assistente de motor - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "Adicionar motor Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Editar motor Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "ConexÃ£o"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Agora vocÃª pode usar o motor do Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "Obrigado"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "Um motor com esse nome jÃ¡ existe! Por favor, especifique outro nome."
@@ -791,33 +823,29 @@ msgstr "Sobre Smuxi"
 msgid "Preferences"
 msgstr "PreferÃªncias"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "NÃ£o foi possÃvel adicionar servidor: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Alternar para motor local vai desconectar vocÃª do motor atual!\n"
-"Tem certeza que deseja fazer isso?"
+msgstr "Alternar para motor local vai desconectar vocÃª do motor atual!\nTem certeza que deseja fazer isso?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Alternar para motor remoto vai desconectar vocÃª do motor atual!\n"
-"Tem certeza que deseja fazer isso?"
+msgstr "Alternar para motor remoto vai desconectar vocÃª do motor atual!\nTem certeza que deseja fazer isso?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "Dia alterado de {0} para {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "Dia alterado para {0}"
@@ -828,66 +856,39 @@ msgstr "Dia alterado para {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "ExpressÃ£o regular de filtro invÃ¡lida: \"{0}\". Motivo: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Tem certeza que deseja excluir o filtro selecionado?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-#| msgid "Network:"
-msgid "Network"
-msgstr "Rede"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protocolo / Servidor"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Tipo de bate-papo"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "PadrÃ£o"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Sem proxy"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "PadrÃ£o do sistema"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Salvar"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-#| msgid "_Add"
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "Sem suporte"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
-msgstr ""
-"Modo de conectividade lenta estÃ¡ ativada: nenhuma mensagem sincronizada."
+msgstr "Modo de conectividade lenta estÃ¡ ativada: nenhuma mensagem sincronizada."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -899,29 +900,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "Obtendo lista de usuÃ¡rios de {0}..."
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "feito."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Fechar o bate-papo do protocolo fecharÃ¡ tambÃ©m todos bate-papos abertos "
-"conectados a ele!\n"
-"Certeza que deseja fazer isso?"
+msgstr "Fechar o bate-papo do protocolo fecharÃ¡ tambÃ©m todos bate-papos abertos conectados a ele!\nCerteza 
que deseja fazer isso?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Tem certeza que deseja excluir o servidor selecionado?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "NÃ£o foi possÃvel editar o servidor: "
 
@@ -1155,18 +1153,14 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Habilita o uso do SSH para a conexÃ£o. Isso representa "
-"um pequeno impacto no desempenho, mas Ã© mais seguro e Ã© exigido para usar "
-"NAT ou firewall com restriÃ§Ãµes de portas</span>"
+msgstr "<span size=\"small\">Habilita o uso do SSH para a conexÃ£o. Isso representa um pequeno impacto no 
desempenho, mas Ã© mais seguro e Ã© exigido para usar NAT ou firewall com restriÃ§Ãµes de portas</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "Servidor SS_H:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
 msgstr "<span size=\"small\">DNS ou endereÃ§o IP e porta do servidor SSH</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
@@ -1176,84 +1170,74 @@ msgid "_Port:"
 msgstr "_Porta:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">DNS ou endereÃ§o IP e porta do servidor Smuxi</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">DNS ou endereÃ§o IP e porta do servidor Smuxi</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_Servidor Smuxi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "Nome de usuÃ¡rio _SSH: (opcional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">Nome de usuÃ¡rio que serÃ¡ usado para se autenticar no "
-"servidor SSH</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Nome de usuÃ¡rio que serÃ¡ usado para se autenticar no servidor SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "_Senha SSH: (opcional)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">Senha que serÃ¡ usada para se autenticar no servidor "
-"SSH. A senha Ã© opcional se a autorizaÃ§Ã£o de chave SSH for usada (veja mais "
-"abaixo).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">Senha que serÃ¡ usada para se autenticar no servidor SSH. A senha Ã© opcional se 
a autorizaÃ§Ã£o de chave SSH for usada (veja mais abaixo).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_Arquivo  de chave SSH: (opcional)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "Selecione um arquivo"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Arquivo de chave SSH privada que serÃ¡ usado para se "
-"autenticar no servidor SSH</span>"
+msgstr "<span size=\"small\">Arquivo de chave SSH privada que serÃ¡ usado para se autenticar no servidor 
SSH</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_Nome de usuÃ¡rio:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">Nome de usuÃ¡rio que serÃ¡ usado para se autenticar no "
-"servidor Smuxi</span>"
+msgstr "<span size=\"small\">Nome de usuÃ¡rio que serÃ¡ usado para se autenticar no servidor Smuxi</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">Senha do usuÃ¡rio</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "Conf_irmar senha:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Repita a senha para verificaÃ§Ã£o</span>"
 
@@ -1263,11 +1247,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Bem-vindo ao assistente de configuraÃ§Ã£o de motor do Smuxi.\n"
-"VocÃª precisa inserir algumas informaÃ§Ãµes antes de poder usar o motor.\n"
-"\n"
-"Clique \"AvanÃ§ar\" para comeÃ§ar."
+msgstr "Bem-vindo ao assistente de configuraÃ§Ã£o de motor do Smuxi.\nVocÃª precisa inserir algumas informaÃ§Ãµes 
antes de poder usar o motor.\n\nClique \"AvanÃ§ar\" para comeÃ§ar."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1287,11 +1267,9 @@ msgstr "Usar como novo motor padrÃ£o"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Se habilitado, o motor atual serÃ¡ o padrÃ£o na prÃ³xima "
-"vez que o Smuxi for iniciado</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Se habilitado, o motor atual serÃ¡ o padrÃ£o na prÃ³xima vez que o Smuxi for 
iniciado</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1301,10 +1279,6 @@ msgstr "Smuxi - Bate-papo aberto"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi - Servidor"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_EndereÃ§o Servidor:"
@@ -1321,10 +1295,6 @@ msgstr "Apelido:"
 msgid "_Protocol:"
 msgstr "_Protocolo:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Conectar automaticamente ao servidor na inicializaÃ§Ã£o"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Usar criptografia"
@@ -1340,71 +1310,3 @@ msgstr "_Comandos ao conectar:"
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "_Comandos para ignorar"
-
-#~ msgid "Character"
-#~ msgstr "Caractere"
-
-#~ msgid "Word"
-#~ msgstr "Palavra"
-
-#~ msgid ""
-#~ "This setting specifies if Smuxi should store chat messages in memory "
-#~ "(volatile) or to disk (persistent).\n"
-#~ "For persistent you can choose between Db4o, an object database or SQLite, "
-#~ "a relational database.\n"
-#~ "The Db4o backend has known issues like high memory and CPU usage and can "
-#~ "even lead to crashes and thus it is deprecated.\n"
-#~ "The SQLite backend has no known performance or stability issues and is "
-#~ "the recommended setting."
-#~ msgstr ""
-#~ "Essa configuraÃ§Ã£o especifica se o Smuxi deveria armazenar mensagens de "
-#~ "bate-papo na memÃ³ria (volÃ¡til) ou no disco (persistente).\n"
-#~ "Para persistente, vocÃª pode escolher entre Db4o, um banco de dados "
-#~ "orientado a objeto e um banco de dados relacional.\n"
-#~ "O backend Db4o possui problemas conhecidos, como o alto uso de memÃ³ria e "
-#~ "de CPU e pode ainda levar a travamentos e, portanto, Ã© obsoleto.\n"
-#~ "O backend SQLite nÃ£o possui problemas de desempenho e estabilidade "
-#~ "conhecidos e Ã© a configuraÃ§Ã£o recomendada."
-
-#~ msgid "Persistent: SQLite (Recommended)"
-#~ msgstr "Persistente: SQLite (Recomendado)"
-
-#~ msgid "Persistent: Db4o (Deprecated)"
-#~ msgstr "Persistente: Db4o (Obsoleto)"
-
-#~ msgid "Persistent (Preview)"
-#~ msgstr "Persistente (visualizaÃ§Ã£o)"
-
-#~ msgid "Volatile"
-#~ msgstr "VolÃ¡til"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgid "Filters"
-#~ msgstr "Filtros"
-
-#~ msgid "Logging"
-#~ msgstr "Registrando log"
-
-#~ msgid "Nicknames(s) field must not be empty."
-#~ msgstr "Campo de apelido(s) nÃ£o pode estar vazio."
-
-#~ msgid "Invalid highlight regex: '{0}'. Reason: {1}"
-#~ msgstr "ExpressÃ£o regular de realce invÃ¡lida: \"{0}\". Motivo: {1}"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protocolo:"
-
-#~ msgid "Hostname:"
-#~ msgstr "Servidor:"
-
-#~ msgid "Your frontend version ({0}) does not match the engine version ({1})!"
-#~ msgstr ""
-#~ "Sua versÃ£o de primeiro plano ({0}) nÃ£o Ã© igual a versÃ£o do motor ({1})!"
-
-#~ msgid "Person"
-#~ msgstr "Pessoa"
diff --git a/po-Frontend-GNOME/ru.po b/po-Frontend-GNOME/ru.po
index 505f647b..c55bb4b4 100644
--- a/po-Frontend-GNOME/ru.po
+++ b/po-Frontend-GNOME/ru.po
@@ -1,419 +1,457 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# VsyachePuz <vsyachepuz gmail com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: smuxi 0.8\n"
+"Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 15:23+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: ÐÐ»ÐµÐºÑ <davian818 gmail com>\n"
-"Language-Team: None <->\n"
-"Language: ru\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-10-27 14:06+0000\n"
+"Last-Translator: Andres G. Aragoneses <knocte gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n%10==1 && n%100!=11 ? 3 : n%10>=2 && n%10<=4 && (n%100<10 
|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
-msgid "<b> Chat </b>"
-msgstr "<b> Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€ </b>"
+msgid "Smuxi Preferences"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Smuxi"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:2
-msgid "<b> Color </b>"
-msgstr "<b> Ð¦Ð²ÐµÑ‚Ð° </b>"
+msgid ""
+"The nickname to use. You can specify extra nicknames (separated by spaces) "
+"which will be used as fallbacks when the first choice is not available. By "
+"default $nick_ and $nick__ will be used as fallbacks."
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ. ÐœÐ¾Ð¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð°, Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð°Ð¼Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ 
Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ, ÐµÑÐ»Ð¸ Ð¿ÐµÑ€Ð²Ð¾Ðµ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾; Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ñ‹ $nick_ Ð¸ 
$nick__."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1364
-msgid "<b> Entry Field </b>"
-msgstr "<b> Ð¡Ñ‚Ñ€Ð¾ÐºÐ° Ð²Ð²Ð¾Ð´Ð° </b>"
+msgid "Nickname(s):"
+msgstr "Ð˜Ð¼ÐµÐ½Ð°:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:4
-msgid "<b> Font </b>"
-msgstr "<b> Ð¨Ñ€Ð¸Ñ„Ñ‚ </b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:315
+msgid "Username:"
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:5
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1694
-msgid "<b> Highlighting </b>"
-msgstr "<b> ÐŸÐ¾Ð´ÑÐ²ÐµÑ‚ÐºÐ° </b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:147
+msgid "Realname:"
+msgstr "ÐŸÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:6
-msgid "<b> Notification Area Icon </b>"
-msgstr "<b> Ð—Ð½Ð°Ñ‡Ð¾Ðº Ð² Ð¾Ð±Ð»Ð°ÑÑ‚Ð¸ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ </b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:359
+msgid "Encoding:"
+msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:7
-msgid "<b> Person List Position </b>"
-msgstr "<b> Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑƒÑ‡Ð°ÑÑ‚Ð½Ð¸ÐºÐ¾Ð² </b>"
+msgid "Automatically convert UTF-8 characters"
+msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¿ÐµÑ€ÐµÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ UTF-8"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:8
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1201
-msgid "<b> Tab Colors </b>"
-msgstr "<b> Ð¦Ð²ÐµÑ‚Ð° Ð²ÐºÐ»Ð°Ð´Ð¾Ðº </b>"
+msgid "<b>General</b>"
+msgstr "<b>ÐžÐ±Ñ‰Ð¸Ðµ</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:9
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1102
-msgid "<b> Tabs Position </b>"
-msgstr "<b> ÐŸÐ¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ </b>"
+msgid "Type:"
+msgstr "Ð¢Ð¸Ð¿:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:10
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1507
-msgid "<b> Topic Position </b>"
-msgstr "<b> Ð¢ÐµÐ¼Ð° </b>"
+msgid "Host:"
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:11
-msgid "<b>General</b>"
-msgstr "<b>ÐžÐ±Ñ‰Ð¸Ðµ</b>"
+msgid "Password:"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:12
-msgid "<b>Global Commands</b>"
-msgstr ""
+msgid "Port:"
+msgstr "ÐŸÐ¾Ñ€Ñ‚:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:13
-msgid "<b>Messaging Menu</b>"
-msgstr "<b>ÐœÐµÐ½ÑŽ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹</b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
+msgid "Show Password"
+msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:14
 msgid "<b>Network Proxy</b>"
 msgstr "<b>ÐŸÑ€Ð¾ÐºÑÐ¸-ÑÐµÑ€Ð²ÐµÑ€</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:15
-msgid "<b>Notification Popups</b>"
-msgstr "<b>Ð’cÐ¿Ð»Ñ‹Ð²Ð°ÑŽoÑ‰Ð¸Ðµ cÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ</b>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:381
+msgid "On Connect Commands:"
+msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¿Ñ€Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:16
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1153
-msgid "Activity"
-msgstr ""
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:427
+msgid "On Startup Commands:"
+msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¿Ñ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:17
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:235
-msgid "Automatically connect to server at startup"
-msgstr ""
+msgid "<b>Global Commands</b>"
+msgstr "<b>Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ñ‹Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:18
-msgid "Background"
-msgstr "Ð¤Ð¾Ð½"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:471
+msgid "C_onnection"
+msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:19
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1352
-msgid "Bash-Style Completion"
-msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð² ÑÑ‚Ð¸Ð»Ðµ Bash"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:526
+msgid "Timestamp Format:"
+msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¼ÐµÑ‚ÐºÐ¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:20
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1682
-msgid "Beep on highlight"
-msgstr "Ð—Ð²ÑƒÐºÐ¾Ð²Ð¾Ð¹ ÑÐ¸Ð³Ð½Ð°Ð»"
-
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox11.Gtk.Box+BoxChild
-#: ../glade/smuxi-frontend-gnome.glade.h:21
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:972
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:994
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1453
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1478
-msgid "Bottom"
-msgstr "Ð¡Ð½Ð¸Ð·Ñƒ"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:22
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:738
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:546
 msgid "Buffer Lines:"
 msgstr "Ð Ð°Ð·_Ð¼ÐµÑ€ Ð±ÑƒÑ„ÐµÑ€Ð°:"
 
-#: ../glade/smuxi-frontend-gnome.glade.h:23
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:663
-msgid "C_onnection"
-msgstr ""
-
-#: ../glade/smuxi-frontend-gnome.glade.h:24
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1304
-msgid "Command Character:"
-msgstr "Ð¡Ð¸Ð¼Ð²Ð¾Ð» ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:25
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1327
-msgid "Command History Size:"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:26
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1284
-msgid "Completion Character:"
-msgstr "Ð¡Ð¸Ð¼Ð²Ð¾Ð» Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:27
-msgid "Enable"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:28
-msgid "Enabled"
-msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ Ð² Ð¶ÑƒÑ€Ð½Ð°Ð»"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:29
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:551
-msgid "Encoding:"
-msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°:"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:30
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:761
+#: ../glade/smuxi-frontend-gnome.glade.h:21
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:569
 msgid "Engine Buffer Lines:"
 msgstr "Ð¡Ñ‚Ñ€Ð¾Ðº Ð² Ð±ÑƒÑ„ÐµÑ€Ðµ ÑÐ´Ñ€Ð°:"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:22
+msgid ""
+"ss = seconds\n"
+"mm = minutes\n"
+"hh = hours (01 - 12)\n"
+"HH = hours (00 - 23)\n"
+"tt = AM/PM\n"
+"\n"
+"dd = day\n"
+"MM = month\n"
+"yy/yyyy = year"
+msgstr "ss = ÑÐµÐºÑƒÐ½Ð´Ñ‹\nmm = Ð¼Ð¸Ð½ÑƒÑ‚Ñ‹\nhh = Ñ‡Ð°ÑÑ‹ (01 - 12)\nHH = Ñ‡Ð°ÑÑ‹ (00 - 23)\ntt = AM/PM\n\ndd = Ð´ÐµÐ½ÑŒ\nMM = 
Ð¼ÐµÑÑÑ†\nyy/yyyy = Ð³Ð¾Ð´"
+
 #: ../glade/smuxi-frontend-gnome.glade.h:31
-msgid "Foreground"
-msgstr "Ð¢ÐµÐºÑÑ‚"
+msgid "Persistency Type:"
+msgstr "Ð¡Ð¿Ð¾ÑÐ¾Ð± ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:32
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:917
-msgid "General"
-msgstr "ÐžÐ±Ñ‰Ð¸Ðµ"
+msgid "Volatile Buffer Lines:"
+msgstr "Ð¡Ñ‚Ñ€Ð¾ÐºÐ¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð±ÑƒÑ„ÐµÑ€Ð°:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:33
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1173
-msgid "Highlight"
-msgstr "ÐŸÐ¾Ð´ÑÐ²ÐµÑ‚ÐºÐ°"
+msgid "Persistent Buffer Lines:"
+msgstr "Ð¡Ñ‚Ñ€Ð¾ÐºÐ¸ Ð¿Ð¾ÑÑ‚Ð¾ÑÐ½Ð½Ð¾Ð³Ð¾ Ð±ÑƒÑ„ÐµÑ€Ð°:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:34
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1658
-msgid "Highlight words:"
-msgstr "ÐŸÐ¾Ð´ÑÐ²ÐµÑ‡Ð¸Ð²Ð°Ñ‚ÑŒ ÑÐ»Ð¾Ð²Ð°"
+msgid "<b>Message Buffer</b>"
+msgstr "<b>Ð‘ÑƒÑ„ÐµÑ€ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:35
-msgid "Host:"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:628
+msgid "Strip Colors"
+msgstr "Ð£Ð±Ð¸Ñ€Ð°Ñ‚ÑŒ Ñ†Ð²ÐµÑ‚Ð°"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:36
-msgid "Hostname:"
-msgstr ""
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:667
+msgid "Strip Formattings"
+msgstr "Ð£Ð±Ð¸Ñ€Ð°Ñ‚ÑŒ Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:37
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1373
-msgid "Input"
-msgstr "Ð’Ð²Ð¾Ð´"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:707
+msgid "Strip UTF-8"
+msgstr "Ð£Ð±Ð¸Ñ€Ð°Ñ‚ÑŒ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ UTF-8"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:38
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1163
-msgid "Join/Part/Mode"
-msgstr "Ð¡Ð»ÑƒÐ¶ÐµÐ±Ð½Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
+msgid "Show Advanced Settings"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:39
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1008
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1033
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1527
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1553
-msgid "Left"
-msgstr "Ð¡Ð»ÐµÐ²Ð°"
+msgid "<b>Advanced</b>"
+msgstr "<b>Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ðµ</b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:40
-msgid "Log Filtered Messages"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ð¾Ñ‚Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:725
+msgid "General"
+msgstr "ÐžÐ±Ñ‰Ð¸Ðµ"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox11.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:41
-msgid "Network:"
-msgstr "Ð¡ÐµÑ‚ÑŒ:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:743
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:767
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1220
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1246
+msgid "Top"
+msgstr "Ð¡Ð²ÐµÑ€Ñ…Ñƒ"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox11.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:42
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1394
-msgid "Nick Colors"
-msgstr "Ð¦Ð²ÐµÑ‚Ð½Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð°"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:780
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:802
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1261
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1286
+msgid "Bottom"
+msgstr "Ð¡Ð½Ð¸Ð·Ñƒ"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:43
-msgid "Nickname(s):"
-msgstr "Ð˜Ð¼ÐµÐ½Ð°:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:816
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:841
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1335
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1361
+msgid "Left"
+msgstr "Ð¡Ð»ÐµÐ²Ð°"
 
+#. Container child vbox6.Gtk.Box+BoxChild
+#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:44
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1145
-msgid "No Activity"
-msgstr "Ð‘ÐµÐ· Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:856
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:881
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1376
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1401
+msgid "Right"
+msgstr "Ð¡Ð¿Ñ€Ð°Ð²Ð°"
 
 #. Container child vbox6.Gtk.Box+BoxChild
 #. Container child vbox11.Gtk.Box+BoxChild
 #. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:45
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1088
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1493
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1608
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:896
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1301
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1416
 msgid "None"
 msgstr "ÐÐµÑ‚"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:46
-msgid "Notification"
-msgstr "ÐžÐ¿Ð¾Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:910
+msgid "<b> Tabs Position </b>"
+msgstr "<b> ÐŸÐ¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:47
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:573
-msgid "On Connect Commands:"
-msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¿Ñ€Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:981
+msgid "Highlight"
+msgstr "ÐŸÐ¾Ð´ÑÐ²ÐµÑ‚ÐºÐ°"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:48
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:619
-msgid "On Startup Commands:"
-msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¿Ñ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:961
+msgid "Activity"
+msgstr "ÐÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚ÑŒ"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:49
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1706
-msgid "Output"
-msgstr "Ð’Ñ‹Ð²Ð¾Ð´"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:953
+msgid "No Activity"
+msgstr "Ð‘ÐµÐ· Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:50
-msgid "Override"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:971
+msgid "Join/Part/Mode"
+msgstr "Ð¡Ð»ÑƒÐ¶ÐµÐ±Ð½Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:51
-msgid "Password:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1009
+msgid "<b> Tab Colors </b>"
+msgstr "<b> Ð¦Ð²ÐµÑ‚Ð° Ð²ÐºÐ»Ð°Ð´Ð¾Ðº </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:52
-msgid "Port:"
-msgstr "ÐŸÐ¾Ñ€Ñ‚:"
+msgid "Automatically switch to newly opened person chats"
+msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ð½Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ‡Ñ‚Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ðµ Ñ‡Ð°Ñ‚Ñ‹"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:53
-msgid "Protocol:"
-msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»:"
+msgid "Automatically switch to newly opened group chats"
+msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ð½Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ‡Ñ‚Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ñ‹Ðµ Ñ‡Ð°Ñ‚Ñ‹"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:54
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:530
-msgid "Realname:"
-msgstr "ÐŸÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ:"
+msgid "Tree"
+msgstr "Ð”ÐµÑ€ÐµÐ²Ð¾"
 
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox12.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:55
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1048
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1073
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1568
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1593
-msgid "Right"
-msgstr "Ð¡Ð¿Ñ€Ð°Ð²Ð°"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1092
+msgid "Completion Character:"
+msgstr "Ð¡Ð¸Ð¼Ð²Ð¾Ð» Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:56
-msgid "Show Advanced Settings"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1112
+msgid "Command Character:"
+msgstr "Ð¡Ð¸Ð¼Ð²Ð¾Ð» ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:57
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:196
-msgid "Show Password"
-msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1135
+msgid "Command History Size:"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:58
-msgid "Show Smuxi in the messaging menu"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Smuxi Ð² Ð¼ÐµÐ½ÑŽ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1160
+msgid "Bash-Style Completion"
+msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð² ÑÑ‚Ð¸Ð»Ðµ Bash"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:59
-msgid "Show always"
-msgstr "Ð’ÑÐµÐ³Ð´Ð°"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1172
+msgid "<b> Entry Field </b>"
+msgstr "<b> Ð¡Ñ‚Ñ€Ð¾ÐºÐ° Ð²Ð²Ð¾Ð´Ð° </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:60
-msgid "Show notification popups"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð²ÑÐ¿Ð»Ñ‹Ð²Ð°ÑŽÑ‰Ð¸Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1181
+msgid "Input"
+msgstr "Ð’Ð²Ð¾Ð´"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:61
-msgid "Show when window is closed"
-msgstr "ÐšÐ¾Ð³Ð´Ð° Ð¾ÐºÐ½Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1202
+msgid "Nick Colors"
+msgstr "Ð¦Ð²ÐµÑ‚Ð½Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð°"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:62
-msgid "Show when window is minimized"
-msgstr "ÐšÐ¾Ð³Ð´Ð° Ð¾ÐºÐ½Ð¾ ÑÐ²ÐµÑ€Ð½ÑƒÑ‚Ð¾"
+msgid "<b> Person List Position </b>"
+msgstr "<b> Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑƒÑ‡Ð°ÑÑ‚Ð½Ð¸ÐºÐ¾Ð² </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:63
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:398
-msgid "Smuxi - Preferences"
-msgstr "Smuxi - Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
+msgid "Override"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:64
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:18
-msgid "Smuxi - Server"
-msgstr ""
+msgid "<b> Font </b>"
+msgstr "<b> Ð¨Ñ€Ð¸Ñ„Ñ‚ </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:65
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:820
-msgid "Strip Colors"
-msgstr "Ð£Ð±Ð¸Ñ€Ð°Ñ‚ÑŒ Ñ†Ð²ÐµÑ‚Ð°"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1315
+msgid "<b> Topic Position </b>"
+msgstr "<b> Ð¢ÐµÐ¼Ð° </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:66
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:859
-msgid "Strip Formattings"
-msgstr "Ð£Ð±Ð¸Ñ€Ð°Ñ‚ÑŒ Ð½Ð°Ñ‡ÐµÑ€Ñ‚Ð°Ð½Ð¸Ñ"
+msgid "Foreground"
+msgstr "Ð¢ÐµÐºÑÑ‚"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:67
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:899
-msgid "Strip UTF-8"
-msgstr "Ð£Ð±Ð¸Ñ€Ð°Ñ‚ÑŒ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ UTF-8"
+msgid "Background"
+msgstr "Ð¤Ð¾Ð½"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:68
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1214
-msgid "Tabs"
-msgstr "Ð’ÐºÐ»Ð°Ð´ÐºÐ¸"
-
-#: ../glade/smuxi-frontend-gnome.glade.h:69
-msgid "The nickname to use. You can specify extra nicknames (separated by spaces) which will be used as 
fallbacks when the first choice is not available. By default $nick_ and $nick__ will be used as fallbacks."
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ. ÐœÐ¾Ð¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð°, Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð°Ð¼Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ 
Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ, ÐµÑÐ»Ð¸ Ð¿ÐµÑ€Ð²Ð¾Ðµ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾; Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ñ‹ $nick_ Ð¸ 
$nick__."
+msgid "<b> Color </b>"
+msgstr "<b> Ð¦Ð²ÐµÑ‚Ð° </b>"
 
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:718
-msgid "Timestamp Format:"
-msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¼ÐµÑ‚ÐºÐ¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸:"
+msgid "_Wrap Mode:"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¿_ÐµÑ€ÐµÐ½Ð¾ÑÐ°:"
 
-#. Container child vbox6.Gtk.Box+BoxChild
-#. Container child vbox11.Gtk.Box+BoxChild
 #: ../glade/smuxi-frontend-gnome.glade.h:71
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:935
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:959
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1412
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1438
-msgid "Top"
-msgstr "Ð¡Ð²ÐµÑ€Ñ…Ñƒ"
+msgid "<b> Chat </b>"
+msgstr "<b> Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€ </b>"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:72
-msgid "Type:"
-msgstr "Ð¢Ð¸Ð¿:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1466
+msgid "Highlight words:"
+msgstr "ÐŸÐ¾Ð´ÑÐ²ÐµÑ‡Ð¸Ð²Ð°Ñ‚ÑŒ ÑÐ»Ð¾Ð²Ð°"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:73
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:507
-msgid "Username:"
-msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1490
+msgid "Beep on highlight"
+msgstr "Ð—Ð²ÑƒÐºÐ¾Ð²Ð¾Ð¹ ÑÐ¸Ð³Ð½Ð°Ð»"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:74
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1873
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1502
+msgid "<b> Highlighting </b>"
+msgstr "<b> ÐŸÐ¾Ð´ÑÐ²ÐµÑ‚ÐºÐ° </b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:75
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1514
+msgid "Output"
+msgstr "Ð’Ñ‹Ð²Ð¾Ð´"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:76
+msgid "Enable"
+msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:77
+msgid "Show always"
+msgstr "Ð’ÑÐµÐ³Ð´Ð°"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:78
+msgid "Show when window is minimized"
+msgstr "ÐšÐ¾Ð³Ð´Ð° Ð¾ÐºÐ½Ð¾ ÑÐ²ÐµÑ€Ð½ÑƒÑ‚Ð¾"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:79
+msgid "Show when window is closed"
+msgstr "ÐšÐ¾Ð³Ð´Ð° Ð¾ÐºÐ½Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:80
+msgid "<b> Notification Area Icon </b>"
+msgstr "<b> Ð—Ð½Ð°Ñ‡Ð¾Ðº Ð² Ð¾Ð±Ð»Ð°ÑÑ‚Ð¸ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ </b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:81
+msgid "Show Smuxi in the messaging menu"
+msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Smuxi Ð² Ð¼ÐµÐ½ÑŽ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:82
+msgid "<b>Messaging Menu</b>"
+msgstr "<b>ÐœÐµÐ½ÑŽ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹</b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:83
+msgid "Show notification popups"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð²ÑÐ¿Ð»Ñ‹Ð²Ð°ÑŽÑ‰Ð¸Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:84
+msgid "<b>Notification Popups</b>"
+msgstr "<b>Ð’cÐ¿Ð»Ñ‹Ð²Ð°ÑŽoÑ‰Ð¸Ðµ cÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ</b>"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:85
+msgid "Notification"
+msgstr "ÐžÐ¿Ð¾Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:86
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1523
+msgid "_Interface"
+msgstr "_Ð’Ð¸Ð´"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1589
+msgid "_Servers"
+msgstr "_Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1681
 msgid "_Filters"
 msgstr "_Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹"
 
-#: ../glade/smuxi-frontend-gnome.glade.h:75
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1715
-msgid "_Interface"
-msgstr "_Ð’Ð¸Ð´"
+#: ../glade/smuxi-frontend-gnome.glade.h:89
+msgid "Enabled"
+msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ Ð² Ð¶ÑƒÑ€Ð½Ð°Ð»"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:90
+msgid "Log Filtered Messages"
+msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ð¾Ñ‚Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
 
-#: ../glade/smuxi-frontend-gnome.glade.h:76
+#: ../glade/smuxi-frontend-gnome.glade.h:91
 msgid "_Logging"
 msgstr "_Ð–ÑƒÑ€Ð½Ð°Ð»"
 
-#: ../glade/smuxi-frontend-gnome.glade.h:77
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1781
-msgid "_Servers"
-msgstr "_Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹"
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - ÑÐµÑ€Ð²ÐµÑ€"
 
-#. This is a setting for character based line wrapping vs word based when
-#. showing messages
-#: ../glade/smuxi-frontend-gnome.glade.h:79
-msgid "_Wrap Mode:"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¿_ÐµÑ€ÐµÐ½Ð¾ÑÐ°:"
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÑÑ‚ÑŒÑÑ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼ Ð¿Ñ€Ð¸ ÑÑ‚Ð°Ñ€Ñ‚Ðµ"
 
-#: ../glade/smuxi-frontend-gnome.glade.h:80
-msgid ""
-"ss = seconds\n"
-"mm = minutes\n"
-"hh = hours (01 - 12)\n"
-"HH = hours (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = day\n"
-"MM = month\n"
-"yy/yyyy = year"
-msgstr ""
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "Ð¡ÐµÑ‚ÑŒ:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "Ð˜Ð¼Ñ Ñ…Ð¾ÑÑ‚Ð°:"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
-msgid "Chat with other people on IRC"
-msgstr "Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€ Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸ Ð² ÑÐµÑ‚Ð¸ IRC"
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
+msgid "Smuxi"
+msgstr "Smuxi"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:2
 msgid "IRC Chat"
@@ -423,197 +461,165 @@ msgstr "IRC-Ñ‡Ð°Ñ‚"
 msgid "Smuxi IRC Client"
 msgstr "IRC-ÐºÐ»Ð¸ÐµÐ½Ñ‚ Smuxi"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:58
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:4
+msgid "Chat with other people on IRC"
+msgstr "Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€ Ñ Ð»ÑŽÐ´ÑŒÐ¼Ð¸ Ð² ÑÐµÑ‚Ð¸ IRC"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
+msgid ""
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
+msgstr "ÐžÐ±Ñ‰Ð°Ñ‚ÑŒÑÑ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ Ð»ÑŽÐ´ÑŒÐ¼Ð¸ Ð² IRC, Twitter, Jabber Ð¸ Campfire"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+msgid ""
+"Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
+"Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
+msgstr "Smuxi ÑÑ‚Ð¾ Ð¾Ð¿ÐµÐ½ÑÐ¾Ñ€ÑÐ½Ð°Ñ, Ñ€Ð°ÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð°Ñ, ÑƒÐ´Ð¾Ð±Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² ÑÐµÑ‚ÑÑ… IRC, Twitter, 
Jabber/XMPP, Campfire Ð¸ JabbR Ð½Ð° SignalR."
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
+msgid ""
+"Inspired by the combination of screen and irssi, Smuxi has a detachable "
+"server (or like a \"normal\" client) that stays connected when you aren't, "
+"and can allow multiple Smuxi frontends to be connected and in sync. This is "
+"similar to screen+irssi or IRC bouncers, but more elegant and powerful."
+msgstr "Ð£Ð»ÑƒÑ‡ÑˆÐ°Ñ Ð¸Ð´ÐµÐ¸ screen Ð¸ irssi, Smuxi Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ Ð² ÑÐµÐ±Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð°ÐµÐ¼Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ (Ð²Ñ‹Ð³Ð»ÑÐ´ÑÑ‰Ð¸Ð¹ Ð´Ð»Ñ ÑÐµÑ‚Ð¸ ÐºÐ°Ðº 
Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹ ÐºÐ»Ð¸ÐµÐ½Ñ‚) ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð¾ÑÑ‚Ð°Ñ‘Ñ‚ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½Ñ‹Ð¼ Ñ ÑÐµÑ‚ÑŒÑŽ Ð´Ð°Ð¶Ðµ ÐºÐ¾Ð³Ð´Ð° Ð²Ñ‹ Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚Ðµ. Ð¡ÐµÑ€Ð²ÐµÑ€ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡Ð¸Ð²Ð°Ñ‚ÑŒ 
Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¸Ñ… ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¸Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼ Smuxi Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾. ÐÑ‚Ð¾ Ð¿Ð¾Ñ…Ð¾Ð¶Ðµ Ð½Ð° Ð±Ð¾ÑƒÐ½ÑÐµÑ€Ñ‹ IRC Ð¸Ð»Ð¸ ÑÐ²ÑÐ·ÐºÑƒ 
screen+irssi Ð½Ð¾ Ñ€ÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾ ÑÐ»ÐµÐ³Ð°Ð½Ñ‚Ð½ÐµÐµ Ð¸ Ñ„ÑƒÐ½Ñ†ÐºÐ¸Ð¾Ð½Ð°Ð»ÑŒÐ½ÐµÐµ."
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
+msgid "The main window showing an IRC channel"
+msgstr "Ð“Ð»Ð°Ð²Ð½Ð¾Ðµ Ð¾ÐºÐ½Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ ÐºÐ°Ð½Ð°Ð» IRC"
+
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
 msgstr "Alexandr Ponomarenko, 2010"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:61
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Ð¡Ð°Ð¹Ñ‚ Smuxi"
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:44
+#: ../src/Frontend-GNOME/CrashDialog.cs:46
 msgid "Oops, I did it again..."
 msgstr "ÐžÐ¿ÑÑ‚ÑŒ Ð´Ð²Ð°Ð´Ñ†Ð°Ñ‚ÑŒ Ð¿ÑÑ‚ÑŒ..."
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:57
+#: ../src/Frontend-GNOME/CrashDialog.cs:59
 msgid "Smuxi crashed because an unhandled exception was thrown!"
 msgstr "Smuxi Ð°Ð²Ð°Ñ€Ð¸Ð¹Ð½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐ°ÐµÑ‚ÑÑ Ð¸Ð·-Ð·Ð° Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ!"
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:61
+#: ../src/Frontend-GNOME/CrashDialog.cs:63
 msgid "Here is the stacktrace, please report this bug!"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰Ð¸Ñ‚Ðµ Ð¾Ð± Ð¾ÑˆÐ¸Ð±ÐºÐµ, Ð¿Ñ€Ð¸Ð»Ð¾Ð¶Ð¸Ð² ÑÑ‚Ñƒ Ñ‚Ñ€Ð°ÑÑÐ¸Ñ€Ð¾Ð²ÐºÑƒ."
 
-#: ../src/Frontend-GNOME/CrashDialog.cs:81
+#: ../src/Frontend-GNOME/CrashDialog.cs:83
 msgid "_Report Bug"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰Ð¸Ñ‚ÑŒ Ð¾Ð± Ð¾_ÑˆÐ¸Ð±ÐºÐµ"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:61
+msgid "Engine not found."
+msgstr "Ð”Ð²Ð¸Ð¶Ð¾Ðº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½."
+
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:77
 msgid "Engine Manager"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ´Ñ€Ð°Ð¼Ð¸"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:68
-msgid "_Connect"
-msgstr "ÐŸ_Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ"
-
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:84
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:96
 msgid "Select which Smuxi engine you want to connect to"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÐ´Ñ€Ð¾ Smuxi, Ðº ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼Ñƒ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:90
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:102
 msgid "Engine:"
 msgstr "Ð¯Ð´Ñ€Ð¾:"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:116
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:176
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:353
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:113
+msgid "Use Low Bandwidth Mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ ÑƒÐ·ÐºÐ¾Ð³Ð¾ ÐºÐ°Ð½Ð°Ð»Ð°"
+
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:137
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:197
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:382
 msgid "Local Engine"
 msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ðµ ÑÐ´Ñ€Ð¾"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:168
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:189
 msgid "Please select an engine!"
 msgstr "ÐÑƒÐ¶Ð½Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ ÑÐ´Ñ€Ð¾!"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:189
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:212
 #, csharp-format
-msgid "Your frontend version ({0}) does not match the engine version ({1})!"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ¸ ({0}) Ð½Ðµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð²ÐµÑ€ÑÐ¸Ð¸ ÑÐ´Ñ€Ð° ({1})!"
+msgid ""
+"Your frontend is not compatible with the engine!\n"
+"Engine Version: {0} Frontend Version: {1}\n"
+"Engine Protocol: {2} Frontend Protocol: {3}"
+msgstr "Ð’Ð°ÑˆÐ° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°-ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð½Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ð° Ñ ÑÐ´Ñ€Ð¾Ð¼!\nÐ’ÐµÑ€ÑÐ¸Ñ ÑÐ´Ñ€Ð°: {0}, Ð²ÐµÑ€ÑÐ¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°: {1}\nÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» ÑÐ´Ñ€Ð°: 
{2}, Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°: {3}"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:216
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ðº ÑÐ´Ñ€Ñƒ!"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:217
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:246
 #, csharp-format
 msgid "Engine URL: {0}"
 msgstr "ÐÐ´Ñ€ÐµÑ URL: {0}"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:220
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:249
 #, csharp-format
 msgid "Error: {0}"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°: {0}"
 
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:290
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:319
 #, csharp-format
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ \"{0}\"?"
 
-#: ../src/Frontend-GNOME/Entry.cs:421
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Ð‘ÑƒÐ´ÑƒÑ‚ Ð²ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ñ‹ {0} ÑÑ‚Ñ€Ð¾Ðº Ñ‚ÐµÐºÑÑ‚Ð°. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:524
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ¸"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:222
-msgid "_File"
-msgstr "_Ð¤Ð°Ð¹Ð»"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:238
-msgid "_Server"
-msgstr "_Ð¡ÐµÑ€Ð²ÐµÑ€"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:242
-msgid "_Quick Connect"
-msgstr "_Ð‘Ñ‹ÑÑ‚Ñ€Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:253
-msgid "_Manage"
-msgstr "_Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:260
-msgid "_Chat"
-msgstr "_Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:264
-msgid "Open / Join Chat"
-msgstr "_ÐÐ°Ñ‡Ð°Ñ‚ÑŒ Ð¸Ð»Ð¸ Ð²ÑÑ‚ÑƒÐ¿Ð¸Ñ‚ÑŒ..."
-
-#: ../src/Frontend-GNOME/MainWindow.cs:269
-msgid "_Find Group Chat"
-msgstr "ÐÐ°Ð¹Ñ‚Ð¸ _ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸ÑŽ"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:274
-msgid "C_lear All Activity"
-msgstr "Ð£_Ð±Ñ€Ð°Ñ‚ÑŒ Ð¼ÐµÑ‚ÐºÐ¸ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ð¸"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:281
-msgid "_Next Chat"
-msgstr "Ð¡_Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:291
-msgid "_Previous Chat"
-msgstr "ÐŸÑ€Ðµ_Ð´Ñ‹Ð´ÑƒÑ‰Ð¸Ð¹"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:341
-msgid "Open Log"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ _Ð¶ÑƒÑ€Ð½Ð°Ð»"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:355
-msgid "_Engine"
-msgstr "_Ð¯Ð´Ñ€Ð¾"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:359
-msgid "_Use Local Engine"
-msgstr "_Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ðµ ÑÐ´Ñ€Ð¾"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:365
-msgid "_Add Remote Engine"
-msgstr "_Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ Ð² ÑÐµÑ‚Ð¸"
+#: ../src/Frontend-GNOME/Main.cs:49
+msgid "Enable debug output"
+msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð²Ð¾Ð´ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:370
-msgid "_Switch Remote Engine"
-msgstr "_Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ Ð² ÑÐµÑ‚Ð¸"
+#: ../src/Frontend-GNOME/Main.cs:56
+msgid "Show this help"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÑ‚Ñƒ ÑÐ¿Ñ€Ð°Ð²ÐºÑƒ"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:377
-msgid "_View"
-msgstr "_Ð’Ð¸Ð´"
+#: ../src/Frontend-GNOME/Main.cs:60
+msgid "Options:"
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹:"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:381
-msgid "_Caret Mode"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼ _Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
+#: ../src/Frontend-GNOME/Main.cs:67
+msgid "Connect to engine"
+msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº ÑÐ´Ñ€Ñƒ"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:389
-msgid "_Browse Mode"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼ _Ð¾Ð±Ð·Ð¾Ñ€Ð°"
+#: ../src/Frontend-GNOME/Main.cs:74
+msgid "Opens the specified link in Smuxi"
+msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÑƒÐºÐ°Ð·Ð°Ð½Ð½ÑƒÑŽ Ð³Ð¸Ð¿ÐµÑ€ÑÑÑ‹Ð»ÐºÑƒ Ð² Smuxi"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:403
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:586
-msgid "Show _Menubar"
-msgstr "Ð¡Ñ‚Ñ€Ð¾ÐºÐ° _Ð¼ÐµÐ½ÑŽ"
+#: ../src/Frontend-GNOME/Main.cs:81
+msgid "Starts a new Smuxi instance and ignores an existing one"
+msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ€ Smuxi, Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÑ ÑƒÐ¶Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð½Ñ‹Ð¹"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:430
-msgid "_Help"
-msgstr "Ð¡Ð¿Ñ€_Ð°Ð²ÐºÐ°"
+#: ../src/Frontend-GNOME/Main.cs:109
+msgid "Passing link to already running Smuxi instance..."
+msgstr "ÐŸÐµÑ€ÐµÐ´Ð°Ñ‡Ð° Ð³Ð¸Ð¿ÐµÑ€ÑÑÑ‹Ð»ÐºÐ¸ Ð² Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÑŽÑ‰ÑƒÑŽ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ Smuxi"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:691
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:225
-msgid "Unable to add server: "
-msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€: "
+#: ../src/Frontend-GNOME/Main.cs:117
+msgid "Bringing already running Smuxi instance to foreground..."
+msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð½Ð¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ Smuxi Ð½Ð°Ð²Ð²ÐµÑ€Ñ… "
 
-#: ../src/Frontend-GNOME/MainWindow.cs:742
+#: ../src/Frontend-GNOME/MainWindow.cs:374
 #, csharp-format
-msgid "Unknown ChatType: {0}"
-msgstr ""
-
-#: ../src/Frontend-GNOME/MainWindow.cs:971
-msgid ""
-"Switching to local engine will disconnect you from the current engine!\n"
-"Are you sure you want to do this?"
-msgstr ""
-"ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ðµ ÑÐ´Ñ€Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ Ð²Ð°Ñ Ð¾Ñ‚ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾!\n"
-"ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
-
-#: ../src/Frontend-GNOME/MainWindow.cs:1013
-msgid ""
-"Switching the remote engine will disconnect you from the current engine!\n"
-"Are you sure you want to do this?"
-msgstr ""
-"Ð¡Ð¼ÐµÐ½Ð° ÑÐ´Ñ€Ð° Ð² ÑÐµÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ Ð²Ð°Ñ Ð¾Ñ‚ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾!\n"
-"ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
+msgid "{0} Users"
+msgstr "{0} Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
 
 #: ../src/Frontend-GNOME/NotImplementedMessageDialog.cs:40
 msgid "Sorry, not implemented yet!"
@@ -628,344 +634,607 @@ msgstr "Ð¿Ð¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼"
 msgid "Word"
 msgstr "Ð¿Ð¾ ÑÐ»Ð¾Ð²Ð°Ð¼"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:198
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "ÐÑ‚Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ Smuxi, Ð³Ð´Ðµ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸ÑÑ‚Ð¾Ñ€Ð¸ÑŽ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ - Ð² Ð¿Ð°Ð¼ÑÑ‚Ð¸ (Ð¿Ñ€Ð¾Ð¿Ð°Ð´Ñ‘Ñ‚ Ð¿Ñ€Ð¸ Ð²Ñ‹Ñ…Ð¾Ð´Ðµ) Ð¸Ð»Ð¸ Ð½Ð° 
Ð´Ð¸ÑÐºÐµ (Ð¾ÑÑ‚Ð°Ð½ÐµÑ‚ÑÑ Ð½Ð°Ð´Ð¾Ð»Ð³Ð¾).\nÐ”Ð»Ñ Ð´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ð±ÑŠÐµÐºÑ‚Ð½ÑƒÑŽ Db4o Ð¸Ð»Ð¸ Ð¾Ð±Ñ‹Ñ‡Ð½ÑƒÑŽ 
Ñ€ÐµÐ»ÑÑ†Ð¸Ð¾Ð½Ð½ÑƒÑŽ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð½Ñ‹Ñ… SQLite.\nDb4o Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð¿Ð°Ð¼ÑÑ‚Ð¸ Ð¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ¾Ñ€Ð° Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÑŒÑˆÐµ 
Ð¾ÑˆÐ¸Ð±Ð¾Ðº Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð¼ ÐºÐ¾Ð´Ðµ, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ ÐµÑ‘ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ.\nÐ¡Ð£Ð‘Ð” SQLite Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ñ… Ð¾ÑˆÐ¸Ð±Ð¾Ðº, 
Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð»ÑƒÑ‡ÑˆÐµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¸Ð¼ÐµÐ½Ð½Ð¾ ÐµÑ‘."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð² SQLite (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð² Db4o (Ð½Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "ÐŸÑ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "ÐÐµ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
 msgid "No Proxy"
 msgstr "Ð‘ÐµÐ· Ð¿Ñ€Ð¾ÐºÑÐ¸-ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:139
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ð°Ñ"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
 msgid "Connection"
 msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
 msgid "Interface"
 msgstr "Ð’Ð¸Ð´"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:220
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
 msgid "Servers"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:227
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
 msgid "Filters"
 msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:231
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
 msgid "Logging"
 msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:281
-msgid "System Default"
-msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ð°Ñ"
-
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:588
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
 msgid "Nicknames(s) field must not be empty."
 msgstr "ÐÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ Ð¾Ð´Ð½Ð¾ Ð¸Ð¼Ñ"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:748
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
 #, csharp-format
 msgid "Invalid highlight regex: '{0}'. Reason: {1}"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑ‚ÐºÐ¸: '{0}'. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {1}"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:69
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:105
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:271
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:74
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:86
 msgid "Topic"
 msgstr "Ð¢ÐµÐ¼Ð°"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:102
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
 "Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"ÐŸÐ¾Ð¸ÑÐº ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ð¹ Ð±ÐµÐ· ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð° Ð½Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð¼Ð½Ð¾Ð³Ð¾ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸, Ð½Ð¾ Ð½Ðµ Ð¿Ñ€Ð¸Ð½ÐµÑÑ‚Ð¸ 
Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°.\n"
-"ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
+msgstr "ÐŸÐ¾Ð¸ÑÐº ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ð¹ Ð±ÐµÐ· ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð° Ð½Ðµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð¼Ð½Ð¾Ð³Ð¾ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸, Ð½Ð¾ Ð½Ðµ 
Ð¿Ñ€Ð¸Ð½ÐµÑÑ‚Ð¸ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°.\nÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
 
-#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:143
+#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ð¹."
 
-#: ../src/Frontend-GNOME/Frontend.cs:399
+#: ../src/Frontend-GNOME/Frontend.cs:388
+msgid "Disconnected from engine."
+msgstr "ÐžÑ‚ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¾ Ð¾Ñ‚ ÑÐ´Ñ€Ð°."
+
+#: ../src/Frontend-GNOME/Frontend.cs:431
+#, csharp-format
+msgid "Reconnecting to engine... (attempt {0})"
+msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ ÑÐ´Ñ€Ð¾Ð¼ (Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° {0})"
+
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:469
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
+msgstr "ÐšÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð¿Ð¾Ñ‚ÐµÑ€ÑÐ»Ð° ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼.\nÐ’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:484
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº ÑÐµÑ€Ð²ÐµÑ€Ñƒ.\n"
-"ÐŸÐ¾Ð¿Ñ€Ð¾Ð±Ð¾Ð²Ð°Ñ‚ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·?"
+msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº ÑÐµÑ€Ð²ÐµÑ€Ñƒ.\nÐŸÐ¾Ð¿Ñ€Ð¾Ð±Ð¾Ð²Ð°Ñ‚ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:585
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð¿Ð¾Ñ‚ÐµÑ€ÑÐ» ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹.\nÐ’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ?"
 
-#: ../src/Frontend-GNOME/NotifyManager.cs:229
+#: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
-msgstr ""
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ"
 
-#: ../src/Frontend-GNOME/QuickConnectDialog.cs:62
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:238
+#: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
 
-#: ../src/Frontend-GNOME/QuickConnectDialog.cs:63
+#: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
 #: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "Ð˜Ð¼Ñ"
 
-#: ../src/Frontend-GNOME/QuickConnectDialog.cs:166
+#: ../src/Frontend-GNOME/QuickConnectDialog.cs:162
 msgid "Unable to load server: "
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:244
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Ð›Ð¸Ñ‡Ð½Ñ‹Ðµ"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:245
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ñ‹Ðµ Ð¸ Ð¾Ð±Ñ‰ÐµÑÑ‚Ð²."
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:70
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:94
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð° ÑÐ´Ñ€Ð° Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:203
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
-msgstr ""
+msgstr "ÐšÐ»ÑŽÑ‡Ð¸ Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð¸"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:265
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Ð¯Ð´Ñ€Ð¾ Smuxi Ð³Ð¾Ñ‚Ð¾Ð²Ð¾ Ðº Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÑŽ"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:268
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
-msgstr ""
+msgstr "Ð¡Ð¿Ð°ÑÐ¸Ð±Ð¾!"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:285
-msgid "An engine with this name already exists! Please specify a different one."
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
+msgid ""
+"An engine with this name already exists! Please specify a different one."
 msgstr "Ð¯Ð´Ñ€Ð¾ Ð¿Ð¾Ð´ Ñ‚Ð°ÐºÐ¸Ð¼ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚! Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ñ€ÑƒÐ³Ð¾Ðµ."
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:198
+#: ../src/Frontend-GNOME/Views/JoinWidget.cs:89
+msgid "Enter which chat to join"
+msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð¼Ñ Ñ‡Ð°Ñ‚Ð° Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ"
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:153
+msgid "About Smuxi"
+msgstr "Ðž Smuxi"
+
+#. TODO: add cmd+, accelerator
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:157
+msgid "Preferences"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
+msgid "Unable to add server: "
+msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€: "
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
+msgid ""
+"Switching to local engine will disconnect you from the current engine!\n"
+"Are you sure you want to do this?"
+msgstr "ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ðµ ÑÐ´Ñ€Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ Ð²Ð°Ñ Ð¾Ñ‚ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾!\nÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
+
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
+msgid ""
+"Switching the remote engine will disconnect you from the current engine!\n"
+"Are you sure you want to do this?"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° ÑÐ´Ñ€Ð° Ð² ÑÐµÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ Ð²Ð°Ñ Ð¾Ñ‚ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾!\nÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
+
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
+#, csharp-format
+msgid "Day changed from {0} to {1}"
+msgstr "Ð”ÐµÐ½ÑŒ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð»ÑÑ, Ð±Ñ‹Ð» {0} ÑÑ‚Ð°Ð» {1}"
+
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
-msgstr ""
+msgstr "Ð”ÐµÐ½ÑŒ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð»ÑÑ Ð½Ð° {0}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:123
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:133
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:120
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:130
 #, csharp-format
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°: '{0}'. ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð°: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:200
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:246
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð¸ ÑÐµÑ€Ð²ÐµÑ€"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:253
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
-msgstr ""
+msgstr "Ð¢Ð¸Ð¿ Ñ‡Ð°Ñ‚Ð°"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:287
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
-msgstr ""
+msgstr "ÐÐ¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:288
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ðµ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:295
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Ð¢Ð¸Ð¿"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:321
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½"
 
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:242
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
+msgid "Low Bandwidth Mode is active: no messages synced."
+msgstr "ÐÐºÑ‚Ð¸Ð²ÐµÐ½ Ñ€ÐµÐ¶Ð¸Ð¼ ÑƒÐ·ÐºÐ¾Ð³Ð¾ ÐºÐ°Ð½Ð°Ð»Ð°: ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹."
+
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
+msgid "Show _Menubar"
+msgstr "Ð¡Ñ‚Ñ€Ð¾ÐºÐ° _Ð¼ÐµÐ½ÑŽ"
+
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:321
 #, csharp-format
 msgid "Retrieving user list for {0}..."
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð½Ð° {0}..."
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:289
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "Ð³Ð¾Ñ‚Ð¾Ð²Ð¾."
 
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:304
-msgid "Person"
-msgstr "Ð›ÑŽÐ´Ð¸"
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
+msgid "Reconnect"
+msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:68
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Ð—Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ðµ Ð¾ÐºÐ½Ð° Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° Ð¿Ñ€ÐµÑ€Ð²ÐµÑ‚ Ð²ÑÐµ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ñ‹ Ð¿Ð¾ ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ.\n"
-"Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑÑ‚Ð¾ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ?"
+msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ðµ Ð¾ÐºÐ½Ð° Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° Ð¿Ñ€ÐµÑ€Ð²ÐµÑ‚ Ð²ÑÐµ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ñ‹ Ð¿Ð¾ ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ.\nÐ’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑÑ‚Ð¾ 
ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:187
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:243
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:277
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
-msgstr ""
+msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‚Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:34
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:24
 msgid "Find"
 msgstr "ÐŸÐ¾Ð¸ÑÐº"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:44
 msgid "_Search for:"
 msgstr "_Ð˜ÑÐºÐ°Ñ‚ÑŒ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:83
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:73
 msgid "_Match Case"
 msgstr "Ð¡ _ÑƒÑ‡ÐµÑ‚Ð¾Ð¼ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:95
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:85
 msgid "Search _Backwards"
 msgstr "ÐÐ°_Ð·Ð°Ð´"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:107
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:97
 msgid "_Wrap Around"
 msgstr "Ð’Ð¾ _Ð²ÑÐµÐ¼ Ñ‚ÐµÐºÑÑ‚Ðµ"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ChatFindDialog.cs:110
 msgid "Use _Regular Expressions"
 msgstr "_Ð ÐµÐ³ÑƒÐ»ÑÑ€Ð½Ñ‹Ðµ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:32
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
 msgid "Smuxi - Find Group Chat"
 msgstr "Smuxi - ÐŸÐ¾Ð¸ÑÐº ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ð¹"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:56
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
 msgid "_Name:"
 msgstr "_ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.QuickConnectDialog.cs:24
-msgid "Smuxi - Quick Connect"
-msgstr "Smuxi - Ð‘Ñ‹ÑÑ‚Ñ€Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.JoinWidget.cs:69
+msgid "Join"
+msgstr "ÐŸÑ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
+msgid "_Smuxi"
+msgstr "Smuxi"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
+msgid "_Server"
+msgstr "_Ð¡ÐµÑ€Ð²ÐµÑ€"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
+msgid "_Chat"
+msgstr "_Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
+msgid "_Engine"
+msgstr "_Ð¯Ð´Ñ€Ð¾"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
+msgid "_View"
+msgstr "_Ð’Ð¸Ð´"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
+msgid "_Help"
+msgstr "Ð¡Ð¿Ñ€_Ð°Ð²ÐºÐ°"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
+msgid "Connect"
+msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
+msgid "Open Log"
+msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ _Ð¶ÑƒÑ€Ð½Ð°Ð»"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
+msgid "_Preferences"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
+msgid "_Quit"
+msgstr "Ð’Ñ‹Ñ…Ð¾Ð´"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:487
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
+msgid "_Connect"
+msgstr "ÐŸ_Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
+msgid "_Add"
+msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
+msgid "_Manage"
+msgstr "_Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
+msgid "_Open / Join Chat"
+msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ / Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº Ñ‡Ð°Ñ‚Ñƒ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
+msgid "_Find Group Chat"
+msgstr "ÐÐ°Ð¹Ñ‚Ð¸ _ÐºÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸ÑŽ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
+msgid "C_lear All Activity"
+msgstr "Ð£_Ð±Ñ€Ð°Ñ‚ÑŒ Ð¼ÐµÑ‚ÐºÐ¸ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ð¸"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
+msgid "_Next Chat"
+msgstr "Ð¡_Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
+msgid "_Previous Chat"
+msgstr "ÐŸÑ€Ðµ_Ð´Ñ‹Ð´ÑƒÑ‰Ð¸Ð¹"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
+msgid "_Close"
+msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
+msgid "_Use Local Engine"
+msgstr "_Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ðµ ÑÐ´Ñ€Ð¾"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
+msgid "_Add Remote Engine"
+msgstr "_Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÐ´Ñ€Ð¾ Ð² ÑÐµÑ‚Ð¸"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
+msgid "Switch Remote Engine"
+msgstr "ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð´Ð°Ð»Ñ‘ÐºÐ¾Ðµ ÑÐ´Ñ€Ð¾"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
+msgid "_Caret Mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ _Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
+msgid "_Browse Mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ _Ð¾Ð±Ð·Ð¾Ñ€Ð°"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
+msgid "Show _Statusbar"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÑ‚Ñ€Ð¾ÐºÑƒ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ñ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
+msgid "_Fullscreen"
+msgstr "ÐŸÐ¾Ð»Ð½Ð¾ÑÐºÑ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
+msgid "_About"
+msgstr "Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
+msgid "Find Group Chat"
+msgstr "ÐÐ°Ð¹Ñ‚Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ð¹ Ñ‡Ð°Ñ‚"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
+msgid "_Website"
+msgstr "Ð’ÐµÐ±ÑÐ°Ð¹Ñ‚"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
+msgid "Show _Toolbar"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.QuickConnectDialog.cs:19
+msgid "Smuxi - Connect"
+msgstr "Smuxi - ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:206
+msgid "Smuxi - Preferences"
+msgstr "Smuxi - Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:295
 msgid "Nicknames:"
-msgstr ""
+msgstr "ÐÐ¸ÐºÐ½ÐµÐ¹Ð¼Ñ‹:"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1022
+msgid "Tabs"
+msgstr "Ð’ÐºÐ»Ð°Ð´ÐºÐ¸"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1622
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1430
 msgid "<b> User List Position </b>"
-msgstr ""
+msgstr "<b> ÐŸÐ¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ¾Ð±ÐµÑÐµÐ´Ð½Ð¸ÐºÐ¾Ð² </b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1633
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1441
 msgid "<b> Channel </b>"
-msgstr ""
+msgstr "<b> ÐšÐ°Ð½Ð°Ð» </b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1844
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1652
 msgid "<b>Channel Filters</b>"
-msgstr ""
+msgstr "<b>Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹ ÐºÐ°Ð½Ð°Ð»Ð°</b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1861
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:1669
 msgid "<b>User Filters</b>"
-msgstr ""
+msgstr "<b>ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹</b>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:56
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:42
 msgid "Use _SSH Tunnel"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ _Ñ‚ÑƒÐ½Ð½ÐµÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ SSH"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:70
-msgid "<span size=\"small\">Enables the use of SSH for the connection.  This has a small performance impact, 
but is more secure and required when using NAT or port-based firewalls</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:56
+msgid ""
+"<span size=\"small\">Enables the use of SSH for the connection.  This has a "
+"small performance impact, but is more secure and required when using NAT or "
+"port-based firewalls</span>"
 msgstr "<span size=\"small\">Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ SSH Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ. ÐÑ‚Ð¾ ÑÐ»ÐµÐ³ÐºÐ° ÑÐ½Ð¸Ð¶Ð°ÐµÑ‚ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ, 
Ð½Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡Ð¸Ð²Ð°ÐµÑ‚ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ Ð¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ ÑÐ¾ÐµÐ´Ð¸Ð½ÑÑ‚ÑŒÑÑ Ñ‡ÐµÑ€ÐµÐ·  NAT Ð¸ Ð±Ñ€Ð°Ð½Ð´Ð¼Ð°ÑƒÑÑ€Ñ‹.</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:149
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "_Ð¡ÐµÑ€Ð²ÐµÑ€ SSH:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:160
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
 msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
 msgstr "<span size=\"small\">Ð˜Ð¼Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ, Ð° Ñ‚Ð°Ðº Ð¶Ðµ Ð¿Ð¾Ñ€Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° SSH</span>"
 
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:187
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:155
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:183
 msgid "_Port:"
 msgstr "_ÐŸÐ¾Ñ€Ñ‚:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:200
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
 msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
+msgstr "<span size=\"small\">IP Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ DNS-Ð¸Ð¼Ñ Ð¸ Ð¿Ð¾Ñ€Ñ‚ Smuxi-ÑÐµÑ€Ð²ÐµÑ€Ð°</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:213
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "_ÐÐ´Ñ€ÐµÑ Smuxi:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:68
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "_Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ SSH Username: (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:91
-msgid "<span size=\"small\">Username which will be used to log into the SSH server</span>"
-msgstr ""
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
+msgid ""
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">Ð›Ð¾Ð³Ð¸Ð½ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ SSH-ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "ÐŸ_Ð°Ñ€Ð¾Ð»ÑŒ SSH: (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:135
-msgid "<span size=\"small\">Password which will be used to log into the SSH server. The password is optional 
if SSH key authorization is used (via Pageant from the PuTTY tools).</span>"
-msgstr "<span size=\"small\">ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€ SSH. ÐÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾, ÐµÑÐ»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑŽÑ‚ÑÑ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ 
(Ð½Ð°Ð¿Ñ€. Ñ‡ÐµÑ€ÐµÐ· Pageant Ð¸Ð· Ð¿Ð°ÐºÐµÑ‚Ð° PuTTY).</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
+msgid ""
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ SSH-ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼. Ð•ÑÐ»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾ ÐºÐ»ÑŽÑ‡Ð°Ð¼ 
SSH, Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ (ÑÐ¼. Ð½Ð¸Ð¶Ðµ).</span>"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
+msgid "_SSH Keyfile: (optional)"
+msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ñ ÐºÐ»ÑŽÑ‡Ð°Ð¼Ð¸ SSH (Ð½Ðµ Ð¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾):"
+
+#. Container child vbox17.Gtk.Box+BoxChild
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
+msgid "Select a File"
+msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¿ÑƒÑ‚ÑŒ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ð°"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
+msgid ""
+"<span size=\"small\">SSH private keyfile which will be used to log into the "
+"SSH server</span>"
+msgstr "<span size=\"small\">Ð¤Ð°Ð¹Ð» Ñ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ÐºÐ»ÑŽÑ‡ÐµÐ¼ Ð´Ð»Ñ SSH, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ðº 
SSH-ÑÐµÑ€Ð²ÐµÑ€Ñƒ</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:156
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:214
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "Ð˜_Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:179
-msgid "<span size=\"small\">Username which will be used to log into the Smuxi server</span>"
-msgstr ""
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
+msgid ""
+"<span size=\"small\">Username which will be used to log into the Smuxi "
+"server</span>"
+msgstr "<span size=\"small\">Ð›Ð¾Ð³Ð¸Ð½, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ðº Smuxi-ÑÐµÑ€Ð²ÐµÑ€Ñƒ</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:199
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:113
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:223
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:243
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "ÐŸÑ€Ð¾_Ð²ÐµÑ€ÐºÐ° Ð¿Ð°Ñ€Ð¾Ð»Ñ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:267
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð· Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸</span>"
 
@@ -975,65 +1244,66 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð¼Ð°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐ´Ñ€Ð° Smuxi.\n"
-"ÐŸÐµÑ€ÐµÐ´ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ.\n"
-"\n"
-"Ð©ÐµÐ»ÐºÐ½Ð¸Ñ‚Ðµ \"Ð’Ð¿ÐµÑ€Ñ‘Ð´\"."
+msgstr "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð¼Ð°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐ´Ñ€Ð° Smuxi.\nÐŸÐµÑ€ÐµÐ´ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ 
Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ.\n\nÐ©ÐµÐ»ÐºÐ½Ð¸Ñ‚Ðµ \"Ð’Ð¿ÐµÑ€Ñ‘Ð´\"."
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:44
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
 msgstr "_ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑÐ´Ñ€Ð°:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:59
 msgid "<span size=\"small\">Profile name of the new engine</span>"
 msgstr "<span size=\"small\">ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ´Ñ€Ð°</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:80
 msgid "_Default Engine:"
 msgstr "ÐŸÐ¾ _ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:91
 msgid "Use as new default engine"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ°Ðº ÑÐ´Ñ€Ð¾ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:112
-msgid "<span size=\"small\">If enabled, the current engine will be the default next time Smuxi is 
started</span>"
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
+msgid ""
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
 msgstr "<span size=\"small\">Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ð¾Ðµ ÑÐ´Ñ€Ð¾ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð¿Ñ€Ð¸ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼ Ð·Ð°Ð¿ÑƒÑÐºÐµ Smuxi</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:26
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
 msgstr "Smuxi - Ð’Ñ‹Ð±Ð¾Ñ€ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð°"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:69
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:63
 msgid "_Type:"
 msgstr "_Ð¢Ð¸Ð¿:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:80
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Ð¡ÐµÑ€Ð²ÐµÑ€:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:101
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:79
 msgid "_Network:"
 msgstr "Ð¡_ÐµÑ‚ÑŒ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:105
+msgid "Nickname:"
+msgstr "ÐÐ¸ÐºÐ½ÐµÐ¹Ð¼:"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:252
 msgid "_Protocol:"
 msgstr "ÐŸ_Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:248
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ _ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:260
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:288
 msgid "Validate Server Certificate"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:280
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:308
 msgid "_On Connect Commands:"
 msgstr "ÐŸ_Ñ€Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:291
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "Ð˜_Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹"
-
diff --git a/po-Frontend-GNOME/sv.po b/po-Frontend-GNOME/sv.po
index acb005c0..1521b86c 100644
--- a/po-Frontend-GNOME/sv.po
+++ b/po-Frontend-GNOME/sv.po
@@ -1,29 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Anders Jonsson <anders jonsson norsjovallen se>, 2016,2018
+# flugsio <flugsio gmail com>, 2011-2012
 # flugsio <flugsio gmail com>, 2013-2015
 # flugsio <flugsio gmail com>, 2011, 2012
-# Martin Bagge <brother bsnet se>, 2013
-# Anders Jonsson <anders jonsson norsjovallen se>, 2016, 2018
 # Josef Andersson <l10nl18nsweja gmail com>, 2018
-#
+# Martin Bagge <brother bsnet se>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/smuxi/issues\n";
-"POT-Creation-Date: 2018-06-10 18:19+0000\n"
-"PO-Revision-Date: 2018-09-05 23:46+0200\n"
-"Last-Translator: Josef Andersson <l10nl18nsweja gmail com>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/smuxi/language/";
-"sv/)\n"
-"Language: sv\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2018-12-30 13:06+0000\n"
+"Last-Translator: Mirco Bauer <meebey gmail com>\n"
+"Language-Team: Swedish (http://www.transifex.com/meebey/smuxi/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.1.1\n"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:1
 msgid "Smuxi Preferences"
@@ -34,10 +32,7 @@ msgid ""
 "The nickname to use. You can specify extra nicknames (separated by spaces) "
 "which will be used as fallbacks when the first choice is not available. By "
 "default $nick_ and $nick__ will be used as fallbacks."
-msgstr ""
-"Smeknamn att anvÃ¤nda. Du kan ange flera smeknamn (separerade med mellanslag) "
-"som ska anvÃ¤ndas som alternativ om det fÃ¶rsta valet inte Ã¤r ledigt. "
-"Standardalternativ Ã¤r $nick_ och $nick__."
+msgstr "Smeknamn att anvÃ¤nda. Du kan ange flera smeknamn (separerade med mellanslag) som ska anvÃ¤ndas som 
alternativ om det fÃ¶rsta valet inte Ã¤r ledigt. Standardalternativ Ã¤r $nick_ och $nick__."
 
 #: ../glade/smuxi-frontend-gnome.glade.h:3
 msgid "Nickname(s):"
@@ -137,16 +132,7 @@ msgid ""
 "dd = day\n"
 "MM = month\n"
 "yy/yyyy = year"
-msgstr ""
-"ss = sekunder\n"
-"mm = minuter\n"
-"hh = timmar (01 - 12)\n"
-"HH = timmar (00 - 23)\n"
-"tt = AM/PM\n"
-"\n"
-"dd = dag\n"
-"MM = mÃ¥nad\n"
-"yy/yyyy = Ã¥r"
+msgstr "ss = sekunder\nmm = minuter\nhh = timmar (01 - 12)\nHH = timmar (00 - 23)\ntt = AM/PM\n\ndd = 
dag\nMM = mÃ¥nad\nyy/yyyy = Ã¥r"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:31
 msgid "Persistency Type:"
@@ -348,7 +334,8 @@ msgstr "Bakgrund"
 msgid "<b> Color </b>"
 msgstr "<b> FÃ¤rg </b>"
 
-#. This is a setting for character based line wrapping vs word based when showing messages
+#. This is a setting for character based line wrapping vs word based when
+#. showing messages
 #: ../glade/smuxi-frontend-gnome.glade.h:70
 msgid "_Wrap Mode:"
 msgstr "_LÃ¤ge fÃ¶r radbrytning:"
@@ -444,6 +431,28 @@ msgstr "Logga filtrerade meddelanden"
 msgid "_Logging"
 msgstr "_Loggning"
 
+#: ../glade/smuxi-frontend-gnome.glade.h:92
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
+msgid "Smuxi - Server"
+msgstr "Smuxi - Server"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
+msgid "Automatically connect to server at startup"
+msgstr "Anslut automatiskt till server vid uppstart"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:94
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:95
+msgid "Network:"
+msgstr "NÃ¤tverk:"
+
+#: ../glade/smuxi-frontend-gnome.glade.h:96
+msgid "Hostname:"
+msgstr "VÃ¤rdnamn:"
+
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
@@ -463,11 +472,8 @@ msgstr "Chatta med andra mÃ¤nniskor pÃ¥ IRC"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
 msgid ""
-"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;"
-"jabbr;"
-msgstr ""
-"chatt;meddelande;snabbmeddelande;im;gnome;gtk;irc;twitter;facebook;gtalk;"
-"xmpp;jabber;campfire;jabbr;"
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "chatt;meddelande;snabbmeddelande;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
 msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
@@ -477,9 +483,7 @@ msgstr "Chatta med andra mÃ¤nniskor pÃ¥ IRC, Twitter, Jabber och Campfire"
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
-msgstr ""
-"Smuxi Ã¤r en Ã¶ppen-kÃ¤llkod, distribuerad och anvÃ¤ndarvÃ¤nlig chattklient fÃ¶r "
-"IRC, Twitter, Jabber/XMPP, Campfire och SignalR's JabbR."
+msgstr "Smuxi Ã¤r en Ã¶ppen-kÃ¤llkod, distribuerad och anvÃ¤ndarvÃ¤nlig chattklient fÃ¶r IRC, Twitter, 
Jabber/XMPP, Campfire och SignalR's JabbR."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
@@ -487,27 +491,17 @@ msgid ""
 "server (or like a \"normal\" client) that stays connected when you aren't, "
 "and can allow multiple Smuxi frontends to be connected and in sync. This is "
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
-msgstr ""
-"Inspirerat av kombinationen av screen och irssi har Smuxi en lÃ¶stagbar "
-"server (eller som en â€normalâ€ klient) som fÃ¶rblir ansluten dÃ¥ du inte Ã¤r "
-"det, och kan lÃ¥ta flera Smuxi-framÃ¤ndar vara anslutna och synkroniserade. "
-"Detta liknar screen+irssi eller IRC-proxyservrar, men mer elegant och "
-"kraftfullt."
+msgstr "Inspirerat av kombinationen av screen och irssi har Smuxi en lÃ¶stagbar server (eller som en â€normalâ€ 
klient) som fÃ¶rblir ansluten dÃ¥ du inte Ã¤r det, och kan lÃ¥ta flera Smuxi-framÃ¤ndar vara anslutna och 
synkroniserade. Detta liknar screen+irssi eller IRC-proxyservrar, men mer elegant och kraftfullt."
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "HuvudfÃ¶nstret dÃ¥ det visar en IRC-kanal"
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:70
+#: ../src/Frontend-GNOME/AboutDialog.cs:66
 msgid "translator-credits"
-msgstr ""
-"Martin Bagge <brother bsnet se>\n"
-"Anders Jonsson <anders jonsson norsjovallen se>\n"
-"\n"
-"Skicka synpunkter pÃ¥ Ã¶versÃ¤ttningen till\n"
-"<tp-sv listor tp-sv se>."
+msgstr "Martin Bagge <brother bsnet se>\nAnders Jonsson <anders jonsson norsjovallen se>\n\nSkicka 
synpunkter pÃ¥ Ã¶versÃ¤ttningen till\n<tp-sv listor tp-sv se>."
 
-#: ../src/Frontend-GNOME/AboutDialog.cs:83
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
 msgid "Smuxi Website"
 msgstr "Smuxis webbplats"
 
@@ -563,10 +557,7 @@ msgid ""
 "Your frontend is not compatible with the engine!\n"
 "Engine Version: {0} Frontend Version: {1}\n"
 "Engine Protocol: {2} Frontend Protocol: {3}"
-msgstr ""
-"Din framÃ¤nde Ã¤r inte kompatibel med motorn!\n"
-"Motorversion: {0} FramÃ¤ndesversion: {1}\n"
-"Motorprotokoll: {2} FramÃ¤ndesprotokoll: {3}"
+msgstr "Din framÃ¤nde Ã¤r inte kompatibel med motorn!\nMotorversion: {0} FramÃ¤ndesversion: 
{1}\nMotorprotokoll: {2} FramÃ¤ndesprotokoll: {3}"
 
 #: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
 msgid "An error occurred while connecting to the engine!"
@@ -587,14 +578,14 @@ msgstr "Fel: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "Ã„r du sÃ¤ker pÃ¥ att du vill radera motorn â€{0}â€?"
 
-#: ../src/Frontend-GNOME/Entry.cs:492
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "Du kommer att klistra in {0} rader. Vill du fortsÃ¤tta?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:609
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Kommandon fÃ¶r framÃ¤nden"
 
@@ -639,9 +630,81 @@ msgstr "{0} AnvÃ¤ndare"
 msgid "Sorry, not implemented yet!"
 msgstr "UrsÃ¤kta, detta Ã¤r inte implementerat Ã¤n!"
 
+#. fill ListStore
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
+msgid "Character"
+msgstr "Tecken"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
+msgid "Word"
+msgstr "Ord"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Denna instÃ¤llning anger huruvida Smuxi ska lagra chattmeddelanden i minne (flyktigt) eller till disk 
(bestÃ¤ndigt).\nFÃ¶r bestÃ¤ndig lagting kan du vÃ¤lja mellan Db4o, en objektdatabas eller SQLite, en relationell 
databas.\nDb4o-bakÃ¤nden har kÃ¤nda problem som hÃ¶g minnes- och processoranvÃ¤ndning och kan till och med leda 
till krascher och anvÃ¤ndning av den avrÃ¥des dÃ¤rfÃ¶r frÃ¥n.\nSQLite-bakÃ¤nden har inga kÃ¤nda prestanda- eller 
stabilitetsproblem och Ã¤r den rekommenderade instÃ¤llningen."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "BestÃ¤ndigt: SQLite (Rekommenderad)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "BestÃ¤ndigt: Db4o (FÃ¶rÃ¥ldrad)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "BestÃ¤ndigt (FÃ¶rhandsversion)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "Flyktig"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
+msgid "No Proxy"
+msgstr "Ingen proxy"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
+msgid "System Default"
+msgstr "Systemstandard"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
+msgid "Connection"
+msgstr "Anslutning"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+msgid "Interface"
+msgstr "GrÃ¤nssnitt"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
+msgid "Servers"
+msgstr "Servrar"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+msgid "Filters"
+msgstr "Filter"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
+msgid "Logging"
+msgstr "Loggning"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
+msgid "Nicknames(s) field must not be empty."
+msgstr "FÃ¤ltet fÃ¶r smeknamn kan inte lÃ¤mnas tomt."
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
+#, csharp-format
+msgid "Invalid highlight regex: '{0}'. Reason: {1}"
+msgstr "Ogiltigt mÃ¶nster fÃ¶r notifiering: â€{0}â€. Anledning: {1}"
+
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:103
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:293
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
 msgid "Name"
 msgstr "Namn"
 
@@ -651,86 +714,58 @@ msgstr "Rubrik"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:115
 msgid ""
-"Searching for group chats without a filter is not recommended.  This may "
-"take a while, or may not work at all.\n"
+"Searching for group chats without a filter is not recommended.  This may take a while, or may not work at 
all.\n"
 "Do you wish to continue?"
-msgstr ""
-"SÃ¶kning efter gruppchattar utan att anvÃ¤nda filter Ã¤r inte rekommenderat. "
-"Det kan ta lÃ¥ng tid eller inte fungera alls.\n"
-"Vill du verkligen fortsÃ¤tta?"
+msgstr "SÃ¶kning efter gruppchattar utan att anvÃ¤nda filter Ã¤r inte rekommenderat. Det kan ta lÃ¥ng tid eller 
inte fungera alls.\nVill du verkligen fortsÃ¤tta?"
 
 #: ../src/Frontend-GNOME/FindGroupChatDialog.cs:156
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Fel vid hÃ¤mtning av lista fÃ¶r gruppchattar frÃ¥n servern."
 
-#: ../src/Frontend-GNOME/Frontend.cs:390
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "FrÃ¥nkopplad frÃ¥n motorn."
 
-#: ../src/Frontend-GNOME/Frontend.cs:433
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Ã…terkopplar till motornâ€¦ (fÃ¶rsÃ¶k {0})"
 
-#: ../src/Frontend-GNOME/Frontend.cs:546
+#: ../src/Frontend-GNOME/Frontend.cs:542
 #, csharp-format
 msgid "Cause: {0}"
 msgstr "Anledning: {0}"
 
-#: ../src/Frontend-GNOME/Frontend.cs:638
-msgid ""
-"A fatal error has been detected because of a protocol incompatibility with "
-"the smuxi-server!\n"
-"\n"
-"Please install Mono on the frontend side so it matches the smuxi-server.\n"
-"\n"
-"More details about this issue can be found here:\n"
-"https://smuxi.im/issues/show/589";
-msgstr ""
-"Ett Ã¶desdigert fel har identifierats beroende pÃ¥ en inkompatibilitet med "
-"smuxi-servern!\n"
-"\n"
-"Installera Mono pÃ¥ klienten sÃ¥ att den matchar smuxi-servern.\n"
-"\n"
-"Detaljer om problemet kan du finna hÃ¤r:\n"
-"https://smuxi.im/issues/show/589";
-
-#: ../src/Frontend-GNOME/Frontend.cs:705
+#: ../src/Frontend-GNOME/Frontend.cs:675
 msgid ""
 "The frontend has lost the connection to the server.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"FramÃ¤nden tappade anslutningen till servern.\n"
-"Vill du Ã¥teransluta?"
+msgstr "FramÃ¤nden tappade anslutningen till servern.\nVill du Ã¥teransluta?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:724
+#: ../src/Frontend-GNOME/Frontend.cs:694
 msgid ""
 "Reconnecting to the server has failed.\n"
 "Do you want to try again?"
-msgstr ""
-"Ã…teranslutningsfÃ¶rsÃ¶ket fungerade inte.\n"
-"Vill du fÃ¶rsÃ¶ka igen?"
+msgstr "Ã…teranslutningsfÃ¶rsÃ¶ket fungerade inte.\nVill du fÃ¶rsÃ¶ka igen?"
 
-#: ../src/Frontend-GNOME/Frontend.cs:1038
+#: ../src/Frontend-GNOME/Frontend.cs:1008
 msgid ""
 "The server has lost the connection to the frontend.\n"
 "Do you want to reconnect now?"
-msgstr ""
-"Servern har tappat anslutningen till framÃ¤nden.\n"
-"Vill du Ã¥teransluta?"
+msgstr "Servern har tappat anslutningen till framÃ¤nden.\nVill du Ã¥teransluta?"
 
 #: ../src/Frontend-GNOME/NotifyManager.cs:338
 msgid "Show"
 msgstr "Visa"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:58
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:235
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:79
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:233
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:70
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: ../src/Frontend-GNOME/QuickConnectDialog.cs:59
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:80
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:71
 msgid "Hostname"
 msgstr "VÃ¤rdnamn"
 
@@ -739,44 +774,40 @@ msgid "Unable to load server: "
 msgstr "Kan inte lÃ¤sa in server: "
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:54
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:267
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:239
 msgid "Person / Private"
 msgstr "Person / Privat"
 
 #: ../src/Frontend-GNOME/ChatTypeWidget.cs:55
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:268
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:240
 msgid "Group / Public"
 msgstr "Grupp / Publikt"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:67
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
 msgid "Engine Assistant - Smuxi"
 msgstr "Motorassistent - Smuxi"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:90
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
 msgid "Add Smuxi Engine"
 msgstr "LÃ¤gg till Smuxi-motor"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:92
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
 msgid "Edit Smuxi Engine"
 msgstr "Redigera Smuxi-motor"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:137
-msgid "Connection"
-msgstr "Anslutning"
-
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:201
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
 msgid "Credentials"
 msgstr "Inloggningsuppgifter"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:303
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
 msgid "Now you can use the Smuxi Engine"
 msgstr "Nu kan du anvÃ¤nda Smuxi-motorn"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:306
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
 msgid "Thank you"
 msgstr "Tack"
 
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:323
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
 msgid ""
 "An engine with this name already exists! Please specify a different one."
 msgstr "En motor med detta namn finns redan. Ange ett annat."
@@ -794,33 +825,29 @@ msgstr "Om Smuxi"
 msgid "Preferences"
 msgstr "Alternativ"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:266
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:240
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
 msgid "Unable to add server: "
 msgstr "Kan inte lÃ¤gga till server: "
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:391
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Byte till lokal motor kommer att koppla bort dig frÃ¥n den aktuella motorn!\n"
-"Ã„r du sÃ¤ker pÃ¥ att du vill gÃ¶ra detta?"
+msgstr "Byte till lokal motor kommer att koppla bort dig frÃ¥n den aktuella motorn!\nÃ„r du sÃ¤ker pÃ¥ att du 
vill gÃ¶ra detta?"
 
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:435
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"Byte av fjÃ¤rrmotor kommer att koppla bort dig frÃ¥n den aktuella motorn!\n"
-"Ã„r du sÃ¤ker pÃ¥ att du vill gÃ¶ra detta?"
+msgstr "Byte av fjÃ¤rrmotor kommer att koppla bort dig frÃ¥n den aktuella motorn!\nÃ„r du sÃ¤ker pÃ¥ att du vill 
gÃ¶ra detta?"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:443
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
 #, csharp-format
 msgid "Day changed from {0} to {1}"
 msgstr "Dag Ã¤ndrades frÃ¥n {0} till {1}"
 
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:447
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
 #, csharp-format
 msgid "Day changed to {0}"
 msgstr "Dag Ã¤ndrades till {0}"
@@ -831,63 +858,39 @@ msgstr "Dag Ã¤ndrades till {0}"
 msgid "Invalid filter regex: '{0}'. Reason: {1}"
 msgstr "Ogiltigt filtermÃ¶nster: â€{0}â€. Anledning: {1}"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:199
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:197
 msgid "Are you sure you want to delete the selected filter?"
 msgstr "Ã„r du sÃ¤ker pÃ¥ att du vill radera det valda filtret?"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:251
-msgid "Network"
-msgstr "NÃ¤tverk"
-
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:269
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:241
 msgid "Protocol / Server"
 msgstr "Protokoll / Server"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:276
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:248
 msgid "Chat Type"
 msgstr "Chatt-typ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:309
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:281
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:310
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:282
 msgid "Event"
 msgstr "HÃ¤ndelse"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:317
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:289
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:342
+#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:314
 msgid "Pattern"
 msgstr "MÃ¶nster"
 
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:224
-msgid "No Proxy"
-msgstr "Ingen proxy"
-
-#: ../src/Frontend-GNOME/Views/PreferencesDialog.cs:226
-msgid "System Default"
-msgstr "Systemstandard"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:64
-msgid "Save"
-msgstr "Spara"
-
-#: ../src/Frontend-GNOME/Views/ServerDialog.cs:72
-msgid "Add"
-msgstr "LÃ¤gg till"
-
-#: ../src/Frontend-GNOME/Views/ServerWidget.cs:81
-msgid "Unsupported"
-msgstr "StÃ¶ds ej"
-
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:562
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "LÃ¥g bandbreddslÃ¤ge Ã¤r aktiverat: inga meddelanden synkroniserade."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:864
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
@@ -899,29 +902,26 @@ msgid "Retrieving user list for {0}..."
 msgstr "HÃ¤mtar anvÃ¤ndarlistan fÃ¶r {0}â€¦"
 
 #. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
 msgid "done."
 msgstr "klar."
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:130
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
 msgid "Reconnect"
 msgstr "Ã…teranslut"
 
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:177
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
 msgid ""
 "Closing the protocol chat will also close all open chats connected to it!\n"
 "Are you sure you want to do this?"
-msgstr ""
-"NÃ¤r protokollchatten stÃ¤ngs kommer Ã¤ven alla Ã¶ppna chattar som Ã¤r anslutna "
-"till den att stÃ¤ngas!\n"
-"Ã„r du sÃ¤ker pÃ¥ att du vill gÃ¶ra detta?"
+msgstr "NÃ¤r protokollchatten stÃ¤ngs kommer Ã¤ven alla Ã¶ppna chattar som Ã¤r anslutna till den att stÃ¤ngas!\nÃ„r 
du sÃ¤ker pÃ¥ att du vill gÃ¶ra detta?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:202
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:189
 msgid "Are you sure you want to delete the selected server?"
 msgstr "Ã„r du sÃ¤ker pÃ¥ att du vill radera den valda servern?"
 
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:258
-#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:292
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:245
+#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:279
 msgid "Unable to edit server: "
 msgstr "Kan inte redigera server: "
 
@@ -1155,20 +1155,15 @@ msgid ""
 "<span size=\"small\">Enables the use of SSH for the connection.  This has a "
 "small performance impact, but is more secure and required when using NAT or "
 "port-based firewalls</span>"
-msgstr ""
-"<span size=\"small\">Aktiverar anvÃ¤ndning av SSH fÃ¶r anslutningen. Detta kan "
-"innebÃ¤ra en liten negativ inverkan pÃ¥ hastigheten men Ã¤r sÃ¤krare och krÃ¤vs "
-"nÃ¤r NAT eller port-baserade brandvÃ¤ggar anvÃ¤nds</span>"
+msgstr "<span size=\"small\">Aktiverar anvÃ¤ndning av SSH fÃ¶r anslutningen. Detta kan innebÃ¤ra en liten 
negativ inverkan pÃ¥ hastigheten men Ã¤r sÃ¤krare och krÃ¤vs nÃ¤r NAT eller port-baserade brandvÃ¤ggar 
anvÃ¤nds</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:135
 msgid "SSH _Host:"
 msgstr "SS_H-vÃ¤rd:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:146
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the SSH server</span>"
-msgstr ""
-"<span size=\"small\">DNS eller IP-adress och port fÃ¶r SSH-servern</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the SSH server</span>"
+msgstr "<span size=\"small\">DNS eller IP-adress och port fÃ¶r SSH-servern</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
@@ -1177,84 +1172,74 @@ msgid "_Port:"
 msgstr "_Port:"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:186
-msgid ""
-"<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
-msgstr ""
-"<span size=\"small\">DNS eller IP-adress och port fÃ¶r Smuxi-servern</span>"
+msgid "<span size=\"small\">DNS or IP address and port of the Smuxi server</span>"
+msgstr "<span size=\"small\">DNS eller IP-adress och port fÃ¶r Smuxi-servern</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:199
 msgid "_Smuxi Host:"
 msgstr "Smuxi-_vÃ¤rd:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:52
 msgid "_SSH Username: (optional)"
 msgstr "_SSH-anvÃ¤ndarnamn: (valbart)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:75
 msgid ""
-"<span size=\"small\">Username which will be used to log into the SSH server</"
-"span>"
-msgstr ""
-"<span size=\"small\">AnvÃ¤ndarnamn som ska anvÃ¤ndas fÃ¶r att logga in i SSH-"
-"servern</span>"
+"<span size=\"small\">Username which will be used to log into the SSH "
+"server</span>"
+msgstr "<span size=\"small\">AnvÃ¤ndarnamn som ska anvÃ¤ndas fÃ¶r att logga in i SSH-servern</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:95
 msgid "_SSH Password: (optional)"
 msgstr "SSH-_lÃ¶senord: (valbart)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:119
 msgid ""
-"<span size=\"small\">Password which will be used to log into the SSH server. "
-"The password is optional if SSH key authorization is used (see below).</span>"
-msgstr ""
-"<span size=\"small\">LÃ¶senord som kommer anvÃ¤ndas att logga in till SSH-"
-"servern. LÃ¶senordet Ã¤r valfritt om SSH-nyckel-auktorisation anvÃ¤nds (se "
-"nedan).</span>"
+"<span size=\"small\">Password which will be used to log into the SSH server."
+" The password is optional if SSH key authorization is used (see "
+"below).</span>"
+msgstr "<span size=\"small\">LÃ¶senord som kommer anvÃ¤ndas att logga in till SSH-servern. LÃ¶senordet Ã¤r 
valfritt om SSH-nyckel-auktorisation anvÃ¤nds (se nedan).</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:140
 msgid "_SSH Keyfile: (optional)"
 msgstr "_SSH-nyckelfil: (valfri)"
 
 #. Container child vbox17.Gtk.Box+BoxChild
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:148
 msgid "Select a File"
 msgstr "VÃ¤lj en fil"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:161
 msgid ""
 "<span size=\"small\">SSH private keyfile which will be used to log into the "
 "SSH server</span>"
-msgstr ""
-"<span size=\"small\">Privat SSH-nyckelfil att anvÃ¤ndas fÃ¶r att logga in pÃ¥ "
-"SSH-servern</span>"
+msgstr "<span size=\"small\">Privat SSH-nyckelfil att anvÃ¤ndas fÃ¶r att logga in pÃ¥ SSH-servern</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "_AnvÃ¤ndarnamn:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:206
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:204
 msgid ""
 "<span size=\"small\">Username which will be used to log into the Smuxi "
 "server</span>"
-msgstr ""
-"<span size=\"small\">AnvÃ¤ndarnamnet som ska anvÃ¤ndas fÃ¶r att logga in pÃ¥ "
-"Smuxi-servern</span>"
+msgstr "<span size=\"small\">AnvÃ¤ndarnamnet som ska anvÃ¤ndas fÃ¶r att logga in pÃ¥ Smuxi-servern</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:226
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_LÃ¶senord:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:250
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:248
 msgid "<span size=\"small\">Password of the user</span>"
 msgstr "<span size=\"small\">LÃ¶senord fÃ¶r anvÃ¤ndaren</span>"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:270
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:268
 msgid "_Verify Password:"
 msgstr "_Verifiera lÃ¶senord:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:294
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:292
 msgid "<span size=\"small\">Repeat the password for verification</span>"
 msgstr "<span size=\"small\">Upprepa lÃ¶senordet fÃ¶r att verifiera det</span>"
 
@@ -1264,11 +1249,7 @@ msgid ""
 "You need to enter some information before you can use the engine.\n"
 "\n"
 "Click \"Forward\" to begin."
-msgstr ""
-"VÃ¤lkommen till instÃ¤llningsdelen fÃ¶r Smuximotorn.\n"
-"Du behÃ¶ver ange lite information innan du kan bÃ¶rja anvÃ¤nda motorn.\n"
-"\n"
-"Klicka â€FramÃ¥tâ€ fÃ¶r att bÃ¶rja."
+msgstr "VÃ¤lkommen till instÃ¤llningsdelen fÃ¶r Smuximotorn.\nDu behÃ¶ver ange lite information innan du kan 
bÃ¶rja anvÃ¤nda motorn.\n\nKlicka â€FramÃ¥tâ€ fÃ¶r att bÃ¶rja."
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:36
 msgid "_Engine Name:"
@@ -1288,11 +1269,9 @@ msgstr "AnvÃ¤nd som ny standardmotor"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantNameWidget.cs:104
 msgid ""
-"<span size=\"small\">If enabled, the current engine will be the default next "
-"time Smuxi is started</span>"
-msgstr ""
-"<span size=\"small\">Om detta vÃ¤ljs kommer den aktuella motorn att bli "
-"standardmotor nÃ¤sta gÃ¥ng Smuxi startas</span>"
+"<span size=\"small\">If enabled, the current engine will be the default next"
+" time Smuxi is started</span>"
+msgstr "<span size=\"small\">Om detta vÃ¤ljs kommer den aktuella motorn att bli standardmotor nÃ¤sta gÃ¥ng 
Smuxi startas</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:20
 msgid "Smuxi - Open Chat"
@@ -1302,10 +1281,6 @@ msgstr "Smuxi - Ã–ppen chatt"
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerDialog.cs:16
-msgid "Smuxi - Server"
-msgstr "Smuxi - Server"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_VÃ¤rdnamn:"
@@ -1322,10 +1297,6 @@ msgstr "Smeknamn:"
 msgid "_Protocol:"
 msgstr "P_rotokoll:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
-msgid "Automatically connect to server at startup"
-msgstr "Anslut automatiskt till server vid uppstart"
-
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "AnvÃ¤nd kryptering"
@@ -1341,65 +1312,3 @@ msgstr "_Kommando vid anslutning:"
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "Kommando att _ignorera"
-
-#~ msgid "Character"
-#~ msgstr "Tecken"
-
-#~ msgid "Word"
-#~ msgstr "Ord"
-
-#~ msgid ""
-#~ "This setting specifies if Smuxi should store chat messages in memory "
-#~ "(volatile) or to disk (persistent).\n"
-#~ "For persistent you can choose between Db4o, an object database or SQLite, "
-#~ "a relational database.\n"
-#~ "The Db4o backend has known issues like high memory and CPU usage and can "
-#~ "even lead to crashes and thus it is deprecated.\n"
-#~ "The SQLite backend has no known performance or stability issues and is "
-#~ "the recommended setting."
-#~ msgstr ""
-#~ "Denna instÃ¤llning anger huruvida Smuxi ska lagra chattmeddelanden i minne "
-#~ "(flyktigt) eller till disk (bestÃ¤ndigt).\n"
-#~ "FÃ¶r bestÃ¤ndig lagting kan du vÃ¤lja mellan Db4o, en objektdatabas eller "
-#~ "SQLite, en relationell databas.\n"
-#~ "Db4o-bakÃ¤nden har kÃ¤nda problem som hÃ¶g minnes- och processoranvÃ¤ndning "
-#~ "och kan till och med leda till krascher och anvÃ¤ndning av den avrÃ¥des "
-#~ "dÃ¤rfÃ¶r frÃ¥n.\n"
-#~ "SQLite-bakÃ¤nden har inga kÃ¤nda prestanda- eller stabilitetsproblem och Ã¤r "
-#~ "den rekommenderade instÃ¤llningen."
-
-#~ msgid "Persistent: SQLite (Recommended)"
-#~ msgstr "BestÃ¤ndigt: SQLite (Rekommenderad)"
-
-#~ msgid "Persistent: Db4o (Deprecated)"
-#~ msgstr "BestÃ¤ndigt: Db4o (FÃ¶rÃ¥ldrad)"
-
-#~ msgid "Persistent (Preview)"
-#~ msgstr "BestÃ¤ndigt (FÃ¶rhandsversion)"
-
-#~ msgid "Volatile"
-#~ msgstr "Flyktig"
-
-#~ msgid "Interface"
-#~ msgstr "GrÃ¤nssnitt"
-
-#~ msgid "Servers"
-#~ msgstr "Servrar"
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Logging"
-#~ msgstr "Loggning"
-
-#~ msgid "Nicknames(s) field must not be empty."
-#~ msgstr "FÃ¤ltet fÃ¶r smeknamn kan inte lÃ¤mnas tomt."
-
-#~ msgid "Invalid highlight regex: '{0}'. Reason: {1}"
-#~ msgstr "Ogiltigt mÃ¶nster fÃ¶r notifiering: â€{0}â€. Anledning: {1}"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protokoll:"
-
-#~ msgid "Hostname:"
-#~ msgstr "VÃ¤rdnamn:"
diff --git a/po-Frontend-GNOME/tr.po b/po-Frontend-GNOME/tr.po
index eade2ed6..978e7592 100644
--- a/po-Frontend-GNOME/tr.po
+++ b/po-Frontend-GNOME/tr.po
@@ -4,16 +4,18 @@
 # 
 # Translators:
 # Mirco Bauer <meebey gmail com>, 2012
+# Mirco Bauer <meebey gmail com>, 2012
 # zeugma <sunder67 hotmail com>, 2013
 # Åž. Uzun <hashirrrt gmail com>, 2014-2015
+# zeugma <sunder67 hotmail com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-03 12:34+0200\n"
-"PO-Revision-Date: 2015-05-14 22:49+0000\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-09-19 09:13+0000\n"
 "Last-Translator: Åž. Uzun <hashirrrt gmail com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/smuxi/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/meebey/smuxi/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +44,7 @@ msgstr "KullanÄ±cÄ± AdÄ±:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:5
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:177
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:147
 msgid "Realname:"
 msgstr "GerÃ§ek Ad:"
 
@@ -76,7 +78,7 @@ msgid "Port:"
 msgstr "Port:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:13
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:254
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
 msgid "Show Password"
 msgstr "ParolayÄ± GÃ¶ster"
 
@@ -434,7 +436,7 @@ msgid "Smuxi - Server"
 msgstr "Smuxi - Sunucu"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:93
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:293
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
 msgid "Automatically connect to server at startup"
 msgstr "BaÅŸlatma anÄ±nda sunucuya kendiliÄŸinden baÄŸlan"
 
@@ -451,6 +453,7 @@ msgid "Hostname:"
 msgstr "Host AdÄ±:"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
 msgstr "Smuxi"
 
@@ -466,13 +469,22 @@ msgstr "Smuxi IRC Ä°stemci"
 msgid "Chat with other people on IRC"
 msgstr "IRC'de baÅŸkalarÄ±yla sohbet et"
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
+msgid ""
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "sohbet;mesajlaÅŸma;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
+msgstr "IRC, Twitter, Jabber ve Campfire'da baÅŸkalarÄ±yla sohbet et"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
 msgstr "Smuxi; IRC, Twitter, Jabber/XMPP, Campfire ve SignalR JabbR iÃ§in aÃ§Ä±k kaynaklÄ±, daÄŸÄ±tÄ±lmÄ±ÅŸ ve 
kullanÄ±mÄ± kolay bir sohbet istemcisidir."
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
 "Inspired by the combination of screen and irssi, Smuxi has a detachable "
 "server (or like a \"normal\" client) that stays connected when you aren't, "
@@ -480,7 +492,7 @@ msgid ""
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
 msgstr "Screen ve irssi kombinasyonundan esinlenerek, Smuxi, siz baÄŸlÄ± deÄŸilken baÄŸlÄ± kalan, birden Ã§ok Ã¶n 
ucun baÄŸlÄ± ve senkronize kalmasÄ±na olanak veren ayrÄ±labilir sunucuya (\"normal\" bir istemci benzeri) 
sahiptir. Bu screen+irssi ya da IRC bouncer yazÄ±lÄ±mlarÄ±na benzerdir, ancak daha zarif ve gÃ¼Ã§lÃ¼dÃ¼r."
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "Bir IRC kanalÄ±nÄ± gÃ¶steren ana pencere"
 
@@ -565,18 +577,46 @@ msgstr "Hata: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "\"{0}\" motorunu silmek istediÄŸinize emin misiniz?"
 
-#: ../src/Frontend-GNOME/Entry.cs:484
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "{0} satÄ±r yapÄ±ÅŸtÄ±racaksÄ±nÄ±z. Devam etmek istiyor musunuz?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:601
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "Ã–n uÃ§ KomutlarÄ±"
 
-#: ../src/Frontend-GNOME/Main.cs:80
+#: ../src/Frontend-GNOME/Main.cs:49
+msgid "Enable debug output"
+msgstr "Hata ayÄ±klama Ã§Ä±ktÄ±sÄ±nÄ± etkinleÅŸtir"
+
+#: ../src/Frontend-GNOME/Main.cs:56
+msgid "Show this help"
+msgstr "YardÄ±mÄ± gÃ¶ster"
+
+#: ../src/Frontend-GNOME/Main.cs:60
+msgid "Options:"
+msgstr "SeÃ§enekler:"
+
+#: ../src/Frontend-GNOME/Main.cs:67
+msgid "Connect to engine"
+msgstr "Motora baÄŸlan"
+
+#: ../src/Frontend-GNOME/Main.cs:74
+msgid "Opens the specified link in Smuxi"
+msgstr "Belirtilen baÄŸlantÄ±yÄ± Smuxi'de aÃ§"
+
+#: ../src/Frontend-GNOME/Main.cs:81
+msgid "Starts a new Smuxi instance and ignores an existing one"
+msgstr "Yeni bir Smuxi sÃ¼reci baÅŸlatÄ±r ve mevcut olanÄ± gÃ¶rmezden gelir"
+
+#: ../src/Frontend-GNOME/Main.cs:109
+msgid "Passing link to already running Smuxi instance..."
+msgstr "BaÄŸlantÄ± Ã§alÄ±ÅŸmakta olan Smuxi sÃ¼recine geÃ§iliyor..."
+
+#: ../src/Frontend-GNOME/Main.cs:117
 msgid "Bringing already running Smuxi instance to foreground..."
 msgstr "Ã‡alÄ±ÅŸmakta olan Smuxi sÃ¼reci Ã¶n plana getiriliyor..."
 
@@ -603,60 +643,60 @@ msgid ""
 "This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
 "For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
 "The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
-"The SQLite backend has no known performance or stability issues but is still an optional preview feature."
-msgstr "Bu ayar Smuxi'nin sohbet mesajlarÄ±nÄ± bellekte mi (geÃ§ici) yoksa diskte mi (kalÄ±cÄ±) depolayacaÄŸÄ±nÄ± 
belirler.\nKalÄ±cÄ± iÃ§in Db4o, bir nesne veritabanÄ± ya da SQLite, bir iliÅŸkisel veritabanÄ± arasÄ±nda seÃ§im 
yapabilirsiniz.\nDb4o arka ucunun yÃ¼ksek bellek ve CPU kullanÄ±mÄ± gibi bilinen sorunlarÄ± bulunmaktadÄ±r ve 
Ã§Ã¶kmelere bile yol aÃ§abilir, bu yÃ¼zden de kullanÄ±m dÄ±ÅŸÄ±dÄ±r.\nSQLite arka ucunun bilinen performans ya da 
kararlÄ±lÄ±k sorunlarÄ± bulunmamaktadÄ±r ama yine de isteÄŸe baÄŸlÄ± bir Ã¶nizleme Ã¶zelliÄŸidir."
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "Bu ayar Smuxi'nin sohbet mesajlarÄ±nÄ± bellekte mi (geÃ§ici) yoksa diskte mi (kalÄ±cÄ±) depolayacaÄŸÄ±nÄ± 
belirler.\nKalÄ±cÄ± iÃ§in Db4o, bir nesne veritabanÄ± ya da SQLite, bir iliÅŸkisel veritabanÄ± arasÄ±nda seÃ§im 
yapabilirsiniz.\nDb4o arka ucunun yÃ¼ksek bellek ve CPU kullanÄ±mÄ± gibi bilinen sorunlarÄ± bulunmaktadÄ±r ve 
Ã§Ã¶kmelere bile yol aÃ§abilir, bu yÃ¼zden de kullanÄ±m dÄ±ÅŸÄ±dÄ±r.\nSQLite arka ucunun bilinen performans ya da 
kararlÄ±lÄ±k sorunlarÄ± bulunmamaktadÄ±r ve Ã¶nerilen ayardÄ±r."
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:207
-msgid "Volatile"
-msgstr "GeÃ§ici"
-
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:209
-msgid "Persistent (Preview)"
-msgstr "KalÄ±cÄ± (Ã–nizleme)"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "KalÄ±cÄ±: SQLite (Ã–nerilen)"
 
 #: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
 msgid "Persistent: Db4o (Deprecated)"
 msgstr "KalÄ±cÄ±: Db4o (KullanÄ±m dÄ±ÅŸÄ±)"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:214
-msgid "Persistent: SQLite (Preview)"
-msgstr "KalÄ±cÄ±: SQLite (Ã–nizleme)"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "KalÄ±cÄ± (Ã–nizleme)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "GeÃ§ici"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:238
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
 msgid "No Proxy"
 msgstr "Vekil Sunucu Yok"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:240
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:336
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
 msgid "System Default"
 msgstr "Sistem VarsayÄ±lanÄ±"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:254
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
 #: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
 msgid "Connection"
 msgstr "BaÄŸlantÄ±"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
 msgid "Interface"
 msgstr "ArayÃ¼z"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
 msgid "Servers"
 msgstr "Sunucular"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:269
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
 msgid "Filters"
 msgstr "SÃ¼zgeÃ§ler"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
 msgid "Logging"
 msgstr "GÃ¼nlÃ¼k Tutma"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:692
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
 msgid "Nicknames(s) field must not be empty."
 msgstr "KullanÄ±cÄ± ad(lar)Ä± alanÄ± boÅŸ bÄ±rakÄ±lamaz."
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:888
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
 #, csharp-format
 msgid "Invalid highlight regex: '{0}'. Reason: {1}"
 msgstr "GeÃ§ersiz vurgulama dÃ¼zenli ifadesi: '{0}'. Neden: {1}"
@@ -681,11 +721,11 @@ msgstr "SÃ¼zgeÃ§siz bir ÅŸekilde toplu sohbet aramasÄ± yapmak tavsiye edilmemekt
 msgid "Error while fetching the list of group chats from the server."
 msgstr "Sunucudan toplu sohbet listesi getirilirken hata oluÅŸtu."
 
-#: ../src/Frontend-GNOME/Frontend.cs:398
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "Motor ile baÄŸlantÄ± kesildi."
 
-#: ../src/Frontend-GNOME/Frontend.cs:440
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "Motora yeniden baÄŸlanÄ±lÄ±yor... ({0}. giriÅŸim)"
@@ -849,9 +889,9 @@ msgstr "KalÄ±p"
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "DÃ¼ÅŸÃ¼k Bant GeniÅŸliÄŸi Modu etkin: hiÃ§bir mesaj eÅŸitlenmedi."
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:839
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:174
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:175
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
 msgstr "Men_Ã¼ Ã‡ubuÄŸunu GÃ¶ster"
 
@@ -908,11 +948,11 @@ msgstr "_Ã‡evrele"
 msgid "Use _Regular Expressions"
 msgstr "_DÃ¼zenli Ä°fade Kullan"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:32
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
 msgid "Smuxi - Find Group Chat"
 msgstr "Smuxi - Toplu Sohbet Bul"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:56
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
 msgid "_Name:"
 msgstr "_Ad:"
@@ -921,155 +961,155 @@ msgstr "_Ad:"
 msgid "Join"
 msgstr "KatÄ±l"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:95
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
 msgid "_Smuxi"
 msgstr "_Smuxi"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:98
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
 msgid "_Server"
 msgstr "_Sunucu"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:101
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
 msgid "_Chat"
 msgstr "S_ohbet"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:104
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
 msgid "_Engine"
 msgstr "_Motor"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:107
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
 msgid "_View"
 msgstr "_GÃ¶rÃ¼nÃ¼m"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:110
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
 msgid "_Help"
 msgstr "_YardÄ±m"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
 msgid "Connect"
 msgstr "BaÄŸlan"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:116
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:186
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:187
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
 msgid "Open Log"
 msgstr "GÃ¼nlÃ¼ÄŸÃ¼ AÃ§"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
 msgid "_Quit"
 msgstr "_Ã‡Ä±k"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
 msgid "_Connect"
 msgstr "_BaÄŸlan"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
 msgid "_Add"
 msgstr "_Ekle"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
 msgid "_Manage"
 msgstr "Y_Ã¶net"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
 msgid "_Open / Join Chat"
 msgstr "Sohbet _AÃ§ / KatÄ±l"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
 msgid "_Find Group Chat"
 msgstr "Toplu Sohbet _Bul"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
 msgid "C_lear All Activity"
 msgstr "TÃ¼m Etkinlikleri _Temizle"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:151
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
 msgid "_Next Chat"
 msgstr "Sonrak_i Sohbet"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:153
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
 msgid "_Previous Chat"
 msgstr "_Ã–nceki Sohbet"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:156
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
 msgid "_Close"
 msgstr "Ka_pat"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:159
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:160
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
 msgid "_Use Local Engine"
 msgstr "Yerel Motor _Kullan"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:162
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
 msgid "_Add Remote Engine"
 msgstr "Uzak Motor _Ekle"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:165
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:166
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
 msgid "Switch Remote Engine"
 msgstr "Uzak Motor DeÄŸiÅŸtir"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:168
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:169
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
 msgid "_Caret Mode"
 msgstr "K_lavye Modu"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:171
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:172
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
 msgid "_Browse Mode"
 msgstr "G_Ã¶zatma Modu"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:177
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:178
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
 msgid "Show _Statusbar"
 msgstr "D_urum Ã‡ubuÄŸunu GÃ¶ster"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:180
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:181
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
 msgid "_Fullscreen"
 msgstr "_Tam Ekran"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:183
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:184
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
 msgid "_About"
 msgstr "_HakkÄ±nda"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:189
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:191
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
 msgid "Find Group Chat"
 msgstr "Toplu Sohbet Bul"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:193
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:194
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
 msgid "_Website"
 msgstr "_Web Sitesi"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:196
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:197
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
 msgid "Show _Toolbar"
 msgstr "Ara_Ã§ Ã‡ubuÄŸunu GÃ¶ster"
 
@@ -1126,7 +1166,7 @@ msgstr "<span size=\"small\">SSH sunucusuna ait DNS ya da IP adresi ve port</spa
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:213
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:183
 msgid "_Port:"
 msgstr "Por_t:"
 
@@ -1175,7 +1215,7 @@ msgid ""
 msgstr "<span size=\"small\">SSH sunucusunda oturum aÃ§mak iÃ§in kullanÄ±lacak kiÅŸiye Ã¶zel anahtar 
dosyasÄ±.</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:272
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "K_ullanÄ±cÄ± AdÄ±:"
 
@@ -1186,7 +1226,7 @@ msgid ""
 msgstr "<span size=\"small\">Smuxi sunucusunda oturum aÃ§mak iÃ§in kullanÄ±lacak kullanÄ±cÄ± adÄ±</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:146
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "_Parola:"
 
@@ -1240,34 +1280,34 @@ msgstr "Smuxi - Sohbet AÃ§"
 msgid "_Type:"
 msgstr "T_Ã¼r:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_Host AdÄ±:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:109
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:79
 msgid "_Network:"
 msgstr "A_ÄŸ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:105
 msgid "Nickname:"
 msgstr "Takma Ad:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:282
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:252
 msgid "_Protocol:"
 msgstr "P_rotokol:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:306
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "Åžifreleme Kullan"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:318
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:288
 msgid "Validate Server Certificate"
 msgstr "Sunucu SertifikasÄ±nÄ± Onayla"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:308
 msgid "_On Connect Commands:"
 msgstr "BaÄŸlanma _AnÄ± KomutlarÄ±:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:349
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "KomutlarÄ± _Yok Say"
diff --git a/po-Frontend-GNOME/zh_CN.po b/po-Frontend-GNOME/zh_CN.po
index 82d73012..e2303622 100644
--- a/po-Frontend-GNOME/zh_CN.po
+++ b/po-Frontend-GNOME/zh_CN.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dean Lee <xslidian gmail com>, 2012-2015
+# Dian Li <xslidian gmail com>, 2012-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-03 12:34+0200\n"
-"PO-Revision-Date: 2015-05-03 19:53+0000\n"
-"Last-Translator: Dean Lee <xslidian gmail com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
+"POT-Creation-Date: 2015-07-14 19:42+0200\n"
+"PO-Revision-Date: 2017-09-23 18:02+0000\n"
+"Last-Translator: Dian Li <xslidian gmail com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/meebey/smuxi/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,7 +40,7 @@ msgstr "ç”¨æˆ·å:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:5
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:177
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:147
 msgid "Realname:"
 msgstr "çœŸå:"
 
@@ -74,7 +74,7 @@ msgid "Port:"
 msgstr "ç«¯å£:"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:13
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:254
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:224
 msgid "Show Password"
 msgstr "æ˜¾ç¤ºå¯†ç "
 
@@ -432,7 +432,7 @@ msgid "Smuxi - Server"
 msgstr "Smuxi - æœåŠ¡å™¨"
 
 #: ../glade/smuxi-frontend-gnome.glade.h:93
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:293
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:263
 msgid "Automatically connect to server at startup"
 msgstr "å¯åŠ¨æ—¶è‡ªåŠ¨è¿žæŽ¥åˆ°æœåŠ¡å™¨"
 
@@ -449,6 +449,7 @@ msgid "Hostname:"
 msgstr "ä¸»æœºå:"
 
 #: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
 msgid "Smuxi"
 msgstr "Smuxi"
 
@@ -464,13 +465,22 @@ msgstr "Smuxi IRC å®¢æˆ·ç«¯"
 msgid "Chat with other people on IRC"
 msgstr "å’Œ IRC ä¸Šçš„å…¶ä»–äººèŠå¤©"
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in.h:5
+msgid ""
+"chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+msgstr "èŠå¤©;é€šè®¯;chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr;"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid "Chat with other people on IRC, Twitter, Jabber and Campfire"
+msgstr "ä¸Ž IRCã€Twitterã€Jabber åŠ Campfire çš„ç”¨æˆ·èŠå¤©"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
 msgid ""
 "Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
 "Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
 msgstr "Smuxi æ˜¯ä¸€æ¬¾å¼€æºã€ç®€å•æ˜“ç”¨çš„åˆ†å¸ƒå¼èŠå¤©å®¢æˆ·ç«¯ï¼Œå…¼å®¹ IRCã€Twitterã€Jabber/XMPPã€Campfire åŠ SignalR çš„ JabbRã€‚"
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:4
 msgid ""
 "Inspired by the combination of screen and irssi, Smuxi has a detachable "
 "server (or like a \"normal\" client) that stays connected when you aren't, "
@@ -478,7 +488,7 @@ msgid ""
 "similar to screen+irssi or IRC bouncers, but more elegant and powerful."
 msgstr "å— screen åŠ irssi çš„å¯å‘ï¼ŒSmuxi æ”¯æŒå¯æ’æ‹”çš„æœåŠ¡å™¨ï¼ˆä¹Ÿå¯ä»¥â€œæ£å¸¸çš„â€å®¢æˆ·ç«¯æ¨¡å¼è¿è¡Œï¼‰ï¼Œå¯åœ¨æ‚¨è„±æœºæ—¶ä¿æŒè¿žæŽ¥ï¼Œä¹Ÿå…è®¸è¿žæŽ¥å¤šä¸ª Smuxi å‰ç«¯å¹¶ä¿æŒåŒæ¥ã€‚è¿™ä¸Ž 
screen+irssi æˆ– IRC è½¬å‘å™¨ç±»ä¼¼ï¼Œä½†æ›´ä¸ºä¼˜é›…åŠå¼ºå¤§ã€‚"
 
-#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:5
 msgid "The main window showing an IRC channel"
 msgstr "æ˜¾ç¤ºæŸ IRC é¢‘é“çš„ä¸»çª—å£"
 
@@ -563,18 +573,46 @@ msgstr "é”™è¯¯: {0}"
 msgid "Are you sure you want to delete the engine \"{0}\"?"
 msgstr "æ‚¨ç¡®å®žè¦åˆ é™¤å¼•æ“Ž \"{0}\" å—?"
 
-#: ../src/Frontend-GNOME/Entry.cs:484
+#: ../src/Frontend-GNOME/Entry.cs:485
 #, csharp-format
 msgid "You are going to paste {0} lines. Do you want to continue?"
 msgstr "æ‚¨æ£åœ¨ç²˜è´´ {0} è¡Œã€‚æ˜¯å¦ç»§ç»?"
 
 #. TRANSLATOR: this line is used as a label / category for a
 #. list of commands below
-#: ../src/Frontend-GNOME/Entry.cs:601
+#: ../src/Frontend-GNOME/Entry.cs:602
 msgid "Frontend Commands"
 msgstr "å‰ç«¯å‘½ä»¤"
 
-#: ../src/Frontend-GNOME/Main.cs:80
+#: ../src/Frontend-GNOME/Main.cs:49
+msgid "Enable debug output"
+msgstr "å¯ç”¨è°ƒè¯•è¾“å‡º"
+
+#: ../src/Frontend-GNOME/Main.cs:56
+msgid "Show this help"
+msgstr "æ˜¾ç¤ºæœ¬å¸®åŠ©"
+
+#: ../src/Frontend-GNOME/Main.cs:60
+msgid "Options:"
+msgstr "é€‰é¡¹:"
+
+#: ../src/Frontend-GNOME/Main.cs:67
+msgid "Connect to engine"
+msgstr "è¿žæŽ¥åˆ°å¼•æ“Ž"
+
+#: ../src/Frontend-GNOME/Main.cs:74
+msgid "Opens the specified link in Smuxi"
+msgstr "åœ¨ Smuxi ä¸æ‰“å¼€æŒ‡å®šé“¾æŽ¥"
+
+#: ../src/Frontend-GNOME/Main.cs:81
+msgid "Starts a new Smuxi instance and ignores an existing one"
+msgstr "å¯åŠ¨æ–°çš„ Smuxi å®žä¾‹ï¼Œå¿½ç•¥çŽ°æœ‰çš„shi'li"
+
+#: ../src/Frontend-GNOME/Main.cs:109
+msgid "Passing link to already running Smuxi instance..."
+msgstr "æ£åœ¨å°†é“¾æŽ¥ä¼ é€’ç»™å·²ç»åœ¨è¿è¡Œçš„ Smuxi shi'li..."
+
+#: ../src/Frontend-GNOME/Main.cs:117
 msgid "Bringing already running Smuxi instance to foreground..."
 msgstr "æ£åœ¨å°†å·²åœ¨è¿è¡Œçš„ Smuxi å®žä¾‹åˆ‡å›žè‡³å‰æ™¯..."
 
@@ -601,60 +639,60 @@ msgid ""
 "This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
 "For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
 "The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it 
is deprecated.\n"
-"The SQLite backend has no known performance or stability issues but is still an optional preview feature."
-msgstr "æœ¬è®¾ç½®æŒ‡å®š Smuxi åº”å°†èŠå¤©æ¶ˆæ¯ä¿å˜åˆ°å†…å˜ï¼ˆæ˜“å¤±ï¼‰è¿˜æ˜¯ä¿å˜åˆ°ç£ç›˜ï¼ˆæŒä¹…ï¼‰ã€‚\nå¯¹äºŽæŒä¹…å˜å‚¨ï¼Œæ‚¨å¯ä»¥é€‰æ‹© Db4oã€å¯¹è±¡æ•°æ®åº“æˆ– SQLiteï¼ˆä¸€æ¬¾å…³ç³»æ•°æ®åº“ï¼‰ã€‚\nDb4o 
åŽç«¯å·²çŸ¥å˜åœ¨çš„é—®é¢˜åŒ…æ‹¬é«˜å†…å˜ã€CPU å ç”¨çŽ‡ï¼Œç”šè‡³å¯èƒ½å¯¼è‡´å´©æºƒï¼Œå› æ¤å·²åºŸå¼ƒã€‚\nSQLite åŽç«¯å·²çŸ¥å˜åœ¨æ€§èƒ½æˆ–ç¨³å®šæ€§é—®é¢˜ï¼Œä½†ä»ä½œä¸ºå¯é€‰çš„é¢„è§ˆåŠŸèƒ½æä¾›ã€‚"
+"The SQLite backend has no known performance or stability issues and is the recommended setting."
+msgstr "æœ¬è®¾ç½®æŒ‡å®š Smuxi åº”å°†èŠå¤©æ¶ˆæ¯å˜å‚¨åœ¨å†…å˜ä¸ (æ˜“å¤±) è¿˜æ˜¯ç£ç›˜ä¸Š (æŒä¹…)ã€‚\nå¯¹äºŽæŒä¹…å˜å‚¨ï¼Œæ‚¨å¯ä»¥é€‰æ‹©å¯¹è±¡æ•°æ®åº“ Db4o æˆ–å…³ç³»æ•°æ®åº“ SQLiteã€‚\nDb4o 
åŽç«¯å˜åœ¨å·²çŸ¥é—®é¢˜ï¼Œå¦‚é«˜å†…å˜ã€CPU å ç”¨ï¼Œç”šè‡³å¯èƒ½å¯¼è‡´å´©æºƒï¼Œå› æ¤å·²åºŸå¼ƒã€‚\nSQLite åŽç«¯æ²¡æœ‰å·²çŸ¥çš„æ€§èƒ½æˆ–ç¨³å®šæ€§é—®é¢˜ï¼Œå› æ¤æŽ¨èè¯¥è®¾ç½®ã€‚"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:207
-msgid "Volatile"
-msgstr "ä¸´æ—¶"
-
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:209
-msgid "Persistent (Preview)"
-msgstr "æŒä¹… (é¢„è§ˆ)"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:208
+msgid "Persistent: SQLite (Recommended)"
+msgstr "æŒä¹…: SQLite (æŽ¨è)"
 
 #: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
 msgid "Persistent: Db4o (Deprecated)"
 msgstr "æŒä¹…: Db4o (åºŸå¼ƒ)"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:214
-msgid "Persistent: SQLite (Preview)"
-msgstr "æŒä¹…: SQLite (é¢„è§ˆ)"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:216
+msgid "Persistent (Preview)"
+msgstr "æŒä¹… (é¢„è§ˆ)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:219
+msgid "Volatile"
+msgstr "ä¸´æ—¶"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:238
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:242
 msgid "No Proxy"
 msgstr "æ— ä»£ç†"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:240
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:336
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:340
 msgid "System Default"
 msgstr "ç³»ç»Ÿé»˜è®¤"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:254
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
 #: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
 msgid "Connection"
 msgstr "è¿žæŽ¥"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
 msgid "Interface"
 msgstr "ç•Œé¢"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:266
 msgid "Servers"
 msgstr "æœåŠ¡å™¨"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:269
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
 msgid "Filters"
 msgstr "è¿‡æ»¤å™¨"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:277
 msgid "Logging"
 msgstr "åŽ†å²"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:692
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:696
 msgid "Nicknames(s) field must not be empty."
 msgstr "æ˜µç§°å—æ®µä¸èƒ½ä¸ºç©ºã€‚"
 
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:888
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:892
 #, csharp-format
 msgid "Invalid highlight regex: '{0}'. Reason: {1}"
 msgstr "é«˜äº®æ£åˆ™è¡¨è¾¾å¼æ— æ•ˆ: '{0}'ã€‚åŽŸå› : {1}"
@@ -679,11 +717,11 @@ msgstr "ä¸å»ºè®®ä¸ç”¨è¿‡æ»¤å™¨æœç´¢ç¾¤ç»„èŠå¤©ã€‚å¯èƒ½è¦è€—è´¹ä¸€äº›æ—¶é—´
 msgid "Error while fetching the list of group chats from the server."
 msgstr "ä»ŽæœåŠ¡å™¨è£…è½½ç¾¤ç»„èŠå¤©åˆ—è¡¨å‡ºé”™ã€‚"
 
-#: ../src/Frontend-GNOME/Frontend.cs:398
+#: ../src/Frontend-GNOME/Frontend.cs:388
 msgid "Disconnected from engine."
 msgstr "ä»Žå¼•æ“Žæ–å¼€è¿žæŽ¥ã€‚"
 
-#: ../src/Frontend-GNOME/Frontend.cs:440
+#: ../src/Frontend-GNOME/Frontend.cs:431
 #, csharp-format
 msgid "Reconnecting to engine... (attempt {0})"
 msgstr "æ£åœ¨é‡æ–°è¿žæŽ¥åˆ°å¼•æ“Ž... (ç¬¬ {0} æ¬¡å°è¯•)"
@@ -847,9 +885,9 @@ msgstr "åŒ¹é…"
 msgid "Low Bandwidth Mode is active: no messages synced."
 msgstr "ä½Žå¸¦å®½æ¨¡å¼æœªå¯ç”¨: æœªåŒæ¥ä»»ä½•ä¿¡æ¯ã€‚"
 
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:839
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:174
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:175
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:859
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
 msgid "Show _Menubar"
 msgstr "æ˜¾ç¤ºèœå•æ (_M)"
 
@@ -906,11 +944,11 @@ msgstr "å…¨æ–‡æœç´¢(_W)"
 msgid "Use _Regular Expressions"
 msgstr "ä½¿ç”¨æ£åˆ™è¡¨è¾¾å¼(_R)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:32
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
 msgid "Smuxi - Find Group Chat"
 msgstr "Smuxi - æŸ¥æ‰¾ç¾¤ç»„èŠå¤©"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:56
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
 msgid "_Name:"
 msgstr "åç§°(_N):"
@@ -919,155 +957,155 @@ msgstr "åç§°(_N):"
 msgid "Join"
 msgstr "åŠ å…¥"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:95
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
 msgid "_Smuxi"
 msgstr "_Smuxi"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:98
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
 msgid "_Server"
 msgstr "æœåŠ¡å™¨(_S)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:101
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
 msgid "_Chat"
 msgstr "èŠå¤©(_C)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:104
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
 msgid "_Engine"
 msgstr "å¼•æ“Ž(_E)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:107
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
 msgid "_View"
 msgstr "è§†å›¾(_V)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:110
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
 msgid "_Help"
 msgstr "å¸®åŠ©(_H)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
 msgid "Connect"
 msgstr "è¿žæŽ¥"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:116
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:186
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:187
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
 msgid "Open Log"
 msgstr "æ‰“å¼€èŠå¤©åŽ†å²"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
 msgid "_Preferences"
 msgstr "åå¥½è®¾ç½®(_P)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
 msgid "_Quit"
 msgstr "é€€å‡º(_Q)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
 msgid "_Connect"
 msgstr "è¿žæŽ¥(_C)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
 msgid "_Add"
 msgstr "æ·»åŠ (_A)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
 msgid "_Manage"
 msgstr "ç®¡ç†(_M)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
 msgid "_Open / Join Chat"
 msgstr "æ‰“å¼€(_O) / åŠ å…¥èŠå¤©"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
 msgid "_Find Group Chat"
 msgstr "æŸ¥æ‰¾ç¾¤ç»„èŠå¤©(_F)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
 msgid "C_lear All Activity"
 msgstr "æ¸…é™¤æ‰€æœ‰æ´»åŠ¨(_L)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:151
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
 msgid "_Next Chat"
 msgstr "ä¸‹ä¸€ä¸ªèŠå¤©(_N)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:153
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
 msgid "_Previous Chat"
 msgstr "ä¸Šä¸€ä¸ªèŠå¤©(_P)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:156
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
 msgid "_Close"
 msgstr "å…³é—(_C)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:159
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:160
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
 msgid "_Use Local Engine"
 msgstr "ä½¿ç”¨æœ¬åœ°å¼•æ“Ž(_U)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:162
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:163
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
 msgid "_Add Remote Engine"
 msgstr "æ·»åŠ è¿œç¨‹å¼•æ“Ž(_A)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:165
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:166
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
 msgid "Switch Remote Engine"
 msgstr "åˆ‡æ¢è¿œç¨‹å¼•æ“Ž"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:168
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:169
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
 msgid "_Caret Mode"
 msgstr "æ’å…¥æ¨¡å¼(_C)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:171
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:172
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
 msgid "_Browse Mode"
 msgstr "æµè§ˆæ¨¡å¼(_B)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:177
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:178
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
 msgid "Show _Statusbar"
 msgstr "æ˜¾ç¤ºçŠ¶æ€æ (_S)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:180
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:181
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
 msgid "_Fullscreen"
 msgstr "å…¨å±(_F)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:183
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:184
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
 msgid "_About"
 msgstr "å…³äºŽ(_A)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:189
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:191
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
 msgid "Find Group Chat"
 msgstr "æŸ¥æ‰¾ç¾¤ç»„èŠå¤©"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:193
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:194
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
 msgid "_Website"
 msgstr "ç½‘ç«™(_W)"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:196
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:197
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
 msgid "Show _Toolbar"
 msgstr "æ˜¾ç¤ºå·¥å…·æ (_T)"
 
@@ -1124,7 +1162,7 @@ msgstr "<span size=\"small\">SSH æœåŠ¡å™¨çš„ DNS æˆ–è€… IP åœ°å€ä¸Žç«¯å£</spa
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:213
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:183
 msgid "_Port:"
 msgstr "ç«¯å£(_P):"
 
@@ -1173,7 +1211,7 @@ msgid ""
 msgstr "<span size=\"small\">SSH ç§é’¥æ–‡ä»¶å°†ç”¨äºŽç™»å½• SSH æœåŠ¡å™¨</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:272
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:242
 msgid "_Username:"
 msgstr "ç”¨æˆ·å(_U):"
 
@@ -1184,7 +1222,7 @@ msgid ""
 msgstr "<span size=\"small\">å°†ç”¨äºŽç™»å½• Smuxi æœåŠ¡å™¨çš„ç”¨æˆ·å</span>"
 
 #: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:146
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:116
 msgid "_Password:"
 msgstr "å¯†ç (_P):"
 
@@ -1238,34 +1276,34 @@ msgstr "Smuxi - å¼€æ”¾èŠå¤©"
 msgid "_Type:"
 msgstr "_ç±»åž‹:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:58
 msgid "_Hostname:"
 msgstr "_ä¸»æœºå:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:109
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:79
 msgid "_Network:"
 msgstr "_ç½‘ç»œ:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:105
 msgid "Nickname:"
 msgstr "æ˜µç§°:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:282
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:252
 msgid "_Protocol:"
 msgstr "_åè®®:"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:306
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:276
 msgid "Use Encryption"
 msgstr "ä½¿ç”¨åŠ å¯†"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:318
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:288
 msgid "Validate Server Certificate"
 msgstr "éªŒè¯æœåŠ¡å™¨è¯ä¹¦"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:308
 msgid "_On Connect Commands:"
 msgstr "è¿žæŽ¥æ—¶å‘½ä»¤(_O):"
 
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:349
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:319
 msgid "_Ignore Commands"
 msgstr "å¿½ç•¥å‘½ä»¤(_I)"
diff --git a/po-Frontend/fa.po b/po-Frontend/fa.po
index 539731dc..0ee12a64 100644
--- a/po-Frontend/fa.po
+++ b/po-Frontend/fa.po
@@ -8,63 +8,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:03+0100\n"
-"PO-Revision-Date: 2013-08-19 12:56+0000\n"
+"POT-Creation-Date: 2015-07-14 19:41+0200\n"
+"PO-Revision-Date: 2017-09-19 19:12+0000\n"
 "Last-Translator: Behrooz Amoozad <behrooz0az gmail com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/smuxi/language/fa/)\n"
+"Language-Team: Persian (http://www.transifex.com/meebey/smuxi/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/Frontend/CommandManager.cs:343
+#: ../src/Frontend/CommandManager.cs:466
 #, csharp-format
 msgid "Unknown Command: {0}"
 msgstr "Ø¯Ø³ØªÙˆØ± Ù†Ø§Ø´Ù†Ø§Ø®ØªÙ‡: {0}"
 
-#: ../src/Frontend/CommandManager.cs:352
+#: ../src/Frontend/CommandManager.cs:475
 #, csharp-format
 msgid "Not enough parameters for {0} command"
-msgstr ""
+msgstr "ØªØ¹Ø¯Ø§Ø¯ Ù¾Ø§Ø±Ø§Ù…ØªØ± Ù‡Ø§ÛŒ Ø¯Ø³ØªÙˆØ± {0} Ù†Ø§Ú©Ø§ÙÛŒØ³Øª."
 
-#: ../src/Frontend/EngineManager.cs:122
+#: ../src/Frontend/EngineManager.cs:112
 msgid "Engine must not be empty."
-msgstr ""
+msgstr "Ù†Ø§Ù… Ù…ÙˆØªÙˆØ± Ù†Ø¨Ø§ÛŒØ¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯."
 
-#: ../src/Frontend/EngineManager.cs:133
+#: ../src/Frontend/EngineManager.cs:123
 msgid "Engine does not exist."
-msgstr ""
+msgstr "Ù…ÙˆØªÙˆØ± Ù…ÙˆØ±Ø¯ Ù†Ø¸Ø± ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯."
 
-#: ../src/Frontend/EngineManager.cs:317
+#: ../src/Frontend/EngineManager.cs:313
 #, csharp-format
 msgid ""
 "Unknown channel ({0}) - only the following channel types are supported:"
 msgstr "Ú©Ø§Ù†Ø§Ù„ Ù†Ø§Ø´Ù†Ø§Ø®ØªÙ‡ ({0}) ÙÙ‚Ø· Ú©Ø§Ù†Ø§Ù„ Ù‡Ø§ÛŒ Ø°ÛŒÙ„ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ù…ÛŒØ´ÙˆÙ†Ø¯. "
 
-#: ../src/Frontend/EngineManager.cs:326
+#: ../src/Frontend/EngineManager.cs:322
 msgid ""
 "Registration with engine failed!  The username and/or password were wrong - "
 "please verify them."
 msgstr "Ø«Ø¨Øª Ù†Ø§Ù… Ù†Ø§ Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯.Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø± Ùˆ/ÛŒØ§ Ø±Ù…Ø² Ù†Ø§Ø¯Ø±Ø³Øª Ø¨ÙˆØ¯Ù†Ø¯ - Ù„Ø·ÙØ§ Ø§Ø² ØµØØª Ø¢Ù†Ù‡Ø§ Ø§Ø·Ù…ÛŒÙ†Ø§Ù† Ù¾ÛŒØ¯Ø§ Ú©Ù†ÛŒØ¯."
 
-#: ../src/Frontend/SshTunnelManager.cs:144
+#: ../src/Frontend/SshTunnelManager.cs:147
 msgid "SSH client application was not found: "
 msgstr "Ø¨Ø±Ù†Ø§Ù…Ù‡ ssh Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯:"
 
-#: ../src/Frontend/SshTunnelManager.cs:147
+#: ../src/Frontend/SshTunnelManager.cs:150
 msgid ""
 "SSH client must be either OpenSSH (ssh) or Plink (plink.exe, not putty.exe)"
 msgstr "Ø¨Ø±Ù†Ø§Ù…Ù‡ ssh Ø¨Ø§ÛŒØ¯ ÛŒØ§ OpenSSH(ssh) Ùˆ ÛŒØ§ PLink(plink.exe Ùˆ Ù†Ù‡ putty.exe) Ø¨Ø§Ø´Ø¯."
 
-#: ../src/Frontend/SshTunnelManager.cs:184
+#: ../src/Frontend/SshTunnelManager.cs:187
 #, csharp-format
 msgid ""
 "The local SSH forwarding port {0} is already in use. Is there an old SSH "
 "tunnel still active?"
 msgstr "Ø¯Ø±Ú¯Ø§Ù‡ Ø¯Ø§Ø®Ù„ÛŒ {0} Ø¯Ø± ØØ§Ù„ Ø³Ø§ØªÙØ§Ø¯Ù‡ Ø§Ø³ØªØŸ Ø¢ÛŒØ§ ÛŒÚ© ØªÙˆÙ†Ù„ Ù‚Ø¯ÛŒÙ…ÛŒ ssh Ù‡Ù†ÙˆØ² ÙØ¹Ø§Ù„ Ø§Ø³ØªØŸ"
 
-#: ../src/Frontend/SshTunnelManager.cs:208
+#: ../src/Frontend/SshTunnelManager.cs:211
 #, csharp-format
 msgid ""
 "SSH tunnel setup failed (exit code: {0})\n"
@@ -76,19 +76,19 @@ msgid ""
 "{3}\n"
 "Program Output:\n"
 "{4}\n"
-msgstr ""
+msgstr "Ø±Ø§Ù‡Ø§Ù†Ø¯Ø§Ø²ÛŒ ØªÙˆÙ†Ù„ SSH Ø´Ú©Ø³Øª Ø®ÙˆØ±Ø¯.(Ú©Ø¯ Ø®Ø±ÙˆØ¬: {0})\n\nØ¨Ø±Ù†Ø§Ù…Ù‡ SSH: {1}\nÙ¾Ø§Ø±Ø§Ù…ØªØ± Ù‡Ø§ÛŒ SSH: {2}\n\nØ®Ø·Ø§ÛŒ 
Ø¨Ø±Ù†Ø§Ù…Ù‡:\n{3}\nØ®Ø±ÙˆØ¬ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡:\n{4}\n"
 
-#: ../src/Frontend/SshTunnelManager.cs:329
-#: ../src/Frontend/SshTunnelManager.cs:478
+#: ../src/Frontend/SshTunnelManager.cs:332
+#: ../src/Frontend/SshTunnelManager.cs:481
 msgid "SSH keyfile not found."
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„ Ú©Ù„ÛŒØ¯ SSH ÛŒØ§ÙØª Ù†Ø´Ø¯."
 
-#: ../src/Frontend/SshTunnelManager.cs:335
-#: ../src/Frontend/SshTunnelManager.cs:484
+#: ../src/Frontend/SshTunnelManager.cs:338
+#: ../src/Frontend/SshTunnelManager.cs:487
 msgid "SSH keyfile could not be read."
-msgstr ""
+msgstr "ÙØ§ÛŒÙ„ Ú©Ù„ÛŒØ¯ SSH Ù‚Ø§Ø¨Ù„ Ø®ÙˆØ§Ù†Ø¯Ù† Ù†ÛŒØ³Øª."
 
-#: ../src/Frontend/SshTunnelManager.cs:426
+#: ../src/Frontend/SshTunnelManager.cs:429
 #, csharp-format
 msgid ""
 "OpenSSH version number not found (exit code: {0})\n"
@@ -99,13 +99,13 @@ msgid ""
 "{2}\n"
 "Program Output:\n"
 "{3}\n"
-msgstr ""
+msgstr "Ø´Ù…Ø§Ø±Ù‡ Ù†Ø³Ø®Ù‡ OpenSSH ÛŒØ§ÙØª Ù†Ø´Ø¯. (Ú©Ø¯ Ø®Ø±ÙˆØ¬: {0})\n\nØ¨Ø±Ù†Ø§Ù…Ù‡ SSH: {1}\n\nØ®Ø·Ø§ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡:\n{2}\nØ®Ø±ÙˆØ¬ÛŒ 
Ø¨Ø±Ù†Ø§Ù…Ù‡â€Œ:\n{3}\n"
 
-#: ../src/Frontend/SshTunnelManager.cs:469
+#: ../src/Frontend/SshTunnelManager.cs:472
 msgid "PuTTY / Plink requires a username to be set."
-msgstr ""
+msgstr "PuTTY / Plink Ù†ÛŒØ§Ø² Ø¨Ù‡ ÛŒÚ© Ø¨Ú© Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ø´Ø¯Ù‡ Ø¯Ø§Ø±Ù†Ø¯."
 
-#: ../src/Frontend/SshTunnelManager.cs:557
+#: ../src/Frontend/SshTunnelManager.cs:560
 #, csharp-format
 msgid ""
 "Plink version number not found (exit code: {0})\n"
diff --git a/po-Frontend/ru.po b/po-Frontend/ru.po
index b04a0bc1..7172e0ba 100644
--- a/po-Frontend/ru.po
+++ b/po-Frontend/ru.po
@@ -3,70 +3,69 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Yuri Myasoedov <omerta13 yandex ru>, 2012.
+# VsyachePuz <vsyachepuz gmail com>, 2015
+# Yuri Myasoedov <omerta13 yandex ru>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: http://www.smuxi.org/issues\n";
-"POT-Creation-Date: 2011-12-29 09:21+0100\n"
-"PO-Revision-Date: 2012-01-07 10:35+0000\n"
-"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/smuxi/team/ru/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:41+0200\n"
+"PO-Revision-Date: 2017-09-19 09:13+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) 
? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../src/Frontend/CommandManager.cs:143
+#: ../src/Frontend/CommandManager.cs:466
 #, csharp-format
 msgid "Unknown Command: {0}"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: {0}"
 
-#: ../src/Frontend/EngineManager.cs:122
+#: ../src/Frontend/CommandManager.cs:475
+#, csharp-format
+msgid "Not enough parameters for {0} command"
+msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð¾ Ð¼Ð°Ð»Ð¾ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ {0}"
+
+#: ../src/Frontend/EngineManager.cs:112
 msgid "Engine must not be empty."
 msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð´Ð²Ð¸Ð¶Ð¾Ðº."
 
-#: ../src/Frontend/EngineManager.cs:133
+#: ../src/Frontend/EngineManager.cs:123
 msgid "Engine does not exist."
 msgstr "Ð”Ð²Ð¸Ð¶Ð¾Ðº Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚."
 
-#: ../src/Frontend/EngineManager.cs:318
+#: ../src/Frontend/EngineManager.cs:313
 #, csharp-format
 msgid ""
 "Unknown channel ({0}) - only the following channel types are supported:"
-msgstr ""
-"ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ ÐºÐ°Ð½Ð°Ð» ({0}). ÐŸÐ¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ ÐºÐ°Ð½Ð°Ð»Ð¾Ð²:"
+msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ ÐºÐ°Ð½Ð°Ð» ({0}). ÐŸÐ¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ ÐºÐ°Ð½Ð°Ð»Ð¾Ð²:"
 
-#: ../src/Frontend/EngineManager.cs:327
+#: ../src/Frontend/EngineManager.cs:322
 msgid ""
 "Registration with engine failed!  The username and/or password were wrong - "
 "please verify them."
-msgstr ""
-"Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸!  ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. "
-"ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð¸Ð¼ÐµÐ½Ð¸ Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ñ."
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸!  ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ÑÑ‚ÑŒ 
Ð¸Ð¼ÐµÐ½Ð¸ Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ñ."
 
-#: ../src/Frontend/SshTunnelManager.cs:145
+#: ../src/Frontend/SshTunnelManager.cs:147
 msgid "SSH client application was not found: "
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¾Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ SSH: "
 
-#: ../src/Frontend/SshTunnelManager.cs:148
+#: ../src/Frontend/SshTunnelManager.cs:150
 msgid ""
 "SSH client must be either OpenSSH (ssh) or Plink (plink.exe, not putty.exe)"
-msgstr ""
-"Ð’ ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° SSH Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð»Ð¸Ð±Ð¾ OpenSSH (ssh), Ð»Ð¸Ð±Ð¾ Plink "
-"(plink.exe, Ð½Ð¾ Ð½Ðµ putty.exe)"
+msgstr "Ð’ ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° SSH Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð»Ð¸Ð±Ð¾ OpenSSH (ssh), Ð»Ð¸Ð±Ð¾ Plink (plink.exe, Ð½Ð¾ Ð½Ðµ 
putty.exe)"
 
-#: ../src/Frontend/SshTunnelManager.cs:185
+#: ../src/Frontend/SshTunnelManager.cs:187
 #, csharp-format
 msgid ""
 "The local SSH forwarding port {0} is already in use. Is there an old SSH "
 "tunnel still active?"
-msgstr ""
-"Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ð¾Ñ€Ñ‚ {0} ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ SSH. Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, "
-"ÑÑ‚Ð°Ñ€Ñ‹Ð¹ Ñ‚ÑƒÐ½Ð½ÐµÐ»ÑŒ Ð´Ð»Ñ SSH Ð²ÑÑ‘ ÐµÑ‰Ñ‘ Ð°ÐºÑ‚Ð¸Ð²ÐµÐ½."
+msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ð¾Ñ€Ñ‚ {0} ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ SSH. Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÑ‚Ð°Ñ€Ñ‹Ð¹ Ñ‚ÑƒÐ½Ð½ÐµÐ»ÑŒ Ð´Ð»Ñ SSH Ð²ÑÑ‘ 
ÐµÑ‰Ñ‘ Ð°ÐºÑ‚Ð¸Ð²ÐµÐ½."
 
-#: ../src/Frontend/SshTunnelManager.cs:209
+#: ../src/Frontend/SshTunnelManager.cs:211
 #, csharp-format
 msgid ""
 "SSH tunnel setup failed (exit code: {0})\n"
@@ -78,28 +77,19 @@ msgid ""
 "{3}\n"
 "Program Output:\n"
 "{4}\n"
-msgstr ""
-"Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ SSH (ÐºÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°: {0})\n"
-"\n"
-"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° SSH: {1}\n"
-"ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ SSH: {2}\n"
-"\n"
-"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð¾ÑˆÐ¸Ð±Ð¾Ðº:\n"
-"{3}\n"
-"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð²Ñ‹Ð²Ð¾Ð´Ð°:\n"
-"{4}\n"
+msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ SSH (ÐºÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°: {0})\n\nÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° SSH: {1}\nÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ SSH: 
{2}\n\nÐ¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð¾ÑˆÐ¸Ð±Ð¾Ðº:\n{3}\nÐ¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð²Ñ‹Ð²Ð¾Ð´Ð°:\n{4}\n"
 
-#: ../src/Frontend/SshTunnelManager.cs:330
-#: ../src/Frontend/SshTunnelManager.cs:476
+#: ../src/Frontend/SshTunnelManager.cs:332
+#: ../src/Frontend/SshTunnelManager.cs:481
 msgid "SSH keyfile not found."
 msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð° SSH Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½."
 
-#: ../src/Frontend/SshTunnelManager.cs:336
-#: ../src/Frontend/SshTunnelManager.cs:482
+#: ../src/Frontend/SshTunnelManager.cs:338
+#: ../src/Frontend/SshTunnelManager.cs:487
 msgid "SSH keyfile could not be read."
 msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð° SSH Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‡Ñ‚Ñ‘Ð½."
 
-#: ../src/Frontend/SshTunnelManager.cs:424
+#: ../src/Frontend/SshTunnelManager.cs:429
 #, csharp-format
 msgid ""
 "OpenSSH version number not found (exit code: {0})\n"
@@ -110,21 +100,13 @@ msgid ""
 "{2}\n"
 "Program Output:\n"
 "{3}\n"
-msgstr ""
-"ÐÐ¾Ð¼ÐµÑ€ Ð²ÐµÑ€ÑÐ¸Ð¸ OpenSSH Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ (ÐºÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°: {0})\n"
-"\n"
-"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° SSH: {1}\n"
-"\n"
-"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð¾ÑˆÐ¸Ð±Ð¾Ðº:\n"
-"{2}\n"
-"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð²Ñ‹Ð²Ð¾Ð´Ð°:\n"
-"{3}\n"
+msgstr "ÐÐ¾Ð¼ÐµÑ€ Ð²ÐµÑ€ÑÐ¸Ð¸ OpenSSH Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ (ÐºÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°: {0})\n\nÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° SSH: {1}\n\nÐ¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° 
Ð¾ÑˆÐ¸Ð±Ð¾Ðº:\n{2}\nÐ¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð²Ñ‹Ð²Ð¾Ð´Ð°:\n{3}\n"
 
-#: ../src/Frontend/SshTunnelManager.cs:467
+#: ../src/Frontend/SshTunnelManager.cs:472
 msgid "PuTTY / Plink requires a username to be set."
 msgstr "Ð”Ð»Ñ PuTTY / Plink Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
 
-#: ../src/Frontend/SshTunnelManager.cs:555
+#: ../src/Frontend/SshTunnelManager.cs:560
 #, csharp-format
 msgid ""
 "Plink version number not found (exit code: {0})\n"
@@ -135,14 +117,4 @@ msgid ""
 "{2}\n"
 "Program Output:\n"
 "{3}\n"
-msgstr ""
-"ÐÐ¾Ð¼ÐµÑ€ Ð²ÐµÑ€ÑÐ¸Ð¸ Plink Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ (ÐºÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°: {0})\n"
-"\n"
-"ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° SSH: {1}\n"
-"\n"
-"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð¾ÑˆÐ¸Ð±Ð¾Ðº:\n"
-"{2}\n"
-"Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð²Ñ‹Ð²Ð¾Ð´Ð°:\n"
-"{3}\n"
-
-
+msgstr "ÐÐ¾Ð¼ÐµÑ€ Ð²ÐµÑ€ÑÐ¸Ð¸ Plink Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ (ÐºÐ¾Ð´ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°: {0})\n\nÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° SSH: {1}\n\nÐ¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° 
Ð¾ÑˆÐ¸Ð±Ð¾Ðº:\n{2}\nÐ¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð¾Ñ‚Ð¾ÐºÐ° Ð²Ñ‹Ð²Ð¾Ð´Ð°:\n{3}\n"
diff --git a/po-Server/ru.po b/po-Server/ru.po
index 4ecd2188..ea04e354 100644
--- a/po-Server/ru.po
+++ b/po-Server/ru.po
@@ -3,138 +3,135 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Yuri Myasoedov <omerta13 yandex ru>, 2012.
+# VsyachePuz <vsyachepuz gmail com>, 2015
+# Yuri Myasoedov <omerta13 yandex ru>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Smuxi - IRC client\n"
-"Report-Msgid-Bugs-To: http://www.smuxi.org/issues\n";
-"POT-Creation-Date: 2011-12-29 09:21+0100\n"
-"PO-Revision-Date: 2012-01-07 10:47+0000\n"
-"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/smuxi/team/ru/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-14 19:41+0200\n"
+"PO-Revision-Date: 2017-09-19 09:14+0000\n"
+"Last-Translator: VsyachePuz <vsyachepuz gmail com>\n"
+"Language-Team: Russian (http://www.transifex.com/meebey/smuxi/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) 
? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 
1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../src/Server/Main.cs:71
+#: ../src/Server/Main.cs:65
 msgid "Add user to Server"
 msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€"
 
-#: ../src/Server/Main.cs:80
+#: ../src/Server/Main.cs:74
 msgid "Modify existing user of Server"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ðµ"
 
-#: ../src/Server/Main.cs:89
+#: ../src/Server/Main.cs:83
 msgid "Delete user from Server"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
-#: ../src/Server/Main.cs:98
+#: ../src/Server/Main.cs:92
 msgid "List all existing users of Server"
 msgstr "Ð’Ñ‹Ð²ÐµÑÑ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²ÑÐµÑ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ðµ"
 
-#: ../src/Server/Main.cs:107
+#: ../src/Server/Main.cs:101
 msgid "User to create, modify or delete"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ, Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: ../src/Server/Main.cs:116
+#: ../src/Server/Main.cs:110
 msgid "Password of the user when creating or modifying a user"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: ../src/Server/Main.cs:125
+#: ../src/Server/Main.cs:119
 msgid "Enable debug output"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð²Ð¾Ð´ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸"
 
-#: ../src/Server/Main.cs:133
+#: ../src/Server/Main.cs:127
 msgid ""
 "Optimize message buffers and exit (valid values: none, defrag, index, all)"
-msgstr ""
-"ÐžÐ¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€Ñ‹ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð¸ Ð²Ñ‹Ð¹Ñ‚Ð¸ (Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ: none, defrag, "
-"index, all)"
+msgstr "ÐžÐ¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€Ñ‹ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð¸ Ð²Ñ‹Ð¹Ñ‚Ð¸ (Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ: none, defrag, index, all)"
 
-#: ../src/Server/Main.cs:146
+#: ../src/Server/Main.cs:140
 msgid "Show this help"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÑ‚Ñƒ ÑÐ¿Ñ€Ð°Ð²ÐºÑƒ"
 
-#: ../src/Server/Main.cs:148
+#: ../src/Server/Main.cs:142
 msgid "Usage: smuxi-server [options]"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: smuxi-server [Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹]"
 
-#: ../src/Server/Main.cs:150
+#: ../src/Server/Main.cs:144
 msgid "Options:"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹:"
 
-#: ../src/Server/Main.cs:161
+#: ../src/Server/Main.cs:152
+msgid "Show version"
+msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
+
+#: ../src/Server/Main.cs:165
 #, csharp-format
 msgid "Unknown option: '{0}'"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€: Â«{0}Â»"
 
-#: ../src/Server/Main.cs:188
+#: ../src/Server/Main.cs:192
 #, csharp-format
 msgid "Command line error: {0}"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð¾ÐºÐµ: {0}"
 
-#: ../src/Server/Main.cs:232
+#: ../src/Server/Main.cs:236
 msgid ""
 "At most one of --add-user, --modify-user, and --delete-user may be used at a"
 " time."
-msgstr ""
-"ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ --add-user, --modify-user Ð¸ --delete-user Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ "
-"Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ð´Ñ€ÑƒÐ³ Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¼."
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ --add-user, --modify-user Ð¸ --delete-user Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ð´Ñ€ÑƒÐ³ Ñ 
Ð´Ñ€ÑƒÐ³Ð¾Ð¼."
 
-#: ../src/Server/Main.cs:242
+#: ../src/Server/Main.cs:246
 msgid "You must specify a username with the --username option."
 msgstr "Ð”Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° --username Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
 
-#: ../src/Server/Main.cs:248
+#: ../src/Server/Main.cs:252
 msgid "Username must not be empty."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
 
-#: ../src/Server/Main.cs:258
+#: ../src/Server/Main.cs:262
 msgid "You must specify a password with the --password option."
 msgstr "Ð”Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° --password Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ."
 
-#: ../src/Server/Main.cs:264
+#: ../src/Server/Main.cs:268
 msgid "Password must not be empty."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ."
 
-#: ../src/Server/Main.cs:283
+#: ../src/Server/Main.cs:287
 #, csharp-format
 msgid ""
 "Invalid optimization value passed to --optimize-message-buffer, valid values"
 " are: {0}"
-msgstr ""
-"ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñƒ --optimize-message-buffer Ð¿ÐµÑ€ÐµÐ´Ð°Ð½Ð¾ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ, "
-"Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ: {0}"
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñƒ --optimize-message-buffer Ð¿ÐµÑ€ÐµÐ´Ð°Ð½Ð¾ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ: {0}"
 
-#: ../src/Server/Main.cs:303
+#: ../src/Server/Main.cs:307
 #, csharp-format
 msgid "User \"{0}\" successfully added to server."
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Â«{0}Â» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€."
 
-#: ../src/Server/Main.cs:312
+#: ../src/Server/Main.cs:316
 #, csharp-format
 msgid "User \"{0}\" successfully modified."
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Â«{0}Â» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½."
 
-#: ../src/Server/Main.cs:321
+#: ../src/Server/Main.cs:325
 #, csharp-format
 msgid "User \"{0}\" successfully deleted from server."
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Â«{0}Â» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°."
 
-#: ../src/Server/Main.cs:328
+#: ../src/Server/Main.cs:332
 msgid "Users:"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸:"
 
-#: ../src/Server/Main.cs:376
+#: ../src/Server/Main.cs:380
 #, csharp-format
 msgid "Successfully optimized {0} message buffers."
 msgstr "Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ {0} Ð±ÑƒÑ„ÐµÑ€Ð¾Ð² ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹."
 
-#: ../src/Server/Main.cs:389
+#: ../src/Server/Main.cs:393
 #, csharp-format
 msgid "Failed to optimize message buffers: {0}"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ€Ð¸ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð±ÑƒÑ„ÐµÑ€Ð¾Ð² ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹: {0}"
-
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]