update po files

1 files changed, 4757 insertions, 3770 deletions

diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 0de9d97f8..10339a4c4 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -5,15 +5,11 @@
 #
 # B. Kokanovic <branko.kokanovic@gmail.com>, 2007.
 # Branko Kokanovic <branko.kokanovic@gmail.com>, 2008, 2009.
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
+"POT-Creation-Date: 2013-08-29 15:27+0200\n"
 "PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -25,306 +21,297 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
+#: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "Lični događaji"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+msgid "_Start Chat..."
+msgstr "_Započni razgovor"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
 msgid "Join _Group Chat..."
 msgstr "Priključi se _grupnom razgovoru..."
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Otkrivanje servisa"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Izvrši naredbu..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "Izmeni nalog"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Otvori Gmail dolaznu poštu"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "Lični događaji"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Započni razgovor"
-
 #: ../data/gui/account_context_menu.ui.h:9
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account"
+msgstr "Izmeni nalog"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: čarobnjak za kreiranje naloga"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Povezivanje na server</b>\n"
-"\n"
-"Molimo pričekajte..."
+"Morate posedovati račun da biste se mogli povezati\n"
+"na džaber mrežu."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "I already have an account I want to _use"
+msgstr "Već imam nalog koji želim da koristim"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I want to _register for a new account"
+msgstr "Želim da registrujem novi nalog"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Molimo odaberite jednu od opcija ispod:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Molimo popunite podatke za Vaš postojeći korisnički nalog</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Molimo odaberite server</b>"
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+#: ../data/gui/accounts_window.ui.h:22
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Password:"
+msgstr "_Lozinka:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
-"SHA1 potpis sertifikata:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:20
+msgid "Save pass_word"
+msgstr "Snimi lozinku"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-msgid "Anon_ymous authentication"
-msgstr "Anon_imno prijavljivanje"
+#: ../data/gui/accounts_window.ui.h:21
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Poveži se kada pritisnem Završi"
+#: ../data/gui/accounts_window.ui.h:23
+msgid "_Jabber ID:"
+msgstr "_Džaber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: čarobnjak za kreiranje naloga"
+msgid "Anon_ymous authentication"
+msgstr "Anon_imno prijavljivanje"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "Već imam nalog koji želim da koristim"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Molimo odaberite server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "Želim da registrujem novi nalog"
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
+msgid "Prox_y:"
+msgstr "Prok_si:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Podesi..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
-msgid "None"
-msgstr "Ništa"
+msgid "Use custom hostname/port"
+msgstr "Koristi Vaše određeno ime hosta/port "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prok_si:"
+msgid "_Hostname:"
+msgstr "Ime hosta:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Snimi lozinku"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Postavi moj profil pri povezivanju"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Napredno"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Koristi Vaše određeno ime hosta/port "
-
-#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Morate posedovati račun da biste se mogli povezati\n"
-"na džaber mrežu."
+"Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
+"SHA1 potpis sertifikata:\n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Napredno"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Završi"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "Ime hosta:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Povezivanje na server</b>\n"
+"\n"
+"Molimo pričekajte..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Džaber ID:"
+msgid "Connect when I press Finish"
+msgstr "Poveži se kada pritisnem Završi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Lozinka:"
+msgid "Set my profile when I connect"
+msgstr "Postavi moj profil pri povezivanju"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Finish"
+msgstr "_Završi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Ostalo</b>"
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
+#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
+#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
+#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
+#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
+#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
+#: ../src/dialogs.py:536 ../src/roster_window.py:3147
+#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+msgid "None"
+msgstr "Ništa"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Nalozi"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Lične informacije</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
+#: ../src/dialogs.py:3570
+msgid "Add"
+msgstr "Dodate"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proksi</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
+#: ../src/dialogs.py:3625
+msgid "Delete"
+msgstr "Obriši"
 
-#: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "Po_desi prema statusu"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+msgid "Re_name"
+msgstr "Prei_menuj"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Nalog"
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "_Omogući"
 
 #: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Nalozi"
+msgid "Anonymous authentication"
+msgstr "Anonimno prijavljivanje"
 
 #: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administratorske operacije"
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Resurs se šalje Džaber serveru kako bi se razlikovao isti džaber ID kod 2 "
+"ili više klijenata spojena u isto vreme na isti server sa istim računom. "
+"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
+"najvišim prioritetom će dobijati obaveštenja o događajima"
 
-#: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonimno prijavljivanje"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339
+#: ../src/notify.py:389 ../src/notify.py:405
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Automatsko povezivanje kada se veza izgubi"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "Sinhronizuj kontakte"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Pregled"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Kliknite da zatražite autorizaciju svim kontaktima drugog naloga"
 
 #: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Po_veži se prilikom pokretanja Gajima"
-
-#: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
 msgstr "I_zmeni lozinku"
 
+#: ../data/gui/accounts_window.ui.h:13
+msgid "Click to change account's password"
+msgstr "Kliknite za izmenu lozinke Vašeg naloga"
+
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Označite ovo da Vas Gajim pita pre nego što pošaljete lozinku preko "
-"nesigurne veze."
+msgid "Administration operations"
+msgstr "Administratorske operacije"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Odaberite datoteku za slanje..."
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Prioritet se u džaberu koristi da odredi ko dobija događaje sa servera u "
+"slučaju da su dva ili više klijenata povezana na njega; klijent sa najvećim "
+"prioritetomdobija događaje"
 
 #: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Odaberite _Ključ"
+msgid "A_djust to status"
+msgstr "Po_desi prema statusu"
 
 #: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Kliknite za izmenu lozinke Vašeg naloga"
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Kliknite da zatražite autorizaciju svim kontaktima drugog naloga"
+msgid "Priori_ty:"
+msgstr "Priori_tet"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
-msgid "Client certificate"
-msgstr "Samopotpisani sertifikat"
-
-#: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Po_veži se prilikom pokretanja Gajima"
-
-#: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Veza"
-
-#: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-mejl:"
-
-#: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Ime:"
+msgid "Resour_ce:"
+msgstr "Resur_s:"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
-msgid "General"
-msgstr "Opšte"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Pregled"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"Ako je ovo označeno, Gajim će odašiljati još neke IP adrese pored Vaše,tako "
-"da prenos datoteka ima veće šanse da će raditi."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Sertifikat odbačen"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Samopotpisani sertifikat"
+
+#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Account"
+msgstr "Nalog"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Ako je ovo označeno, Gajim će slati poruke da je prisutan kako bi sprečio "
-"prekid veze zbog duge neaktivnosti"
+msgid "C_onnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -335,6 +322,18 @@ msgstr ""
 "na džaber koristeći ovaj nalog"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatsko povezivanje kada se veza izgubi"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Snimi dnevnik razgovora za sve kontakte"
+
+#: ../data/gui/accounts_window.ui.h:33
+msgid "Synch_ronize account status with global status"
+msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+
+#: ../data/gui/accounts_window.ui.h:34
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -344,175 +343,204 @@ msgstr ""
 "padajućeg menija na dnu prozora kontakt liste) će promeniti i status ovog "
 "naloga "
 
-#: ../data/gui/accounts_window.ui.h:32
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ako je podrazumevani port koji se koristi za dolazne poruke neodgovarajući "
-"za Vaša podešavanja, ovde možete odabrati neki drugi.\n"
-"Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Informacije o Vama, kako su uskladištene na serveru"
-
 #: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Džaber ID:"
+msgid "Use file transfer proxies"
+msgstr "Koristi proksi za prenos datoteka"
 
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Prezime:"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ako je ovo označeno, Gajim će odašiljati još neke IP adrese pored Vaše,tako "
+"da prenos datoteka ima veće šanse da će raditi."
 
-#: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Spoji naloge"
+#. FIXME: Ugly workaround.
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
+#. General group cannot be changed
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
+#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
+#: ../src/roster_window.py:5842
+msgid "General"
+msgstr "Opšte"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Nije odabran nijedan ključ"
+#: ../data/gui/accounts_window.ui.h:38
+msgid "_use HTTP__PROXY environment variable"
+msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Lične Informacije"
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+msgid "_Manage..."
+msgstr "_Podesi..."
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "<b>Proxy</b>"
+msgstr "<b>Proksi</b>"
 
 #: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tet"
+msgid "_Warn before using an insecure connection"
+msgstr "Upozori pre korišćenja nesigurne veze"
 
 #: ../data/gui/accounts_window.ui.h:42
 msgid ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Prioritet se u džaberu koristi da odredi ko dobija događaje sa servera u "
-"slučaju da su dva ili više klijenata povezana na njega; klijent sa najvećim "
-"prioritetomdobija događaje"
+"Označite ovo da Vas Gajim pita pre nego što pošaljete lozinku preko "
+"nesigurne veze."
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
+msgid "Send _keep-alive packets"
+msgstr "Šalji podat_ke o živosti"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Prei_menuj"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ako je ovo označeno, Gajim će slati poruke da je prisutan kako bi sprečio "
+"prekid veze zbog duge neaktivnosti"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Resur_s:"
+msgid "Use cust_om hostname/port"
+msgstr "K_oristi Vaše određeno ime hosta/port "
 
 #: ../data/gui/accounts_window.ui.h:46
-msgid ""
-"Resource is sent to the Jabber server in order to separate the same JID in "
-"two or more parts depending on the number of the clients connected in the "
-"same server with the same account. So you might be connected in the same "
-"account with resource 'Home' and 'Work' at the same time. The resource which "
-"has the highest priority will get the events. (see below)"
-msgstr ""
-"Resurs se šalje Džaber serveru kako bi se razlikovao isti džaber ID kod 2 "
-"ili više klijenata spojena u isto vreme na isti server sa istim računom. "
-"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
-"najvišim prioritetom će dobijati obaveštenja o događajima"
+msgid "_Hostname: "
+msgstr "Ime _hosta:"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Snimi dnevnik razgovora za sve kontakte"
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Ostalo</b>"
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Šalji podat_ke o živosti"
+msgid "Connection"
+msgstr "Veza"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
+#: ../src/config.py:2436
+msgid "No key selected"
+msgstr "Nije odabran nijedan ključ"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinhroni_zuj status naloga sa globalnim statusom"
+msgid "Choose _Key..."
+msgstr "Odaberite _Ključ"
 
 #: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Sinhronizuj kontakte"
+msgid "Use G_PG Agent"
+msgstr "Koristi G_PG agenta"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use G_PG Agent"
-msgstr "Koristi G_PG agenta"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "K_oristi Vaše određeno ime hosta/port "
+msgid "_Edit Personal Information..."
+msgstr "Izm_eni lične informacije..."
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "K_oristi svoj port:"
+msgid "Information about you, as stored in the server"
+msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Koristi proksi za prenos datoteka"
+msgid "<b>Personal Information</b>"
+msgstr "<b>Lične informacije</b>"
 
-#: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Lične Informacije"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "Izm_eni lične informacije..."
+msgid "Co_nnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Omogući"
+#: ../data/gui/accounts_window.ui.h:60
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinhroni_zuj status naloga sa globalnim statusom"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "Ime _hosta:"
+msgid "Use cust_om port:"
+msgstr "K_oristi svoj port:"
 
-#: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Podesi..."
+#: ../data/gui/accounts_window.ui.h:62
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Ako je podrazumevani port koji se koristi za dolazne poruke neodgovarajući "
+"za Vaša podešavanja, ovde možete odabrati neki drugi.\n"
+"Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
+
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "First Name:"
+msgstr "Ime:"
 
 #: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port:"
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Last Name:"
+msgstr "Prezime:"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "Upozori pre korišćenja nesigurne veze"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "E-Mail:"
+msgstr "E-mejl:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
+#: ../src/dialogs.py:841
+msgid "Jabber ID:"
+msgstr "Džaber ID:"
+
+#: ../data/gui/accounts_window.ui.h:68
+msgid "Mer_ge accounts"
+msgstr "_Spoji naloge"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Nalog:"
+msgid "Add New Contact"
+msgstr "Dodaj novi kontakt"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Dozvo_li ovom kontaktu da vidi moj status"
+msgid "A_ccount:"
+msgstr "_Nalog:"
 
 #: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Dodaj novi kontakt"
+msgid "_Protocol:"
+msgstr "_Protokol:"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
-msgid "I would like to add you to my contact list."
-msgstr "Želio bih da Vas dodam na listu mojih kontakata."
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_User ID:"
+msgstr "_ID korisnika:"
 
 #: ../data/gui/add_new_contact_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Nickname:"
+msgstr "_Nadimak:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+msgid "_Group:"
+msgstr "_Grupa:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "A_llow this contact to view my status"
+msgstr "Dozvo_li ovom kontaktu da vidi moj status"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Pretplata"
+
+#: ../data/gui/add_new_contact_window.ui.h:9
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -524,7 +552,11 @@ msgstr ""
 "protokola. Kliknite na dugme za registraciju\n"
 "za nastavak."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:13
+msgid "_Register"
+msgstr "_Registracija"
+
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -532,593 +564,373 @@ msgstr ""
 "Morate biti povezani na transport da biste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupa:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Nadimak:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Registracija"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Pretplata"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_ID korisnika:"
+#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366
+msgid "I would like to add you to my contact list."
+msgstr "Želio bih da Vas dodam na listu mojih kontakata."
 
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Dogodila se greška:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hok komande - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Odaberite komandu za izvršenje:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Molimo sačekajte dok se dobavlja lista komandi..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hok komande - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Odaberite komandu za izvršenje:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Označite još jednom"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Opis greške"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "Molimo sačekajte dok se komanda šalje..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Završi"
+msgid "Please wait..."
+msgstr "Molimo sačekajte..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Molimo sačekajte dok se dobavlja lista komandi..."
+msgid "This jabber entity does not expose any commands."
+msgstr "Ovaj džaber izvor ne izlaže nijednu komandu."
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "Molimo sačekajte dok se komanda šalje..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Dogodila se greška:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "Molimo sačekajte..."
+msgid "Error description..."
+msgstr "Opis greške"
 
 #: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "Ovaj džaber izvor ne izlaže nijednu komandu."
+#, fuzzy
+msgid "F_inish"
+msgstr "_Završi"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Napredna izmena konfiguracije"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NAPOMENA:</b> Trebalo bi da ponovo pokrenete Gajim da bi neke izmene "
 "podešavanja postale primenjene"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Napredna izmena konfiguracije"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filter:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Ponovo učitaj podrazumevane boje"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Izbriši poruku dana"
+msgid "Show _XML Console"
+msgstr "Prikaži _XML Konzolu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Briše poruku dana"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit Archi_ving Preferences"
 msgstr "_Podešavanja"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Izmeni liste _privatnosti..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
-msgid "Sends a message to users currently connected to this server"
-msgstr "Šalje poruku trenutno povezanim korisnicima ovog servera"
+msgid "_Send Server Message..."
+msgstr "_Pošalji serversku poruku..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Postavi poruku dana..."
+msgid "Sends a message to users currently connected to this server"
+msgstr "Šalje poruku trenutno povezanim korisnicima ovog servera"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Postavlja poruku dana"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Prikaži _XML Konzolu"
+msgid "Set MOTD..."
+msgstr "Postavi poruku dana..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Osveži poruku dana..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Osvežava poruku dana"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "Osveži poruku dana..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Delete MOTD"
+msgstr "Izbriši poruku dana"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Pošalji serversku poruku..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " otvaranje prozora/jezička sa tim kontaktom "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Akcije</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Uslovi</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Zvukovi</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Napredne Akcije"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Napredna kontrola obaveštavanja"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Svi statusi"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Odsutan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Zaposlen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt promenio status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt Otišao Sa Veze"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Nemam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Prenosi datoteka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Zahtev za prenosom datoteke"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Prenos datoteke zaustavljen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Bojenje Poruka Sa Grupnog Razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Primljena Poruka Sa Grupnog Razgovora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Imam "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Nevidljiv"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Pokrenite komandu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nedostupan"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Jedan ili više posebnih statusa..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Na vezi / Slobodan za razgovor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Puštanje zvukove"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Nova Privatna Poruka"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kada "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktiviranje upravnika prozora za bljeskanje prozora razgovora u panelu"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Onemogući automatsko otvaranje prozora za razgovor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Onemogući postojeći iskačući prozor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Onemogući postojeći zvuk za ovaj događaj"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Onemogući prikazivanje događaja u listi kontakata"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Onemogući prikazivanje događaja u listi kontakata"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Obavesti me iskačućim prozorom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Otvori prozor za razgovor sa korisnikom"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Prikaži događaj u listi kontakata"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Prikaži događaj u listi kontakata"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "i ja "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakti"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "za"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Grupe"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "kada sam u"
+msgid "Deletes Message of the Day"
+msgstr "Briše poruku dana"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
+#, fuzzy
+msgid "Prefer"
+msgstr "Podešavanja"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
-msgid "Auto"
-msgstr "Automatsko povezivanje"
+msgid "Concede"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
+msgid "Forbid"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Ništa"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Podešavanja"
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+#, fuzzy
+msgid "Auto"
+msgstr "Automatsko povezivanje"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Unos:"
+msgid "New entry received"
+msgstr "Nov događaj primljen"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:128
+msgid "You have received new entry:"
+msgstr "Primili ste novi unos:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Ime teme:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Unos:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Zadnji put izmenjeno:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Nov događaj primljen"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Primili ste novi unos:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokirani kontakti"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
+#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Poruka:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>Poruka:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:3
+msgid "<b>Message:</b>"
+msgstr "<b>Poruka:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Izmeni lozinku"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Unesite ponovo kao potvrdu:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Unesite novu lozinku:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Unesite ponovo kao potvrdu:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Upišite Vašu novu statusnu poruku</b>"
+msgid "Save as Preset..."
+msgstr "Snimi kao već postavljenu..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
-msgid "Activity:"
-msgstr "Aktivnost:"
-
-#: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
+#: ../data/gui/change_status_message_dialog.ui.h:3
+msgid "Activity:"
+msgstr "Aktivnost:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Već postavljene poruke:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Snimi kao već postavljenu..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Upišite Vašu novu statusnu poruku</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Priključi se _grupnom razgovoru"
+msgid "_Copy Link Location"
+msgstr "_Kopiraj lokaciju veze"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Dodaj na listu kontakata..."
+msgid "_Open Link in Browser"
+msgstr "_Otvori vezu u internet pregledaču"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiraj lokaciju veze"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Otvori sastavljač e-mejla"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u internet pregledaču"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "_Započni razgovor"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:6
+msgid "Join _Group Chat"
+msgstr "Priključi se _grupnom razgovoru"
+
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Dodaj na listu kontakata..."
+
+#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži listu smajlija (Alt+M)"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "O"
+#: ../data/gui/chat_control.ui.h:3
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:4
+#, fuzzy
+msgid "View contact information (Ctrl+I)"
+msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Prikaži meni naprednih funkcija (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Pošalji poruku"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
+msgid "_Send"
+msgstr "_Pošalji"
+
+#: ../data/gui/chat_control.ui.h:11
 msgid "1"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:12
 msgid "2"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:13
 msgid "3"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:14
 msgid "4"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:8
+#: ../data/gui/chat_control.ui.h:15
 msgid "5"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:9
+#: ../data/gui/chat_control.ui.h:16
 msgid "6"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:10
+#: ../data/gui/chat_control.ui.h:17
 msgid "7"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:18
 msgid "8"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:19
 msgid "9"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:13
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
-
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
-
-#: ../data/gui/chat_control.ui.h:15
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
-
-#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prikaži listu smajlija (Alt+M)"
-
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
-msgid "Show a list of formattings"
-msgstr "Prikaži listu formatiranja"
-
-#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Prikaži meni naprednih funkcija (Alt+A)"
-
-#: ../data/gui/chat_control.ui.h:19
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Prikaži profil kontakta (Ctrl+I)"
-
 #: ../data/gui/chat_control.ui.h:20
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/gui/chat_control.ui.h:21
-msgid "Toggle video session"
+msgid "*"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Pošalji"
-
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+msgid "0"
+msgstr "O"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "Pozo_vi"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozovi prijatelje!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "Server grupnog razgovora"
-
-#: ../data/gui/chat_to_muc_window.ui.h:4
-msgid "Please select a MUC server."
-msgstr "Molimo odaberite server grupnog razgovora."
-
-#: ../data/gui/chat_to_muc_window.ui.h:5
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
@@ -1126,119 +938,136 @@ msgstr ""
 "Započećete grupni razgovor.\n"
 "Odaberite kontakte koje želite da pozovete"
 
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Traži njegov/njen status"
+#: ../data/gui/chat_to_muc_window.ui.h:4
+msgid "Please select a MUC server."
+msgstr "Molimo odaberite server grupnog razgovora."
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj poseb_no obaveštenje..."
+#: ../data/gui/chat_to_muc_window.ui.h:5
+msgid "MUC server"
+msgstr "Server grupnog razgovora"
 
-#: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Pridruži Open_PGP Ključ..."
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "Pozo_vi"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "I_zvrši naredbu..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Započni ra_zgovor"
 
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Izmeni _grupe..."
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+msgid "Send Single _Message..."
+msgstr "Pošalji jednu _poruku..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Send _File..."
+msgstr "Pošalji _datoteku..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
+#: ../src/roster_window.py:5906
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Pozovi kontakte"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "_Ukloni"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/isključi enkripciju s kraja na kraj"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
+#: ../src/roster_window.py:5995
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
 
+#: ../data/gui/contact_context_menu.ui.h:9
+msgid "E_xecute Command..."
+msgstr "I_zvrši naredbu..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Pošalji jednu _poruku..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Upravljanje kontaktima"
 
 #: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Pošalji _datoteku..."
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
 #: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Postavi korisnički definisan avatar..."
+msgid "Edit _Groups..."
+msgstr "Izmeni _grupe..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Započni ra_zgovor"
+msgid "Assign Open_PGP Key..."
+msgstr "Pridruži Open_PGP Ključ..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Uključi/isključi enkripciju s kraja na kraj"
+msgid "Set Custom _Avatar..."
+msgstr "Postavi korisnički definisan avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Uključi/isključi Open_PGP enkripciju"
+msgid "Add Special _Notification..."
+msgstr "Dodaj poseb_no obaveštenje..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Pretplata"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Dozvoli mu/joj da vidi moj status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Dozvo_li ovom kontaktu da vidi moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Blokiraj"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Traži njegov/njen status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
 
-#: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Istorijat"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignoriši"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
+#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+msgid "_Block"
+msgstr "_Blokiraj"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Upravljanje kontaktima"
+msgid "_Unignore"
+msgstr "_Poništi ignrisanje"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Preimenuj..."
+msgid "_Ignore"
+msgstr "_Ignoriši"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Pretplata"
+#: ../data/gui/contact_context_menu.ui.h:25
+msgid "Remo_ve"
+msgstr "_Ukloni"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Poništi ignrisanje"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:6145
+msgid "_History"
+msgstr "_Istorijat"
 
 #: ../data/gui/data_form_window.ui.h:1
-msgid "Fill in the form."
-msgstr "Popunite formular."
-
-#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracija sobe"
 
+#: ../data/gui/data_form_window.ui.h:2
+msgid "Fill in the form."
+msgstr "Popunite formular."
+
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Izmeni grupe"
@@ -1251,55 +1080,47 @@ msgstr "(<b>ESession</b> info)"
 msgid "_Verify"
 msgstr "_Potvrdi"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Mogućnosti"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Lista mogućnosti Gajima:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Mogućnosti"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
+msgid "File Transfers"
+msgstr "Prenosi datoteka"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Prekini prenos datoteke"
+msgid "Shows a list of file transfers between you and others"
+msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Prekini prenos označene datoteke"
+msgid "file transfers list"
+msgstr "lista prenosa datoteka"
 
 #: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "_Počisti"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Obavesti me kada se završi prenos datoteke"
 
 #: ../data/gui/filetransfers.ui.h:6
-msgid "File Transfers"
-msgstr "Prenosi datoteka"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
 
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Sakriva prozor"
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Ukloni završene, prekinute i neuspele prenose datoteka iz liste"
 
 #: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prenos datoteka sa liste"
 
 #: ../data/gui/filetransfers.ui.h:9
-msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Ukloni završene, prekinute i neuspele prenose datoteka iz liste"
-
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
-
-#: ../data/gui/filetransfers.ui.h:11
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1307,82 +1128,108 @@ msgstr ""
 "Ova akcija uklanja prenos datoteke sa liste. Ako je prenos aktivan, prvo se "
 "zaustavlja, pa onda uklanja"
 
+#: ../data/gui/filetransfers.ui.h:10
+msgid "Clean _up"
+msgstr "_Počisti"
+
+#: ../data/gui/filetransfers.ui.h:11
+msgid "_Pause"
+msgstr "_Pauziraj"
+
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Nastavi"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Prekini prenos datoteke"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Obavesti me kada se završi prenos datoteke"
+msgid "Cancels the selected file transfer"
+msgstr "Prekini prenos označene datoteke"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Otvori sadržavajuću fasciklu"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Sakriva prozor"
 
-#: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pauziraj"
+#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905
+msgid "_Continue"
+msgstr "_Nastavi"
 
-#: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "lista prenosa datoteka"
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../src/filetransfers_window.py:213
+msgid "_Open Containing Folder"
+msgstr "_Otvori sadržavajuću fasciklu"
 
 #: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Boje jezičaka statusa razgovora</b>"
-
-#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
 msgid "Account row"
 msgstr "Nalog"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Podebljano"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Sastavljanje"
+msgid "Gajim Themes Customization"
+msgstr "Personalizacija Gajim tema"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakt"
+msgid "Text _color:"
+msgstr "Boja tekst_a:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Izgled fonta:"
+msgid "_Background:"
+msgstr "_Pozadina:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalizacija Gajim tema"
+msgid "Text _font:"
+msgstr "_Font teksta:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Otišao"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupa"
+msgid "Font style:"
+msgstr "Izgled fonta:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktivno"
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+msgid "Bold"
+msgstr "Podebljano"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
 msgid "Italic"
 msgstr "Kurziv"
 
+#: ../data/gui/gajim_themes_window.ui.h:12
+msgid "Paused"
+msgstr "Pauzirano"
+
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Sastavljanje"
+
+#: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "Neaktivno"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Boje jezičaka statusa razgovora</b>"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
+msgid "Gone"
+msgstr "Otišao"
+
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid ""
 "MUC\n"
 "Messages"
@@ -1390,7 +1237,7 @@ msgstr ""
 "Poruke\n"
 "višekorisničkog razgovora"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1398,105 +1245,98 @@ msgstr ""
 "Usmerene poruke\n"
 "višekorisničkog razgovora"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pauzirano"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Boja tekst_a:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Font teksta:"
-
-#: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Pozadina:"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Promeni _nadimak..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "Upravljanje sobama"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Promeni _temu..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Podesi _sobu..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Markiraj ovu so_bu"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "Uništi sobu"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "Upravljanje sobama"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "Umanji prozor na zatvaranje"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Glas"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+msgid "_Bookmark"
+msgstr "_Markiraj ovu so_bu"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Pošalji privatnu poruku"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "_Akcije prisutnih"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Pošalji _datoteku"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "_Akcije prisutnih"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na listu kontakata"
+msgid "_Voice"
+msgstr "_Glas"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Član"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Zabrani"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Vlasnik"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Član"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Vlasnik"
+msgid "_Ban"
+msgstr "_Zabrani"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Pošalji privatnu poruku"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Glas"
+msgid "_Add to Roster"
+msgstr "_Dodaj na listu kontakata"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Markiraj ovu sobu (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723
+msgid "Show a list of formattings"
+msgstr "Prikaži listu formatiranja"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Promeni nadimak (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr "Promeni temu sobe (Alt+T)"
 
-#: ../data/gui/groupchat_control.ui.h:4
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Promeni nadimak (Ctrl+N)"
+#: ../data/gui/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Markiraj ovu sobu (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
@@ -1508,40 +1348,19 @@ msgid "From:"
 msgstr "Od:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
-msgid ""
-"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
-msgstr ""
-"<b>UPOZORENJE:</b>\n"
-"Ako planirate da radite veća uklanjanja, potrudite se da Gajim nije "
-"pokrenut. Uopšte, izbegavakte uklanjanja kontakata sa kojima trenutno "
-"razgovorate."
+msgid "Gajim History Logs Manager"
+msgstr "Gajim menadžer dnevnika istorijata"
 
-#: ../data/gui/history_manager.ui.h:3
+#: ../data/gui/history_manager.ui.h:2
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajimov menadžer dnevnika istorijata</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Obriši"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Izvezi"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim menadžer dnevnika istorijata"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1555,173 +1374,200 @@ msgstr ""
 "Koristite ovaj program da obrišete ili izvezete dnevnike. Možete odabrati "
 "dnevnike sa leve strane i/ili pretražiti bazu ispod."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:6
+msgid ""
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<b>UPOZORENJE:</b>\n"
+"Ako planirate da radite veća uklanjanja, potrudite se da Gajim nije "
+"pokrenut. Uopšte, izbegavakte uklanjanja kontakata sa kojima trenutno "
+"razgovorate."
+
+#: ../data/gui/history_manager.ui.h:8
 msgid "_Search Database"
 msgstr "_Pretraži bazu podataka"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Svi statusi"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "Istorijat razgovora"
+#: ../data/gui/history_manager.ui.h:9
+msgid "Export"
+msgstr "Izvezi"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:1
 #, fuzzy
 msgid "Enter JID or Contact name"
 msgstr "Ime kontakta"
 
-#: ../data/gui/history_window.ui.h:4
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
 msgid "Groupchat Histories"
 msgstr "Grupni razgovori"
 
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Svi statusi"
+
+#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326
+msgid "Conversation History"
+msgstr "Istorijat razgovora"
+
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pretraga:"
 
 #: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "_In date search"
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:7
+msgid "Searching only in the selected day "
+msgstr ""
+
+#: ../data/gui/history_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
+#: ../data/gui/history_window.ui.h:9
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Zapisuj u dnevnik statusne promene kontakata"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "save"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "Naložen"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr ""
+#: ../src/gajim-remote.py:230
+msgid "jid"
+msgstr "džid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "false"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "džid"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "poruka"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "Naložen"
+msgid "concede"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
+msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "require"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
-msgid "Bro_wse Rooms"
-msgstr "_Pregled"
-
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Uđi u ovu sobu automatski kada se povežem"
+#: ../data/gui/join_groupchat_window.ui.h:2
+msgid "Room:"
+msgstr "Soba:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:3
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
+#: ../data/gui/join_groupchat_window.ui.h:4
+msgid "Recently:"
+msgstr "Nedavno:"
+
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Nedavno:"
+#: ../data/gui/join_groupchat_window.ui.h:6
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Uđi u ovu sobu automatski kada se povežem"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "Room:"
-msgstr "Soba:"
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Markiraj ovu sobu"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
 msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 #, fuzzy
-msgid "_Bookmark this room"
-msgstr "Markiraj ovu sobu"
+msgid "Bro_wse Rooms"
+msgstr "_Pregled"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
+#: ../src/disco.py:1396 ../src/disco.py:1847
 msgid "_Join"
 msgstr "_Pridruži se"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Automatsko povezivanje"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr ""
-"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Podešavanje markera"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Umanji prozor na auto povezivanje"
+msgid "Roo_m:"
+msgstr ""
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+#, fuzzy
+msgid "_Title:"
+msgstr "Naslov:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#, fuzzy
+msgid "Pr_int status:"
 msgstr "Ispis statusa:"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+#, fuzzy
+msgid "A_uto join"
+msgstr "Automatsko povezivanje"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Naslov:"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Umanji prozor na auto povezivanje"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1732,100 +1578,103 @@ msgid "_Configure"
 msgstr "_Konfiguriši"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Karakteristike</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP spoj\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Podešavanja</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP spoj\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje proksi profila"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Type:"
+msgstr "Vrs_ta:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Lozinka:"
+msgid "_Name:"
+msgstr "_Ime:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proksi _host:"
+msgid "<b>Properties</b>"
+msgstr "<b>Karakteristike</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proksi _port:"
+msgid "Use HTTP prox_y"
+msgstr "Kor_isti HTTP proksi"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "_BOSH URL:"
+msgstr "_BOSH adresa:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
-msgid "Use HTTP prox_y"
-msgstr "Kor_isti HTTP proksi"
-
-#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Koristi proksi prijavljivanje"
 
+#: ../data/gui/manage_proxies_window.ui.h:11
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH adresa:"
+msgid "Pass_word:"
+msgstr "Lozinka:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Ime:"
+msgid "Proxy _Host:"
+msgstr "Proksi _host:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "Vrs_ta:"
+msgid "Proxy _Port:"
+msgstr "Proksi _port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Korisničko ime:"
+msgid "<b>Settings</b>"
+msgstr "<b>Podešavanja</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Podešavanje naloga"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lozinka"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Odobri autorizaciju"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Dostupan"
+msgid "Version:"
+msgstr "GTK+ verzija:"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "_Konfiguriši"
+msgid "<empty>"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Opis:"
+msgid "Authors:"
+msgstr "_Odobri autorizaciju"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
@@ -1833,39 +1682,32 @@ msgid "Homepage:"
 msgstr "<b>Lična strana:</b>"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "homepage url"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
-msgid "Installed"
-msgstr "Zastoj"
+msgid "Description:"
+msgstr "Opis:"
 
 #: ../data/gui/plugins_window.ui.h:10
-msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfiguriši"
 
 #: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:13
 #, fuzzy
-msgid "Version:"
-msgstr "GTK+ verzija:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
+msgid "Installed"
+msgstr "Zastoj"
 
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
+#: ../data/gui/plugins_window.ui.h:13
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
 msgstr ""
 
 #: ../data/gui/popup_notification_window.ui.h:1
@@ -1879,220 +1721,292 @@ msgid "Event desc"
 msgstr "događaj"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Napredna izmena konfiguracije</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Aplikacije</b>"
+msgid "Custom"
+msgstr "Korisnički"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Akcije</b>"
+msgid "All chat states"
+msgstr "Svi statusi"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Auto status</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Sastavljanje"
 
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Izgled razgovora</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:164
+#: ../src/config.py:677
+msgid "Disabled"
+msgstr "Onemogućeno"
 
 #: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Boje linija razgovora</b>"
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Obaveštenja stanja razgovora</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikad\n"
+"Samo za događaje na čekanju\n"
+"Uvek"
 
 #: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Uslovi</b>"
+msgid "Always"
+msgstr "Odsutan"
+
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr ""
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-msgid "<b>Custom</b>"
-msgstr "<b>Personalni</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Obavesti me o kontaktima koji se _odjave"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Prikaži događaj u listi kontakata"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Gmail Opcije</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Već postavljene statusne poruke</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privatnost</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Izgled liste kontakata</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Poslednji status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Statusne poruke</b>"
+msgid "Preferences"
+msgstr "Podešavanja"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Teme</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Prikaži _avatare kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Srednje ime:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Vizualna obaveštenja</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Prikaži statusne poruke kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
+"Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
+"kontakta u listi kontakata i u grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Napredno"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Prikaži _raspoloženja kontakata na listi"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Napredno..."
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
+"kontakata"
 
 #: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
-msgid "All chat states"
-msgstr "Svi statusi"
+msgid "Sort contacts by status"
+msgstr "Sortiraj kontakte po statusu"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Dozvoli slanje podataka o OS-u"
+msgid "in _roster"
+msgstr "u _listi kontakata"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Dozvoli slanje podataka o OS-u"
+msgid "in _group chats"
+msgstr "u _grupnim razgovorima"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-"Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
-"nevidljiv"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Izgled liste kontakata</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Doz_voli zvukove kada sam zauzet"
+msgid "_Window behavior:"
+msgstr "Ponašanje prozora:"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Odsutan"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
+"ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Pitaj za statusnu poruku pri:"
+msgid "_Emoticons:"
+msgstr "_Smajliji:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Ma_ke message windows compact"
+msgstr "Načini prozor poruke kompaktnim"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Sakrij svu dugmad u prozoru razgovora"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Poruka razgovora:"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
+"je označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
+msgid "_Highlight misspelled words"
+msgstr "_Oboji pogrešno napisane reči"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Sastavljanje"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"Ako je označena, Gajim će osvetljavati greške u kucanju u poljima za unos "
+"prozora razgovora. Ako se jezik eksplicitno ne postavi preko desnog klika na "
+"polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
+"grupni razgovor."
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Konfigurisanje boje i fonta interfejsa"
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "_Prikaži listu kontakata"
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Poruka razgovora:"
+msgid "Show icon when your messages are received"
+msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Ime kontakta"
-
-#: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Korisnički"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Izgled razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "When new event is received:"
+msgstr "Kada se primi novi događaj:"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Obavesti me o kontaktima koji se _prijave"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Obavesti me o kontaktima koji se _odjave"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
+"Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
+"prozorom u donjem desnom uglu ekrana"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Onemogućeno"
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
+"nevidljiv"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Prikaži aktivnosti kontakata na listi"
+msgid "Notify on new _GMail email"
+msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Prikaži dodatne e-mejl detalje"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
+"GMail-amejlova"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Prikaži _raspoloženja kontakata na listi"
+msgid "Display _extra email details"
+msgstr "Prikaži dodatne e-mejl detalje"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Prikaži _pesme kontakata na listi"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
+"e-mejlova"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Prikaži _avatare kontakata na listi"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Gmail Opcije</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Prikaži _raspoloženja kontakata na listi"
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Prikaži statusne poruke kontakata na listi"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualna obaveštenja</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
+msgid "Play _sounds"
+msgstr "Puštaj zvukove"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Ma_nage..."
+msgstr "Pode_si..."
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Allow sound when I'm _busy"
+msgstr "Doz_voli zvukove kada sam zauzet"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "<b>Sounds</b>"
+msgstr "<b>Zvukovi</b>"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid "Notifications"
+msgstr "Obaveštenja"
+
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -2102,7 +2016,11 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:60
+msgid "_Display chat state notifications:"
+msgstr "_Prikazana obaveštenja o stanju razgovora:"
+
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -2112,690 +2030,629 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../data/gui/preferences_window.ui.h:56
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
-msgstr ""
-"Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
-"prozorom u donjem desnom uglu ekrana"
-
-#: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Sakrij svu dugmad u prozoru razgovora"
-
-#: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
-"sistem koristite"
-
-#: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
-"e-mejlova"
-
-#: ../data/gui/preferences_window.ui.h:61
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr ""
-"Ako je označena, Gajim će automatski promeniti status u Odsutan kada računar "
-"nije u upotrebi."
-
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
-"duže nije u upotrebi"
+msgid "_Send chat state notifications:"
+msgstr "Pošalji obaveštenja o stanju razgovora:"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
-"u grupnim razgovorima"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Obaveštenja stanja razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
-"kontakta u listi kontakata i u grupnim razgovorima"
+msgid "Personal Events"
+msgstr "Lični događaji"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Ako je označena, Gajim će prikazivati aktivnosti kontakata u listi kontakata"
+msgid "_Away after:"
+msgstr "Autom_atski odsutan posle:"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
-"kontakata"
+"Ako je označena, Gajim će automatski promeniti status u Odsutan kada računar "
+"nije u upotrebi."
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
-"kontakata"
+msgid "_Not available after:"
+msgstr "Automatski _nedostupan nakon:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Ako je označena, Gajim će prikazivati pesme kontakata u listi kontakata"
+"Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
+"duže nije u upotrebi"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will highlight spelling errors in input fields of chat "
-"windows. If no language is explicitly set via right click on the input "
-"field, the default language will be used for this contact or group chat."
-msgstr ""
-"Ako je označena, Gajim će osvetljavati greške u kucanju u poljima za unos "
-"prozora razgovora. Ako se jezik eksplicitno ne postavi preko desnog klika na "
-"polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
-"grupni razgovor."
+msgid "minutes"
+msgstr "minuta"
 
 #: ../data/gui/preferences_window.ui.h:70
 msgid ""
-"If checked, Gajim will ignore incoming events from unauthorized contacts. "
-"Use with caution, because it blocks all messages from any contact that is "
-"not in the roster"
-msgstr ""
-"Ako je označena, Gajim će ignorisati sve dolazne događajeKoristite sa "
-"oprezom, blokiraće sve poruke koje dolaze od ljudi van Vaše liste kontakata"
-
-#: ../data/gui/preferences_window.ui.h:71
-msgid ""
-"If checked, Gajim will keep logs for encrypted messages. Please note that "
-"when using E2E encryption the remote party has to agree on logging, else the "
-"messages will not be logged."
-msgstr ""
-"Ako je označena, Gajim će držati dnevnike šifrovanih razgovora. Primetiti da "
-"kada se koristi E2E enkripcija, druga strana mora da se složi sa čuvanjem "
-"dnevnika, u suprotnom se poruke neće pamtiti."
-
-#: ../data/gui/preferences_window.ui.h:72
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
-"Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
-"GMail-amejlova"
+"Automatska statusna poruka pri odsutnosti. Ako je prazno, Gajim neće "
+"izmeniti trenutnu statusnu poruku\n"
+"$S će biti zamenjeno prethodnom statusnom porukom\n"
+"$T će biti zamenjeno sa vremenom odsutnosti"
 
 #: ../data/gui/preferences_window.ui.h:73
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
-msgstr ""
-"Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
-"(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
-
-#: ../data/gui/preferences_window.ui.h:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr ""
-"Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
-"podrazumevana poruka će biti korišćena."
-
-#: ../data/gui/preferences_window.ui.h:75
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
-"Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
-"ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
+"Automatska statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće "
+"izmeniti trenutnu statusnu poruku\n"
+"$S će biti zamenjeno prethodnom statusnom porukom\n"
+"$T će biti zamenjeno sa vremenom nedostupnosti"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Auto status</b>"
 
 #: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Načini prozor poruke kompaktnim"
+msgid "Ask status message when I:"
+msgstr "Pitaj za statusnu poruku pri:"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Pode_si..."
+msgid "Sign _in"
+msgstr "Prijavljivanju"
 
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
-msgid "Never"
-msgstr "Server"
+msgid "Sign _out"
+msgstr "Odjavljivanju"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Obaveštenja"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
+"podrazumevana poruka će biti korišćena."
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Obavesti me o kontaktima koji se _prijave"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Statusne poruke</b>"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Obavesti me o kontaktima koji se _odjave"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Već postavljene statusne poruke</b>"
 
-#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "Obavesti me o kontaktima koji se _odjave"
+#: ../data/gui/preferences_window.ui.h:83 ../src/config.py:398
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
+msgid "Use system _default"
+msgstr "Koristi sistemski podrazumevano"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Nikad\n"
-"Samo za događaje na čekanju\n"
-"Uvek"
+msgid "Chat message:"
+msgstr "Poruka razgovora:"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Lični događaji"
+msgid "<b>Font</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Puštaj zvukove"
+msgid "Use _transports icons"
+msgstr "Koristi ikone za _transporte"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
+"Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
+"(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Podešavanja"
+msgid "Status _iconset:"
+msgstr "Skup statusnih ikona:"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Konfigurisanje boje i fonta interfejsa"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "T_heme:"
+msgstr "T_ema:"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Themes</b>"
+msgstr "<b>Teme</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Notification-daemon"
+msgid "Contact's nickname:"
+msgstr "Ime kontakta"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Prikaži događaj u listi kontakata"
+msgid "Your nickname:"
+msgstr "Nadimak:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Prijavljivanju"
+msgid "_Status message:"
+msgstr "_Statusna poruka:"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Odjavljivanju"
+msgid "_URL highlight:"
+msgstr "URL osvetljavanje:"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "_Reset to Default Colors"
+msgstr "_Ponovo učitaj podrazumevane boje"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
-"je označeno, Gajim će samo prikazivati sirovi tekst poruke."
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Poruka razgovora:"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sortiraj kontakte po statusu"
+#, fuzzy
+msgid "Your message:"
+msgstr "Poruka greške: %s"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Skup statusnih ikona:"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Boje linija razgovora</b>"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_ema:"
+msgid "Audio input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-away timeout"
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:105
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akcije</b>"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Video input device"
 msgstr ""
-"Automatska statusna poruka pri odsutnosti. Ako je prazno, Gajim neće "
-"izmeniti trenutnu statusnu poruku\n"
-"$S će biti zamenjeno prethodnom statusnom porukom\n"
-"$T će biti zamenjeno sa vremenom odsutnosti"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Video framerate"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Video size"
 msgstr ""
-"Automatska statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće "
-"izmeniti trenutnu statusnu poruku\n"
-"$S će biti zamenjeno prethodnom statusnom porukom\n"
-"$T će biti zamenjeno sa vremenom nedostupnosti"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Koristi ikone za _transporte"
+msgid "View own video source"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+msgid "<b>Video</b>"
+msgstr "<b>Srednje ime:</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Koristi sistemski podrazumevano"
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Uslovi</b>"
 
-#: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "Kada se primi novi događaj:"
+#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
-msgid "Your message:"
-msgstr "Poruka greške: %s"
+msgid "_File manager:"
+msgstr "_Pregledač datoteka:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Nadimak:"
+msgid "_Mail client:"
+msgstr "_E-mejl klijent:"
 
 #: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "Autom_atski odsutan posle:"
-
-#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Prikazana obaveštenja o stanju razgovora:"
+msgid "<b>Custom</b>"
+msgstr "<b>Personalni</b>"
 
 #: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Smajliji:"
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikacije</b>"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Pregledač datoteka:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Oboji pogrešno napisane reči"
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Ako je označena, Gajim će ignorisati sve dolazne događajeKoristite sa "
+"oprezom, blokiraće sve poruke koje dolaze od ljudi van Vaše liste kontakata"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
 
 #: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Zapisuj u dnevnik statusne promene kontakata"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_E-mejl klijent:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "Automatski _nedostupan nakon:"
+msgid "Log _encrypted chat session"
+msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Otvori..."
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"Ako je označena, Gajim će držati dnevnike šifrovanih razgovora. Primetiti da "
+"kada se koristi E2E enkripcija, druga strana mora da se složi sa čuvanjem "
+"dnevnika, u suprotnom se poruke neće pamtiti."
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Ponovo učitaj podrazumevane boje"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "Pošalji obaveštenja o stanju razgovora:"
-
-#: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Statusna poruka:"
+msgid "Global proxy:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "URL osvetljavanje:"
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatnost</b>"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "Ponašanje prozora:"
+msgid "_Log status changes of contacts"
+msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "u _grupnim razgovorima"
-
-#: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "u _listi kontakata"
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minuta"
+msgid "_Open..."
+msgstr "_Otvori..."
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Napredna izmena konfiguracije</b>"
+
+#: ../data/gui/preferences_window.ui.h:141
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste privatnosti:"
 
-#: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Dodaj / Izmeni pravilo</b>"
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+msgid "Privacy List"
+msgstr "Lista privatnosti"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Lista pravila</b>"
-
-#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista privatnosti</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "Active for this session"
 msgstr "Aktivno za ovu sesiju"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active on each startup"
 msgstr "Aktovno po svakom pokretanju"
 
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista pravila</b>"
+
 #: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Svi"
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Dodaj / Izmeni pravilo</b>"
 
 #: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "Sve (uključujući i pretplate)"
-
-#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "JabberID"
 msgstr "Džaber ID"
 
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "all in the group"
+msgstr "sve u grupi"
+
 #: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Poredak:"
+msgid "all by subscription"
+msgstr "sve prema pretplati"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Lista privatnosti"
+#: ../data/gui/privacy_list_window.ui.h:12
+msgid "All"
+msgstr "Svi"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "sve prema pretplati"
+msgid "to send me messages"
+msgstr "da mi šalje poruke"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-msgid "all in the group"
-msgstr "sve u grupi"
+msgid "to send me queries"
+msgstr "da mi šalje upite"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Oboje"
+msgid "to view my status"
+msgstr "da vidi moj status"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "Od"
+msgid "to send me status"
+msgstr "da mi pošalje status"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "jedan"
+msgid "All (including subscription)"
+msgstr "Sve (uključujući i pretplate)"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dva"
+msgid "Order:"
+msgstr "Poredak:"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-msgid "to send me messages"
-msgstr "da mi šalje poruke"
+#, fuzzy
+msgid "none"
+msgstr "jedan"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-msgid "to send me queries"
-msgstr "da mi šalje upite"
+#, fuzzy
+msgid "both"
+msgstr "Oboje"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-msgid "to send me status"
-msgstr "da mi pošalje status"
+#, fuzzy
+msgid "from"
+msgstr "Od"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "da vidi moj status"
-
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Adresa</b>"
-
-#: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#, fuzzy
+msgid "to"
+msgstr "dva"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Rođendan:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>Grad:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Family:</b>"
+msgstr "<b>Prezime:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Firma:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Država:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Middle:</b>"
+msgstr "<b>Srednje ime:</b>"
 
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Odsek:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-mejl:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefiks:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Dodatna adresa:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Given:</b>"
+msgstr "<b>Ime:</b>"
 
-#. Family Name
+#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Prezime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sufiks:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno ime</b>"
 
-#. Given Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "<b>Street:</b>"
+msgstr "<b>Ulica:</b>"
+
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>Ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>City:</b>"
+msgstr "<b>Grad:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Lična strana:</b>"
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>State:</b>"
+msgstr "<b>Pokrajina:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Dodatna adresa:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Srednje ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:31
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Poštanski broj:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Ime:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Country:</b>"
+msgstr "<b>Država:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Nadimak:</b>"
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Address</b>"
+msgstr "<b>Adresa</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Broj telefona:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Homepage:</b>"
+msgstr "<b>Lična strana:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Pozicija:</b>"
+#: ../data/gui/vcard_information_window.ui.h:35
+msgid "<b>Name:</b>"
+msgstr "<b>Ime:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Poštanski broj:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Nickname:</b>"
+msgstr "<b>Nadimak:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:37
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Broj telefona:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: GGGG-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Uloga:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Birthday:</b>"
+msgstr "<b>Rođendan:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>Pokrajina:</b>"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-mejl:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Ulica:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/profile_window.ui.h:28
+msgid "Click to set your avatar"
+msgstr "Kliknite da biste postavili Vaš avatar"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sufiks:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Lične informacije"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Firma:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "O"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Position:</b>"
+msgstr "<b>Pozicija:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Kliknite da biste postavili Vaš avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Department:</b>"
+msgstr "<b>Odsek:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: GGGG-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Uloga:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Lične informacije"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Posao"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Šta želite da uradite?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "O"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Ukloni nalog i iz Gajima i sa servera"
 
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Šta želite da uradite?</b>"
+
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
+#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
 msgid "_Remove"
 msgstr "_Ukloni"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
+msgid "Roster Item Exchange"
+msgstr "Razmena stavki kontakata"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2803,115 +2660,112 @@ msgstr ""
 "<b>neko@domaćin.com</b> želi da <b>dodate</b> neke kontakte u listu "
 "kontakata."
 
-#: ../data/gui/roster_item_exchange_window.ui.h:2
-msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Telo poruke <trenutno se ne koristi, pa je podrazumevano sakriveno>"
-
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-msgid "Roster Item Exchange"
-msgstr "Razmena stavki kontakata"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:4
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_U redu"
 
-#: ../data/gui/roster_window.ui.h:1
-msgid "Add _Contact..."
-msgstr "_Dodaj kontakt..."
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr "Telo poruke <trenutno se ne koristi, pa je podrazumevano sakriveno>"
 
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/gui/roster_window.ui.h:2
-msgid "Fea_tures"
-msgstr "_Mogućnosti"
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Akcije"
 
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Prenosi da_toteka"
+#: ../data/gui/roster_window.ui.h:6
+msgid "Add _Contact..."
+msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Često postavljana pitanja (internet)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+msgid "_Edit"
+msgstr "_Izmeni"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Pomoć sa interneta"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Nalozi"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Profil, A_vatar"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Prikaz"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Prikaži kontakte koji nisu na vezi"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Prikaži trans_porte"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Prikaži kontakte koji nisu na vezi"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359
 msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Nalozi"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Prenosi da_toteka"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Akcije"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Izmeni"
+#: ../data/gui/roster_window.ui.h:22
+msgid "Help online"
+msgstr "Pomoć sa interneta"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:23
 msgid "_FAQ"
 msgstr "_ČPP"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Pošalji jednu _poruku..."
+#: ../data/gui/roster_window.ui.h:24
+msgid "Frequently Asked Questions (online)"
+msgstr "Često postavljana pitanja (internet)"
 
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Prikaz"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Molimo sačekajte dok se dobavlja formular pretrage..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "_Mogućnosti"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1
 msgid "Search"
 msgstr "Pretraga"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Molimo sačekajte dok se dobavlja formular pretrage..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2931,41 +2785,37 @@ msgstr "Registruj se na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Odgovori na ovu poruku"
+#: ../data/gui/single_message_window.ui.h:1
+msgid "To:"
+msgstr "Za:"
 
-#: ../data/gui/single_message_window.ui.h:4
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Sen_d"
 msgstr "P_ošalji"
 
-#: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Pošalji poruku"
-
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Pošalji poruku i zatvori prozor"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Odgovor"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Za:"
+msgid "Reply to this message"
+msgstr "Odgovori na ovu poruku"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Odgovor"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Pošalji i zatvori"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Pošalji poruku i zatvori prozor"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Odobri autorizaciju"
+msgid "Subscription Request"
+msgstr "Zahtev za pretplatom"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Odobri autorizaciju kontakta tako da može da vidi kada ste na vezi"
+msgid "_Deny"
+msgstr "_Odbij"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2973,262 +2823,274 @@ msgid ""
 "connected"
 msgstr "Odbij autorizaciju tako da ne može da vidi kada ste na vezi"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Zahtev za pretplatom"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Odobri autorizaciju"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Odbij"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Odobri autorizaciju kontakta tako da može da vidi kada ste na vezi"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Sinhronizuj kontakte"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Odaberite kontakte koje želite da sinhronizujete"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinhronizacija: odaberite kontakte"
 
-#: ../data/gui/systray_context_menu.ui.h:1
-msgid "Mute Sounds"
-msgstr "Ugasi zvukove"
-
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Pošalji _jednu poruku"
-
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Prikaži sv_e događaje na čekanju"
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Odaberite kontakte koje želite da sinhronizujete"
 
-#: ../data/gui/systray_context_menu.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
 msgid "_Group Chat"
 msgstr "_Grupni razgovor"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Autorizacija:</b>"
+#: ../data/gui/systray_context_menu.ui.h:4
+msgid "Send Single _Message"
+msgstr "Pošalji _jednu poruku"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Klijent:</b>"
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Prikaži sv_e događaje na čekanju"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Vreme kontakta na vezi:</b>"
+#: ../data/gui/systray_context_menu.ui.h:6
+msgid "Mute Sounds"
+msgstr "Ugasi zvukove"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Informacije kontakta"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Džaber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Prijava:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Klijent:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>Sistem:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentari"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Vreme kontakta na vezi:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Konfigurisani avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
-msgid "Contact"
-msgstr "Kontakt"
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Subscription:</b>"
+msgstr "<b>Prijava:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Informacije kontakta"
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Ask:</b>"
+msgstr "<b>Autorizacija:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "More"
 msgstr "Još"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Korisnički avatar:"
+#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/zeroconf_information_window.ui.h:6
+msgid "Contact"
+msgstr "Kontakt"
 
-#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentari"
 
-#: ../data/gui/xml_console_window.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Džaber saobraćaj</b>"
 
-#: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Unos</b>"
-
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Upit"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/gui/xml_console_window.ui.h:13
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IU"
 
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Upit"
+
+#: ../data/gui/xml_console_window.ui.h:13
+msgid "_Presence"
+msgstr "_Prisutnost"
+
 #: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../data/gui/xml_console_window.ui.h:15
-msgid "_Presence"
-msgstr "_Prisutnost"
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Unos</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:2
 msgid "_Modify Account..."
 msgstr "_Izmeni nalog..."
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokalni džaber ID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
-msgid "Personal"
-msgstr "Lično"
-
-#: ../data/gui/zeroconf_information_window.ui.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:4
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Džaber klijent"
+#: ../data/gui/zeroconf_information_window.ui.h:11
+msgid "Personal"
+msgstr "Lično"
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim Brze Poruke"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Džaber IM Klijent"
 
-#: ../src/adhoc_commands.py:323
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Džaber klijent"
+
+#: ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr ""
+
+#: ../src/adhoc_commands.py:325
 msgid "Cancel confirmation"
 msgstr "Poništi odobravanje"
 
-#: ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:326
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Trenutno izvršavate komandu. Da li želite da je prekinete?"
 
-#: ../src/adhoc_commands.py:370
+#: ../src/adhoc_commands.py:372
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neispravna soba"
 
-#: ../src/adhoc_commands.py:371
+#: ../src/adhoc_commands.py:373
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
 msgstr "Servis je poslao loše podatke"
 
-#: ../src/adhoc_commands.py:399
+#: ../src/adhoc_commands.py:401
 msgid "Service changed the session identifier."
 msgstr "Servis je izmenio identifikator sesije."
 
+#: ../src/adhoc_commands.py:421
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hok komande - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:516
 msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Activated"
 msgstr "Aktivirano"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:92
 msgid "Deactivated"
 msgstr "Deaktivirano"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:94
 msgid "Boolean"
 msgstr "Da/Ne"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Integer"
 msgstr "Ceo broj"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:108
 msgid "Preference Name"
 msgstr "Ime postavke"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:114
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:124
 msgid "Type"
 msgstr "Tip"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:179
 msgid "(None)"
 msgstr "(ništa)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:305
 msgid "Hidden"
 msgstr "Skriven"
 
@@ -3240,242 +3102,185 @@ msgstr[0] "Primili ste nove unose (%(count)d nije prikazano):"
 msgstr[1] "Primili ste nove unose (%(count)d nije prikazano):"
 msgstr[2] "Primili ste nove unose (%(count)d nije prikazano):"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Engleski"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Beloruski"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bugarski"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretanski"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Češki"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Nemački"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Grčki"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Britanski"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Španski"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Baskijski"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francuski"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Hrvatski"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italijanski"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norveški (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandski"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norveški"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Poljski"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugalski"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilski portugalski"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruski"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Srpski"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovački"
+#: ../src/chat_control.py:209
+msgid "Ping?"
+msgstr "Ping?"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Švedski"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Kineski (Ch)"
+#: ../src/chat_control.py:214
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Jezik za pravopis"
+#: ../src/chat_control.py:219
+msgid "Error."
+msgstr "Greška."
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:800
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:801
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslata ako niste povezani."
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1047
 msgid "Underline"
 msgstr "Podvučeno"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1048
 msgid "Strike"
 msgstr "Precrtano"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1071
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1080
 msgid "Clear formating"
 msgstr "Očisti formatiranje"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1157
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1158
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
+#: ../src/chat_control.py:1727
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:1730
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "Ovak kontakt ne podržava prenos datoteka."
+
 #. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
+#: ../src/chat_control.py:1735 ../src/common/contacts.py:152
+#: ../src/common/contacts.py:273 ../src/common/helpers.py:67
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
+#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
+#: ../src/roster_window.py:771 ../src/roster_window.py:1732
+#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
+#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1575
+#. change tooltip text for audio and video buttons if python-farstream is
+#. not installed
+#: ../src/chat_control.py:1760
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../src/chat_control.py:1761
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:1763
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
+
+#: ../src/chat_control.py:1767
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:1780
+#, fuzzy
+msgid "Send files"
+msgstr "Pošalji _datoteku"
+
+#: ../src/chat_control.py:1785
 msgid "This contact does not support file transfer."
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1788
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Morate znati pravi džaber ID kontakta da biste mu/joj poslali datoteku."
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1906
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2098
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2230
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:2239
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2265
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2267
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2284
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2286
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2290
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2294
 msgid "and NOT authenticated"
 msgstr "i NEprijavljeni"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2062
+#: ../src/chat_control.py:2301
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3484,57 +3289,57 @@ msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2439
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2449
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2451
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesija NEĆE biti pamćena"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2460
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2463
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2465
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2470
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet drugog korisnika nije potvrđen. Kliknite na štit za više detalja."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2472
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2526
 msgid "The following message was encrypted"
 msgstr "Sledeća poruka je bila šifrovana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2797
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2799
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3542,13 +3347,14 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
+#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
+#: ../src/common/connection_handlers.py:1145
+#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
+#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2968
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3557,170 +3363,474 @@ msgstr ""
 "Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite ili "
 "uklonite (sav istorijat poruka će biti izgubljen)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Ne mogu da dešifrujem poruku od kontakta %s\n"
+"Možda je promenjena."
+
+#: ../src/chat_control.py:3262
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/chat_control.py:3321
+#, fuzzy
+msgid "File transfer"
+msgstr "Prenosi datoteka"
+
+#: ../src/chat_control.py:3324
+#, fuzzy
+msgid "Size"
+msgstr "Veličina: %s"
+
+#: ../src/chat_control.py:3326
+#, fuzzy
+msgid "_Accept"
+msgstr "_Nalozi"
+
+#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+msgid "File transfer completed"
+msgstr "Prenos datoteke završen"
+
+#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/gui_interface.py:646 ../src/notify.py:278
+msgid "Groupchat Invitation"
+msgstr "Poziv na grupni razgovor"
+
+#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1991
+msgid "Remote contact stopped transfer"
+msgstr "Udaljeni kontakt je prekinuo prenos"
+
+#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1993
+msgid "Error opening file"
+msgstr "Greška pri otvaranju datoteke"
+
+#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "Prenos datoteke zaustavljen"
+
+#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:233
+msgid "File transfer cancelled"
+msgstr "Prenos datoteke prekinut"
+
+#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:234
+msgid "Connection with peer cannot be established."
+msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
+
+#: ../src/command_system/implementation/custom.py:105
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:74
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Način korišćenja: /%s, sakriva dugmad."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s nije pronađen"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:249
+#: ../src/tooltips.py:189
+msgid "Away"
+msgstr "Odsutan"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Dostupan"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../src/command_system/implementation/standard.py:195
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Način korišćenja: /%s, šalje pink kontaktu"
+
+#: ../src/command_system/implementation/standard.py:198
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Komanda nije podržana za zeroconf  nalog."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s nije ispravan nivo logovanja"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Promeni nadimak (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
+#: ../src/dialogs.py:2154
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Nadimak nije pronađen: %s "
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Pošalji %s za %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Pozvani ste u grupni razgovor"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Neispravan server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "vezanost izmenjena"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175
+#: ../src/command_system/mapping.py:195
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Nedostaje argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:262
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:87
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka, ali bi trebala biti fascikla"
 
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
+#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
+#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
+#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
+#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je fascikla, ali bi trebala biti datoteka"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:366
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Izmeni statusne informacije"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Izmeni status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Postavi tip prisutnosti i opis"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Na vezi"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Duže odsutan"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Ne smetaj"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Nije na vezi"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Opis prisutnosti:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:330
 msgid "The status has been changed."
 msgstr "Status se promenio."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Napusti grupne razgovore"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "Ppridružili ste se grupnom razgovoru."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:67 ../src/roster_window.py:824
+#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
+#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sledeće grupne razgovore:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su prosleđene."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Pusti zvuk kada je korisnik zauzet"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Prikaži u listi samo kontakte koji su na vezi i slobodni za ćaskanje."
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Vreme u minutama, nakom koga će se Vaš status promeiti u Odsutan."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:83
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "odsutnosti."
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vreme u minutama, nakom koga će se Vaš status promeiti u Nije dostupan."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:86
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "nedostupnosti"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 #, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3728,64 +3838,120 @@ msgstr ""
 "Kada prikazati ikonicu u sistemskoj kaseti. Može biti 'never', 'on_event', "
 "'always'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "Boja za dolazni nadimak."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "Boja za odlazni nadimak."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "Boja dolaznog teksta."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "Boja odlaznog teksta."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "Boja teksta statusne poruke."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Prikaži događaj u listi kontakata"
+
+#. limegreen
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Prikaži događaj u listi kontakata"
+
+#. red
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
+
+#. dodgerblue
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Zahtev za prenosom datoteke"
+
+#. khaki
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Prenos datoteke prekinut"
+
+#. firebrick
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+
+#. yellowgreen
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Poziv na grupni razgovor"
+
+#. tan1
+#: ../src/common/config.py:109
+msgid "Status changed notification background color"
+msgstr ""
+
+#. thistle2
+#: ../src/common/config.py:110
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:111
 msgid "Incoming nickname font."
 msgstr "Font dolaznog nadimka."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:112
 msgid "Outgoing nickname font."
 msgstr "Font odlaznog nadimka."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:113
 msgid "Incoming text font."
 msgstr "Font dolaznog teksta."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:114
 msgid "Outgoing text font."
 msgstr "Font odlaznog teksta."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:115
 msgid "Status message text font."
 msgstr "Font teksta statusne poruke."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:117 ../src/common/config.py:533
+#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
+#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
 msgid "default"
 msgstr "podrazumevano"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:123
 msgid "Language used by speller"
 msgstr "Jezik koji koristi pravopis"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:124
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3795,7 +3961,7 @@ msgstr ""
 "'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikad' - nikad ne ispisuj vreme."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:125
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3806,18 +3972,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje_vremena "
 "postavnjeno na 'ponekad'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:128
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:129
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:132
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3828,7 +3994,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ako želite da koristite ovo, instalirajte "
 "docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:141
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3836,7 +4002,7 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:142
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3844,7 +4010,13 @@ msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:160
+msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3855,44 +4027,51 @@ msgstr ""
 "dokumentaciju za strftime, za punu dokumentaciju: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani pre nadimka u razgovoru"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani posle nadimka u razgovoru"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste kontakata?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
 "razgovor ponovo otvori."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta da traju linije prethodnog razgovora."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3900,7 +4079,12 @@ msgstr ""
 "Koliko sekundi čekati pre ponovnog automatskog pridruživanja sobi sa koje "
 "ste raskačeni. Staviti 0 da onemogućite ponovno automatsko pridruživanje."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3908,11 +4092,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter, a sa Enter pravi novu liniju. (Podrazumevano "
 "ponašanje Miralabisovog ICQ klijenta)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija sačuvati sa Ctrl+KeyUP"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3921,11 +4105,11 @@ msgstr ""
 "Ili Vaš specificirani URL sa %s u njemu gde je %s reč ili fraza ili 'VIKI-"
 "REČNIK' što znači korišćenje viki-rečnika."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolisati korišćenjem gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3936,14 +4120,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na neistinito i "
 "sinhronizuj sa globalnim statusom) u zavisnosti od statusa mrežne konekcije."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3951,7 +4135,7 @@ msgstr ""
 "Prikazana obaveštenja o stanju razgovora u prozoru za razgovor. Može biti "
 "jedno od 'svi', 'samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3959,36 +4143,39 @@ msgstr ""
 "Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
 "svakih x minuta"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Uvek pitaj pre zatvaranja jezička/prozora kada je u pitanju ova lista "
 "odvojena blanko karakterima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Nikad ne pitaj pre zatvaranja jezička/prozora grupnog razgovora kada je u "
 "pitanju ova listaodovojena blanko znacima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Pitaj pre zatvaranja jezička ćaskanja ako postoji kontrola koja može "
 "izgubiti podatke (ćaskanje, privatno ćaskanje, grupni razgovor koji neće "
 "biti minimizovan)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3996,28 +4183,34 @@ msgstr ""
 "Lista hostova odvojena zarezima, koju šaljemo, uz lokalne interefejse, za "
 "transfer datoteka, u slučaju prosleđivanja porta/NATovanja."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definiše KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži jezičak iako je samo jedan razgovor?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaši granicu sveske u prozorima razgovora?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -4028,18 +4221,18 @@ msgstr ""
 "prioritet, odvojeni zarezima. Validne grupe su 1, 2, 5, 14, 15, 16, 17 i 18. "
 "Višlji brojevi su sugurniji, ali tada treba više vremena za početak sesije."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
 "razgovorima"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4048,14 +4241,14 @@ msgstr ""
 "Ako je istinito, Gajim se završava kada se pritisne X dugme. Ovo podešavanje "
 "se koristi samo ako je ikona sistemske kasete u upotrebi."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je istinito, Gajim proverava da li je podrazumevani džaber klijent na "
 "svakom startovanju."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4063,7 +4256,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
 "nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4071,12 +4264,12 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:256
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definišite poziciju avatara u listi kontakata. Može biti levo ili desno"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:257
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4084,7 +4277,7 @@ msgstr ""
 "Ako je istinito, Gajim će poslati upit za avatar za svaki kontakt koji "
 "prošlog puta nije  imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:258
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -4092,9 +4285,10 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:259
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
@@ -4106,30 +4300,34 @@ msgstr ""
 "sve statusne poruke. Ako je \"in_and_out\". Gajim će prikazivati samo poruke "
 "tipa taj i taj je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:261
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakta kada tek dođu na vezu."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:263
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakta kada tek odu sa veze."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:265
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ako je istinito, vraćene poruke iz istorijata će biti manjeg fonta od "
 "podrazumevanog."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:266
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:267
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:268
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4139,7 +4337,7 @@ msgstr ""
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:270
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -4150,7 +4348,8 @@ msgstr ""
 "u grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:273
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4158,7 +4357,7 @@ msgid ""
 "along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Kontroliše prozor gde se smeštaju nove poruke.\n"
@@ -4169,31 +4368,39 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:274
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:276
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je istinito, pritisak na taster 'esc' zatvara jezičak/prozor."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:277
 msgid "Hides the buttons in chat windows."
 msgstr "Sakriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:278
 msgid "Hides the banner in a group chat window"
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:279
 msgid "Hides the banner in two persons chat window"
 msgstr "Sakriva baner u prozoru razgovora dve osobe"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:280
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:281
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -4201,15 +4408,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku novog reda samo kada se ne radi o "
 "istoj osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:282
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:283
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko skrolovanje u prozoru razgovora"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:284
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4217,11 +4424,11 @@ msgstr ""
 "Lista boja odvojena sa \":\" koje će biti korišćene za bojenje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:285
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab ide na sledeći jezičak kada nema nepročitanih jezičaka"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4229,7 +4436,7 @@ msgstr ""
 "Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4237,7 +4444,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:288
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4245,7 +4452,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu prilagođenog statusa? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:289
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -4255,7 +4462,7 @@ msgstr ""
 "nalog u prozoru za izmenu podešavanja naloga. BUDITE OPREZNI, kada ste "
 "povezani sa negativnim prioritetom NEĆETE primati nikakve poruke od servera."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4263,7 +4470,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4271,7 +4478,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti KDE Novčanik (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4279,7 +4486,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:293
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4287,7 +4494,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretira sve dolazne "
 "poruke kao poruke postavljenog tipa"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:294
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4295,19 +4502,11 @@ msgstr ""
 "Ako je istinito, Gajim će skrolovati i označiti kontakt koji Vam je "
 "poslednji poslao poruku, ako prozor razgovora nije otvoren."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u sliku "
-"koristeći dvips u ibaciti je u prozor razgovora."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:295
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Vreme neaktivnosti posle koga se prozor za izmenu statusa zatvara."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:296
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4315,7 +4514,7 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:297
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4324,18 +4523,12 @@ msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Odaberite interval između dve provere da se ništa ne dešava na računaru."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:299
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4343,21 +4536,22 @@ msgstr ""
 "Ispravne uri šeme. Samo šeme sa ove liste će biti prihvaćene kao \"stvarne\" "
 "uri. (mailto i xmpp se obrađuju zasebno)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:300
+#, fuzzy
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
-"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Pitaj za statusne poruke van veze za sve kontakte koji nisu na vezi kada se "
 "uspostavi veza sa nalogom. UPOZORENJE: ovo će poslati mnogo zahteva serveru!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:301
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Ako je True, dopunjavanje u grupnim razgovorima će biti kao dopunjavanje u "
 "konzoli"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:302
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4365,31 +4559,60 @@ msgstr ""
 "Kada se prikazuje sopstveni kontakt. Može biti \"always\", "
 "\"when_other_resource\" or \"never\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:307
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:308
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:309
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:312
 msgid ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
 msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:313
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:314
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:315
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:317
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
+"podrazumevana poruka će biti korišćena."
+
+#: ../src/common/config.py:332
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4397,7 +4620,7 @@ msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:340
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4406,39 +4629,39 @@ msgstr ""
 "dnd, invisible. PAŽNJA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:341
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:343
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Ako je True, kontakti koji traže autorizaciju će automatski biti prihvaćeni."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:344
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ako je False, nalog će biti onemogućen i neće se prikazivati u listi "
 "kontakata."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:347
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ako je onemogućeno, ne potpisuj prisustvo sa GPG ključem, čak iako je GPG "
 "konfigurisan."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:349
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:350
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Da li će Gajim automatski startovati šifrovanu sesiju ako je moguće?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:351
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4446,49 +4669,64 @@ msgstr ""
 "Uređena lista (odvojena zarezima) tipova konekcije za probu. Može sadržati "
 "tls, ssl ili plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:353
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Prikaži prozor upozorenja pre korišćenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:354
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:356
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:362
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:363
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:366
 msgid "Whitespace sent after inactivity"
 msgstr "Slanje belina posle neaktivnosti"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:367
 msgid "XMPP ping sent after inactivity"
 msgstr "Slanje XMPP pinga posle neaktivnosti"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:371
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "Koliko sekundi čekati na odgovor o paketima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:375
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:378
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4496,15 +4734,34 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:379
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:393
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:394
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:403
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
+
+#: ../src/common/config.py:404
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s Vam želi poslati datoteku."
+
+#: ../src/common/config.py:405
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4512,20 +4769,52 @@ msgstr ""
 "Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
 "želite da čuvate poruke u dnevniku?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:408
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:409
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:410
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:411
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:412
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Anonimno prijavljivanje"
+
+#: ../src/common/config.py:413
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_imno prijavljivanje"
+
+#: ../src/common/config.py:414
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:415
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:477
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:478
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4533,108 +4822,108 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:479 ../src/common/config.py:482
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "sve ili razmakom odvojen status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'da', 'ne', ili 'oboje'"
+#: ../src/common/config.py:483
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'da', 'ne' ili ''"
+#: ../src/common/config.py:484
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:487
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:492 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:493
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:494 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:494
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:495
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:496 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:496
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:497
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:498
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:509
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:510
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:511 ../src/config.py:1646
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:512
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:513
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:514 ../src/common/config.py:515
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:526
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4643,27 +4932,186 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:527
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:536 ../src/common/optparser.py:309
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:540 ../src/common/optparser.py:295
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:544
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:548
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:94
+#: ../src/common/config.py:555
+#, fuzzy
+msgid "Tor"
+msgstr "Za"
+
+#: ../src/common/connection_handlers_events.py:370
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Džaber ID %s ne poštuje RFC pravila. Neće biti dodat na Vašu listu "
+"kontakata. Upotrebite alate kao što je http://jru.jabberstudio.org/ da biste "
+"ga uklonili"
+
+#: ../src/common/connection_handlers_events.py:825
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "zahtev za ukidanje pretplate od kontakta %s"
+
+#: ../src/common/connection_handlers_events.py:910
+#: ../src/common/connection_handlers.py:343
+#: ../src/common/connection_handlers.py:1143
+#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
+#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+msgid "Disk Write Error"
+msgstr "Greška pri upisu na disk"
+
+#: ../src/common/connection_handlers_events.py:914
+#: ../src/common/connection_handlers.py:1146
+#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
+#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite "
+"(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
+"istorijat poruka će biti izgubljen)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:935
+msgid "Room has been destroyed"
+msgstr "Soba grupnog razgovora je uništena"
+
+#: ../src/common/connection_handlers_events.py:943
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Možete se priključiti sobi %s umesto ove"
+
+#: ../src/common/connection_handlers_events.py:1027
+#: ../src/common/connection_handlers_events.py:1070
+#: ../src/common/connection.py:270 ../src/common/connection.py:280
+#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
+#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+msgid "Invalid Jabber ID"
+msgstr "Neispravan džaber ID"
+
+#: ../src/common/connection_handlers_events.py:1028
+#: ../src/common/connection_handlers_events.py:1071
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Poruka od neispravnog džaber ID-a, ignorisana je."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1102
+#: ../src/gui_interface.py:433 ../src/gui_interface.py:447
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "greška prilikom slanja %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1307
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1608
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nepoznata SSL greška: %d"
+
+#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Single Message"
+msgstr "Nova Samostalna Poruka"
+
+#: ../src/common/connection_handlers_events.py:2213
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova samostalna poruka od kontakta %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/notify.py:267
+msgid "New Private Message"
+msgstr "Nova Privatna Poruka"
+
+#: ../src/common/connection_handlers_events.py:2219
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova privatna poruka sa grupnog razgovora %s"
+
+#: ../src/common/connection_handlers_events.py:2222
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2225
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/notify.py:266
+msgid "New Message"
+msgstr "Nova Poruka"
+
+#: ../src/common/connection_handlers_events.py:2231
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2375
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s je promenio status"
+
+#: ../src/common/connection_handlers_events.py:2377
+#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/history_window.py:455
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/notify.py:280
+msgid "Contact Changed Status"
+msgstr "Kontakt promenio status"
+
+#: ../src/common/connection_handlers_events.py:2383
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s je na vezi"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/notify.py:262
+msgid "Contact Signed In"
+msgstr "Kontakt je na vezi"
+
+#: ../src/common/connection_handlers_events.py:2389
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s je otišao"
+
+#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/notify.py:264
+msgid "Contact Signed Out"
+msgstr "Kontakt je otišao sa veze"
+
+#: ../src/common/connection_handlers.py:92
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
@@ -4673,213 +5121,188 @@ msgstr "Nije moguće učitavanje modula idle"
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
 
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "Registracija uspešna"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s uspešna"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:145
 msgid "Registration failed"
 msgstr "Registracija neuspela"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:146
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registracija sa agentom %(agent)s neuspela uz grešku %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Greška pri upisu na disk"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Neispravan džaber ID"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Poruka od neispravnog džaber ID-a, ignorisana je."
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr ""
-"Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite "
-"(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
-"istorijat poruka će biti izgubljen)."
+#: ../src/common/connection_handlers.py:1956
+msgid "I would like to add you to my roster."
+msgstr "Želeo bih da te dodam na moju listu kontakata."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:70
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:71
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:72
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:73
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:74
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:75
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:76
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:77
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:78
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:79
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:80
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:81
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:82
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:83
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:84
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:85
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:86
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:87
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:88
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:89
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:90
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:91
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:92
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:93
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:94
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:95
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:96
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:97
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:98
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:99
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:100
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:101
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:271 ../src/common/connection.py:281
+#: ../src/dialogs.py:3245
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati poruku za %s, ovaj džaber ID nije ispravan."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:304
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Niti je udaljeno prisustvo potpisano, niti je ključ dodeljen."
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:307
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Ključ kontakta (%s) ne poklapa se sa ključem pridruženim u Gajimu."
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:363
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:507
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4888,76 +5311,77 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:930
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:931
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:942
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s je loše odgovorio na zahtev registracije:: %(error)s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:984
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nepoznata SSL greška: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1001
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1002
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s je loše odgovorio na zahtev registracije: %(error)s"
 
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1297
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Veza sa \"%s\" nije moguća"
+
+#: ../src/common/connection.py:1300
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server je odgovorio: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1322
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Izgubljena veza sa nalogom %s. Pokušajte ponovo da se konektujete."
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1388
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1391
 #, python-format
 msgid ""
 "\n"
@@ -4966,7 +5390,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1393
 #, python-format
 msgid ""
 "\n"
@@ -4975,24 +5399,33 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
+#: ../src/common/connection.py:1420
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "Autentičnost sertifikata %s može biti neispravna."
+
+#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1498
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1499
 msgid "Please check your login and password for correctness."
 msgstr "Molimo Vas da proverite Vaše korisničko ime i lozinku od grešaka."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1574
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1575
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5001,66 +5434,66 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od Vaših "
 "resursa na vezi. Deaktivirajte je tamo i pokušajte ponovo."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:2067
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2070
 msgid "Sent contacts:"
 msgstr "Poslati kontakti:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2826
 msgid "Unregister failed"
 msgstr "Odjava registracije neuspela"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2827
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Odjava registracije sa serverom %(server)s neuspela: %(error)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:67
+#: ../src/gui_interface.py:485
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:361
+#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
+#: ../src/disco.py:1554 ../src/roster_window.py:863
+#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
+#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
+#: ../src/roster_window.py:2589
 msgid "Transports"
 msgstr "Prenosi"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:369
 msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na ovom računaru nedostaju python vezivanja za D-Bus"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
@@ -5075,7 +5508,7 @@ msgstr ""
 "Servis nije dostupan: Gajim nije pokrenut ili je stavka podešavanja "
 "remote_control neistinita"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus ne postoji na ovom računaru ili nema python modula."
 
@@ -5260,224 +5693,232 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:163
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:176
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:225
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:230
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+msgid "Not Available"
+msgstr "Nedostupan"
+
+#: ../src/common/helpers.py:235
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:237 ../src/tooltips.py:187
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:240
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prenosa:Pauziran"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:242 ../src/tooltips.py:185
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prenosa:Pauziran"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:244
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:247
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:252
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:254 ../src/tooltips.py:195
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:257
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:259
+msgid "Invisible"
+msgstr "Nevidljiv"
+
+#: ../src/common/helpers.py:263
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:270
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:272
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:274
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:276
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:284
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:286
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:295
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:298
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:300
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:303
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:305
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:308
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:310
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:316 ../src/tooltips.py:209
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:318 ../src/tooltips.py:215
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:320 ../src/tooltips.py:213
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:322 ../src/tooltips.py:211
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:361
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:363
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:365
 msgid "is composing a message..."
 msgstr "piše poruku..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:368
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:370
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:651
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:655
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:662
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1119 ../src/common/helpers.py:1126
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5485,22 +5926,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1132
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1152
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1137
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1144 ../src/common/helpers.py:1150
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5508,21 +5949,40 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1182
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1368
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1478 ../src/common/helpers.py:1487
+#: ../src/common/helpers.py:1541
+msgid "Timeout loading image"
+msgstr "Isteklo vreme za učitavanje slike"
+
+#: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539
+msgid "Image is too big"
+msgstr "Slika je prevelika"
+
+#: ../src/common/helpers.py:1507
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL nije još validan"
+
+#: ../src/common/helpers.py:1543
+#, fuzzy
+msgid "Error loading image"
+msgstr "Isteklo vreme za učitavanje slike"
+
+#: ../src/common/jingle_rtp.py:114
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija sobe"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5534,111 +5994,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:220
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:220
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:354
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:357
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:412
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:421
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
-
 #: ../src/common/logging_helpers.py:33
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravan nivo logovanja"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:41
 #, fuzzy
 msgid " Default device"
 msgstr "Podrazumevana poruka"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:62
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:113
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:83
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Veličina: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:71
+#: ../src/common/multimedia_helpers.py:85
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Datoteka: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:79
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:92
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:97
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:100
+#, fuzzy
+msgid "Screen"
+msgstr "zelena"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:107
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:110
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:112
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:53 ../src/gtkgui_helpers.py:204
+#: ../src/gtkgui_helpers.py:220
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "greška: ne mogu otvoriti %s za čitanje"
+msgid "Error: cannot open %s for reading"
+msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:384
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -6275,19 +6749,115 @@ msgstr "Uči"
 msgid "Writing"
 msgstr "Piše"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "podrazumevano"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "morska"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Krije se"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Nalog"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Nalog"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Opis"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Greška"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "jedan"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "soba"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:349
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:352
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:355
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:358
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6296,32 +6866,19 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "iz <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Ne mogu da se povežem na port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ovo je deo šifrovane sesije. Ukoliko vidite ovo, nešto je pošlo naopako.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6330,44 +6887,43 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:394
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6379,24 +6935,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:404
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:406
+#: ../src/config.py:413
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:747 ../src/dialogs.py:1499
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:734
+#: ../src/config.py:748
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6405,214 +6961,215 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1226
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
+#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
+#: ../src/disco.py:2089 ../src/history_window.py:92
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1656
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1657
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1814 ../src/config.py:1949
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1990 ../src/config.py:2039
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1991
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2021
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2022
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2035
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2040
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da biste promenili ime naloga, morate prvo pročitati sve događaje na čekanju."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2046
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2047
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ovo ime već koristi jedan od Vaših naloga. Molimo Vas, odaberite drugo ime."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2051 ../src/config.py:2056
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2052
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2057
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2138
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2139
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2168
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2394 ../src/config.py:3726
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2395 ../src/config.py:3727
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2417
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2418
 msgid "There is no OpenPGP secret key available."
 msgstr "Nema dostupnih OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2456
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2457
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2465
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2466
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
+#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2474
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa serverom, nije moguća izmena ličnih informacija."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2479
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2480
 msgid "Your server can't save your personal information."
 msgstr "Vaš server ne može da sačuva Vaše lične informacije."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2597 ../src/config.py:2635
 msgid "To disable the account, you must be disconnected."
 msgstr "Da biste onemogućili nalog, morate biti raskačeni."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2604
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2605
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molimo Vas, preimenujte ili uklonite pre omogućavanja lokalnih poruka."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2766
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2768
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2804
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2805
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2806
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
 msgid "JID"
 msgstr "DŽID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2880
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2887
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2893
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2920
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2922
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6620,11 +7177,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2924
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2925
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6632,11 +7189,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2927
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2928
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6644,11 +7201,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2930
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2931
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6656,7 +7213,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2932
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6672,110 +7229,107 @@ msgstr ""
 "4. domen (samo se domen poklapa, kao i bilo koji korisnik@domen,\n"
 "domen/resurs, ili adresa koja sadrži poddomen."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3033
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3048
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3049
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3063 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3064 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3074
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3075
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3089
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3090
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Šta želite da uradite?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3091
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3092
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3185
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3186
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3187
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3246
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3279
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3280
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Neispravan nadimak"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
+#: ../src/config.py:3437 ../src/config.py:3445
 msgid "Character not allowed"
 msgstr "Karakter nije dozvoljen"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
+#: ../src/config.py:3702
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3444
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3614
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3615 ../src/config.py:3621
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6785,32 +7339,32 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3620
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3659
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3661
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3703
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3759 ../src/gui_interface.py:1313
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3760 ../src/gui_interface.py:1314
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Sertifikat je već u datoteci %s, pa nije ponovo dodat."
 
-#: ../src/config.py:3734
+#: ../src/config.py:3850
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6825,7 +7379,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3856 ../src/gui_interface.py:1342
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6836,72 +7390,89 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3888 ../src/config.py:3922
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3987
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3988
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4118
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4119
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
 
-#: ../src/config.py:4036
+#: ../src/config.py:4147
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Konfiguriši"
+
+#: ../src/config.py:4163 ../src/plugins/gui.py:92
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4171
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4205
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Primljena Prva Poruka"
+
+#: ../src/config.py:4206
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4207
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4209
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4210
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4211
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4212
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4213
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4214
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4215
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#, python-format
+msgid ""
+"<b>Message was corrected. Last message was:</b>\n"
+"  %s"
+msgstr ""
+
+#: ../src/conversation_textview.py:654
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6911,7 +7482,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:673
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6919,237 +7490,238 @@ msgstr ""
 "Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put\n"
 "obratili pažnju na ovaj grupni razgovor"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:793
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:800
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:813
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:818
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:835
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u Rečnika nedostaje \"%s\" i nije Viki rečnik"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:848
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:851
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:857
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1386
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Juče"
 msgstr[1] "Juče"
 msgstr[2] "Juče"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:575
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:577
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:592
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
 msgstr "Džaber ID već u listi kontakata"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:638
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Džaber ID koji ste uneli je već na listi. Odaberite neki drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:649
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:652 ../src/dataforms_widget.py:654
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:86
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:200
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:207
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:299
 msgid "KeyID"
 msgstr "ID Ključa"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:304
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:479
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:599
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:613
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:804
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:805
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:813
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:814
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:842
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:843
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:844
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:845
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:846
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:883
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:886
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
+#: ../src/dialogs.py:3770
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1087
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1092
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1106
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1107
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ džaber klijent"
+#: ../src/dialogs.py:1279
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Džaber klijent"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1280
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1281
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1291
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1293
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1299
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1305
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
 "održavateljima paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1317
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1500
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7162,100 +7734,154 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
+#: ../src/gui_interface.py:1488
+msgid "Insecure connection"
+msgstr "Nesigurna veza"
+
+#: ../src/dialogs.py:1846
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
+"PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
+
+#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1491
+msgid "Yes, I really want to connect insecurely"
+msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
+
+#: ../src/dialogs.py:1853
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1492 ../src/message_window.py:222
+#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
+#: ../src/roster_window.py:4556
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/dialogs.py:1950
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1958
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2277
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtev pretplate na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2280
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2370
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2414
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy
+msgid "Wrong server"
+msgstr "Loš uri"
+
+#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Ovo nije grupni razgovor"
+
+#: ../src/dialogs.py:2598
 msgid "Invalid Account"
 msgstr "Neispravan nalog"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2599
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Morate odabrati nalog sa koga želite da uđete u sobu."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2611
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
+#: ../src/groupchat_control.py:2198
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2617
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2623
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2663
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2676
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2712
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2713
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2738
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2799
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2801
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2802
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7264,168 +7890,138 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2842
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2851
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2870
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2874
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2875
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakt je na vezi"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Kontakt je otišao sa veze"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova Poruka"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Nova Samostalna Poruka"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nova Privatna Poruka"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
+#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Poziv na grupni razgovor"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakt promenio status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3132
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3134
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3136
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3139
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3162
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3185
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3268
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3269
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3329
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3331
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3478
 #, fuzzy
 msgid "modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3479
 #, fuzzy
 msgid "remove"
 msgstr "_Ukloni"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3508
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7433,189 +8029,187 @@ msgid ""
 msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte u listu vaših kontakata."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Dodate"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
 msgid "Modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3228
+#. holds jid
+#: ../src/dialogs.py:3532 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Džaber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3538
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3646
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s je predložio da vas dodam u listu mojih kontakata."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3660
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Dodaj _kontakt"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Dodaj _kontakt"
+msgstr[1] "Dodaj _kontakt"
+msgstr[2] "Dodaj _kontakt"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3698
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Uklanja kontakt sa liste"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Uklanja kontakt sa liste"
+msgstr[1] "Uklanja kontakt sa liste"
+msgstr[2] "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3779
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Neispravano ime servera"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3780
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3827
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4047
 #, fuzzy
 msgid "There is an error"
 msgstr "Servis je vratio grešku."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4115
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4119
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4186
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redosled: %(order)s, akcija: %(action)s, tip: %(type)s, vrednost: %(value)s"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4191
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4242
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4353
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4452
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4454
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4543
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4544
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4580
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4583
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4585
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4593
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4595
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4612
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4664
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
+#: ../src/dialogs.py:4860
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4679
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4706
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4721
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4759
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4777
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4847
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4865
 #, fuzzy
 msgid "Zip files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4891
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4893
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Uslov"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "kada sam "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5113
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7626,19 +8220,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5116
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5128
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5133
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7648,19 +8242,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
 msgid "Contact's identity NOT verified"
 msgstr "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5141
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5152
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5153
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7674,85 +8268,126 @@ msgstr ""
 "da li i on ima istu kratku Autentikacionu nisku kao vi.\n"
 "Kratka Autentikaciona Niska ove sesije: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5154
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Da li ste razgovarali sa kontaktom i potvrdili KAN?"
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5189
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ključ kontakta (%s) <b>ne poklapa se</b> sa ključem pridruženim u Gajimu."
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5195
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
 "poruke."
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5202
+#, fuzzy
 msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG ključ je dodeljen kontaktu, ali Vi <b>ne verujete</b> ovom ključu, tako "
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5208
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG ključ je dodeljen ovom kontaktu i Vi verujete ovom ključu tako da će "
 "poruke biti šifrovane."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5273
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5275
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5277
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5281
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "za nalog %s"
+
+#: ../src/dialogs.py:5376
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
+msgid "View cert..."
+msgstr ""
+
+#: ../src/dialogs.py:5436
+#, fuzzy
+msgid "Certificate"
+msgstr "Samopotpisani sertifikat"
+
+#: ../src/disco.py:120
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:124
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:517
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:603
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:605
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:761
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:762
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7760,233 +8395,248 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:768 ../src/disco.py:1109
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:769
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovaj tip usluge ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:810 ../src/disco.py:820
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:873
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:917
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1110
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1378
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1388 ../src/disco.py:1560
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1601
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1797
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1805
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1813
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1877 ../src/gui_interface.py:2574
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1878 ../src/gui_interface.py:2575
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1887 ../src/gui_interface.py:2589
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1888 ../src/gui_interface.py:2590
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
 "kontakata."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2098
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2106
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2173
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2179
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2185
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "Validacija SSL sertifikata"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi da proveri sertifikate servera i osigura sigurnu "
 "vezu."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:52 ../src/features_window.py:53
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Zahteva python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Razgovor bez servera sa autodetekcijom klijenata u lokalnoj mreži."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "Zahteva python-avahi."
 
-#: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Zahteva pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-
 #: ../src/features_window.py:57
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
+
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "Komandna linija"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta za kontrolu Gajima iz komandne linije."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "Zahteva python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:89 ../src/features_window.py:105
+#: ../src/features_window.py:109 ../src/features_window.py:113
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "Šifrovanje OpenPGP poruke"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:63
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Šifrujem poruke razgovora sa gpg ključevima."
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Zahteva gpg i python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
 
 #: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "Autodetekcija statusa mreže."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Zahteva gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "Menadžment sesija"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana na prekidu veze i učitana po logovanju."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "Zahteva python-gnome2."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "Šifrovanje lozinkom"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu sačuvati i pouzdanije od običnog teksta."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Zahteva gnome-keyring and python-gnome2-desktop, ili kwalletcli."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "Zahteva dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "Zahteva nslookup da biste koristili SRV zapise."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "Provera pravopisa"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "Provera pravopisa sastavljenih poruka."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "Zahteva libgtkspell."
 
 #: ../src/features_window.py:85
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Zahteva libgtkspell."
+
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "Obaveštenje"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "Pasivna iskačuća obaveštenja o novim događajima."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7994,67 +8644,41 @@ msgstr ""
 "Zahteva python-notify ili, umesto toga python-dbus u sprezi sa notification-"
 "daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatski status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Daje mogućnost merenja vremena kada se ništa ne dešava, da se odredi auto "
 "status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Zahteva libxss biblioteku."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Zahteva python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
 #: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Pretvara LaTeX izraze između $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-"Zahteva texlive-latex-base, i dvipng. Morate podesiti'use_latex' na True u "
-"editoru naprednih podešavanja."
-
-#: ../src/features_window.py:96
-#, fuzzy
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
-"You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-"Zahteva texlive-latex-base i dvipng (sve iz MikTeX-a). Morate "
-"podesiti'use_latex' na True u editoru naprednih podešavanja."
-
-#: ../src/features_window.py:97
 msgid "End to End message encryption"
 msgstr "Šifrovanje poruke s kraja na kraj"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Encrypting chat messages."
 msgstr "Šifrujem poruke razgovora."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:96 ../src/features_window.py:97
 msgid "Requires python-crypto."
 msgstr "Zahteva python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:98
 msgid "RST Generator"
 msgstr "RST generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:99
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8062,172 +8686,200 @@ msgstr ""
 "Generiše XHTML izlaz od RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-docutils."
 msgstr "Zahteva python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid "Ability to start audio and video chat."
 msgstr ""
 
+#: ../src/features_window.py:104
+msgid "Requires python-farstream and gstreamer-plugins-bad."
+msgstr ""
+
+#: ../src/features_window.py:106
+msgid "UPnP-IGD"
+msgstr ""
+
 #: ../src/features_window.py:107
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:108
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Zahteva python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Zahteva python-gnome2."
+
+#: ../src/features_window.py:110
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:112
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Zahteva python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:120
 #, fuzzy
 msgid "?features:Available"
 msgstr "Dostupan"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "Mogućnost"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:83
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:98
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:110
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:453
 #, python-format
 msgid "Size: %s"
 msgstr "Veličina: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:196 ../src/filetransfers_window.py:206
+#: ../src/history_manager.py:551
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:197
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
+#: ../src/tooltips.py:758
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:209
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Prenos datoteke završen"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Prenos datoteke prekinut"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Prenos datoteke zaustavljen"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:313
 msgid "Choose File to Send..."
 msgstr "Odaberite datoteku za slanje..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:342
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:343
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Datoteka: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tip: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Opis: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s Vam želi poslati datoteku:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:389 ../src/gtkgui_helpers.py:851
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:390 ../src/gtkgui_helpers.py:852
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Datoteka sa ovim imenom već postoji i nemate privilegijaprepisati je."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:407 ../src/gtkgui_helpers.py:856
 msgid "What do you want to do?"
 msgstr "Šta želite da uradite?"
 
-#. read-only bit is used to mark special folder under windows,
-#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
+#. read-only bit is used to mark special folder under
+#. windows, not to mark that a folder is read-only.
+#. See ticket #3587
+#: ../src/filetransfers_window.py:418 ../src/gtkgui_helpers.py:863
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:419 ../src/gtkgui_helpers.py:864
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:430
 msgid "Save File as..."
 msgstr "Snimi datoteku kao..."
 
+#: ../src/filetransfers_window.py:450
+#, python-format
+msgid "File: %s"
+msgstr "Datoteka: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "Type: %s"
+msgstr "Tip: %s"
+
+#: ../src/filetransfers_window.py:458
+#, python-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: ../src/filetransfers_window.py:459
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s Vam želi poslati datoteku:"
+
+#: ../src/filetransfers_window.py:500
+#, fuzzy
+msgid "Checking file..."
+msgstr "Slanje profila..."
+
+#: ../src/filetransfers_window.py:514
+#, fuzzy
+msgid "File error"
+msgstr "Greška pri prenosu datoteke"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:551
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8235,69 +8887,106 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:644
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/sek)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:700 ../src/filetransfers_window.py:703
 msgid "Invalid File"
 msgstr "Neispravna datoteka"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:700
 msgid "File: "
 msgstr "Datoteka: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:704
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:894
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:135 ../src/history_manager.py:73
+#, fuzzy
+msgid "Usage:"
+msgstr "poruka"
+
+#: ../src/gajim.py:137 ../src/history_manager.py:75
+#, fuzzy
+msgid "Options:"
+msgstr "_Smajliji:"
+
+#: ../src/gajim.py:139 ../src/history_manager.py:77
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/gajim.py:141
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Prikaži događaj u listi kontakata"
+
+#: ../src/gajim.py:143
+msgid "Print xml stanzas and other debug information"
+msgstr ""
+
+#: ../src/gajim.py:145
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Napredna izmena konfiguracije"
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Konfiguracija sobe"
+
+#: ../src/gajim.py:149
+msgid "Configure logging system"
+msgstr ""
+
+#: ../src/gajim.py:211
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:213
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "neuspelo uvoženje PyGTK modula: %s"
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:256
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
+msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajimu treba pyGTK 2.12 ili veća verzija"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:257
 #, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajimu treba pyGTK 2.12 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:259
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
+msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajimu treba GTK 2.12 ili veća verzija"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:260
 #, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.12 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:269
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:270
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8306,12 +8995,11 @@ msgstr ""
 "Molimo osigurajte se da je Pywin32 instaliran na Vašem sistemu. Možete ga "
 "naći na %s"
 
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:410
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:411
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8319,28 +9007,28 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8348,53 +9036,57 @@ msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
-#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
-#: ../src/gajim-remote.py:291
-msgid "account"
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:account"
 msgstr "nalog"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Menja status jednog ili više naloga"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:110
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:110
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283
+#, fuzzy
+msgid "?CLI:message"
+msgstr "poruka"
+
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8403,20 +9095,44 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:118
+msgid "Changes the priority of account or accounts"
+msgstr "Menja status jednog ili više naloga"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: ../src/gajim-remote.py:120
+msgid "priority you want to give to the account"
+msgstr "prioritet koji želite da date ovom nalogu"
+
+#: ../src/gajim-remote.py:122
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"izmena prioriteta datog naloga. Ako nije određen, menja se status svih "
+"naloga koji imaju postavljenu opciju \"sinhronizacija sa globalnim statusom\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dijalog razgovora kako biste mogli razgovarati sa kontaktom"
 
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Džaber ID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:135
+msgid "message content. The account must be specified or \"\""
+msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
+
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8426,34 +9142,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8463,134 +9174,131 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:243
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvara dijalog za započinjanje razgovora"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj nalog"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8598,44 +9306,93 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:269
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Izmeni status"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nadimak za korišćenje"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
+"sve naloge"
+
+#: ../src/gajim-remote.py:278
 msgid "Handle a xmpp:/ uri"
 msgstr "Upravlja xmpp:/ uri-jem"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:280
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "URI to handle"
+msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "Account in which you want to handle it"
+msgstr "Nalog u kome želite da upravljate njime"
+
+#: ../src/gajim-remote.py:283
+msgid "Message content"
+msgstr "Sadržaj poruke"
+
+#: ../src/gajim-remote.py:287
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:289
+#, fuzzy
+msgid "?CLI:room"
 msgstr "soba"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:289
+msgid "Room JID"
+msgstr "Džaber ID sobe:"
+
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:290
+msgid "Nickname to use"
+msgstr "Nadimak za korišćenje"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:291
+msgid "Password to enter the room"
+msgstr "Lozinka za ulazak u sobu"
+
+#: ../src/gajim-remote.py:292
+msgid "Account from which you want to enter the room"
+msgstr "Nalog sa koga želite da uđete u sobu"
+
+#: ../src/gajim-remote.py:297
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:301
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:350
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8644,156 +9401,44 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:353
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:406
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Čini se da Gajim ne radi. Ne možete da koristite gajim-remote."
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:433
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
+"Korišćenje: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:437
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:441
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:447
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Previše argumenata\n"
-"Ukucajte \"%(basename)s help %(command)s\" za više informacija"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Argument \"%(arg)s\" nije naveden. \n"
-"Ukucajte \"%(basename)s help %(command)s\" za više informacija"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Loš uri"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr ""
-"jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
-"uznemiravaj, nevidljiv"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Menja status jednog ili više naloga"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioritet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioritet koji želite da date ovom nalogu"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"izmena prioriteta datog naloga. Ako nije određen, menja se status svih "
-"naloga koji imaju postavljenu opciju \"sinhronizacija sa globalnim statusom\""
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Izmeni status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Nadimak za korišćenje"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
-"sve naloge"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI za upravljanje"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Nalog u kome želite da upravljate njime"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Sadržaj poruke"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Džaber ID sobe:"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Nadimak za korišćenje"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Lozinka za ulazak u sobu"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Nalog sa koga želite da uđete u sobu"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Korišćenje: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:517
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8802,7 +9447,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:522
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8811,10 +9456,14 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:541
 msgid "No uri given"
 msgstr ""
 
+#: ../src/gajim-remote.py:543
+msgid "Wrong uri"
+msgstr "Loš uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8837,181 +9486,219 @@ msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati Vašu trenutnu temu"
 
 #: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
+
+#: ../src/groupchat_control.py:236
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:238
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:584
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:767
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:769
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
+#: ../src/groupchat_control.py:1268
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s je postavio temu na %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
+#: ../src/groupchat_control.py:1289
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Soba sada prikazuje nedostupne članove"
+
+#: ../src/groupchat_control.py:1291
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "soba sada ne prikazuje nedostupne članove"
+
+#: ../src/groupchat_control.py:1293
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
+"korisnika)"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1297
+msgid "Room logging is now enabled"
+msgstr "Logovanje u sobi je sada omogućeno"
+
+#: ../src/groupchat_control.py:1299
+msgid "Room logging is now disabled"
+msgstr "Logovanje u sobi je sada onemogućeno"
+
+#: ../src/groupchat_control.py:1301
+msgid "Room is now non-anonymous"
+msgstr "Soba sada više nije anonimna"
+
+#: ../src/groupchat_control.py:1304
+msgid "Room is now semi-anonymous"
+msgstr "Soba je sada polu anonimna"
+
+#: ../src/groupchat_control.py:1307
+msgid "Room is now fully-anonymous"
+msgstr "Soba je sada potpuno anonimna"
+
+#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1592
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1594
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1597
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server Vam je ili dodelio nadimak ili promenio postojeći"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1603
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1606
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1618
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranu od člana %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1710
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1701
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1706
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1712
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1795
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Afilijacija %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1799
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Afilijacija %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1814
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1818
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1848
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s je trenutno %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2126
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
 
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "_Ne pitaj me više"
-
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2165
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2166
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2173
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2174
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
+#: ../src/groupchat_control.py:2199
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2205
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2206
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9019,22 +9706,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2208
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2408
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2742
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -9057,65 +9744,59 @@ msgstr "_Prijavi grešku"
 msgid "Details"
 msgstr "Detalji"
 
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Greška: nije moguće otvoriti %s za čitanje"
-
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:349
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:352
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:393
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nije moguće pisati u %s. Upravljanje sesijama neće biti moguće"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:767
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije Vaš podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:768
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li da Vam Gajim postane podrazumevani Gajim klijent?"
 
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:769
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Uvek na startovanju proveravaj da li je Gajim podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:836
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:837
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Sliku nije moguće sačuvati u %(type)s formatu. Sačuvati kao %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:873
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py:134 ../src/gui_interface.py:298
+#: ../src/gui_interface.py:307 ../src/gui_interface.py:313
+#: ../src/gui_interface.py:316 ../src/gui_interface.py:319
+#: ../src/gui_interface.py:324
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:135
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9126,92 +9807,86 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:138
 msgid "Always use this nickname when there is a conflict"
 msgstr "Uvek koristi nadimak kada postoji konflikt"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:155
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:157
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:203 ../src/notify.py:282
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:287
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
 
-#: ../src/gui_interface.py:324
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#: ../src/gui_interface.py:299
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Dostignut najveći broj korisnika za %s"
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:308
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:314
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:317
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: ../src/gui_interface.py:344
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:320
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:325
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:418 ../src/gui_interface.py:422
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "greška prilikom slanja %(message)s ( %(error)s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:474 ../src/notify.py:284
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:499
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:500
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:509
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9219,102 +9894,96 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:530 ../src/notify.py:286
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:541
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:625
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s je postavio temu na %(subject)s"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "Soba sada prikazuje nedostupne članove"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "soba sada ne prikazuje nedostupne članove"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
-"Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
-"korisnika)"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Logovanje u sobi je sada omogućeno"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Logovanje u sobi je sada onemogućeno"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Soba sada više nije anonimna"
 
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Soba je sada polu anonimna"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Soba je sada potpuno anonimna"
+#: ../src/gui_interface.py:629
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:658
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:668
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG lozinka nije tačna"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:681
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Sertifikat je istekao"
+
+#: ../src/gui_interface.py:682
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
+
+#: ../src/gui_interface.py:704
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG ključ nije od poverenja"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:704
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "GPG ključ koji se koristi za šifrovanje nije od poverenja. Da li zaista "
 "želite da šifrujete ovu poruku?"
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:717
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
 "Gnome Keyring je instaliran, ali nije \t\t\t\tpravilno pokrenut (promenljive "
 "okruženja verovatno nisu \t\t\tpravilno podešene)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:755
+msgid ""
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:758
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:856
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:858
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9322,7 +9991,7 @@ msgstr[0] "Imate %d novi e-mejl razgovor"
 msgstr[1] "Imate %d nova e-mejl razgovora"
 msgstr[2] "Imate %d novih e-mejl razgovora"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:871
 #, python-format
 msgid ""
 "\n"
@@ -9337,80 +10006,65 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:941
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "Udaljeni kontakt je prekinuo prenos"
-
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Greška pri otvaranju datoteke"
+#: ../src/gui_interface.py:1038
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Prenosi datoteka"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1059
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1063
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1067
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
+
+#: ../src/gui_interface.py:1080
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1084
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Ne mogu da dešifrujem poruku od kontakta %s\n"
-"Možda je promenjena."
+#. ft hash error
+#: ../src/gui_interface.py:1088
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1163
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1175
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1176
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Greška."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1191
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1192
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9419,21 +10073,21 @@ msgstr ""
 "novo ime resursa"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1247
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1250
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1337
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1338
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9444,15 +10098,20 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1347
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1355
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Greška SSL sertifikata"
+
+#: ../src/gui_interface.py:1374
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1375
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9469,27 +10128,7 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-msgid "Insecure connection"
-msgstr "Nesigurna veza"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
-msgstr ""
-"Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
-"PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
-
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1447
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -9497,7 +10136,7 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1489
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9507,17 +10146,17 @@ msgstr ""
 "želite to da uradite?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1996
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2019
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -9527,90 +10166,93 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2450
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3043
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3044
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3058
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3059
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, bićete povezani sa %s bez OpenPGP-a."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3068
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3069
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:94
 msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:436
 msgid "I would like to add you to my roster"
 msgstr "Želeo bih Vas dodati na moju listu kontakata"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Set logs directory"
+msgstr "kreiram fasciklu %s"
+
+#: ../src/history_manager.py:126
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontakti"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:179 ../src/history_manager.py:223
+#: ../src/history_window.py:100
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:186 ../src/history_manager.py:242
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:195 ../src/history_manager.py:230
+#: ../src/history_window.py:108
 msgid "Message"
 msgstr "Poruka"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:203 ../src/history_manager.py:236
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:262
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Želite li počistiti bazu podataka? (NE PREPORUČUJE SE AKO JE GAJIM POKRENUT)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:264
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9624,97 +10266,109 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:269
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Greška sa bazom podataka"
+
+#: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
 msgstr "Izvoženje dnevnika istorijata..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:564
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s u %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py:572
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
-msgstr[1] ""
-"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
-msgstr[2] ""
-"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
+#: ../src/history_manager.py:602
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Da li zaista želite da izbrišete označenu poruku?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
+
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Ova operacija je nepovratna."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:610 ../src/history_manager.py:649
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Poništi odobravanje"
+
+#: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
 msgstr[2] "Da li zaista želite da izbrišete označene poruke?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:308
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istorijat razgovora sa %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:358
 msgid "Disk Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:451
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:462
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:464
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:466
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:469
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Isteklo vreme za učitavanje slike"
+#: ../src/htmltextview.py:523
+#, fuzzy
+msgid "Loading"
+msgstr "Programira"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Slika je prevelika"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:518
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:520
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:522
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:528
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9726,100 +10380,112 @@ msgstr "- poruke će biti logovane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s je promenio status"
+#: ../src/notify.py:324
+msgid "Ignore"
+msgstr "Ignoriši"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s je na vezi"
+#: ../src/plugins/gui.py:82
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s je otišao"
+#: ../src/plugins/gui.py:151
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Zabranjujem %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova samostalna poruka od kontakta %(nickname)s"
+#: ../src/plugins/gui.py:209
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registracija neuspela"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova privatna poruka sa grupnog razgovora %s"
+#: ../src/plugins/gui.py:254
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
+#: ../src/plugins/pluginmanager.py:534
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Servis je poslao loše podatke"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nova poruka od %(nickname)s"
+#: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
+#: ../src/plugins/pluginmanager.py:542
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Ova datoteka već postoji"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova poruka od %(nickname)s"
+#: ../src/plugins/gui.py:286
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignoriši"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfiguracija sobe"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:514
+#, fuzzy
+msgid "Archive empty"
+msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:129 ../src/roster_window.py:3192
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:132 ../src/roster_window.py:3195
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:146 ../src/profile_window.py:163
+#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:235
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije kontakta"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:236
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:294
 msgid "Information received"
 msgstr "Informacije primljene"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:372
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Ako niste na vezi, ne možete objaviti Baše informacije"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:385
 msgid "Sending profile..."
 msgstr "Slanje profila..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:404
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:411
 msgid "vCard publication failed"
 msgstr "Publikacija vCard neuspela"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:412
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9827,51 +10493,52 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1035
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2059
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2060
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2083
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2084
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2098
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2099
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2126
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2127
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Povezaćete se na %s bez OpenPGP ključa."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9879,38 +10546,38 @@ msgstr ""
 "Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2361
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2427
 msgid "Really quit Gajim?"
 msgstr "Stvarno zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2428
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2429
 msgid "Always close Gajim"
 msgstr "Uvek zatvori Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2519
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini prenos datoteke"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2520
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2552
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9918,16 +10585,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2989
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2992
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2993
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9935,11 +10602,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2996
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3001
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9948,12 +10615,12 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3043
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete blokirati kontakt. Jeste li sigurni da želite da nastavite?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:3045
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9962,56 +10629,56 @@ msgstr ""
 "šalje."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3084
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3085
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3092
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3093
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3138
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3140
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno uklonja i sve kontakte iz ove grupe iz liste kontakata"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3179
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3180
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3635
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" će biti uklonjen sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3637
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Upravo ćete ukloniti \"%(name)s\" (%(jid)s) iz vaše liste kontakata.\n"
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3642
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10020,11 +10687,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3648
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3652
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10032,16 +10699,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno podrazumevano uklanjate i odobrenje što "
 "znači da će Vas ta osoba uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3655
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3659
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3664
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10051,15 +10718,15 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3722
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete poslati prilagođen status. Jeste li sigurni da želite da "
 "nastavite?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3724
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10068,35 +10735,36 @@ msgstr ""
 "Kontakt će vas privremeno videti kao %(status)s, ali samo dok ne promenite "
 "status. Onda će videti globalni status."
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3743
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3744
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
 "kontaktima."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4456
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4458
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4550
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4552
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -10106,11 +10774,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4673
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4685
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -10118,12 +10786,17 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4820
 #, python-format
 msgid "Send %s to %s"
 msgstr "Pošalji %s za %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4831
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Napravi metakontakte od %s i %s"
+
+#: ../src/roster_window.py:4834
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
@@ -10133,130 +10806,130 @@ msgstr "Napravi metakontakte od %s i %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
+#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5364
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5369
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5408 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5428
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5469
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5562
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5567
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5715
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5733
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5737
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5918
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5927
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5982
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:6029
 msgid "Execute Command..."
 msgstr "Izvrši naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:6039
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:6048
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:6058
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:6118
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:6127
 msgid "_Reconnect"
 msgstr "U_loguj se ponovo"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:6134
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6228
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6243
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6471
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
@@ -10273,24 +10946,14 @@ msgstr "Greška u primanju forme za podatke"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Greška pri upisu na disk"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Tema: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:409 ../src/session.py:469
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:448
+#: ../src/session.py:411
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10302,7 +10965,7 @@ msgstr ""
 "\n"
 "\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:492
+#: ../src/session.py:471
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10317,147 +10980,152 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
+
+#: ../src/statusicon.py:241
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:355
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "u _listi kontakata"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:366
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
+#: ../src/tooltips.py:393 ../src/tooltips.py:614
 msgid "Jabber ID: "
 msgstr "Džaber ID: "
 
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
+#: ../src/tooltips.py:397 ../src/tooltips.py:619
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:403
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:511
 msgid " [blocked]"
 msgstr " [blokiran]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:515
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
+#: ../src/tooltips.py:530 ../src/tooltips.py:791
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:575
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslednji status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:577
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:595
 msgid "Connected"
 msgstr "Na vezi"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:597
 msgid "Disconnected"
 msgstr "Van veze"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
+#: ../src/tooltips.py:626
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:625
+#: ../src/tooltips.py:636
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:646
+#: ../src/tooltips.py:659
 #, fuzzy, python-format
 msgid "Idle since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:647
+#: ../src/tooltips.py:660
 #, fuzzy, python-format
 msgid "Idle for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
+#: ../src/tooltips.py:714
+#, fuzzy
+msgid "Mood: "
 msgstr "Raspoloženje:"
 
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
+#: ../src/tooltips.py:718
+#, fuzzy
+msgid "Activity: "
 msgstr "Aktivnost:"
 
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
+#: ../src/tooltips.py:722
+#, fuzzy
+msgid "Tune: "
 msgstr "Pesma:"
 
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
+#: ../src/tooltips.py:726
+#, fuzzy
+msgid "Location: "
 msgstr "Obaveštenje"
 
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:751
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:757
 msgid "Upload"
 msgstr "Slanje"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:764
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:770
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:773 ../src/tooltips.py:790
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:775
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:777 ../src/tooltips.py:780
 msgid "Completed"
 msgstr "Završen"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:783
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:786
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:788
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: ../src/tooltips.py:812
+#: ../src/tooltips.py:825
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: ../src/tooltips.py:815
+#: ../src/tooltips.py:828
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10465,32 +11133,32 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:312
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:314
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:339
 msgid "?Time:Unknown"
 msgstr "?Vreme:Nepoznato"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:363 ../src/vcard.py:373 ../src/vcard.py:581
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:396
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:400
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:408
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10498,7 +11166,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:410
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10506,13 +11174,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:412
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:414
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10520,18 +11188,392 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:421
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:423
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:428 ../src/vcard.py:482 ../src/vcard.py:604
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Odaberite datoteku za slanje..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " otvaranje prozora/jezička sa tim kontaktom "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akcije</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Uslovi</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Napredne Akcije"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Napredna kontrola obaveštavanja"
+
+#~ msgid "All statuses"
+#~ msgstr "Svi statusi"
+
+#~ msgid "Busy "
+#~ msgstr "Zaposlen"
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt promenio status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt Otišao Sa Veze"
+
+#~ msgid "Don't have "
+#~ msgstr "Nemam "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Prenos datoteke zaustavljen"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Primljena Poruka Sa Grupnog Razgovora"
+
+#~ msgid "Have "
+#~ msgstr "Imam "
+
+#~ msgid "Launch a command"
+#~ msgstr "Pokrenite komandu"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Jedan ili više posebnih statusa..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Na vezi / Slobodan za razgovor"
+
+#~ msgid "Play a sound"
+#~ msgstr "Puštanje zvukove"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nova Privatna Poruka"
+
+#~ msgid "When "
+#~ msgstr "Kada "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktiviranje upravnika prozora za bljeskanje prozora razgovora u panelu"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Onemogući automatsko otvaranje prozora za razgovor"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Onemogući postojeći iskačući prozor"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Onemogući postojeći zvuk za ovaj događaj"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Obavesti me iskačućim prozorom"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Otvori prozor za razgovor sa korisnikom"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Prikaži događaj u listi kontakata"
+
+#~ msgid "and I "
+#~ msgstr "i ja "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontakti"
+
+#~ msgid "for "
+#~ msgstr "za"
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupe"
+
+#~ msgid "when I'm in"
+#~ msgstr "kada sam u"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Dozvoli mu/joj da vidi moj status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Opis:"
+
+#~ msgid "Advanced..."
+#~ msgstr "Napredno..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Prikaži aktivnosti kontakata na listi"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Prikaži _pesme kontakata na listi"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Prikaži _raspoloženja kontakata na listi"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ako je označena, Gajim će prikazivati aktivnosti kontakata u listi "
+#~ "kontakata"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
+#~ "kontakata"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Ako je označena, Gajim će prikazivati pesme kontakata u listi kontakata"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Pošalji jednu _poruku..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Korisnički avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Brze Poruke"
+
+#~ msgid "English"
+#~ msgstr "Engleski"
+
+#~ msgid "Belarusian"
+#~ msgstr "Beloruski"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bugarski"
+
+#~ msgid "Breton"
+#~ msgstr "Bretanski"
+
+#~ msgid "Czech"
+#~ msgstr "Češki"
+
+#~ msgid "German"
+#~ msgstr "Nemački"
+
+#~ msgid "Greek"
+#~ msgstr "Grčki"
+
+#~ msgid "British"
+#~ msgstr "Britanski"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Španski"
+
+#~ msgid "Basque"
+#~ msgstr "Baskijski"
+
+#~ msgid "French"
+#~ msgstr "Francuski"
+
+#~ msgid "Croatian"
+#~ msgstr "Hrvatski"
+
+#~ msgid "Italian"
+#~ msgstr "Italijanski"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norveški (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandski"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norveški"
+
+#~ msgid "Polish"
+#~ msgstr "Poljski"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugalski"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilski portugalski"
+
+#~ msgid "Russian"
+#~ msgstr "Ruski"
+
+#~ msgid "Serbian"
+#~ msgstr "Srpski"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovački"
+
+#~ msgid "Swedish"
+#~ msgstr "Švedski"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Kineski (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Jezik za pravopis"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u "
+#~ "sliku koristeći dvips u ibaciti je u prozor razgovora."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
+
+#~ msgid "all or space separated status"
+#~ msgstr "sve ili razmakom odvojen status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'da', 'ne', ili 'oboje'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'da', 'ne' ili ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "greška: ne mogu otvoriti %s za čitanje"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Ne mogu da se povežem na port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti "
+#~ "prekinut."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ džaber klijent"
+
+#~ msgid "Condition"
+#~ msgstr "Uslov"
+
+#~ msgid "when I am "
+#~ msgstr "kada sam "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Zahteva pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Zahteva gpg i python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Pretvara LaTeX izraze između $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "Zahteva texlive-latex-base, i dvipng. Morate podesiti'use_latex' na True "
+#~ "u editoru naprednih podešavanja."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in "
+#~ "MikTeX). You have to set 'use_latex' to True in the Advanced "
+#~ "Configuration Editor."
+#~ msgstr ""
+#~ "Zahteva texlive-latex-base i dvipng (sve iz MikTeX-a). Morate "
+#~ "podesiti'use_latex' na True u editoru naprednih podešavanja."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Zahteva python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
+#~ "uznemiravaj, nevidljiv"
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Previše argumenata\n"
+#~ "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argument \"%(arg)s\" nije naveden. \n"
+#~ "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakti"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Greška pri upisu na disk"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Tema: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Raspoloženje:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Aktivnost:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10559,32 +11601,12 @@ msgstr " resurs sa prioritetom "
 #~ msgid "Nickname not allowed: %s"
 #~ msgstr "Nedozvoljen nadimak: %s "
 
-#~ msgid "Room has been destroyed"
-#~ msgstr "Soba grupnog razgovora je uništena"
-
-#~ msgid "You can join this room instead: %s"
-#~ msgstr "Možete se priključiti sobi %s umesto ove"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "Želeo bih da te dodam na moju listu kontakata."
-
 #~ msgid "we are now subscribed to %s"
 #~ msgstr "sada ste pretplaćeni na %s"
 
-#~ msgid "unsubscribe request from %s"
-#~ msgstr "zahtev za ukidanje pretplate od kontakta %s"
-
 #~ msgid "we are now unsubscribed from %s"
 #~ msgstr "sada Vam je ukinuta pretplata od kontakta %s"
 
-#~ msgid ""
-#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
-#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
-#~ msgstr ""
-#~ "Džaber ID %s ne poštuje RFC pravila. Neće biti dodat na Vašu listu "
-#~ "kontakata. Upotrebite alate kao što je http://jru.jabberstudio.org/ da "
-#~ "biste ga uklonili"
-
 #~ msgid "Account Modification"
 #~ msgstr "Izmena naloga"
 
@@ -10687,9 +11709,6 @@ msgstr " resurs sa prioritetom "
 #~ "Istorijati grupnih razgovora\n"
 #~ "Istorijat svih razgovora"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Podešavanje naloga"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10858,18 +11877,9 @@ msgstr " resurs sa prioritetom "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Pridruži Open_PGP Ključ"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Komanda nije podržana za zeroconf  nalog."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Komanda: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Način korišćenja: /%s, sakriva dugmad."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10877,12 +11887,6 @@ msgstr " resurs sa prioritetom "
 #~ "Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
 #~ "razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Način korišćenja: /%s, šalje pink kontaktu"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Nema informacija ni pomoći za /%s"
 
@@ -10899,10 +11903,6 @@ msgstr " resurs sa prioritetom "
 #~ msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Nadimak nije pronađen: %s "
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -10914,12 +11914,6 @@ msgstr " resurs sa prioritetom "
 #~ "imenima NISU podržani."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10961,10 +11955,6 @@ msgstr " resurs sa prioritetom "
 #~ "Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
 #~ "razgovoru."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr ""
-#~ "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11001,9 +11991,6 @@ msgstr " resurs sa prioritetom "
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
 
-#~ msgid "Show _roster"
-#~ msgstr "_Prikaži listu kontakata"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"