Merge branch 'sasl'

[empathy.git] / po / sr@latin.po

diff --git a/po/sr@latin.po b/po/sr@latin.po
index 5a512f9895d523fdd5cd3ea5eac0e6d61a39887e..5310efb9b6f2584213b04783352332156ed4345f 100644 (file)
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -11,15 +11,16 @@
 #   Nikola Kotur <kotnik@ns-linux.org>, 2006.
 #   Miloš Popović <gpopac@gmail.com>, 2007, 2008.
 #
-# Maintainder: Branko Kokanović <branko.kokanovic@gmail.com>, 2009.
+# Maintainer: Branko Kokanović <branko.kokanovic@gmail.com>, 2010.
 # Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
+# Miloš Popović <gpopac@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidžin\n"
+"Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-05-10 09:53+0000\n"
-"PO-Revision-Date: 2009-05-16 15:43+0200\n"
+"POT-Creation-Date: 2010-08-30 17:00+0000\n"
+"PO-Revision-Date: 2010-08-30 21:48+0200\n"
 "Last-Translator: Branko Kokanović <branko.kokanovic@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,18 +30,28 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Internet pismonoša"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ćaskajte na Google Talk-u, Fejsbuku, MSN-u i na mnogim drugim servisima za "
+"ćaskanje"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Šaljite i primajte brze internet poruke"
+msgid "Empathy"
+msgstr "Internet pismonoša"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Dopisivanje preko Internet pismonoše"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/empathy.desktop.in.in.h:4
+msgid "IM Client"
+msgstr "Program za brze poruke"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Uvek otvori poseban prozor za nova ćaskanja."
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -48,1013 +59,2116 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi automatsko dovršavanje "
 "nadimka (tab) u grupnim ćaskanjima."
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "Tema prozora za ćaskanje"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Lista jezika odvojena zarezima koju koristi provera pravopisa (npr. sr, en, "
-"fr)."
+"Lista jezika odvojena zarezima koju koristi provera pravopisa (npr. „sr, en, "
+"fr“)."
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "Zbijeni spisak prijatelja"
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
-msgstr "Kriterijum za sortiranje prijatelja u spisku prijatelja"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Connection managers should be used"
+msgstr "Da li da se koristi upravnik mrežom"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Contact list sort criterion"
+msgstr "Kriterijum za sortiranje prijatelja"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
-msgstr "Podrazumevana fascikla za odabir slika"
+msgstr "Podrazumevana fascikla za izbor slika"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "Isključuje iskačuća obaveštenja kada sam odsutan"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "Onemogućava zvukove kada sam odsutan"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Prikaži dolazne događaje u statusnoj liniji"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Prikaži dolazne događaje u statusnoj liniji. Ako nije postavljeno, odmah ih "
+"prikazuje korisniku."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Empathy can publish the user's location"
+msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+msgid "Empathy can use the network to guess the location"
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
 msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy has asked about importing accounts"
 msgstr "Da li da Pismonoša pita za uvoz naloga"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Empathy has migrated butterfly logs"
+msgstr "Pismonoša je prebacio dnevnike iz leptira"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Da li da Pismonoša pređe u stanje automatskog odsustva u mirovanju"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should auto-connect on startup"
 msgstr "Da li da Pismonoša sam uspostaviti vezu po pokretanju"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Da li da Pismonoša umanji preciznost lokacije"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Da li da Pismonoša koristi sliku prijatelja kao ikonu prozora za ćaskanje"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+msgid "Enable WebKit Developer Tools"
+msgstr "Omogućava WebKit alatke za programere"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable popup notifications for new messages"
 msgstr "Omogućava iskačuća obaveštenja za nove poruke"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Enable spell checker"
 msgstr "Omogućava proveru pisanja"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide main window"
 msgstr "Sakriva glavni prozor"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Hide the main window."
 msgstr "Sakriva glavni prozor programa."
 
-#: ../data/empathy.schemas.in.h:18
-msgid "NetworkManager should be used"
-msgstr "Da li da koristi upravnika mrežom"
-
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Nick completed character"
 msgstr "Karakter za dovršavanje nadimka"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Open new chats in separate windows"
 msgstr "Otvara nova ćaskanja u različitim prozorima"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Path of the Adium theme to use"
+msgstr "Putanja do Adijum teme za korišćenje"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for incoming messages"
 msgstr "Pušta zvuk za dolazeće poruke"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for new conversations"
 msgstr "Pušta zvuk za nove razgovore"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound for outgoing messages"
 msgstr "Pušta zvuk za odlazeće poruke"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs in"
 msgstr "Pušta zvuk kada se prijatelj prijavi"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when a contact logs out"
 msgstr "Pušta zvuk kada se prijatelj odjavi"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log in"
 msgstr "Pušta zvuk kada se ja prijavim"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound when we log out"
 msgstr "Pušta zvuk kada se ja odjavim"
 
-#: ../data/empathy.schemas.in.h:28
-msgid "Popup notifications if the chat isn't focused"
-msgstr "Ispisuje obaveštenje ako ćaskanje nije u fokusu"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ispisuj obaveštenja ako ćaskanje nije u fokusu"
 
-#: ../data/empathy.schemas.in.h:29
-msgid "Salut account is created"
-msgstr "Salut nalog je napravljen"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ispisuj obaveštenja kada se prijatelj prijavi"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ispisuj obaveštenja kada se prijatelj odjavi"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show avatars"
 msgstr "Prikazuje slike"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+msgid "Show contact list in rooms"
+msgstr "Prikazuje spisak prijatelja u sobama"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show hint about closing the main window"
 msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show offline contacts"
 msgstr "Prikazuje prijatelje koji nisu na vezi"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Show protocols"
+msgstr "Prikaži protokole"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pisanja"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The default folder to save file transfers in."
 msgstr "Podrazumevana fascikla za čuvanje prenesenih datoteka."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Poslednja fascikla iz koje izabrana slika."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "Pozicija bočne površi prozora za ćaskanje"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Sačuvana pozicija (u pikselima) bočne površi prozora za ćaskanje."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use graphical smileys"
 msgstr "Prikazuje sličicu sa smeškom"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use notification sounds"
 msgstr "Koristi zvukove za obaveštenja"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Use theme for chat rooms"
 msgstr "Koristi teme za sobe ćaskanja"
 
-#: ../data/empathy.schemas.in.h:40
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Da li da Pismonoša objavljuje lokaciju korisnika njegovim prijateljima."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Da li vas je Pismonoša pitao za uvoženje naloga iz drugih programa."
 
-#: ../data/empathy.schemas.in.h:41
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Da li da se Pismonoša sam prijavi na postojeće naloge nakon pokretanja."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Da li da  Pismonoša automatski pređe u stanje odsustva u mirovanju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Da li da Pismonoša umanji preciznost lokacije zbog povećane privatnosti."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Da li da Pismonoša koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Da li je Salut nalog napravljen kada je Internet pismonoša prvi put pokrenut."
+"Da li da se omoguće WebKit alati za programere, kao što je Veb Inspektor."
 
 # Nije connect već disconnect!!! ~Miloš
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
 "Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
 "uspostavljanje veze."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "Da li da proverava pisanje reči za izabrane jezike."
 
-#: ../data/empathy.schemas.in.h:46
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Da li da prikazuje smeške kao sličice unutar razgovora."
 
-#: ../data/empathy.schemas.in.h:47
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
 
-#: ../data/empathy.schemas.in.h:49
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Whether to play a sound to notify of events."
 msgstr "Da li da pusti obaveštajni zvuk za događaje."
 
-#: ../data/empathy.schemas.in.h:50
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
 
-#: ../data/empathy.schemas.in.h:51
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
 
-#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
 
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to play a sound when logging into a network."
 msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
 
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "Da li da pusti zvuk kada se odjavljujete sa mreže."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
 
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to play sound notifications when away or busy."
 msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Da li da prikazuje iskačući prozor kada se prijatelj odjavi sa mreže."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Da li da prikazuje iskačući prozor kada se prijatelj prijavi na mrežu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
 "Da li da prikazuje iskačući prozor sa pristiglim porukama čak i kada je "
 "prozor za ćaskanje otvoren, ali nije u fokusu."
 
-#: ../data/empathy.schemas.in.h:57
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Da li da prikazuje iskačući prozor kada primite novu poruku."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
-#: ../data/empathy.schemas.in.h:59
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
 
-#: ../data/empathy.schemas.in.h:60
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to show popup notifications when away or busy."
 msgstr "Da li da prikazuje iskačući prozor kada ste zauzeti ili odsutni."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to show the contact list in compact mode."
+msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
 "Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
 "„x“ dugme."
 
-#: ../data/empathy.schemas.in.h:62
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
-
-#: ../data/empathy.schemas.in.h:63
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Whether to use the theme for chat rooms."
 msgstr "Da li da koristi temu za sobe razgovora."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
-"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano je "
-"sortiranje po imenu prijatelja (vrednost „name“). Ako je vrednost „state“, "
+"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
+"koristi „name“ (sortiranje po imenu prijatelja). Ako je vrednost „state“, "
 "sortiranje se vrši po stanju prijatelja."
 
-#: ../libempathy/empathy-tp-contact-list.c:732 ../src/empathy.c:271
-msgid "People nearby"
-msgstr "Ljudi u okolini"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljaj nalozima za brze poruke i VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2151
+msgid "Messaging and VoIP Accounts"
+msgstr "Nalozi za brze poruke i VoIP"
+
+#: ../libempathy/empathy-ft-handler.c:851
+msgid "The hash of the received file and the sent one do not match"
+msgstr "Poslata heš vrednost i heš vrednost primljene datoteke se ne slažu"
+
+#: ../libempathy/empathy-ft-handler.c:1111
+msgid "File transfer not supported by remote contact"
+msgstr "Druga strana ne podržava prenos datoteka"
+
+#: ../libempathy/empathy-ft-handler.c:1169
+msgid "The selected file is not a regular file"
+msgstr "Izabrana datoteka nije obična datoteka"
+
+#: ../libempathy/empathy-ft-handler.c:1178
+msgid "The selected file is empty"
+msgstr "Izabrana datoteka je prazna"
+
+#: ../libempathy/empathy-tp-file.c:283
+msgid "Socket type not supported"
+msgstr "Tip soketa nije podržan"
+
+#: ../libempathy/empathy-tp-file.c:402
+msgid "No reason was specified"
+msgstr "Nije naveden razlog"
+
+#: ../libempathy/empathy-tp-file.c:405
+msgid "The change in state was requested"
+msgstr "Zahtevana je promena stanja"
+
+#: ../libempathy/empathy-tp-file.c:408
+msgid "You canceled the file transfer"
+msgstr "Obustavili ste prenos datoteke"
+
+#: ../libempathy/empathy-tp-file.c:411
+msgid "The other participant canceled the file transfer"
+msgstr "Druga strana je prekinula prenos datoteke"
+
+#: ../libempathy/empathy-tp-file.c:414
+msgid "Error while trying to transfer the file"
+msgstr "Greška prilikom prenosa datoteke"
+
+#: ../libempathy/empathy-tp-file.c:417
+msgid "The other participant is unable to transfer the file"
+msgstr "Druga strana nije u mogućnosti da prenese datoteku"
+
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+msgid "Unknown reason"
+msgstr "Nepoznat razlog"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-utils.c:242
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:244
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:247
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:259
-msgid "Hidden"
-msgstr "Sakriven"
+#: ../libempathy/empathy-utils.c:249
+msgid "Invisible"
+msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:251
 msgid "Offline"
 msgstr "Nepovezan"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
+#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "No reason specified"
+msgstr "Nije naveden razlog"
+
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+msgid "Status is set to offline"
+msgstr "Stanje je postavljeno na „nepovezan“"
+
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+msgid "Network error"
+msgstr "Greška u mreži"
+
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+msgid "Authentication failed"
+msgstr "Neuspešna prijava"
+
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+msgid "Encryption error"
+msgstr "Greška pri šifrovanju"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Name in use"
+msgstr "Ime je u upotrebi"
+
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+msgid "Certificate not provided"
+msgstr "Sertifikat nije prosleđen"
+
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+msgid "Certificate untrusted"
+msgstr "Sertifikat nije od poverenja"
+
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+msgid "Certificate expired"
+msgstr "Sertifikat je istekao"
+
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+msgid "Certificate not activated"
+msgstr "Sertifikat nije aktiviran"
+
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+msgid "Certificate hostname mismatch"
+msgstr "Ime domaćina sertifikata se ne poklapa"
+
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+msgid "Certificate fingerprint mismatch"
+msgstr "Otisak sertifikata se ne poklapa"
+
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+msgid "Certificate self-signed"
+msgstr "Sertifikat je samopotpisan"
+
+#: ../libempathy/empathy-utils.c:318
+msgid "Certificate error"
+msgstr "Greška u sertifikatu"
+
+#: ../libempathy/empathy-utils.c:352
+msgid "Encryption is not available"
+msgstr "Šifrovanje nije dostupno"
+
+#: ../libempathy/empathy-utils.c:354
+msgid "Certificate is invalid"
+msgstr "Sertifikat nije ispravan"
+
+#: ../libempathy/empathy-utils.c:356
+msgid "Connection has been refused"
+msgstr "Veza je odbijena"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Connection can't be established"
+msgstr "Veza ne može da se uspostavi"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been lost"
+msgstr "Veza je izgubljena"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "This resource is already connected to the server"
+msgstr "Ovaj resurs je već povezan sa serverom"
+
+#: ../libempathy/empathy-utils.c:364
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "Veza je zamenjena novom vezom koristeći isti resurs"
+
+#: ../libempathy/empathy-utils.c:367
+msgid "The account already exists on the server"
+msgstr "Ovaj nalog već postoji na serveru"
+
+#: ../libempathy/empathy-utils.c:369
+msgid "Server is currently too busy to handle the connection"
+msgstr "Server je trenutno previše zauzet da bi uspostavio vezu"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "Certificate has been revoked"
+msgstr "Sertifikat je opozvan"
+
+#: ../libempathy/empathy-utils.c:373
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Sertifikat koristi nebezbedni algoritam šifrovanja ili je kriptografski slab"
+
+#: ../libempathy/empathy-utils.c:376
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Dužina sertifikata servera, ili dubina lanca sertifikata servera premašuje "
+"granice biblioteke za šifrovanje"
+
+#: ../libempathy/empathy-utils.c:540
+msgid "People Nearby"
+msgstr "Ljudi u okolini"
+
+#: ../libempathy/empathy-utils.c:545
+msgid "Yahoo! Japan"
+msgstr "Jahu! Japan"
+
+#: ../libempathy/empathy-utils.c:546
+msgid "Facebook Chat"
+msgstr "Fejsbuk ćaskanje"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "Pre %d sekunde"
+msgstr[1] "Pre %d sekunde"
+msgstr[2] "Pre %d sekundi"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "Pre %d minuta"
+msgstr[1] "Pre %d minuta"
+msgstr[2] "Pre %d minuta"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "Pre %d sata"
+msgstr[1] "Pre %d sata"
+msgstr[2] "Pre %d sati"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Pre %d dana"
+msgstr[1] "Pre %d dana"
+msgstr[2] "Pre %d dana"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "Pre %d nedelje"
+msgstr[1] "Pre %d nedelje"
+msgstr[2] "Pre %d nedelja"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "Pre %d meseca"
+msgstr[1] "Pre %d meseca"
+msgstr[2] "Pre %d meseci"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "u budućnosti"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:463
 msgid "All"
 msgstr "Sve"
 
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:606
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Napredno</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Zaboravi lozinku i očisti unos."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget.c:1145
+msgid "Username:"
+msgstr "Korisničko ime:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1475
+msgid "A_pply"
+msgstr "P_rimeni"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1505
+msgid "L_og in"
+msgstr "_Prijavi me"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1571
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1397
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Nalog:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1582
+msgid "_Enabled"
+msgstr "_Omogućeno"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1647
+msgid "This account already exists on the server"
+msgstr "Ovaj nalog već postoji na serveru"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1650
+msgid "Create a new account on the server"
+msgstr "Napravi novi nalog na serveru"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1743
+msgid "Ca_ncel"
+msgstr "Po_ništi"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2028
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s na %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2054
+#, c-format
+msgid "%s Account"
+msgstr "%s nalog"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2058
+msgid "New account"
+msgstr "Novi nalog"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> MojNadimak"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Advanced"
+msgstr "Napredno"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Lozinka"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 msgid "Screen _Name:"
 msgstr "_Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "Koja je vaša AIM lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "Koji je vaš AIM nadimak?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "Se_rver:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> korisničko_ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "Korisničko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "Koji je vaš GroupWise korisnički ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
-msgid "_Charset:"
-msgstr "_Kodni raspored:"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "Koja je vaša GroupWise lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
-msgid "New Network"
-msgstr "Nova mreža"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Mreža</b>"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "Kodni r_aspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Serveri</b>"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
-msgid "Charset:"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ UIN?"
+msgstr "Koji je vaš ICQ UIN?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+msgid "What is your ICQ password?"
+msgstr "Koja je vaša ICQ lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "Auto"
+msgstr "Auto"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+msgid "Register"
+msgstr "Registruj"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+msgid "Options"
+msgstr "Opcije"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+msgid "None"
+msgstr "Ništa"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Character set:"
 msgstr "Kodni raspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Napravi novu IRC mrežu"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Izmeni izabranu IRC mrežu"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Mreža"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Mreža:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Poruka za kraj:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Ukloni izabranu IRC mrežu"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Serveri"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "Koji je vaš IRC nadimak?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "Koja IRC mreža?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> korisnik@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Prevaziđi postavke servera</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Zaht_eva se šifrovanje(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignoriši greške SSL sertifikata"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+msgid "Override server settings"
+msgstr "Prevaziđi postavke servera"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
 msgstr "Pri_oritet:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "Reso_urce:"
 msgstr "Res_urs:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+"Ovo je vaše korisničko ime, a ne obična Fejsbuk prijava.\n"
+"Ako vam je adresa facebook.com/<b>pera</b>, unesite <b>pera</b>.\n"
+"Ukoliko nemate korisničko ime za Fejsbuk, idite na <a href=\"http://www."
+"facebook.com/username/\">ovu stranu</a> da ga izaberete."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "Use old SS_L"
 msgstr "Koristi stari SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
-msgid "_Encryption required (TLS/SSL)"
-msgstr "Zaht_eva se šifrovanje(TLS/SSL)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "What is your Facebook password?"
+msgstr "Koja je vaša Fejsbuk lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
-msgid "_Ignore SSL certificate errors"
-msgstr "_Ignoriši greške SSL sertifikata"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "What is your Facebook username?"
+msgstr "Koje je vaše Fejsbuk korisničko ime?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Google ID?"
+msgstr "Koji je vaš Gugl ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Google password?"
+msgstr "Koja je vaša Gugl lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your Jabber ID?"
+msgstr "Koji je vaš Džaber ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+msgid "What is your Jabber password?"
+msgstr "Koja je vaša Džaber lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "What is your desired Jabber ID?"
+msgstr "Koji je vaš željeni Džaber ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+msgid "What is your desired Jabber password?"
+msgstr "Koja ja vaša željena Džaber lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Primer:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
-msgid "_Email:"
-msgstr "_E-pošta:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live ID?"
+msgstr "Koja je vaša Windows Live identifikacija?"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live password?"
+msgstr "Koja je vaša Windows Live lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "E-_mail address:"
+msgstr "Adresa e-_pošte:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Nadimak:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "I_me:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Dža_ber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "_Prezime:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
-msgid "_Nickname:"
-msgstr "_Nadimak:"
-
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "Ime za o_bjavu:"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
-msgid "Discover STUN"
-msgstr "Otkrivaj STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Primer:</b> korisnik@moj.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "Korisničko ime za prijavu:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "Discover Binding"
+msgstr "Otkrivaj povezivanja"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Automatski otkrivaj STUN server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Interval (seconds)"
+msgstr "Interval (u sekundama)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Keep-Alive Options"
+msgstr "Opcije za održavanje stalne veze"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Loose Routing"
+msgstr "Slabo rutiranje"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Mechanism:"
+msgstr "Mehanizam:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Miscellaneous Options"
+msgstr "Razne opcije"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "NAT Traversal Options"
+msgstr "Opcije prolaska kroz NAT"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Proxy Options"
+msgstr "Opcije proksija"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "STUN Server:"
 msgstr "STUN Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
-msgid "STUN port:"
-msgstr "STUN port:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "What is your SIP account password?"
+msgstr "Koja je lozinka za vaš SIP nalog?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "What is your SIP login ID?"
+msgstr "Koja je identifikacija za SIP prijavu?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Koristi _Jahu Japan"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+msgid "I_gnore conference and chat room invitations"
+msgstr "Zanemar_i pozivnice za pričaonice i konferencije"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
-msgid "Yahoo I_D:"
-msgstr "Jahu ID:"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Use _Yahoo! Japan"
+msgstr "Koristi _Jahu! Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
-msgid "_Ignore conference and chatroom invitations"
-msgstr "Zanemar_i pozivnice za pričaonice i konferencije"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "What is your Yahoo! ID?"
+msgstr "Koji je vaš Jahu! IB?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "What is your Yahoo! password?"
+msgstr "Koja je vaša Jahu! lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Yahoo! I_D:"
+msgstr "Jahu I_B:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "Lok_alni spisak soba:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:538
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
 msgstr "Ne mogu da pretvorim sliku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
-msgid "None of the accepted image formats is supported on your system"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+msgid "None of the accepted image formats are supported on your system"
 msgstr "Nijedan od prihvaćenih formata slika nije podržan na vašem sistemu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:957
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
-msgstr "Odaberite vašu sliku"
+msgstr "Izaberite vašu sliku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "Bez slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1022
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "Slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1026
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:323
 msgid "Click to enlarge"
 msgstr "Kliknite za uvećanje"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:639
+msgid "Failed to open private chat"
+msgstr "Nije uspelo otvaranje privatnog ćaskanja"
+
+#: ../libempathy-gtk/empathy-chat.c:679
+msgid "Topic not supported on this conversation"
+msgstr "Teme nisu podržane u ovom razgovoru"
+
+#: ../libempathy-gtk/empathy-chat.c:685
+msgid "You are not allowed to change the topic"
+msgstr "Nije vam dozvoljeno da promenite temu"
+
+#: ../libempathy-gtk/empathy-chat.c:819
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: čisti sve poruke iz ovog razgovora"
+
+#: ../libempathy-gtk/empathy-chat.c:822
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
+
+#: ../libempathy-gtk/empathy-chat.c:825
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <IB sobe>: priključuje se novoj sobi za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:828
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <IB sobe>: priključuje se novoj sobi za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:833
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:836
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <IB prijatelja> <poruka>: otvara privatno ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:840
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nadimak>: menja vaš nadimak na trenutnom serveru"
+
+#: ../libempathy-gtk/empathy-chat.c:843
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <poruka>: šalje ACTION poruku na trenutni razgovor"
+
+#: ../libempathy-gtk/empathy-chat.c:846
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+"/say <poruka>: šalje <poruka> na trenutni razgovor. Ovo se koristi za slanje "
+"poruka koje počinju sa „/“. Na primer: \"/say /join se koristi za "
+"priključivanje u novu sobu za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:851
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<komanda>]: prikazuje sve podržane komande. Ako se da i konkretna "
+"<komanda>, prikazuje njeno uputstvo za upotrebu."
+
+#: ../libempathy-gtk/empathy-chat.c:861
+#, c-format
+msgid "Usage: %s"
+msgstr "Korišćenje: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:890
+msgid "Unknown command"
+msgstr "Nepoznata komanda"
+
+#: ../libempathy-gtk/empathy-chat.c:1011
+msgid "Unknown command; see /help for the available commands"
+msgstr "Nepoznata komanda; pogledajte /help za dostupne komande"
+
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:525
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:528
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:531
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "too long message"
 msgstr "poruka je predugačka"
 
-#: ../libempathy-gtk/empathy-chat.c:534
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "not implemented"
 msgstr "nije podržano"
 
-#: ../libempathy-gtk/empathy-chat.c:537
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1169
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Greška pri slanju poruke „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:571
+#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Tema:"
+
+#: ../libempathy-gtk/empathy-chat.c:1291
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:573
+#: ../libempathy-gtk/empathy-chat.c:1293
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:988
+#: ../libempathy-gtk/empathy-chat.c:1772
+msgid "(No Suggestions)"
+msgstr "(Nema predloga)"
+
+#: ../libempathy-gtk/empathy-chat.c:1826
 msgid "Insert Smiley"
 msgstr "Ubaci smešak"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1006
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
-msgid "_Check Word Spelling..."
-msgstr "Proveri pi_sanje..."
+#: ../libempathy-gtk/empathy-chat.c:1878
+msgid "_Spelling Suggestions"
+msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s je ušao(la) u pričaonicu"
+#: ../libempathy-gtk/empathy-chat.c:1955
+msgid "Failed to retrieve recent logs"
+msgstr "Nije uspelo preuzimanje skorašnjih dnevnika"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:2061
+#, c-format
+msgid "%s has disconnected"
+msgstr "%s je otišao sa veze"
+
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2068
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr "%2$s je izbacio korisnika %1$s"
+
+#: ../libempathy-gtk/empathy-chat.c:2071
+#, c-format
+msgid "%s was kicked"
+msgstr "%s je izbačen"
+
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2079
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%2$s je zabranio pristup korisniku %1$s"
+
+#: ../libempathy-gtk/empathy-chat.c:2082
+#, c-format
+msgid "%s was banned"
+msgstr "Korisniku %s je zabranjen pristup"
+
+#: ../libempathy-gtk/empathy-chat.c:2086
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) pričaonicu"
 
-#: ../libempathy-gtk/empathy-chat.c:1276 ../src/empathy-call-window.c:764
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:2095
+#, c-format
+msgid " (%s)"
+msgstr " (%s)s"
+
+#: ../libempathy-gtk/empathy-chat.c:2120
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s je ušao(la) u pričaonicu"
+
+#: ../libempathy-gtk/empathy-chat.c:2145
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s je sada poznat kao %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1673
+#: ../libempathy-gtk/empathy-chat.c:2922
+msgid "Wrong password; please try again:"
+msgstr "Pogrešna lozinka, pokušajte ponovo:"
+
+#: ../libempathy-gtk/empathy-chat.c:2923
+msgid "Retry"
+msgstr "Pokušaj ponovo"
+
+#: ../libempathy-gtk/empathy-chat.c:2928
+msgid "This room is protected by a password:"
+msgstr "Ova soba je zaštićena lozinkom:"
+
+#: ../libempathy-gtk/empathy-chat.c:2929
+msgid "Join"
+msgstr "Priključi se"
+
+#: ../libempathy-gtk/empathy-chat.c:3069
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1723
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "Razgovor"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Tema:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Grupno ćaskanje"
-
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
 msgid "_Copy Link Address"
 msgstr "_Umnoži adresu veze"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:339
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
 msgid "_Open Link"
 msgstr "_Otvori vezu"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:432
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Podaci o profilu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
 msgid "Edit Contact Information"
 msgstr "Izmeni podatke o prijatelju"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Podaci o prijatelju"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Ja bih voleo da te dodam u moj spisak prijatelja."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+msgid "Personal Information"
+msgstr "Podaci o profilu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-individual-dialogs.c:112
 msgid "New Contact"
 msgstr "Novi prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Od_luči kasnije"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Zahtev za pretplatu"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2244
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2247
 msgid "Removing group"
 msgstr "Uklanjam grupu"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2332
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2334
 msgid "Removing contact"
 msgstr "Uklanjam prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Izvini, ne želim te više u mom spisku prijatelja."
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../libempathy-gtk/empathy-individual-menu.c:364
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Add Contact…"
+msgstr "Dod_aj prijatelja…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:489
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "Ća_skanje"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_Pozovi"
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:530
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio poziv"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:572
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video poziv"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:630
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Previous Conversations"
+msgstr "_Prethodni razgovori"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:671
+msgid "Send File"
+msgstr "Pošalji datoteku"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
-msgid "_View Previous Conversations"
-msgstr "_Pogledaj prethodne razgovore"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:713
+msgid "Share My Desktop"
+msgstr "Podeli moju radnu površinu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-msgid "Send file"
-msgstr "Pošalji datoteku"
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:747
+#: ../libempathy-gtk/empathy-individual-widget.c:1288
+msgid "Favorite"
+msgstr "Omiljeni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:774
 msgid "Infor_mation"
 msgstr "_Podaci"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:490
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "Izm_eni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
-msgid "Inviting to this room"
-msgstr "Pozivam u ovu sobu za ćaskanje"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:967
+#: ../src/empathy-chat-window.c:903
+msgid "Inviting you to this room"
+msgstr "Pozivam vas u ovu sobu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:367
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:1014
+msgid "_Invite to Chat Room"
 msgstr "Pozov_i u sobu za ćaskanje"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
-msgstr "Odaberite prijatelja"
+msgstr "Izaberite prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:360
-msgid "Save Avatar"
-msgstr "Sačuvaj sliku"
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Full name:"
+msgstr "Puno ime:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:416
-msgid "Unable to save avatar"
-msgstr "Ne mogu da sačuvam sliku"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr "Broj telefona:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-msgid "Select"
-msgstr "Izaberi"
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr "Adresa e-pošte:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:920
-#: ../src/empathy-main-window.c:991
-msgid "Group"
-msgstr "Grupa"
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Website:"
+msgstr "Veb stranica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Podaci o programu</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "Rođendan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Podaci o prijatelju</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-individual-widget.c:451
+msgid "Country ISO Code:"
+msgstr "ISO kod države:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:453
+msgid "Country:"
+msgstr "Država:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "State:"
+msgstr "Savezna jedinica:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "City:"
+msgstr "Grad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "Area:"
+msgstr "Oblast:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "Postal Code:"
+msgstr "Poštanski kod:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Street:"
+msgstr "Ulica:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Building:"
+msgstr "Zgrada:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Floor:"
+msgstr "Sprat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Room:"
+msgstr "Soba:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Text:"
+msgstr "Tekst:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "URI:"
+msgstr "Adresa:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Accuracy Level:"
+msgstr "Nivo tačnosti:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "Error:"
+msgstr "Greška:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Vertical Error (meters):"
+msgstr "Vertikalna greška (u metrima):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Horizontal Error (meters):"
+msgstr "Horizontalna greška (u metrima):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Speed:"
+msgstr "Brzina:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Bearing:"
+msgstr "Pravac:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Climb Speed:"
+msgstr "Brzina penjanja:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Last Updated on:"
+msgstr "Poslednji put ažurirano:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Longitude:"
+msgstr "Geografska dužina:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Latitude:"
+msgstr "Geografska širina:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Altitude:"
+msgstr "Visina:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:595
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Lokacija"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:597
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Prijatelj</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:646
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e.%d.%Y u %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grupe</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:837
+msgid "Save Avatar"
+msgstr "Sačuvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
-msgid "Account:"
-msgstr "Nalog:"
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:895
+msgid "Unable to save avatar"
+msgstr "Ne mogu da sačuvam sliku"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Lokacija</b> u (datum)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1223
 msgid "Alias:"
 msgstr "Nadimak:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
-msgid "Birthday:"
-msgstr "Rođendan:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Client Information"
+msgstr "Podaci o klijentu"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "Program:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Podaci o prijatelju"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
-msgid "Email:"
-msgstr "E-pošta"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
-msgid "Fullname:"
-msgstr "Puno ime:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Detalji o prijatelju"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1427
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
-msgid "Information requested..."
-msgstr "Zahtevni su podaci..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr "Zahtevani su podaci…"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Izdanje:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "Grupe"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"Odaberite grupe u kojima želite da se prijatelj nalazi.  Primetite da možete "
+"Izaberite grupe u kojima želite da se prijatelj nalazi.  Primetite da možete "
 "da odaberete i više grupa kao i nijednu."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
-msgid "Version:"
-msgstr "Izdanje:"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
-msgid "Web site:"
-msgstr "Veb adresa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "Dod_aj grupu"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "Izaberi"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "Grupa"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Odveži"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+msgid "Linked Contacts"
+msgstr "Povezani prijatelji"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:353
+msgid "Select contacts to link"
+msgstr "Izaberite prijatelja za povezivanje"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:426
+msgid "New contact preview"
+msgstr "Pregled novog prijatelja"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:470
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "Označeni prijatelji na spisku levo će biti uvezani"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:112
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:825
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Uredi"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:857
+msgctxt "Link individual (contextual menu)"
+msgid "_Link…"
+msgstr "_Poveži…"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "Meta-prijatelj sadrži %u prijatelja"
+msgstr[1] "Meta-prijatelj sadrži %u prijatelja"
+msgstr[2] "Meta-prijatelj sadrži %u prijatelja"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Lokacija</b> u (datum)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Nova mreža"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "Odaberite IRC mrežu"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "novi server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:282
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:109
+msgid "Link Contacts"
+msgstr "Poveži prijatelje"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid "_Link"
+msgstr "_Poveži"
+
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "Nalog"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "Datum"
 
 #. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "Razgovori"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Find Next"
+msgstr "Nađi sledeće"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Find Previous"
+msgstr "Nađi prethodno"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "Prethodni razgovori"
 
 #. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "Traži"
 
 #. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
 msgstr "_Za:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
-msgid "C_all"
-msgstr "_Pozovi"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "ID prijatelja:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
 msgid "C_hat"
 msgstr "Ć_askaj"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
-msgid "Contact ID:"
-msgstr "ID prijatelja:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
 msgid "New Conversation"
 msgstr "Novi razgovor"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
-msgstr "Proizvoljne poruke..."
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Proizvoljna poruka"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Poruka:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Sačuvaj poruku"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Stanje:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Reč"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Predlozi za reč"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+msgid "Send _Video"
+msgstr "Pošalji _video"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Provera pisanja"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Predlozi za reč:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Klasično"
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "_Pozovi"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Prosto"
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "New Call"
+msgstr "Novi poziv"
+
+#. COL_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
+msgstr "Proizvoljna poruka…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
+msgstr "Uredi proizvoljne poruke…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
+msgid "Click to remove this status as a favorite"
+msgstr "Kliknite da uklonite ovu statusnu poruku iz omiljenih"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
+msgid "Click to make this status a favorite"
+msgstr "Kliknite da stavite ovu statusnu poruku kao omiljenu"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
+msgid "Set status"
+msgstr "Postavi stanje"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
+msgid "Set your presence and current status"
+msgstr "Postavi vaše prisustvo i trenutno stanje"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Čisto"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+msgid "Custom messages…"
+msgstr "Proizvoljne poruke…"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Plavo"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Traži:"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1406
-msgid "Unable to open URI"
-msgstr "Ne mogu da otvorim adresu"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Poklopi velika i mala slova"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
-msgid "Select a file"
-msgstr "Izaberite datoteku"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Izraz nije nađen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1587
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "Primljena je brza poruka"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1589
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "Poslata je brza poruka"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1591
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "Dolazeći zahtev za ćaskanje"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1593
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "Prijatelj je na vezi"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1595
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "Prijatelj je otišao sa veze"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "Na vezi sa serverom"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1599
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "Isključen sa servera"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1601
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "Dolazeći poziv"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1603
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "Odlazeći poziv"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1605
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "Poziv je završen"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
+msgid "Enter Custom Message"
+msgstr "Unesi proizvoljnu poruku"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+msgid "Edit Custom Messages"
+msgstr "Uredi proizvoljne poruke"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Dodaj _novu postavku"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Snimljene postavke"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Klasično"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Prosto"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Čisto"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Plavo"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "Identitet servera za ćaskanje se ne može proveriti.\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Sertifikat nije potpisao Autoritet za sertifikate"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "Sertifikat je istekao"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "Sertifikat još nije aktiviran"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "Sertifikat nema očekivani otisak"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr ""
+"Ime domaćina koje je provereno u sertifikatu se ne slaže sa imenom servera"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "Sertifikat je samopotpisan"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "Sertifikat je povukao Autoritet za sertifikate koji ga je i izdao"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "Sertifikat je kriptografski slab"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "Dužina sertifikata premašuje granice koje se mogu proveriti"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "Sertifikat nije ispravan"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Očekivano ime domaćina: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Ime domaćina sertifikata: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "Nastavi"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "Ova veza nije od poverenja. Želite li ipak da nastavite?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "Zapamti ovaj izbor za naredne veze"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "Detalji sertifikata"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
+msgid "Unable to open URI"
+msgstr "Ne mogu da otvorim adresu"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
+msgid "Select a file"
+msgstr "Izaberite datoteku"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Dolazeća datoteka od %s"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Trenutni lokalitet"
@@ -1222,77 +2336,36 @@ msgstr "zapadni"
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Prijatelj za prikazivanje u programčetu. Prazno znači da nijedan prijatelj nije "
-"prikazan."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "Slika prijatelja. Prazno znači da prijatelj nema sliku."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megafon"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
-msgid "Talk!"
-msgstr "Pričaj!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_O programu"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "Podac_i"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
-msgid "_Preferences"
-msgstr "_Postavke"
-
-#: ../megaphone/src/megaphone-applet.c:255
-msgid "Please configure a contact."
-msgstr "Podesite prijatelja."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "Izabrani prijatelj ne može da primi datoteke."
 
-#: ../megaphone/src/megaphone-applet.c:348
-msgid "Select contact..."
-msgstr "Izaberite prijatelja..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "Izabrani prijatelj nije na vezi."
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Prisustvo"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "Nema poruka sa greškom"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
-msgid "Set your own presence"
-msgstr "Postavite prisustvo"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "Brza poruka (Pismonoša)"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:414
 msgid "Don't connect on startup"
 msgstr "Ne povezuj se po pokretanju"
 
-#: ../src/empathy.c:434
-msgid "Don't show the contact list on startup"
-msgstr "Ne prikazuj spisak prijatelja po pokretanju"
-
-#: ../src/empathy.c:438
-msgid "Show the accounts dialog"
-msgstr "Prikaži dijalog sa nalozima"
+#: ../src/empathy.c:418
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+"Ne prikazuj spisak prijatelja niti bilo koje drugo prozorče po pokretanju"
 
-#: ../src/empathy.c:450
-msgid "- Empathy Instant Messenger"
-msgstr "- Internet pismonoša"
+#: ../src/empathy.c:435
+msgid "- Empathy IM Client"
+msgstr "- Internet pismonoša za brze poruke"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1304,7 +2377,7 @@ msgstr ""
 "Zadužbina za Slobodni Softver (FSF); bilo verzije 2 te Licence, bilo (po "
 "vašem nahođenju) bilo koje novije verzije."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1316,7 +2389,7 @@ msgstr ""
 "PRILAGOĐENOSTI ODREĐENOJ NAMENI.  Vidite GNU Opštu Javnu Licencu za više "
 "detalja."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:93
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1326,11 +2399,11 @@ msgstr ""
 "pismonošu; ako niste, pišite Zadužbini za Slobodni Softver (Free Software "
 "Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomov program za brze poruke"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
 "Danilo Šergan <dsegan@gmx.net>\n"
@@ -1342,68 +2415,258 @@ msgstr ""
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/empathy-accounts-dialog.c:391
-msgid "Enabled"
-msgstr "Omogućeno"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "Greška pri uvoženju naloga."
+
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "Greška pri obradi detalja naloga."
+
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "Greška pri pravljenju naloga."
+
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "Dogodila se greška."
+
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr "Ispisana poruka greške: %s"
+
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
+"zatvorite asistenta i dodate naloge kasnije iz menija „Izmeni“."
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
-msgid "Accounts"
-msgstr "Nalozi"
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1310
+msgid "An error occurred"
+msgstr "Dogodila se greška"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
 #, c-format
 msgid "New %s account"
 msgstr "Novi %s nalog"
 
-#: ../src/empathy-accounts-dialog.c:943
-#, c-format
+#: ../src/empathy-account-assistant.c:509
+msgid "What kind of chat account do you have?"
+msgstr "Koji tip naloga za ćaskanje imate?"
+
+#: ../src/empathy-account-assistant.c:515
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
+
+#: ../src/empathy-account-assistant.c:521
+msgid "Enter your account details"
+msgstr "Unesite detalje naloga"
+
+#: ../src/empathy-account-assistant.c:526
+msgid "What kind of chat account do you want to create?"
+msgstr "Koji tip naloga za ćaskanje želite da napravite?"
+
+#: ../src/empathy-account-assistant.c:532
+msgid "Do you want to create other chat accounts?"
+msgstr "Da li želite da napravite još naloga za ćaskanje?"
+
+#: ../src/empathy-account-assistant.c:539
+msgid "Enter the details for the new account"
+msgstr "Unesite detalje novog naloga"
+
+#: ../src/empathy-account-assistant.c:654
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa prijateljima "
+"i kolegama koji koriste Google Talk, AIM, Windows Live i mnoge druge "
+"programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i "
+"audio i video pozive."
+
+#: ../src/empathy-account-assistant.c:671
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+"Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
+
+#: ../src/empathy-account-assistant.c:694
+msgid "Yes, import my account details from "
+msgstr "Da, uvezi detalje mog naloga iz "
+
+#: ../src/empathy-account-assistant.c:715
+msgid "Yes, I'll enter my account details now"
+msgstr "Da, ja ću sam uneti detalje naloga"
+
+#: ../src/empathy-account-assistant.c:737
+msgid "No, I want a new account"
+msgstr "Ne, želim novi nalog"
+
+#: ../src/empathy-account-assistant.c:747
+msgid "No, I just want to see people online nearby for now"
+msgstr "Ne, za sada samo želim da vidim ljude u blizini"
+
+#: ../src/empathy-account-assistant.c:768
+msgid "Select the accounts you want to import:"
+msgstr "Izaberite naloge koje želite da uvezete:"
+
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/empathy-account-assistant.c:859
+msgid "No, that's all for now"
+msgstr "Ne, to je sve za sada"
+
+#: ../src/empathy-account-assistant.c:1124
 msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
 msgstr ""
-"Uklonićete nalog %s!\n"
-"Da li želite da nastavite?"
+"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
+"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
+"su detalji ispod tačni. Lako ih možete izmeniti kasnije ili isključiti ovu "
+"mogućnost iz prozorčeta „Nalozi“."
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
+msgid "Edit->Accounts"
+msgstr "Izmeni->Nalozi"
+
+#: ../src/empathy-account-assistant.c:1146
+msgid "I don't want to enable this feature for now"
+msgstr "Ne, za sada ne želim da koristim ovu mogućnost"
+
+#: ../src/empathy-account-assistant.c:1182
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
 msgstr ""
-"Svi pridruženi razgovori i sobe za ćaskanje NEĆE biti uklonjeni ako "
-"nastavite.\n"
-"\n"
-"Ako ikada poželite da vratite nalog, oni će biti dostupni."
+"Ne mogu da ćaskam sa ljudima povezanim u vašu lokalnu mrežu jer telepathy-"
+"salut nije instaliran. Ako želite da omogućite ovo, instalirajte telepathy-"
+"salut paket i napravite nalog „Ljudi u okolini“ iz prozorčeta „Nalozi“."
+
+#: ../src/empathy-account-assistant.c:1188
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut nije instaliran"
+
+#: ../src/empathy-account-assistant.c:1234
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Asistent naloga za brze poruke i VoIP"
+
+#: ../src/empathy-account-assistant.c:1268
+msgid "Welcome to Empathy"
+msgstr "Dobrodošli u Internet Pismonošu"
+
+#: ../src/empathy-account-assistant.c:1277
+msgid "Import your existing accounts"
+msgstr "Uvezite vaše postojeće naloge"
+
+#: ../src/empathy-account-assistant.c:1295
+msgid "Please enter personal details"
+msgstr "Unesite lične podatke"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:65
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "Postoje nesačuvane izmene na vašem nalogu %s."
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:69
+msgid "Your new account has not been saved yet."
+msgstr "Vaš novi nalog još nije sačuvan."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Novi nalog</b>"
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+msgid "Connecting…"
+msgstr "Povezujem se…"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Nijedan protokol nije instaliran</b>"
+#: ../src/empathy-accounts-dialog.c:322
+#, c-format
+msgid "Offline — %s"
+msgstr "Nepovezan — %s"
+
+#: ../src/empathy-accounts-dialog.c:334
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Veza je prekinuta — %s"
+
+#: ../src/empathy-accounts-dialog.c:345
+msgid "Offline — No Network Connection"
+msgstr "Nepovezan — Nema mrežne konekcije"
+
+#: ../src/empathy-accounts-dialog.c:352
+msgid "Unknown Status"
+msgstr "Nepoznato stanje"
+
+#: ../src/empathy-accounts-dialog.c:364
+msgid "Offline — Account Disabled"
+msgstr "Nepovezan — Nalog je onemogućen"
+
+#: ../src/empathy-accounts-dialog.c:805
+msgid ""
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
+"Da li sigurno želite da nastavite?"
+
+#: ../src/empathy-accounts-dialog.c:1152
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vašeg računara?"
+
+#: ../src/empathy-accounts-dialog.c:1156
+msgid "This will not remove your account on the server."
+msgstr "Ovo neće ukloniti vaš nalog na serveru."
 
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Postavke</b>"
+#: ../src/empathy-accounts-dialog.c:1394
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Ovim ćete izabrati drugi nalog, zanemarivši unete izmene.\n"
+"Da li sigurno želite da nastavite?"
+
+#: ../src/empathy-accounts-dialog.c:1997
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Ovim ćete zatvoriti prozor, zanemarivši unete izmene.\n"
+"Da li sigurno želite da nastavite?"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
-msgid "Cr_eate"
-msgstr "N_apravi"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "Učitavam podatke o nalogu"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Već imam nalog koji želim da koristim"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "No protocol installed"
+msgstr "Nijedan protokol nije instaliran"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
-msgid "Import Accounts..."
-msgstr "Uvezi naloge..."
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Protocol:"
+msgstr "Protokol:"
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1411,254 +2674,459 @@ msgstr ""
 "Da biste dodali novi nalog, prvo morate da instalirate priključke za sve "
 "protokole koje želite da koristite."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
-msgid "Type:"
-msgstr "Vrsta:"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Add…"
+msgstr "Dod_aj…"
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Import…"
+msgstr "_Uvezi…"
+
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - Internet pismonoša klijent prijave"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Internet pismonoša klijent prijave"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "Ljudi u okolini"
+
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-call-window.c:346
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Internet pismonoša Audio/Video klijent"
+
+#: ../src/empathy-call-window.c:479
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:349
+#: ../src/empathy-call-window.c:482
 msgid "Brightness"
 msgstr "Osvetljenost"
 
-#: ../src/empathy-call-window.c:352
+#: ../src/empathy-call-window.c:485
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:590
 msgid "Volume"
 msgstr "Jačina zvuka"
 
-#: ../src/empathy-call-window.c:547
+#: ../src/empathy-call-window.c:1163
 msgid "_Sidebar"
 msgstr "_Bočna površ"
 
-#: ../src/empathy-call-window.c:565
-msgid "Dialpad"
-msgstr "Brojčanik"
-
-#: ../src/empathy-call-window.c:571
+#: ../src/empathy-call-window.c:1182
 msgid "Audio input"
 msgstr "Zvučni ulaz"
 
-#: ../src/empathy-call-window.c:575
+#: ../src/empathy-call-window.c:1186
 msgid "Video input"
 msgstr "Video ulaz"
 
-#: ../src/empathy-call-window.c:588
-msgid "Connecting..."
-msgstr "Uspostavljam vezu..."
+#: ../src/empathy-call-window.c:1190
+msgid "Dialpad"
+msgstr "Brojčanik"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:844
+#: ../src/empathy-call-window.c:1195
+msgid "Details"
+msgstr "Detalji"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1263
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "Povezan -- %d:%02dm"
+msgid "Call with %s"
+msgstr "Poziv sa korisnikom %s"
 
-#: ../src/empathy-call-window.glade.h:1
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1342
+msgid "Call"
+msgstr "Poziv"
+
+#: ../src/empathy-call-window.c:1496
+msgid "The IP address as seen by the machine"
+msgstr "IP adresa kako je vidi ovaj računar"
+
+#: ../src/empathy-call-window.c:1498
+msgid "The IP address as seen by a server on the Internet"
+msgstr "IP adresa kako je vidi server na internetu"
+
+#: ../src/empathy-call-window.c:1500
+msgid "The IP address of the peer as seen by the other side"
+msgstr "IP adresa vršnjaka kako je vidi druga strana"
+
+#: ../src/empathy-call-window.c:1502
+msgid "The IP address of a relay server"
+msgstr "IP adresa relejnog servera"
+
+#: ../src/empathy-call-window.c:1504
+msgid "The IP address of the multicast group"
+msgstr "IP adresa grupe za višestruko emitovanje"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:2237
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Povezan — %d:%02dm"
+
+#: ../src/empathy-call-window.c:2298
+msgid "Technical Details"
+msgstr "Tehnički detalji"
+
+#: ../src/empathy-call-window.c:2336
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "Program %s ne razume nijedan zvučni format koji podržava vaš računar"
+
+#: ../src/empathy-call-window.c:2341
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "Program %s ne razume nijedan video format koji podržava vaš računar"
+
+#: ../src/empathy-call-window.c:2347
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja "
+"ne dozvoljava direktne veze."
+
+#: ../src/empathy-call-window.c:2353
+msgid "There was a failure on the network"
+msgstr "Došlo je do greške u mreži"
+
+#: ../src/empathy-call-window.c:2357
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Zvučni formati potrebni za ovaj poziv nisu instalirani na vašem računaru"
+
+#: ../src/empathy-call-window.c:2360
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Video formati potrebni za ovaj poziv nisu instalirani na vašem računaru"
+
+#: ../src/empathy-call-window.c:2370
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Nešto neočekivano se desilo u komponenti Telepatije. Prijavite <a href=\"%s"
+"\">ovu grešku</a> i prikačite dnevnike pokupljene iz prozora „Otklanjanje "
+"grešaka“ u meniju „Pomoć“."
+
+#: ../src/empathy-call-window.c:2378
+msgid "There was a failure in the call engine"
+msgstr "Došlo je do greške u motoru za pozive"
+
+#: ../src/empathy-call-window.c:2381
+msgid "The end of the stream was reached"
+msgstr "Dostignut je kraj toka"
+
+#: ../src/empathy-call-window.c:2421
+msgid "Can't establish audio stream"
+msgstr "Ne mogu da uspostavim zvučni tok"
+
+#: ../src/empathy-call-window.c:2431
+msgid "Can't establish video stream"
+msgstr "Ne mogu da uspostavim video tok"
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera Off"
+msgstr "Isklj. kameru"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Camera On"
+msgstr "Uklj. kameru"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Kodek za dekodiranje:"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Onemogući kameru i prestani da šalješ video"
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Omogući kameru i šalji video"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Omogući kameru, ali ne šalji video"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Kodek za kodiranje:"
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "Spusti"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Spusti trenutni poziv"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokalni kandidat:"
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Preview"
+msgstr "Pregled"
+
+#: ../src/empathy-call-window.ui.h:14
+msgid "Redial"
+msgstr "Ponovo zovi"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Udaljeni kandidat:"
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "Pošalji zvuk"
 
-#: ../src/empathy-call-window.glade.h:3
-msgid "Send video"
-msgstr "Pošalji video"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Uključi/isključi prenos zvuka"
+
+#: ../src/empathy-call-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#: ../src/empathy-call-window.glade.h:4
-msgid "Video preview"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "Video"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Video Off"
+msgstr "Isklj. video"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Video On"
+msgstr "Uklj. video"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video Preview"
 msgstr "Pregled videa"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Pozovi"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "_Pregled"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
 #, c-format
-msgid "Conversations (%d)"
-msgstr "Razgovori (%d)"
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d nepročitana)"
+msgstr[1] "%s (%d nepročitane)"
+msgstr[2] "%s (%d nepročitanih)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Tema:"
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (i %u ostala)"
+msgstr[1] "%s (i %u ostale)"
+msgstr[2] "%s (i %u ostalih)"
 
-#: ../src/empathy-chat-window.c:423
-msgid "Typing a message."
-msgstr "Kuca poruku."
+#: ../src/empathy-chat-window.c:480
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d nepročitana od ostalih)"
+msgstr[1] "%s (%d nepročitane od ostalih)"
+msgstr[2] "%s (%d nepročitanih od ostalih)"
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:428
+#: ../src/empathy-chat-window.c:489
 #, c-format
-msgid "New message from %s"
-msgstr "Nova poruka od %s"
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d nepročitana od svih)"
+msgstr[1] "%s (%d nepročitane od svih)"
+msgstr[2] "%s (%d nepročitanih od svih)"
+
+#: ../src/empathy-chat-window.c:695
+msgid "Typing a message."
+msgstr "Kuca poruku."
 
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Očisti"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "_Prijatelj"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "Ćaskanje"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Ubaci _smešak"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Pozi_vnica:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Pozovi"
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Pozovi _učesnike…"
 
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "Premesti jezičak _levo"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "Premesti jezičak _desno"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Izaberite koga želite da pozovete:"
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Obavesti za sve poruke"
 
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Pozvani ste da se priključite konferencijskom ćaskanju."
-
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "_Prijatelj"
-
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Razgovor"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "_Otkači list"
 
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Edit"
+msgstr "Izm_eni"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Favorite Chat Room"
 msgstr "O_miljena soba za ćaskanje"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Sledeći list"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "P_rethodni list"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
+msgid "_Show Contact List"
+msgstr "Prikaži _spisak prijatelja"
+
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "_Listovi"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "_Opozovi zatvaranje jezička"
+
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "Soba"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "Automatsko povezivanje"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Izmeni omiljenu sobu"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Priključi se sobi po pokretanju"
-
-# Da ne komplikujemo, a? ~Miloš
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Pridruži se ovoj sobi za ćaskanje po povezivanju Internet pismonoše"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Uredi omiljene sobe"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Ime:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_erver:"
+#: ../src/empathy-event-manager.c:468
+msgid "Incoming video call"
+msgstr "Dolazeći video poziv"
 
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Soba:"
-
-#: ../src/empathy-event-manager.c:376
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: ../src/empathy-event-manager.c:379
+#: ../src/empathy-event-manager.c:472
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s vas zove, želite li da se javite?"
-
-#: ../src/empathy-event-manager.c:386
-msgid "_Reject"
-msgstr "_Odbaci"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s vas zove video pozivom. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:392
-msgid "_Answer"
-msgstr "_Javi se"
+#: ../src/empathy-event-manager.c:473
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s vas zove. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:515
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dolazni poziv od %s"
 
-#: ../src/empathy-event-manager.c:563
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s vam nudi pozivnicu"
+#: ../src/empathy-event-manager.c:501
+msgid "_Reject"
+msgstr "_Odbaci"
 
-#: ../src/empathy-event-manager.c:569
-msgid "An external application will be started to handle it."
-msgstr "Spoljni program će biti pokrenut za obradu."
+#: ../src/empathy-event-manager.c:507
+msgid "_Answer"
+msgstr "_Javi se"
 
-#: ../src/empathy-event-manager.c:574
-msgid "You don't have the needed external application to handle it."
-msgstr "Nemate potrebni spoljni program za obradu."
+#: ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Dolazni video poziv od %s"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:695
 msgid "Room invitation"
 msgstr "Pozivnice za sobu"
 
-#: ../src/empathy-event-manager.c:700
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Pozivnica da se pridružite u %s"
+
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:708 ../src/empathy-ft-manager.c:1031
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../src/empathy-event-manager.c:713
+#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Priključi se"
 
@@ -1667,17 +3135,22 @@ msgstr "_Priključi se"
 msgid "%s invited you to join %s"
 msgstr "%s vas je pozvao(la) da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:866
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "Pozvani ste da se pridružite u %s"
+
+#: ../src/empathy-event-manager.c:797
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Dolazni prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:960
+#: ../src/empathy-event-manager.c:1005
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s vam je uputio(la) zahtev za pretplatu"
 
-#: ../src/empathy-event-manager.c:964
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -1686,174 +3159,128 @@ msgstr ""
 "\n"
 "Poruka: %s"
 
+#: ../src/empathy-event-manager.c:1052
+#, c-format
+msgid "%s is now offline."
+msgstr "%s nije više na vezi."
+
+#: ../src/empathy-event-manager.c:1072
+#, c-format
+msgid "%s is now online."
+msgstr "%s je sada na vezi."
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:117
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "Nije naveden razlog"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr "Zahtevana je promena stanja"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr "Obustavili ste prenos datoteke"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr "Druga strana je prekinula prenos datoteke"
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr "Greška prilikom prenosa datoteke"
+#: ../src/empathy-ft-manager.c:178
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strana nije u mogućnosti da prenese datoteku"
+#: ../src/empathy-ft-manager.c:273
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s od %s u %s/s"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
+#: ../src/empathy-ft-manager.c:274
+#, c-format
+msgid "%s of %s"
+msgstr "%s od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Primam „%s“ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Šaljem „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Nepoznato"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:338
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Greška pri primanju „%s“ od %s"
+
+#: ../src/empathy-ft-manager.c:341
+msgid "Error receiving a file"
+msgstr "Greška pri primanju datoteke"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:346
 #, c-format
-msgid "%s of %s"
-msgstr "%s od %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Greška pri slanju „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "Čekam na odgovor druge strane"
+#: ../src/empathy-ft-manager.c:349
+msgid "Error sending a file"
+msgstr "Greška pri slanju datoteke"
 
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ je primljen od %s"
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "„%s“ se prima od %s"
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+msgid "Waiting for the other participant's response"
+msgstr "Čekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "„%s“ se šalje za %s"
+msgid "Checking integrity of \"%s\""
+msgstr "Proveravam integritet datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Prenos datoteke je obustavljen: %s"
+msgid "Hashing \"%s\""
+msgstr "Tražim heš datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-ft-manager.c:663
+#: ../src/empathy-ft-manager.c:996
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:675
+#: ../src/empathy-ft-manager.c:1008
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:697
+#: ../src/empathy-ft-manager.c:1030
 msgid "Remaining"
 msgstr "Preostalo"
 
-#: ../src/empathy-ft-manager.c:895
-msgid "Cannot save file to this location"
-msgstr "Ne mogu da sačuvam datoteku na ovo mesto"
-
-#: ../src/empathy-ft-manager.c:941
-msgid "Save file as..."
-msgstr "Sačuvaj kao..."
-
-#: ../src/empathy-ft-manager.c:1011
-msgid "unknown size"
-msgstr "nepoznata veličina"
-
-#: ../src/empathy-ft-manager.c:1017
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s želi da vam pošalje datoteku"
-
-#: ../src/empathy-ft-manager.c:1022
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Da li želite da prihvatite datoteku „%s“ (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1040
-msgid "_Accept"
-msgstr "P_rihvati"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Prenosi datoteka"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ukloni završene, otkazane i neuspešne prenose datoteka iz liste"
 
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:260
-msgid "Import"
-msgstr "Uvezi"
-
-#: ../src/empathy-import-dialog.c:269
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../src/empathy-import-dialog.c:295
-msgid "Source"
-msgstr "Izvor"
-
-#: ../src/empathy-import-dialog.c:383
+#: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1861,137 +3288,178 @@ msgstr ""
 "Nisam pronašao nijedan nalog za uvoz. Internet pismonoša trenutno podržava "
 "samo uvoženje naloga iz Pidžina."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
 msgstr "Uvezite naloge"
 
-#: ../src/empathy-main-window.c:391
-msgid "No error specified"
-msgstr "Nije navedena nijedna greška"
-
-#: ../src/empathy-main-window.c:394
-msgid "Network error"
-msgstr "Greška u mreži"
-
-#: ../src/empathy-main-window.c:397
-msgid "Authentication failed"
-msgstr "Neuspešna prijava"
-
-#: ../src/empathy-main-window.c:400
-msgid "Encryption error"
-msgstr "Greška pri šifrovanju"
-
-#: ../src/empathy-main-window.c:403
-msgid "Name in use"
-msgstr "Ime je u upotrebi"
-
-#: ../src/empathy-main-window.c:406
-msgid "Certificate not provided"
-msgstr "Sertifikat nije prosleđen"
-
-#: ../src/empathy-main-window.c:409
-msgid "Certificate untrusted"
-msgstr "Sertifikat nije od poverenja"
-
-#: ../src/empathy-main-window.c:412
-msgid "Certificate expired"
-msgstr "Sertifikat je istekao"
-
-#: ../src/empathy-main-window.c:415
-msgid "Certificate not activated"
-msgstr "Sertifikat nije aktiviran"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:292
+msgid "Import"
+msgstr "Uvezi"
 
-#: ../src/empathy-main-window.c:418
-msgid "Certificate hostname mismatch"
-msgstr "Ime domaćina sertifikata se ne poklapa"
+#: ../src/empathy-import-widget.c:301
+msgid "Protocol"
+msgstr "Protokol"
 
-#: ../src/empathy-main-window.c:421
-msgid "Certificate fingerprint mismatch"
-msgstr "Otisak sertifikata se ne poklapa"
+#: ../src/empathy-import-widget.c:325
+msgid "Source"
+msgstr "Izvor"
 
-#: ../src/empathy-main-window.c:424
-msgid "Certificate self-signed"
-msgstr "Sertifikat je samopotpisan"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "Nema nijedno poklapanje"
 
-#: ../src/empathy-main-window.c:427
-msgid "Certificate error"
-msgstr "Greška u sertifikatu"
+#: ../src/empathy-main-window.c:535
+msgid "Reconnect"
+msgstr "Ponovo se poveži"
 
-#: ../src/empathy-main-window.c:430
-msgid "Unknown error"
-msgstr "Nepoznata greška"
+#: ../src/empathy-main-window.c:541
+msgid "Edit Account"
+msgstr "Izmeni nalog"
 
-#: ../src/empathy-main-window.c:594
-msgid "Show and edit accounts"
-msgstr "Prikaži i izmeni naloge"
+#: ../src/empathy-main-window.c:547
+msgid "Close"
+msgstr "Zatvori"
 
-#: ../src/empathy-main-window.c:974
+#: ../src/empathy-main-window.c:1229
 msgid "Contact"
 msgstr "Prijatelj"
 
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "Izm_eni nalog"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.c:1554
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.c:1663
+msgid "Show and edit accounts"
+msgstr "Prikaži i izmeni naloge"
+
+#: ../src/empathy-main-window.ui.h:1
+msgid "Contacts on a _Map"
+msgstr "Prijatelji na _mapi"
+
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
 msgstr "Kontekst"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "P_ridruži se omiljenim"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Pridruži se _novoj..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "Uredi omiljene"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Prikaži nep_ovezane prijatelje"
+#: ../src/empathy-main-window.ui.h:5
+msgid "N_ormal Size"
+msgstr "N_ormalna veličina"
+
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Novi po_ziv…"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Normalna veličina sa _avatarima"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "P_references"
+msgstr "_Postavke"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Prikaži p_rotokole"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Sort by _Name"
+msgstr "Sortiraj po ime_nu"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:11
+msgid "Sort by _Status"
+msgstr "Sortiraj po _stanju"
+
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "N_alozi"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "Dod_aj prijatelja..."
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Compact Size"
+msgstr "_Kompaktna veličina"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_Debug"
+msgstr "Otklanjanje _grešaka"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
-msgid "_New Conversation..."
-msgstr "_Novi razgovori..."
+#: ../src/empathy-main-window.ui.h:19
+msgid "_File Transfers"
+msgstr "Prenosi _datoteka"
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Join…"
+msgstr "_Priključi se…"
+
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_Novi razgovor…"
+
+#: ../src/empathy-main-window.ui.h:23
+msgid "_Offline Contacts"
+msgstr "Nep_ovezane prijatelji"
+
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "Lični _podaci"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "_Soba"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:379
+msgid "Chat Room"
 msgstr "Sobe za ćaskanje"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Razgledaj:"
+#: ../src/empathy-new-chatroom-dialog.c:395
+msgid "Members"
+msgstr "Članovi"
+
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:607
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s\n"
+"Potrebna pozivnica: %s\n"
+"Potrebna lozinka: %s\n"
+"Članovi: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
+msgid "No"
+msgstr "Ne"
+
+#: ../src/empathy-new-chatroom-dialog.c:638
+msgid "Could not start room listing"
+msgstr "Ne mogu da pokrenem listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:648
+msgid "Could not stop room listing"
+msgstr "Ne mogu da zaustavim listanje spiska soba"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Ne mogu da učitam spisak soba"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Ovde unesite ime sobe za pridruživanje ili kliknite na neku od soba u listi."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -1999,184 +3467,337 @@ msgstr ""
 "Unesite server koji ugošćava sobe, ili ostavite prazno ako su sobe na "
 "serveru na kojem vam je nalog"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Priključi se"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Priključi se novoj"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Pridruži se sobi"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "O_sveži"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "Ova lista predstavlja sve sobe za ćaskanje na serveru koji ste uneli."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Soba:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:398
+#: ../src/empathy-preferences.c:445
 msgid "Language"
 msgstr "Jezik"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Izgled</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Ponašanje</b>"
-
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Spisak prijatelja</b>"
-
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Omogući proveru pravopisa za sledeće jezike:</b>"
-
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Pusti zvuk za događaje</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>Ovaj spisak jezika predstavlja samo one jezike za koje imate  "
-"instalirane rečnike.</small>"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "Postavke"
 
-#: ../src/empathy-preferences.glade.h:7
-msgid "Automatically _connect on startup "
-msgstr "Automatski se pove_ži po pokretanju "
+#: ../src/empathy-preferences.ui.h:1
+msgid "Appearance"
+msgstr "Izgled"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Slike bira korisnik i one se prikazuju u spisku prijatelja"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Behavior"
+msgstr "Ponašanje"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "Tema ćaskanja:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "Isključi obaveštenja kada sam odsutan ili zauzet"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "Isključi zvukove kada sam odsutan ili zauzet"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Prikaži dolazne događaje u obaveštajnoj zoni"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Enable notifications when a contact comes online"
+msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Enable notifications when a contact goes offline"
+msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Omogući obaveštenja kada ćaskanja nisu u fokusu"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable spell checking for languages:"
+msgstr "Omogući proveru pravopisa za sledeće jezike:"
+
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Izvori lokacija:"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "Beleži razgovore"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../src/empathy-preferences.glade.h:15
-msgid "Preferences"
-msgstr "Postavke"
+#: ../src/empathy-preferences.ui.h:16
+msgid "Play sound for events"
+msgstr "Pusti zvuk za događaje"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Prik_aži slike"
+#: ../src/empathy-preferences.ui.h:17
+msgid "Privacy"
+msgstr "Privatnost"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:18
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Umanjena preciznost lokacije podrazumeva da će najprecizniji podaci o vašoj "
+"lokaciji biti grad i država.  GPS koordinate će biti tačne do 1. decimale."
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "Prikaži slike _smešaka"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Prikaži z_bijeni spisak prijatelja"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Sortiraj po ime_nu"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Sor_tiraj po stanju"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Show contact _list in rooms"
+msgstr "Prikaži _spisak prijatelja u sobama"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Zvukovi"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "Provera pisanja"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
+"rečnike."
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "_Automatski se poveži po pokretanju "
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Cellphone"
+msgstr "_Mobilni telefon"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "Omogući obav_eštenja u oblačićima"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "Omogući zvukovna obav_eštenja"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:29
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Mreža (IP, bežična)"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "_Otvaraj ćaskanja u novim prozorima"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Publish location to my contacts"
+msgstr "Objavi lokaciji mojim _prijateljima"
+
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
+msgid "_Reduce location accuracy"
+msgstr "Umanji _tačnost lokacije"
+
+#: ../src/empathy-status-icon.c:141
+msgid "Respond"
+msgstr "Odgovori"
+
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Odbaci"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Javi se"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Odbij"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Prihvati"
+
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "Prikaži _spisak prijatelja"
+#: ../src/empathy-map-view.c:452
+msgid "Contact Map View"
+msgstr "Mapa prijatelja"
 
-#: ../src/empathy-tube-dispatch.c:364
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Ne mogu da pokrenem program servisa %s“: %s"
+#: ../src/empathy-debug-window.c:1219
+msgid "Save"
+msgstr "Sačuvaj"
 
-#: ../src/empathy-tube-dispatch.c:435
-#, c-format
+#: ../src/empathy-debug-window.c:1395
+msgid "Debug Window"
+msgstr "Prozor za otklanjanje grešaka"
+
+#: ../src/empathy-debug-window.c:1475
+msgid "Pause"
+msgstr "Pauza"
+
+#: ../src/empathy-debug-window.c:1487
+msgid "Level "
+msgstr "Nivo"
+
+#: ../src/empathy-debug-window.c:1507
+msgid "Debug"
+msgstr "Otklanjanje grešaka"
+
+#: ../src/empathy-debug-window.c:1513
+msgid "Info"
+msgstr "Informacija"
+
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+msgid "Message"
+msgstr "Poruka"
+
+#: ../src/empathy-debug-window.c:1525
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: ../src/empathy-debug-window.c:1531
+msgid "Critical"
+msgstr "Kritična"
+
+#: ../src/empathy-debug-window.c:1537
+msgid "Error"
+msgstr "Greška"
+
+#: ../src/empathy-debug-window.c:1556
+msgid "Time"
+msgstr "Vreme"
+
+#: ../src/empathy-debug-window.c:1559
+msgid "Domain"
+msgstr "Domen"
+
+#: ../src/empathy-debug-window.c:1561
+msgid "Category"
+msgstr "Kategorija"
+
+#: ../src/empathy-debug-window.c:1563
+msgid "Level"
+msgstr "Nivo"
+
+#: ../src/empathy-debug-window.c:1600
 msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "Izabrani upravnik veze nema proširenje za udaljeno otklanjanje grešaka."
+
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Pozovi učesnike"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
+
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Pozovi"
+
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
-"Pozivnica je ponuđena za servis %s, ali nemate potreban program za obradu."
+"Ne prikazuj nijedno prozorče; uradi posao koji imaš (npr. uvoženje) i izađi"
+
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "Ne prikazuj nijedno prozorče ukoliko postoje ne-salut nalozi"
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Početno izabiranje datog naloga (npr. gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<identifikacija naloga>"
+
+#: ../src/empathy-accounts.c:200
+msgid "- Empathy Accounts"
+msgstr "- Pismonošini nalozi"
+
+#: ../src/empathy-accounts.c:216
+msgid "Empathy Accounts"
+msgstr "Pismonošini nalozi"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Pismonošino otklanjanje grešaka"
+
+#~ msgid "_Character set:"
+#~ msgstr "_Skup znakova:"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "Adresa _e-pošte:"
+
+#~ msgid "_Nickname:"
+#~ msgstr "_Nadimak:"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>Lokacija</b>,"