[smuxi] L10N: update translations from Transifex



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 "Añ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]