Merge upstream changes

1 files changed, 105 insertions, 192 deletions

diff --git a/po/sr@latin.po b/po/sr@latin.po
index d3be94f9..b035baad 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Велимир Мајсторов <majstorov@gmail.com>, 2013
+# Велимир Майсторов <majstorov@gmail.com>, 2013
 # o Zoltan Čala <zolika@sezampro.yu>, 1999
 # Zlatan Vasović <inactive+ZDroid@transifex.com>, 2013
+# Zlatan Vasović <inactive+ZDroid@transifex.com>, 2013
+# Велимир Майсторов <majstorov@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-03 16:11-0400\n"
-"PO-Revision-Date: 2017-09-23 18:41+0000\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-04-03 20:10+0000\n"
 "Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/hexchat/hexchat/"
-"language/sr%40latin/)\n"
-"Language: sr@latin\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/hexchat/hexchat/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -301,9 +301,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Nije dobra ideja da koristite IRC kao\n"
-"  administrator. Bolje je napraviti nalog.\n"
+msgstr "* Nije dobra ideja da koristite IRC kao\n  administrator. Bolje je napraviti nalog.\n"
 
 #: src/common/ignore.c:127 src/common/ignore.c:131 src/common/ignore.c:135
 #: src/common/ignore.c:139 src/common/ignore.c:143 src/common/ignore.c:147
@@ -436,8 +434,7 @@ msgstr "ALLCHAN <naredba>, šalje komandu na sve kanale gde ste povezani"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <komanda>, šalje komandu ka svim kanalima na trenutnom serveru"
+msgstr "ALLCHANL <komanda>, šalje komandu ka svim kanalima na trenutnom serveru"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -456,9 +453,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <šablon> [<vrsta>], zabrana za sve korisnike obuhvaćene šablonom od "
-"pristupa kanalu. Ako su već na kanalu, ne izbacuje ih (za to treba biti „op‟)"
+msgstr "BAN <šablon> [<vrsta>], zabrana za sve korisnike obuhvaćene šablonom od pristupa kanalu. Ako su već na kanalu, ne izbacuje ih (za to treba biti „op‟)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -466,10 +461,9 @@ msgstr "CHANOPT [-quiet] <promenljiva> [<vrednost>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<enkoding>], dobija ili podešava enkoding korišćen za trenutnu "
-"konekciju"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<enkoding>], dobija ili podešava enkoding korišćen za trenutnu konekciju"
 
 #: src/common/outbound.c:3946
 msgid ""
@@ -491,13 +485,12 @@ msgstr "COUNTRY [-s] <kod|šablon>, traži kod zemlje, npr: au = australija"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <ime> <poruka>, šalje CTCP poruku na dato ime, poput VERSION ili "
-"USERINFO"
+msgstr "CTCP <ime> <poruka>, šalje CTCP poruku na dato ime, poput VERSION ili USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
 msgstr ""
 
 #: src/common/outbound.c:3956
@@ -511,26 +504,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <ime>                      - prihvati ponuđenu datoteku\n"
-"DCC SEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku\n"
-"DCC PSEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku, pasivan "
-"način\n"
-"DCC LIST                           - pokaži spisak za DCC\n"
-"DCC CHAT <ime>                     - ponudi razgovor preko DCC\n"
-"DCC PCHAT <ime>                     - ponudi razgovor preko DCC, pasivan "
-"način\n"
-"DCC CLOSE <tip> <ime> <dat>            primer:\n"
-"         /dcc close send peraperić datoteka.tar.gz"
+msgstr "\nDCC GET <ime>                      - prihvati ponuđenu datoteku\nDCC SEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku\nDCC PSEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku, pasivan način\nDCC LIST                           - pokaži spisak za DCC\nDCC CHAT <ime>                     - ponudi razgovor preko DCC\nDCC PCHAT <ime>                     - ponudi razgovor preko DCC, pasivan način\nDCC CLOSE <tip> <ime> <dat>            primer:\n         /dcc close send peraperić datoteka.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <ime>, sklanja polu-op zvanje za ime na trenutnom kanalu (potreban "
-"je„op)‟"
+msgstr "DEHOP <ime>, sklanja polu-op zvanje za ime na trenutnom kanalu (potreban je„op)‟"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -568,9 +548,7 @@ msgstr "ECHO <tekst>, ispisuje tekst"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <naredba>, izvrši naredbu. Ako je data oznaka -o onda se "
-"ispisšalje na trenutni kanal, inače se ispisuje u okviru za tekst."
+msgstr "EXEC [-o] <naredba>, izvrši naredbu. Ako je data oznaka -o onda se ispisšalje na trenutni kanal, inače se ispisuje u okviru za tekst."
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -580,9 +558,7 @@ msgstr "EXECCONT, šalje procesu SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], zaustavlja poziv exec u ovoj sesiji. Ako je dato i -9 procesu "
-"se šalje SIGKILL"
+msgstr "EXECKILL [-9], zaustavlja poziv exec u ovoj sesiji. Ako je dato i -9 procesu se šalje SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -623,20 +599,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <šablon> <tipovi...> <izbori...>\n"
-"    šablon - šablon za ime računara, npr. *!*@.aol.com\n"
-"    tipovi - šta zanemariti, jedan ili više iz skupa:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    izbori  - NOSAVE, QUIET"
+msgstr "IGNORE <šablon> <tipovi...> <izbori...>\n    šablon - šablon za ime računara, npr. *!*@.aol.com\n    tipovi - šta zanemariti, jedan ili više iz skupa:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    izbori  - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <ime> [<kanal>], poziva ime da se priključi kanalu, misli se na "
-"trenutni ako se ne navede (potreban je op)"
+msgstr "INVITE <ime> [<kanal>], poziva ime da se priključi kanalu, misli se na trenutni ako se ne navede (potreban je op)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -663,8 +632,7 @@ msgid ""
 "    Use -h to highlight the found string(s)\n"
 "    Use -m to match case\n"
 "    Use -r when string is a Regular Expression\n"
-"    Use -- (double hyphen) to end options when searching for, say, the "
-"string '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
 msgstr ""
 
 #: src/common/outbound.c:4034
@@ -674,8 +642,7 @@ msgstr "LOAD [-e] <dat.>, učitava dodatak ili skriptu"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, oduzima zvanje svim polu-operatorima na ovom kanalu (potreban je op)"
+msgstr "MDEHOP, oduzima zvanje svim polu-operatorima na ovom kanalu (potreban je op)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -683,11 +650,9 @@ msgstr "MDEOP, oduzima zvanje svim operatorima na ovom kanalu (potreban je op)"
 
 #: src/common/outbound.c:4041
 msgid ""
-"ME <action>, sends the action to the current channel (actions are written in "
-"the 3rd person, like /me jumps)"
-msgstr ""
-"ME <radnja>, šalje opis radnje na ovaj kanal (radnje se pišu u trećem licu, "
-"npr. /me skače"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <radnja>, šalje opis radnje na ovaj kanal (radnje se pišu u trećem licu, npr. /me skače"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -704,8 +669,8 @@ msgstr "MOP, svima na kanalu dodeljuje zvanje operatora (potreban je op)"
 
 #: src/common/outbound.c:4051
 msgid ""
-"MSG <nick> <message>, sends a private message, message \".\" to send to last "
-"nick or prefix with \"=\" for dcc chat"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
 msgstr ""
 
 #: src/common/outbound.c:4054
@@ -732,9 +697,7 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nadimak>], prikazuje Vašu listu "
-"obaveštenja ili dodaje nekoga na nju"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nadimak>], prikazuje Vašu listu obaveštenja ili dodaje nekoga na nju"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -743,8 +706,7 @@ msgstr "OP <ime>, daje zvanje operatora ovom imenu (potreban je op)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanal>] [<razlog>], napušta kanal, i to trenutni ako se ne navede"
+msgstr "PART [<kanal>] [<razlog>], napušta kanal, i to trenutni ako se ne navede"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -772,23 +734,17 @@ msgstr "QUOTE <tekst>, šalje sirovi tekst serveru"
 
 #: src/common/outbound.c:4080
 msgid ""
-"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as /"
-"RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
+"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as "
+"/RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
 "reconnect to all the open servers"
-msgstr ""
-"RECONNECT [-ssl] [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /"
-"RECONNECT za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno "
-"spajanje na sve otvorene servere"
+msgstr "RECONNECT [-ssl] [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /RECONNECT za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno spajanje na sve otvorene servere"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<host>] [<port>] [<password>], Can be called just as /RECONNECT "
 "to reconnect to the current server or with /RECONNECT ALL to reconnect to "
 "all the open servers"
-msgstr ""
-"RECONNECT [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /RECONNECT "
-"za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno spajanje na "
-"sve otvorene servere"
+msgstr "RECONNECT [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /RECONNECT za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno spajanje na sve otvorene servere"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -820,17 +776,13 @@ msgstr "SERVCHAN <rač.> <port> <kanal>, povezuje se i učlani na kanal"
 msgid ""
 "SERVER [-ssl] <host> [<port>] [<password>], connects to a server, the "
 "default port is 6667 for normal connections, and 6697 for ssl connections"
-msgstr ""
-"SERVER [-ssl] <host> [<port>] [<lozinka>], povezuje sa serverom, "
-"podrazumevani port je 6667 za normalne konekcije, i 6697 za ssl konekcije"
+msgstr "SERVER [-ssl] <host> [<port>] [<lozinka>], povezuje sa serverom, podrazumevani port je 6667 za normalne konekcije, i 6697 za ssl konekcije"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <rač.> [<port>] [<lozinka>], povezuje se na server, uzima da je port "
-"6667"
+msgstr "SERVER <rač.> [<port>] [<lozinka>], povezuje se na server, uzima da je port 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -850,9 +802,9 @@ msgstr "SETTEXT <novi tekst>, zamenjuje tekst u okviru za unos"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<tema>], postavlja temu ako je navedena, inače prikaže trenutnu temu"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<tema>], postavlja temu ako je navedena, inače prikaže trenutnu temu"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -878,8 +830,8 @@ msgstr "UNLOAD <ime>, ukloni dodatak ili skript"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
 msgstr ""
 
 #: src/common/outbound.c:4124
@@ -888,10 +840,9 @@ msgstr "URL <url>, otvara URL u pregledniku mreže"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <ime1> <ime2> itd, naglašava imena u spisku korisnika "
-"kanala"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <ime1> <ime2> itd, naglašava imena u spisku korisnika kanala"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -920,9 +871,7 @@ msgstr "Upotreba: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Za ovu naredbu pomoć nije dostupna.\n"
+msgstr "\nZa ovu naredbu pomoć nije dostupna.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -943,8 +892,7 @@ msgstr ""
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Nema hexchat_plugin_init simbola; da li je ovo stvarno HexChat dodatak?"
+msgstr "Nema hexchat_plugin_init simbola; da li je ovo stvarno HexChat dodatak?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -992,9 +940,7 @@ msgstr "Da li ste sigurni da je ovo SSL server i port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Računar %s naizgled ne postoji\n"
-"Proverite podešavanja za IP!\n"
+msgstr "Računar %s naizgled ne postoji\nProverite podešavanja za IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1010,9 +956,7 @@ msgstr "Pokušavam vezu sa sledećim serverom u %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Upozorenje: Skup znakova „%s‟ nije poznat. Za mrežu %s se zato neće "
-"koristiti konverzija."
+msgstr "Upozorenje: Skup znakova „%s‟ nije poznat. Za mrežu %s se zato neće koristiti konverzija."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1171,7 +1115,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:148
@@ -1205,8 +1150,8 @@ msgstr ""
 
 #: src/common/textevents.h:169
 msgid ""
-"%C20*%O$tReceived a malformed DCC request from %C18$1%O.$a010%C23*%O"
-"$tContents of packet: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:172
@@ -1227,7 +1172,8 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:187
@@ -1240,7 +1186,8 @@ msgstr ""
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:196
@@ -1257,7 +1204,8 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:208
@@ -1316,8 +1264,7 @@ msgstr "%OLista ignorisanja je prazna."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tNe mogu da se priključim %C22$1%C (%C20Kanal je samo za pozvane%O)"
+msgstr "%C20*%O$tNe mogu da se priključim %C22$1%C (%C20Kanal je samo za pozvane%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1537,9 +1484,7 @@ msgstr "**** POČETAK ZAPISA U DNEVNIKU U %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Ne mogu da otvorim log datoteku (datoteke) za pisanje. Proverite\n"
-"dozvole %s"
+msgstr "* Ne mogu da otvorim log datoteku (datoteke) za pisanje. Proverite\ndozvole %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -3274,9 +3219,7 @@ msgstr "Datum"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Spisak ućutkanih se može otvoriti samo ako je otvoren jezičak za prikaz "
-"kanala"
+msgstr "Spisak ućutkanih se može otvoriti samo ako je otvoren jezičak za prikaz kanala"
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3397,18 +3340,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Ne mogu da pristupim: %s\n"
-"%s.\n"
-"Nastavljanje nije moguće."
+msgstr "Ne mogu da pristupim: %s\n%s.\nNastavljanje nije moguće."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Datoteka koja je prethodno preuzeta je veća nego ponuđena. Zato nije moguće "
-"nastaviti prenos."
+msgstr "Datoteka koja je prethodno preuzeta je veća nego ponuđena. Zato nije moguće nastaviti prenos."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3554,10 +3492,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Ne može se otvoriti font:\n"
-"\n"
-"%s"
+msgstr "Ne može se otvoriti font:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3575,18 +3510,18 @@ msgstr "Mrežni red slanja: bajtova: %d"
 
 #: src/fe-gtk/fkeys.c:141
 msgid ""
-"The Run Command action runs the data in Data 1 as if it had been typed into "
-"the entry box where you pressed the key sequence. Thus it can contain text "
-"(which will be sent to the channel/person), commands or user commands. When "
-"run all \\n characters in Data 1 are used to deliminate separate commands so "
-"it is possible to run more than one command. If you want a \\ in the actual "
-"text run then enter \\\\"
+"The Run Command action runs the data in Data 1 as if it had been typed "
+"into the entry box where you pressed the key sequence. Thus it can contain "
+"text (which will be sent to the channel/person), commands or user commands. "
+"When run all \\n characters in Data 1 are used to deliminate separate "
+"commands so it is possible to run more than one command. If you want a \\ "
+"in the actual text run then enter \\\\"
 msgstr ""
 
 #: src/fe-gtk/fkeys.c:143
 msgid ""
-"The Change Page command switches between pages in the notebook. Set Data 1 "
-"to the page you want to switch to. If Data 2 is set to anything then the "
+"The Change Page command switches between pages in the notebook. Set Data 1"
+" to the page you want to switch to. If Data 2 is set to anything then the "
 "switch will be relative to the current position. Set Data 1 to auto to "
 "switch to the page with the most recent and important activity (queries "
 "first, then channels with hilight, channels with dialogue, channels with "
@@ -3601,53 +3536,46 @@ msgstr ""
 
 #: src/fe-gtk/fkeys.c:147
 msgid ""
-"The Scroll Page command scrolls the text widget up or down one page or one "
-"line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
+"The Scroll Page command scrolls the text widget up or down one page or one"
+" line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
 msgstr ""
 
 #: src/fe-gtk/fkeys.c:149
 msgid ""
-"The Set Buffer command sets the entry where the key sequence was entered to "
-"the contents of Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
 msgstr ""
 
 #: src/fe-gtk/fkeys.c:151
 msgid ""
-"The Last Command command sets the entry to contain the last command entered "
-"- the same as pressing up in a shell"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
 msgstr ""
 
 #: src/fe-gtk/fkeys.c:153
 msgid ""
-"The Next Command command sets the entry to contain the next command entered "
-"- the same as pressing down in a shell"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
 msgstr ""
 
 #: src/fe-gtk/fkeys.c:155
 msgid ""
 "This command changes the text in the entry to finish an incomplete nickname "
-"or command. If Data 1 is set then double-tabbing in a string will select the "
-"last nick, not the next"
-msgstr ""
-"Ova komanda menja tekst u liniji za unos tako što dovršava nepotpuno ime ili "
-"komandu. Ako je polje Data 1 popunjeno, dupli pritisak na tabulator bira "
-"poslednje ime, ne sledeće"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ova komanda menja tekst u liniji za unos tako što dovršava nepotpuno ime ili komandu. Ako je polje Data 1 popunjeno, dupli pritisak na tabulator bira poslednje ime, ne sledeće"
 
 #: src/fe-gtk/fkeys.c:157
 msgid ""
-"This command scrolls up and down through the list of nicks. If Data 1 is set "
-"to anything it will scroll up, else it scrolls down"
-msgstr ""
-"Ovom komandom se možete šetati gore-dole kroz listu imena. Ako je Data 1 "
-"postavljeno na bilo šta, kretaćete se na gore, inače na dole"
+"This command scrolls up and down through the list of nicks. If Data 1 is set"
+" to anything it will scroll up, else it scrolls down"
+msgstr "Ovom komandom se možete šetati gore-dole kroz listu imena. Ako je Data 1 postavljeno na bilo šta, kretaćete se na gore, inače na dole"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Ova komanda proverava da li se poslednja uneta reč nalazi na spisku za "
-"zamene, i zamenjuje je ako je pronađe"
+msgstr "Ova komanda proverava da li se poslednja uneta reč nalazi na spisku za zamene, i zamenjuje je ako je pronađe"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3822,9 +3750,7 @@ msgstr "Tema nije postavljena"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Ovaj server ima ukupno ovoliko kanala: %d ili dijaloga. Da li želite da ih "
-"sve zatvorite?"
+msgstr "Ovaj server ima ukupno ovoliko kanala: %d ili dijaloga. Da li želite da ih sve zatvorite?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -5776,8 +5702,8 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:562
 msgid ""
-"Automatically include timestamps in copied lines of text. Otherwise, include "
-"timestamps if the Shift key is held down while selecting."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
 msgstr ""
 
 #: src/fe-gtk/setup.c:564
@@ -5786,8 +5712,8 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:565
 msgid ""
-"Automatically include color information in copied lines of text.  Otherwise, "
-"include color information if the Ctrl key is held down while selecting."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
 msgstr ""
 
 #: src/fe-gtk/setup.c:570
@@ -5838,7 +5764,8 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
 msgstr ""
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
@@ -5948,11 +5875,9 @@ msgstr "Saznaj IP ovog računara od servera"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Upitajte IRC server da saznate vašu adresu. Korisni ukoliko je prava adresa "
-"iz opsega 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Upitajte IRC server da saznate vašu adresu. Korisni ukoliko je prava adresa iz opsega 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6187,14 +6112,12 @@ msgid ""
 msgstr ""
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
 msgstr ""
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Neke izmene će postati vidljive tek kada sledeći put pokrenete program."
+msgstr "Neke izmene će postati vidljive tek kada sledeći put pokrenete program."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6202,11 +6125,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*UPOZORENJE*\n"
-"Automatsko prihvatanje DCC zahteva u kućnom\n"
-"direktorijumu je opasno i može se iskoristiti.\n"
-"Npr. neko može poslati datoteku .bash_profile"
+msgstr "*UPOZORENJE*\nAutomatsko prihvatanje DCC zahteva u kućnom\ndirektorijumu je opasno i može se iskoristiti.\nNpr. neko može poslati datoteku .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6320,8 +6239,8 @@ msgstr ""
 #: plugins/sysinfo/sysinfo.c:168
 msgid ""
 "Sysinfo: Valid settings are: announce and hide_* for each piece of "
-"information. e.g. hide_os. Without a value it will show current (or default) "
-"setting.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
 msgstr ""
 
 #: plugins/sysinfo/sysinfo.c:190
@@ -6337,9 +6256,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"