diff --git a/NEWS b/NEWS
index 9beea0b..0c8259b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,47 @@
+NEW in 2.32.0.1 (04/10/2010)
+===============
+
+This release in the stable 2.32 branches fixes various bugs and brings some
+small improvements. We suggest distributions shipping GNOME 2.32 to use this version.
+If it's too late for you, we strongly recommend that you backport at least these
+two patches:
+
+http://git.gnome.org/browse/empathy/commit/?h=gnome-2-32&id=045d3c82deb7d6288c9026c98dc1b836370864ed
+without it newly created GTalk accounts won't be able to connect.
+
+http://git.gnome.org/browse/empathy/commit/?h=gnome-2-32&id=6c7d6ae27283e2a54b97198baedfe9c26b812b46
+which fixes a crash when trying to connect to some XMPP servers.
+
+Dependencies:
+
+ • GTK+ ≥ 2.22.0
+
+Bugs fixed:
+ - Fixed #631095, auth client crashes when trying to connect (Cosimo Cecchi)
+ - Fixed #558802, show the "new message" icon regardless of focus, active tab (Guillaume Desmottes)
+ - Fixed #593437, Should leave fullscreen mode when call is disconnected (Guillaume Desmottes)
+ - Fixed #629782, doesn't check unique result (Guillaume Desmottes)
+ - Fixed #629912, Better heuristic to pick default individual (Guillaume Desmottes)
+ - Fixed #629922, Contacts list window triggers _NET_ACTIVE_WINDOW timestamp error from Metacity (Guillaume Desmottes)
+ - Fixed #630107, update Empathy to deprecation changes in GTK+ 2.22 (Diego Escalante Urrelo)
+ - Fixed #630276, Hitting redial doesn't clear error messages (Guillaume Desmottes)
+ - Fixed #630427, Empathy Loses ContactInfo data it doesn't support in the UI (Guillaume Desmottes)
+ - Fixed #631098, Always show status icon in contact right-click menu (for meta-contacts)
+ - Fixed #630544, Refers to a nonexistent UI item (Milo Casagrande)
+ - Fixed #631049, Recommended SIP provider no longer available (Milo Casagrande)
+
+Translations:
+ - Updated el Translation (Simos Xenitellis, Giannis Katsampirhs)
+ - Updated es Translation (Jorge González)
+ - Updated lt Translation (Žygimantas Beručka)
+ - Updated nl Translation (Hannie Dumoleyn)
+ - Updated sv Translation (Daniel Nylander)
+
+Documentation translations:
+ - Updated el Documentation translation (Michael Kotsarinis)
+ - Updated hu Documentation translation (Gabor Kelemen)
+ - Updated it Documentation translation (Milo Casagrande)
+
 NEW in 2.32.0 (27/09/2010)
 =============
 
diff --git a/configure.ac b/configure.ac
index 2b80f37..3349402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define(empathy_released, 0)
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [32])
 m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
diff --git a/data/element-properties b/data/element-properties
index 2986ecb..af1d275 100644
--- a/data/element-properties
+++ b/data/element-properties
@@ -46,3 +46,9 @@ slave-method=2
 
 [rtph264pay]
 config-interval=5
+
+[rtppcmupay]
+ptime-multiple=20000000
+
+[rtppcmapay]
+ptime-multiple=20000000
diff --git a/help/el/el.po b/help/el/el.po
index 841c3c1..62f7262 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -4,9 +4,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-help-el-4325__.merged\n"
-"POT-Creation-Date: 2010-08-30 11:19+0000\n"
-"PO-Revision-Date: 2010-08-31 22:32+0200\n"
-"Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n"
+"POT-Creation-Date: 2010-09-29 11:54+0000\n"
+"PO-Revision-Date: 2010-09-30 22:46+0200\n"
+"Last-Translator: Michael Kotsarinis <mk73628@hotmail.com>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,9 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None)
-#: C/video-call.page:63(None)
+#: C/video-call.page:38(None)
 #: C/audio-video.page:70(None)
-#: C/audio-call.page:65(None)
+#: C/audio-call.page:36(None)
 msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 
@@ -40,6 +39,7 @@ msgstr "Έναρξη βιντεοσυζήτησης με τις επαφές σ
 #: C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name)
 #: C/prev-conv.page:16(name)
+#: C/link-contacts.page:15(name)
 #: C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name)
 #: C/irc-nick-password.page:18(name)
@@ -48,7 +48,7 @@ msgstr "Έναρξη βιντεοσυζήτησης με τις επαφές σ
 #: C/irc-join-pwd.page:17(name)
 #: C/irc-commands.page:10(name)
 #: C/introduction.page:13(name)
-#: C/index.page:18(name)
+#: C/index.page:19(name)
 #: C/import-account.page:23(name)
 #: C/hide-contacts.page:11(name)
 #: C/group-conversations.page:19(name)
@@ -62,7 +62,7 @@ msgstr "Έναρξη βιντεοσυζήτησης με τις επαφές σ
 #: C/disable-account.page:20(name)
 #: C/create-account.page:18(name)
 #: C/audio-video.page:17(name)
-#: C/audio-call.page:18(name)
+#: C/audio-call.page:19(name)
 #: C/add-account.page:20(name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
@@ -79,6 +79,7 @@ msgstr "Milo Casagrande"
 #: C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email)
 #: C/prev-conv.page:17(email)
+#: C/link-contacts.page:16(email)
 #: C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email)
 #: C/irc-nick-password.page:19(email)
@@ -87,7 +88,7 @@ msgstr "Milo Casagrande"
 #: C/irc-join-pwd.page:18(email)
 #: C/irc-commands.page:11(email)
 #: C/introduction.page:14(email)
-#: C/index.page:19(email)
+#: C/index.page:20(email)
 #: C/import-account.page:24(email)
 #: C/hide-contacts.page:12(email)
 #: C/group-conversations.page:20(email)
@@ -101,7 +102,7 @@ msgstr "Milo Casagrande"
 #: C/disable-account.page:21(email)
 #: C/create-account.page:19(email)
 #: C/audio-video.page:18(email)
-#: C/audio-call.page:19(email)
+#: C/audio-call.page:20(email)
 #: C/add-account.page:21(email)
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
@@ -110,7 +111,7 @@ msgstr "milo@ubuntu.com"
 #: C/status-icons.page:24(p)
 #: C/share-desktop.page:17(p)
 #: C/set-custom-status.page:23(p)
-#: C/send-message.page:20(p)
+#: C/send-message.page:21(p)
 #: C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p)
 #: C/remove-account.page:22(p)
@@ -120,6 +121,7 @@ msgstr "milo@ubuntu.com"
 #: C/prob-conn-auth.page:25(p)
 #: C/prob-conn-acctdisabled.page:22(p)
 #: C/prev-conv.page:24(p)
+#: C/link-contacts.page:19(p)
 #: C/irc-start-conversation.page:19(p)
 #: C/irc-send-file.page:20(p)
 #: C/irc-nick-password.page:22(p)
@@ -128,7 +130,7 @@ msgstr "milo@ubuntu.com"
 #: C/irc-join-pwd.page:21(p)
 #: C/irc-commands.page:14(p)
 #: C/introduction.page:17(p)
-#: C/index.page:22(p)
+#: C/index.page:23(p)
 #: C/import-account.page:31(p)
 #: C/hide-contacts.page:15(p)
 #: C/group-conversations.page:23(p)
@@ -143,7 +145,7 @@ msgstr "milo@ubuntu.com"
 #: C/create-account.page:22(p)
 #: C/change-status.page:23(p)
 #: C/audio-video.page:21(p)
-#: C/audio-call.page:22(p)
+#: C/audio-call.page:23(p)
 #: C/add-contact.page:22(p)
 #: C/add-account.page:28(p)
 #: C/accounts-window.page:22(p)
@@ -152,35 +154,76 @@ msgstr "milo@ubuntu.com"
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: C/video-call.page:35(title)
+#: C/video-call.page:28(title)
 msgid "Start a video conversation"
 msgstr "Έναρξη βιντεοκλήσης"
 
-#: C/video-call.page:37(p)
-msgid "If you have a webcam, you can call your contacts and have an video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
+#: C/video-call.page:30(p)
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have an video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
+msgid "If you have a webcam, you can call your contacts and have a video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
 msgstr "Αν έχετε κάμερα, μπορείτε να κάνετε βιντεοκλήσεις με τις επαφές σας. Αυτή η δυνατότητα υπάρχει μόνο για ορισμένους τύπους λογαριασμών, και προϋποθέτει ότι ο συνομιλητής σας διαθέτει και αυτός εφαρμογή που υποστηρίζει βιντεοκλήσεις."
 
-#: C/video-call.page:44(p)
-msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Video Call</gui>. Alternatively, right click the contact and choose <gui style=\"menuitem\">Video Call</gui>."
+#: C/video-call.page:37(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
+msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Video Call</gui>."
 msgstr "Από το παράθυρο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και επιλέξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>. Εναλλακτικά, κάνετε δεξί κλικ στο όνομα της επαφής και επιλέξτε  <gui>Βιντεοκλήση</gui>."
 
-#: C/video-call.page:50(p)
-#: C/audio-call.page:52(p)
+#: C/video-call.page:43(p)
+#: C/audio-call.page:42(p)
 msgid "A new window will open. When the connection is established, you will see <gui>Connected</gui> at the bottom of the window, along with the total conversation time."
 msgstr "Θα ανοίξει ένα νέο παράθυρο. Όταν επιτευχθεί η σύνδεση, θα δείτε το μήνυμα <gui>Σε σύνδεση</gui> στο κάτω μέρος του παραθύρου, μαζί με τη διάρκεια της συνομιλίας."
 
-#: C/video-call.page:55(p)
-#: C/audio-call.page:57(p)
-#| msgid ""
-#| "To end the conversation, choose <guiseq><gui style=\"menu\">Call</"
-#| "gui><gui style=\"menuitem\">Hang up</gui></guiseq>."
+#: C/video-call.page:48(p)
+#: C/audio-call.page:48(p)
 msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr "Για να τερματίσετε τη συνομιλία, επιλέξτε <gui style=\"button\">Κλείσιμο</gui>."
 
-#: C/video-call.page:61(p)
-msgid "To turn a video conversation into an audio conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> toolbar button to deselect it."
+#: C/video-call.page:54(p)
+#| msgid ""
+#| "To turn a video conversation into an audio conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#| "it."
+msgid "To turn a video conversation into an audio conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr "Για να μετατρέψετε μια βιντεοκλήση σε φωνητική συνομιλία, επιλέξτε <guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο ανενεργό</gui></guiseq>, ή πατήστε το κουμπί <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> της εργαλειοθήκης για να το αποεπιλέξετε."
 
+#: C/video-call.page:60(title)
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a video conversation with a meta-contact"
+msgstr "Έναρξη βιντεοσυζήτησης με μια μετα-επαφή"
+
+#: C/video-call.page:63(p)
+#: C/send-message.page:53(p)
+#: C/audio-call.page:66(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click on the drop-down list at "
+#| "the top."
+msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "Στο παράθυρο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ στη μετα-επαφή."
+
+#: C/video-call.page:68(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Video Call</gui>."
+msgstr "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το μενού επιλέξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>."
+
+#: C/video-call.page:75(p)
+#: C/send-message.page:65(p)
+#: C/audio-call.page:78(p)
+msgid "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a contact in the <gui>Contact List</gui> window, and stop over it for a second: a small pop-up message will appear showing the number of the contacts that form the meta-contact."
+msgstr "Για να αναγνωρίσετε αν μια επαφή είναι μια <em>μετα-επαφή</em>, μετακινήστε το ποντίκι σε μια επαφή στο παράθυρο της <gui>Λίστας επαφών</gui> και σταματήστε το πάνω της για ένα δευτερόλεπτο: θα εμφανιστεί ένα μικρό αναδυόμενο μήνυμα που θα δείχνει τον αριθμό των επαφών που απαρτίζουν τη μετα-επαφή."
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:39(None)
@@ -314,7 +357,6 @@ msgid "In order to be able to share your desktop or to remotely use your contact
 msgstr "Για να μπορείτε να μοιραστείτε την επιφάνεια εργασίας σας ή να χρησιμοποιήσετε απομακρυσμένα την επιφάνεια εργασίας μιας επαφής σας, θα πρέπει να έχετε εγκατεστημένη μια εφαρμογή προβολής απομακρυσμένης επιφάνειας εργασίας."
 
 #: C/share-desktop.page:46(p)
-#: C/send-message.page:35(p)
 #: C/send-file.page:40(p)
 #: C/favorite-rooms.page:66(p)
 msgid "From the <gui>Contact List</gui> window, perform one of the following:"
@@ -449,7 +491,7 @@ msgstr "Όταν τροποποιείτε ή προσθέτετε ένα προ
 msgid "Send a message to one of your contacts."
 msgstr "Αποστολή μηνυμάτων στις επαφές σας."
 
-#: C/send-message.page:16(name)
+#: C/send-message.page:17(name)
 #: C/send-file.page:17(name)
 #: C/prob-conn.page:14(name)
 #: C/prob-conn-neterror.page:14(name)
@@ -460,7 +502,7 @@ msgstr "Αποστολή μηνυμάτων στις επαφές σας."
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/send-message.page:17(email)
+#: C/send-message.page:18(email)
 #: C/send-file.page:18(email)
 #: C/prob-conn.page:15(email)
 #: C/prob-conn-neterror.page:15(email)
@@ -471,22 +513,33 @@ msgstr "Phil Bull"
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
-#: C/send-message.page:31(title)
+#: C/send-message.page:32(title)
 msgid "Send a message to someone"
 msgstr "Αποστολή μηνυμάτων"
 
-#: C/send-message.page:40(p)
-msgid "Double click the name of the contact that you want to have a conversation with."
-msgstr "Κάνετε διπλό κλικ στο όνομα της επαφής με την οποία θέλετε να συζητήσετε."
-
-#: C/send-message.page:46(p)
-msgid "Right-click on the name of the contact you want to have a conversation with, and choose <gui>Chat</gui>."
-msgstr "Κάνετε δεξί κλικ στο όνομα της επαφής με την οποία θέλετε να συζητήσετε, και επιλέξτε <gui>Συζήτηση</gui>."
+#: C/send-message.page:36(p)
+#| msgid ""
+#| "Double click the name of the contact that you want to have a conversation "
+#| "with."
+msgid "From the <gui>Contact List</gui> window, double-click the name of the contact that you want to have a conversation with."
+msgstr "Στο παράθυρο <gui>Λίστα επαφών</gui>, κάντε διπλό κλικ στο όνομα της επαφής με την οποία θέλετε να συζητήσετε."
 
-#: C/send-message.page:54(p)
+#: C/send-message.page:42(p)
 msgid "A new window will open. Type a message into the box at the bottom of the window and press <key>Enter</key> to send it."
 msgstr "Θα ανοίξει ένα νέο παράθυρο. Εισάγετε το μήνυμά σας στο πεδίο κειμένου στο κάτω μέρος του παραθύρου και πατήστε <key>Enter</key> για να το στείλετε."
 
+#: C/send-message.page:50(title)
+#| msgid "Send a message to someone"
+msgid "Send a message to a meta-contact"
+msgstr "Αποστολή μηνύματος σε μια μετα-επαφή"
+
+#: C/send-message.page:58(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Chat</gui>."
+msgstr "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το μενού επιλέξτε <gui style=\"menuitem\">Συζήτηση</gui>."
+
 #: C/send-file.page:8(desc)
 msgid "Send a file from your computer to one of your contacts."
 msgstr "Αποστολή αρχείων από των υπολογιστή σας στις επαφές σας."
@@ -583,7 +636,6 @@ msgid "Select the account you wish to remove from the accounts list on the left
 msgstr "Επιλέξτε το λογαριασμό που θέλετε να διαγράψετε από τη λίστα στην αριστερή πλευρά του παραθύρου."
 
 #: C/remove-account.page:50(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
 msgid "Click on <gui style=\"button\">Remove</gui>."
 msgstr "Πατήστε <gui style=\"button\">Αφαίρεση</gui>."
 
@@ -816,6 +868,82 @@ msgstr "Μπορείτε να κάνετε αναζήτηση στη συζήτ
 msgid "You can quickly view the previous conversations with one of your contacts from the <gui>Contact List</gui> window. Simply right click the contact and choose <gui>View Previous Conversations</gui>. The <gui>Previous Conversations</gui> window will open with that contact already selected."
 msgstr "Υπάρχει ένας γρήγορος τρόπος για να προβάλετε τις προηγούμενες συζητήσεις σας με μία επαφή. Από το παράθυρο <gui>Λίστα επαφών</gui>, κάνετε δεξί κλικ στην επαφή και επιλέξτε <gui>Προβολή προηγούμενων συζητήσεων</gui>. Θα εμφανιστεί το παράθυρο <gui>Προηγούμενες συζητήσεις</gui>, με τη συγκεκριμένη επαφή επιλεγμένη."
 
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Συγχωνεύστε και διαχωρίστε διαφορετικές επαφές σε μία."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Συνδυάστε και διαχωρίστε επαφές"
+
+#: C/link-contacts.page:26(p)
+msgid "If one, or more, of your contacts has multiple accounts with different messaging services, you can combine these contacts into a single one."
+msgstr "Αν μία, ή περισσότερες, από τις επαφές σας έχει πολλαπλούς λογαριασμούς με διαφορετικές υπηρεσίες μηνυμάτων, μπορείτε να συνδυάσετε αυτές τις επαφές σε μία."
+
+#: C/link-contacts.page:30(p)
+msgid "The resulting contact is called a <em>meta-contact</em>: a contact composed from different single contacts."
+msgstr "Η επαφή που προκύπτει ονομάζεται <em>μετα-επαφή</em>: μια επαφή αποτελούμενη από διαφορετικές απλές επαφές."
+
+#: C/link-contacts.page:34(p)
+msgid "If you have a Jane Smith contact that is using three different messaging services like:"
+msgstr "Αν έχετε μια επαφή Μαρία Παπαδοπούλου που χρησιμοποιεί τρεις διαφορετικές υπηρεσίες μηνυμάτων όπως:"
+
+#: C/link-contacts.page:40(p)
+#| msgid "Facebook"
+msgid "janes@facebook"
+msgstr "mariap@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "maria.papad@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "maria_papad@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Μπορείτε να συνδυάσετε αυτές τις επαφές σε μία μόνο Μαρία Παπαδοπούλου."
+
+#: C/link-contacts.page:60(title)
+#| msgid "Hide offline contacts"
+msgid "Combining contacts"
+msgstr "Συνδυασμός επαφών"
+
+#: C/link-contacts.page:63(p)
+msgid "From the <gui>Contact List</gui> window, right-click one of the contact that has different accounts, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "Από το παράθυρο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ σε μια επαφή που έχει διαφορετικούς λογαριασμούς και επιλέξτε <gui style=\"menuitem\">Συγχώνευση επαφών…</gui>."
+
+#: C/link-contacts.page:70(p)
+#| msgid ""
+#| "From the <gui>Saved Presets</gui> box, select the status message you want "
+#| "to remove."
+msgid "From the left pane in the <gui>Link Contacts</gui> window, select the contacts you want to combine."
+msgstr "Από το αριστερό πλαίσιο στο παράθυρο <gui>Συγχώνευση επαφών</gui>, επιλέξτε τις επαφές που θέλετε να συγχωνεύσετε."
+
+#: C/link-contacts.page:76(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Πατήστε <gui style=\"button\">Συγχώνευση</gui>."
+
+#: C/link-contacts.page:82(p)
+msgid "When a meta-contact has been created, the default contact that will be used to have a conversation with when you double-click on it, is the contact with the highest presence on-line."
+msgstr "Όταν έχει δημιουργηθεί μια μετα-επαφή, η προεπιλεγμένη επαφή που θα χρησιμοποιηθεί για να έχετε μια συζήτηση με αυτή όταν κάνετε διπλό κλικ σε αυτή, είναι η επαφή με τη μεγαλύτερη διαδικτυακή παρουσία."
+
+#: C/link-contacts.page:91(title)
+#| msgid "Hide offline contacts"
+msgid "Separating contacts"
+msgstr "Διαχωρισμός επαφών"
+
+#: C/link-contacts.page:94(p)
+msgid "From the <gui>Contact List</gui>, right-click the contact to separate, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "Από το παράθυρο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ στην επαφή που θα διαχωρίσετε και επιλέξτε <gui style=\"menuitem\">Συγχώνευση επαφών…</gui>."
+
+#: C/link-contacts.page:100(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Πατήστε <gui style=\"button\">Διαχωρισμός</gui>."
+
 #: C/license.page:8(desc)
 msgid "Legal information."
 msgstr "Νομικές πληροφορίες."
@@ -873,7 +1001,8 @@ msgid "For the full text of the license, see the <link href=\"http://creativecom
 msgstr "Για το πλήρες κείμενο της άδειας, δείτε τον <link href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">ιστότοπο CreativeCommons</link>, ή διαβάστε όλη την <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Πράξη Commons</link>."
 
 #: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
 msgstr "Έναρξη συζήτησης με επαφή στο IRC."
 
 #: C/irc-start-conversation.page:30(title)
@@ -921,12 +1050,6 @@ msgid "On some IRC networks, you can register your nickname with a service calle
 msgstr "Σε ορισμένα δίκτυα IRC μπορείτε να καταχωρήσετε το ψευδώνυμό σας στην υπηρεσία NickServ. Ορίζετε το συνθηματικό σας στέλνοντας ειδικά μηνύματα στο NickServ, και το χρησιμοποιείτε για να εισέρχεστε. Ορισμένα δωμάτια συζήτησης IRC δεν επιτρέπουν την είσοδο χωρίς καταχωρημένο ψευδώνυμο."
 
 #: C/irc-nick-password.page:40(p)
-#| msgid ""
-#| "<app>Empathy</app> does not currently support nickname registration. Some "
-#| "IRC networks, however, will automatically forward a <em>server password</"
-#| "em> to NickServ. On these networks, you can use the IRC password in "
-#| "<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode "
-#| "network is known to have this feature."
 msgid "<app>Empathy</app> does not currently support nickname registration. Some IRC networks, however, will automatically forward a <em>server password</em> to NickServ. On these networks, you can use the IRC password in <app>Empathy</app> to identify yourself to NickServ. The popular freenode network is known to have this feature."
 msgstr "Προς το παρόν, το <app>Empathy</app> δεν υποστηρίζει την καταχώρηση ψευδωνύμων. Ωστόσο, ορισμένα δίκτυα IRC προωθούν αυτόματα το <em>συνθηματικό εξυπηρετητή</em> στο NickServ. Σε αυτά τα δίκτυα, μπορείτε να χρησιμοποιείτε το συνθηματικό του IRC στο <app>Empathy</app> για να κάνετε την πιστοποίηση στο NickServ. Το δημοφιλές δίκτυο FreeNode ανήκει σε αυτήν την κατηγορία δικτύων."
 
@@ -961,9 +1084,6 @@ msgstr "Internet Relay Chat (IRC)"
 
 #: C/irc-manage.page:37(p)
 #: C/account-irc.page:39(p)
-#| msgid ""
-#| "You must have the <sys>telepathy-idle</sys> package installed in order to "
-#| "use IRC in <app>Empathy</app>."
 msgid "You must have the <sys>telepathy-idle</sys> package installed to use IRC in <app>Empathy</app>."
 msgstr "Για να χρησιμοποιήσετε το IRC στο <app>Empathy</app>, θα πρέπει να έχετε εγκατεστημένο το πακέτο <sys>telepathy-idle</sys>."
 
@@ -980,7 +1100,7 @@ msgid "Common IRC Problems"
 msgstr "Κοινά προβλήματα του IRC"
 
 #: C/irc-manage.page:52(title)
-#: C/index.page:52(title)
+#: C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Κοινά προβλήματα"
 
@@ -1027,20 +1147,14 @@ msgid "Join a protected IRC chat room"
 msgstr "Είσοδος σε προστατευμένο δωμάτιο συζήτησης IRC"
 
 #: C/irc-join-pwd.page:27(p)
-#| msgid ""
-#| "On some IRC networks, private IRC rooms may be protected with a password."
 msgid "On some IRC networks, private IRC rooms may be protected with a password. If you know the password, use the following steps to join:"
 msgstr "Σε μερικά δίκτυα IRC, κάποια ιδιωτικά δωμάτια συζήτησης μπορεί να προστατεύονται με ένα συνθηματικό. Αν το γνωρίζετε, χρησιμοποιήστε τα ακόλουθα βήματα για να συνδεθείτε:"
 
 #: C/irc-join-pwd.page:33(p)
-#| msgid "<link xref=\"irc-join-room\">Join the room</link>."
 msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
 msgstr "<link xref=\"irc-join-room\">Συνδεθείτε στο δωμάτιο</link> κανονικά."
 
 #: C/irc-join-pwd.page:38(p)
-#| msgid ""
-#| "In the <gui>This room is protected by a password</gui> text box, type the "
-#| "IRC room password, and click on <gui style=\"button\">Join</gui>."
 msgid "Empathy will prompt you for a password. Enter the password for the IRC chat room and click <gui style=\"button\">Join</gui>."
 msgstr "Το Empathy θα σας ζητήσει συνθηματικό. Πληκτρολογήστε το συνθηματικό του δωματίου του IRC, και πατήστε το <gui style=\"button\">Είσοδος</gui>."
 
@@ -1075,11 +1189,6 @@ msgid "Introduction"
 msgstr "Εισαγωγή"
 
 #: C/introduction.page:23(p)
-#| msgid ""
-#| "<app>Empathy</app> is an instant messaging application for the GNOME "
-#| "Desktop. It supports text messaging, voice &amp; video call, file "
-#| "transfers and all the most used messaging systems such as MSN and Google "
-#| "Talk."
 msgid "<app>Empathy</app> is an instant messaging application for the GNOME Desktop. It supports text messaging, voice &amp; video calls, file transfers, and all the most used messaging systems such as MSN and Google Talk."
 msgstr "Το <app>Empathy</app> είναι μια εφαρμογή αποστολής άμεσων μηνυμάτων για την επιφάνεια εργασίας του GNOME. Παρέχει υποστήριξη για αποστολή γραπτών μηνυμάτων, φωνητικές κλήσεις &amp; βιντεοκλήσεις, μεταφορά αρχείων, και όλα τα πιο δημοφιλή συστήματα αποστολής μηνυμάτων, όπως το MSN και το Google Talk."
 
@@ -1088,10 +1197,6 @@ msgid "<app>Empathy</app> includes features that help you better collaborate whi
 msgstr "Το <app>Empathy</app> περιλαμβάνει λειτουργίες που διευκολύνουν τις επαγγελματικές σας συνεργασίες και σας επιτρέπουν να παραμένετε σε επαφή με τους φίλους σας."
 
 #: C/introduction.page:32(p)
-#| msgid ""
-#| "You can group all the conversations in a single window, or have multiple "
-#| "windows for different kind of conversations; easily search through your "
-#| "previous conversations, and share your desktop in just two clicks."
 msgid "Using <app>Empathy</app>, you can group all the conversations in a single window, have multiple windows for different kind of conversations, easily search through your previous conversations, and share your desktop in just two clicks."
 msgstr "Η χρήση του <app>Empathy</app>, σας επιτρέπει να ομαδοποιείτε όλες τις συζητήσεις σας σε ένα παράθυρο, ή να χρησιμοποιείτε διαφορετικά παράθυρα για κάθε συζήτηση. Σας δίνει τη δυνατότητα να κάνετε εύκολα αναζητήσεις στις προηγούμενες συζητήσεις σας και να μοιράζεστε την επιφάνεια εργασίας σας με δύο μόνο κλικ."
 
@@ -1109,36 +1214,40 @@ msgstr "Βασικό παράθυρο του <app>Empathy</app>"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:27(None)
+#: C/index.page:28(None)
 msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
 msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
 
 #: C/index.page:7(title)
 #: C/index.page:8(title)
-msgid "Empathy Instant Messenger"
+#| msgid "Empathy Instant Messenger"
+msgid "Empathy Internet Messenger"
 msgstr "Αποστολέας άμεσων μηνυμάτων Empathy"
 
-#: C/index.page:26(title)
-msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+#: C/index.page:27(title)
+#| msgid ""
+#| "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+#| "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger"
 msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">λογότυπο του Αποστολέα άμεσων μηνυμάτων Empathy</media> Αποστολέας άμεσων μηνυμάτων Empathy"
 
-#: C/index.page:32(title)
+#: C/index.page:35(title)
 msgid "Account Management"
 msgstr "Διαχείριση λογαριασμών"
 
-#: C/index.page:36(title)
+#: C/index.page:39(title)
 msgid "Contact Management"
 msgstr "Διαχείριση επαφών"
 
-#: C/index.page:40(title)
+#: C/index.page:43(title)
 msgid "Text Conversations"
 msgstr "Γραπτές συζητήσεις"
 
-#: C/index.page:44(title)
+#: C/index.page:47(title)
 msgid "Audio and Video Conversations"
 msgstr "Φωνητικές κλήσεις και βιντεοκλήσεις"
 
-#: C/index.page:48(title)
+#: C/index.page:51(title)
 msgid "Advanced Actions"
 msgstr "Για προχωρημένους"
 
@@ -1339,8 +1448,12 @@ msgid "To increase the accuracy of your position, deselect <gui>Reduce location
 msgstr "Για να αυξήσετε την ακρίβεια του εντοπισμού, αποεπιλέξτε το <gui>Μείωση της ακρίβειας της τοποθεσίας μου</gui>."
 
 #: C/geolocation-turn.page:61(p)
-msgid "If you have an external device like a GPS or want to send a more accurate position, select the appropriate option in the <gui>Geoclue Settings</gui> section."
-msgstr "Αν διαθέτετε εξωτερική συσκευή (π.χ. GPS), ή αν θέλετε να στέλνετε πιο ακριβή στοιχεία για την τοποθεσία σας, σημειώστε την κατάλληλη επιλογή στην ενότητα <gui>Ρυθμίσεις Geoclue</gui>."
+#| msgid ""
+#| "If you have an external device like a GPS or want to send a more accurate "
+#| "position, select the appropriate option in the <gui>Geoclue Settings</"
+#| "gui> section."
+msgid "If you have an external device like a GPS or want to send a more accurate position, select the appropriate option in the <gui>Location sources</gui> section."
+msgstr "Αν διαθέτετε μια εξωτερική συσκευή (π.χ. GPS), ή αν θέλετε να στέλνετε πιο ακριβή στοιχεία για την τοποθεσία σας, σημειώστε την κατάλληλη επιλογή στην ενότητα <gui>Πηγές τοποθεσίας</gui>."
 
 #: C/geolocation-supported.page:7(desc)
 msgid "Services that supports geolocation and compatibility."
@@ -1591,16 +1704,10 @@ msgid "Most account types require you to create an account with a account provid
 msgstr "Οι περισσότερες υπηρεσίες απαιτούν τη δημιουργία λογαριασμού σε συγκεκριμένο πάροχο, πριν σας επιτρέψουν να στέλνετε άμεσα μηνύματα, χρησιμοποιώντας εφαρμογές όπως το <app>Empathy</app>. Για ορισμένους παρόχους μπορείτε να χρησιμοποιήσετε το <app>Empathy</app> για να δημιουργήσετε νέο λογαριασμό, ακολουθώντας την ίδια διαδικασία που θα χρησιμοποιούσατε και για <link xref=\"add-account\">προσθήκη λογαριασμού</link>."
 
 #: C/create-account.page:41(p)
-#| msgid ""
-#| "This page provides information on creating a new account for various "
-#| "types of accounts. Your account provider should give you a login ID and a "
-#| "password, as well as any additional information you need to connect with "
-#| "<app>Empathy</app>."
 msgid "This page provides information on creating a new account for various types of accounts. Your account provider should give you a login ID and a password, as well as any additional information you need to connect using <app>Empathy</app>."
 msgstr "Αυτή η σελίδα παρέχει πληροφορίες για τη δημιουργία νέου λογαριασμού σε διάφορες υπηρεσίες. Ο πάροχος του λογαριασμού θα πρέπει να σας παρέχει το όνομα χρήστη και το συνθηματικό σας, καθώς και οποιεσδήποτε άλλες πληροφορίες απαιτούνται για τη σύνδεση μέσω <app>Empathy</app>."
 
 #: C/create-account.page:46(title)
-#| msgid "Facebook Chat"
 msgid "Facebook"
 msgstr "Facebook"
 
@@ -1673,10 +1780,6 @@ msgid "You do not need to register for an account to use IRC. Although you speci
 msgstr "Δε χρειάζεται να διαθέτετε λογαριασμό για να χρησιμοποιήσετε το IRC. Παρόλο που πρέπει να επιλέξετε ένα ψευδώνυμο για να προσθέσετε ένα λογαριασμό IRC στο <app>Empathy</app>, το ψευδώνυμο αυτό μπορεί να αλλάζει κάθε φορά που συνδέεστε. Επίσης, αν υπάρχει άλλος χρήστης με το ίδιο ψευδώνυμο, θα πρέπει να αλλάξετε το δικό σας."
 
 #: C/create-account.page:117(p)
-#| msgid ""
-#| "Some IRC networks use a service called NickServ to allow users to protect "
-#| "thier nicknames. See <link xref=\"irc-nick-password\"/> for more "
-#| "information."
 msgid "Some IRC networks use a service called NickServ to allow users to protect their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr "Ορισμένα δίκτυα IRC χρησιμοποιούν μία υπηρεσία που ονομάζεται NickServ και η οποία επιτρέπει στους χρήστες να προστατεύουν τα ψευδώνυμά τους. Δείτε το <link xref=\"irc-nick-password\"/> για περισσότερες πληροφορίες."
 
@@ -1743,7 +1846,6 @@ msgstr "Αν δεν έχετε χρησιμοποιήσει τον υπολογ
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/audio-video.page:58(None)
-#: C/audio-call.page:47(None)
 msgid "@@image: 'figures/audio-input-microphone.png'; md5=8d89026b66a263a3bc5b1f0665948567"
 msgstr "@@image: 'figures/audio-input-microphone.png'; md5=8d89026b66a263a3bc5b1f0665948567"
 
@@ -1903,21 +2005,44 @@ msgstr "zephyr"
 msgid "Call your contacts over the Internet."
 msgstr "Κλήση των επαφών σας μέσω διαδικτύου."
 
-#: C/audio-call.page:33(title)
+#: C/audio-call.page:27(title)
 msgid "Start an audio conversation"
 msgstr "Έναρξη φωνητικής κλήσης"
 
-#: C/audio-call.page:35(p)
+#: C/audio-call.page:29(p)
 msgid "You can call your contacts and have an audio conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports audio calls."
 msgstr "Μπορείτε να καλείτε τις επαφές σας και να μιλάτε μαζί τους. Αυτή η λειτουργία διατίθεται μόνο για ορισμένους τύπους λογαριασμών, και προϋποθέτει ότι η επαφή σας θα διαθέτει επίσης εφαρμογή με υποστήριξη για φωνητικές κλήσεις."
 
-#: C/audio-call.page:46(p)
-msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Audio Call</gui>. Alternatively, right click the contact and choose <gui style=\"menuitem\">Audio Call</gui>."
-msgstr "Στο παράθυρο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\">φωνητική κλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και επιλέξτε  <gui style=\"menuitem\">Φωνητική κλήση</gui>. Εναλλακτικά, κάνετε δεξί κλικ στο όνομα της επαφής και επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
-
-#: C/audio-call.page:63(p)
-msgid "To turn an audio conversation into a video conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> toolbar button to select it."
-msgstr "Για να μετατρέψετε μια φωνητική κλήση σε βιντεοκλήση, επιλέξτε <guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο ενεργό</gui></guiseq>, ή πατήστε το κουμπί <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> της εργαλειοθήκης."
+#: C/audio-call.page:34(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
+msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "Από το παράθυρο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
+
+#: C/audio-call.page:55(p)
+#| msgid ""
+#| "To turn an audio conversation into a video conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to select it."
+msgid "To turn an audio conversation into a video conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+msgstr "Για να μετατρέψετε μια φωνητική κλήση σε βιντεοκλήση, επιλέξτε <guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο ενεργό</gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Έναρξη φωνητικής συζήτησης με μια μετα-επαφή"
+
+#: C/audio-call.page:71(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το μενού επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
 
 #: C/add-contact.page:9(desc)
 msgid "Add someone to the contact list."
@@ -1980,7 +2105,6 @@ msgid "Enter the required information. For most accounts, you will only need a l
 msgstr "Εισάγετε τις απαιτούμενες πληροφορίες. Για τους περισσότερους τύπους λογαριασμών, αρκούν το όνομα χρήστη και το συνθηματικό. Ωστόσο, ορισμένοι τύποι μπορεί να απαιτούν και επιπλέον στοιχεία. Δείτε την <link xref=\"accounts-window#details\"/> για περισσότερες πληροφορίες."
 
 #: C/add-account.page:71(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
 msgid "Click <gui style=\"button\">Log in</gui>."
 msgstr "Πατήστε <gui style=\"button\">Σύνδεση</gui>."
 
@@ -2013,7 +2137,6 @@ msgid "Advanced options for Jabber and Google Talk accounts."
 msgstr "Επιλογές για προχωρημένους σε λογαριασμούς Jabber και Google Talk."
 
 #: C/account-jabber.page:29(title)
-#| msgid "Jabber Account Details"
 msgid "Jabber account details"
 msgstr "Στοιχεία λογαριασμού Jabber"
 
@@ -2082,7 +2205,6 @@ msgid "Additional information necessary for connecting to IRC networks."
 msgstr "Επιπλέον στοιχεία που απαιτούνται για τη σύνδεση σε δίκτυα IRC."
 
 #: C/account-irc.page:31(title)
-#| msgid "IRC Account Details"
 msgid "IRC account details"
 msgstr "Στοιχεία λογαριασμού IRC"
 
@@ -2120,13 +2242,6 @@ msgid "NickServ Passwords"
 msgstr "Συνθηματικά NickServ"
 
 #: C/account-irc.page:66(p)
-#| msgid ""
-#| "On some networks, nicknames can be registered using a service known as "
-#| "NickServ. <app>Empathy</app> does not directly support nickname "
-#| "passwords. On some networks, including the popular FreeNode network, "
-#| "server passwords are automatically forwarded to NickServ, allowing you to "
-#| "set this field to identify yourself with NickServ. See <link xref=\"irc-"
-#| "nick-password\"/> for more details."
 msgid "On some networks, nicknames can be registered using a service known as NickServ. <app>Empathy</app> does not directly support nickname passwords. On some networks, including the popular freenode network, server passwords are automatically forwarded to NickServ, allowing you to set this field to identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for more details."
 msgstr "Σε ορισμένα δίκτυα, είναι δυνατόν να καταχωρήσετε το ψευδώνυμό σας, χρησιμοποιώντας την υπηρεσία NickServ. Το <app>Empathy</app> δεν υποστηρίζει απευθείας τη χρήση συνθηματικών για τα ψευδώνυμα. Σε ορισμένα δίκτυα, όπως το δημοφιλές δίκτυο FreeNode, τα συνθηματικά του εξυπηρετητή προωθούνται αυτόματα στο NickServ, και άρα μπορείτε να εισάγετε το συνθηματικό σας στο πεδίο αυτό. Για περισσότερες λεπτομέρειες, δείτε την <link xref=\"irc-nick-password\"/>."
 
@@ -2220,6 +2335,19 @@ msgstr ""
 "Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα http://www.gnome.gr/"
 
 #~ msgid ""
+#~ "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#~ "mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
+#~ "media> icon next to the name of the contact you wish to call and choose "
+#~ "<gui style=\"menuitem\">Audio Call</gui>. Alternatively, right click the "
+#~ "contact and choose <gui style=\"menuitem\">Audio Call</gui>."
+#~ msgstr ""
+#~ "Στο παράθυρο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
+#~ "\">φωνητική κλήση</media> δίπλα από το όνομα της επαφής που επιθυμείτε να "
+#~ "καλέσετε, και επιλέξτε  <gui style=\"menuitem\">Φωνητική κλήση</gui>. "
+#~ "Εναλλακτικά, κάνετε δεξί κλικ στο όνομα της επαφής και επιλέξτε <gui "
+#~ "style=\"menuitem\">Φωνητική κλήση</gui>."
+#~ msgid ""
 #~ "Click on the trash icon next to the account name to remove the account."
 #~ msgstr ""
 #~ "Κάνετε κλικ στο εικονίδιο των απορριμμάτων δίπλα στο όνομα του "
diff --git a/help/hu/hu.po b/help/hu/hu.po
index 5a55e30..83ecff0 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -880,7 +880,7 @@ msgstr "„A név használatban”"
 msgid ""
 "An error message which says “<gui>Name in use</gui>” appears in the main "
 "window."
-msgstr "A főablakban a „<gui>A név használatban</gui>” üzenet jelenik meg."
+msgstr "A főablakban az „<gui>A név használatban</gui>” üzenet jelenik meg."
 
 #: C/prob-conn-name.page:32(title)
 msgid "I get a message that says “Name in use”"
diff --git a/help/it/it.po b/help/it/it.po
index 6051088..4f3b136 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy help\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:00+0000\n"
-"PO-Revision-Date: 2010-04-25 15:29+0200\n"
+"POT-Creation-Date: 2010-09-29 11:54+0000\n"
+"PO-Revision-Date: 2010-10-02 10:42+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None) C/video-call.page:63(None)
-#: C/audio-video.page:70(None) C/audio-call.page:65(None)
+#: C/video-call.page:38(None) C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
 msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgstr "non serve"
 
@@ -32,18 +32,19 @@ msgstr "Avviare una conversazione video con i propri contatti."
 #: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
 #: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
-#: C/irc-start-conversation.page:15(name) C/irc-send-file.page:16(name)
-#: C/irc-nick-password.page:18(name) C/irc-manage.page:19(name)
-#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:17(name)
-#: C/irc-commands.page:10(name) C/introduction.page:13(name)
-#: C/index.page:18(name) C/import-account.page:23(name)
-#: C/hide-contacts.page:11(name) C/group-conversations.page:19(name)
-#: C/geolocation-what-is.page:18(name) C/geolocation-turn.page:18(name)
-#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
-#: C/geolocation-not-showing.page:17(name) C/geolocation.page:17(name)
-#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
-#: C/create-account.page:18(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:20(name)
+#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
+#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
+#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
+#: C/introduction.page:13(name) C/index.page:19(name)
+#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
+#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
+#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
+#: C/disable-account.page:20(name) C/create-account.page:18(name)
+#: C/audio-video.page:17(name) C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
@@ -53,52 +54,58 @@ msgstr "Milo Casagrande"
 #: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
 #: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
-#: C/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
-#: C/irc-nick-password.page:19(email) C/irc-manage.page:20(email)
-#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:18(email)
-#: C/irc-commands.page:11(email) C/introduction.page:14(email)
-#: C/index.page:19(email) C/import-account.page:24(email)
-#: C/hide-contacts.page:12(email) C/group-conversations.page:20(email)
-#: C/geolocation-what-is.page:19(email) C/geolocation-turn.page:19(email)
-#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
+#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
+#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
+#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
+#: C/introduction.page:14(email) C/index.page:20(email)
+#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
+#: C/geolocation-privacy.page:18(email)
 #: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
 #: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
 #: C/create-account.page:19(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:21(email)
+#: C/audio-call.page:20(email) C/add-account.page:21(email)
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
 #: C/video-call.page:25(p) C/status-icons.page:24(p)
 #: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:20(p) C/send-file.page:25(p)
+#: C/send-message.page:21(p) C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
 #: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
 #: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
 #: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
-#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:23(p)
-#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
-#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
-#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
-#: C/group-conversations.page:23(p) C/geolocation-what-is.page:22(p)
-#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
-#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
-#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:22(p)
-#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
-#: C/add-contact.page:22(p) C/add-account.page:28(p)
-#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:20(p)
+#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
+#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
+#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
+#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
+#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
+#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
+#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
+#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
+#: C/create-account.page:22(p) C/change-status.page:23(p)
+#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
+#: C/add-account.page:28(p) C/accounts-window.page:22(p)
+#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: C/video-call.page:35(title)
+#: C/video-call.page:28(title)
 msgid "Start a video conversation"
 msgstr "Avviare una conversazione video"
 
-#: C/video-call.page:37(p)
+#: C/video-call.page:30(p)
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have an video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
 msgid ""
-"If you have a webcam, you can call your contacts and have an video "
+"If you have a webcam, you can call your contacts and have a video "
 "conversation with them. This features only works with certain types of "
 "accounts, and it requires the other person to have an application that "
 "supports video calls."
@@ -108,22 +115,25 @@ msgstr ""
 "con l'utilizzo di alcuni tipi di account e richiede che i propri contatti "
 "dispongano di un programma che supporti le conversazioni video."
 
-#: C/video-call.page:44(p)
+#: C/video-call.page:37(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
 msgid ""
 "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
 "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
 "next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
-"choose <gui style=\"menuitem\">Video Call</gui>."
+"\"menuitem\">Video Call</gui>."
 msgstr ""
 "Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media type="
 "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata "
 "video</media> a fianco del nome del contatto da chiamare e scegliere <gui "
-"style=\"menuitem>Chiamata video</gui>. In alternativa, fare clic col "
-"pulsante destro del mouse sul contatto e scegliere <gui style=\"menuitem"
-"\">Chiamata video</gui>."
+"style=\"menuitem>Chiamata video</gui>."
 
-#: C/video-call.page:50(p) C/audio-call.page:52(p)
+#: C/video-call.page:43(p) C/audio-call.page:42(p)
 msgid ""
 "A new window will open. When the connection is established, you will see "
 "<gui>Connected</gui> at the bottom of the window, along with the total "
@@ -133,27 +143,63 @@ msgstr ""
 "viene visualizzato, in basso nella finestra, il messaggio <gui>Connessi</"
 "gui> assieme al tempo tascorso della conversazione."
 
-#: C/video-call.page:55(p) C/audio-call.page:57(p)
-#| msgid ""
-#| "To end the conversation, choose <guiseq><gui style=\"menu\">Call</"
-#| "gui><gui style=\"menuitem\">Hang up</gui></guiseq>."
+#: C/video-call.page:48(p) C/audio-call.page:48(p)
 msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr ""
 "Per terminare la conversazione, fare clic su <gui style=\"button\">Chiudi</"
 "gui>."
 
-#: C/video-call.page:61(p)
+#: C/video-call.page:54(p)
+#| msgid ""
+#| "To turn a video conversation into an audio conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#| "it."
 msgid ""
 "To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to deselect it."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr ""
 "Per convertire una conversazione video in una conversazione audio, scegliere "
 "<guiseq style=\"menu\"><gui>Video</gui><gui style=\"menuitem\">Disattivato</"
-"gui></guiseq> oppure fare clic sul pulsante <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">della chiamata video</media> "
-"nella barra degli strumenti."
+"gui></guiseq>."
+
+#: C/video-call.page:60(title)
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a video conversation with a meta-contact"
+msgstr "Avviare una conversazione video con un meta-contatto"
+
+#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click on the drop-down list at "
+#| "the top."
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "Dalla finestra <gui>Elenco contatti</gui>, fare clic sul meta-contatto"
+
+#: C/video-call.page:68(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"Selezionare il contatto con cui iniziare una conversazione e dal menù "
+"selezionare <gui style=\"menuitem\">Chiamata video</gui>."
+
+#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+"Per riconoscere un <em>meta-contatto</em> da uno normale, spostare il "
+"puntatore del mouse su un contatto all'interno della finestra <gui>Elenco "
+"contatti</gui> e fermarsi su di esso per almeno un secondo: apparirà un "
+"piccolo messaggio in cui è indicato il numero dei contatti che compongono il "
+"meta-contatto."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -326,7 +372,7 @@ msgstr ""
 "utilizzare il loro da remoto, è necessario avere installato un programma di "
 "visualizzazione di desktop remoti."
 
-#: C/share-desktop.page:46(p) C/send-message.page:35(p) C/send-file.page:40(p)
+#: C/share-desktop.page:46(p) C/send-file.page:40(p)
 #: C/favorite-rooms.page:66(p)
 msgid "From the <gui>Contact List</gui> window, perform one of the following:"
 msgstr ""
@@ -557,40 +603,36 @@ msgstr ""
 msgid "Send a message to one of your contacts."
 msgstr "Inviare un messaggio a uno dei propri contatti."
 
-#: C/send-message.page:16(name) C/send-file.page:17(name)
+#: C/send-message.page:17(name) C/send-file.page:17(name)
 #: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
 #: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
 #: C/change-status.page:19(name) C/add-contact.page:18(name)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/send-message.page:17(email) C/send-file.page:18(email)
+#: C/send-message.page:18(email) C/send-file.page:18(email)
 #: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
 #: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
 #: C/change-status.page:20(email) C/add-contact.page:19(email)
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
-#: C/send-message.page:31(title)
+#: C/send-message.page:32(title)
 msgid "Send a message to someone"
 msgstr "Inviare un messaggio"
 
-#: C/send-message.page:40(p)
-msgid ""
-"Double click the name of the contact that you want to have a conversation "
-"with."
-msgstr ""
-"Fare doppio-clic sul nome del contatto con cui iniziare una conversazione."
-
-#: C/send-message.page:46(p)
+#: C/send-message.page:36(p)
+#| msgid ""
+#| "Double click the name of the contact that you want to have a conversation "
+#| "with."
 msgid ""
-"Right-click on the name of the contact you want to have a conversation with, "
-"and choose <gui>Chat</gui>."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 msgstr ""
-"Fare clic col pulsante destro del mouse sul contatto con cui iniziare una "
-"conversazione e scegliere <gui>Conversazione</gui>."
+"Dalla finestra <gui>Elenco contatti</gui>, fare doppio-clic sul contatto con "
+"cui avere una conversazione."
 
-#: C/send-message.page:54(p)
+#: C/send-message.page:42(p)
 msgid ""
 "A new window will open. Type a message into the box at the bottom of the "
 "window and press <key>Enter</key> to send it."
@@ -599,6 +641,22 @@ msgstr ""
 "testo nella parte inferiore della finestra e premere <key>Invio</key> per "
 "inviarlo."
 
+#: C/send-message.page:50(title)
+#| msgid "Send a message to someone"
+msgid "Send a message to a meta-contact"
+msgstr "Inviare un messaggio a un meta-contatto"
+
+#: C/send-message.page:58(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr ""
+"Selezionare il contatto con cui iniziare una conversazione e dal menù "
+"selezionare <gui style=\"menuitem\">Conversazione</gui>."
+
 #: C/send-file.page:8(desc)
 msgid "Send a file from your computer to one of your contacts."
 msgstr "Inviare un file dal proprio computer a uno dei propri contatti."
@@ -759,7 +817,6 @@ msgstr ""
 "sinistra della finestra."
 
 #: C/remove-account.page:50(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
 msgid "Click on <gui style=\"button\">Remove</gui>."
 msgstr "Fare clic su <gui style=\"button\">Rimuovi</gui>."
 
@@ -999,9 +1056,6 @@ msgstr ""
 "selezionare l'account che non funziona."
 
 #: C/prob-conn-acctdisabled.page:65(p)
-#| msgid ""
-#| "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is "
-#| "selected. If it is not, select the check-box to enalbe the account."
 msgid ""
 "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
 "If it is not, select the check-box to enable the account."
@@ -1172,6 +1226,116 @@ msgstr ""
 "precedenti</gui>. La finestra <gui>Conversazioni precedenti</gui> viene "
 "aperta con quel contatto già selezionato."
 
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Unire e separare diversi contatti in uno solo."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Unire e dividere contatti"
+
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+"Se uno o più dei propri contatti presenta molteplici account con differenti "
+"servizi di messaggistica, è possibile unire questi contatti in uno solo."
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+"Il risultato di questa unione è un nuovo contatto chiamato <em>meta-"
+"contatto</em>: un contatto composto da molteplici contatti singoli."
+
+#: C/link-contacts.page:34(p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+"Se nell'elenco dei contatti è presente un contatto Mario Rossi che utilizza "
+"tre diversi servizi di messaggistica come:"
+
+#: C/link-contacts.page:40(p)
+#| msgid "Facebook"
+msgid "janes@facebook"
+msgstr "mario@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "mario.rossi@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "mario_rossi@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr ""
+"È possibile unire questi contatti in un singolo contatto per Mario Rossi."
+
+#: C/link-contacts.page:60(title)
+#| msgid "Hide offline contacts"
+msgid "Combining contacts"
+msgstr "Unire i contatti"
+
+#: C/link-contacts.page:63(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
+msgstr ""
+"Dalla finestra <gui>Elenco contatti</gui>, fare clic col pulsante destro del "
+"mouse su uno dei contatti che presenta molteplici account e selezionare <gui "
+"style=\"menuitem\">Unisci contatti...</gui>."
+
+#: C/link-contacts.page:70(p)
+#| msgid ""
+#| "From the <gui>Saved Presets</gui> box, select the status message you want "
+#| "to remove."
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr ""
+"Dal riquadro a sinistra nella finestra <gui>Unisci contatti</gui>, "
+"selezionare i contatti da unire assieme."
+
+#: C/link-contacts.page:76(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Fare clic su <gui style=\"button\">Unisci</gui>."
+
+#: C/link-contacts.page:82(p)
+msgid ""
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
+msgstr ""
+"Quando viene creato un meta-contatto, l'account del contatto utilizzato in "
+"modo predefinito per avere una conversazione è quello con la maggiore "
+"presenza online."
+
+#: C/link-contacts.page:91(title)
+#| msgid "Hide offline contacts"
+msgid "Separating contacts"
+msgstr "Dividere i contatti"
+
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+"Dalla finestra <gui>Elenco contatti</gui>, fare clic col pulsante destro del "
+"mouse sul contatto da separare e selezionare  <gui style=\"menuitem\">Unisci "
+"contatti...</gui>."
+
+#: C/link-contacts.page:100(p)
+#| msgid "Click <gui style=\"button\">Log in</gui>."
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Fare clic su <gui style=\"button\">Dividi</gui>."
+
 #: C/license.page:8(desc)
 msgid "Legal information."
 msgstr "Informazioni legali."
@@ -1253,7 +1417,8 @@ msgstr ""
 "org/licenses/by-sa/3.0/deed.it\">commons deed</link>."
 
 #: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
 msgstr "Avviare una conversazione con un contatto IRC."
 
 #: C/irc-start-conversation.page:30(title)
@@ -1338,11 +1503,17 @@ msgstr ""
 "prive di un soprannome registrato."
 
 #: C/irc-nick-password.page:40(p)
+#| msgid ""
+#| "<app>Empathy</app> does not currently support nickname registration. Some "
+#| "IRC networks, however, will automatically forward a <em>server password</"
+#| "em> to NickServ. On these networks, you can use the IRC password in "
+#| "<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode "
+#| "network is known to have this feature."
 msgid ""
 "<app>Empathy</app> does not currently support nickname registration. Some "
 "IRC networks, however, will automatically forward a <em>server password</em> "
 "to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
 "network is known to have this feature."
 msgstr ""
 "Attualmente <app>Empathy</app> non supporta la registrazione del soprannome. "
@@ -1391,9 +1562,6 @@ msgid "Internet Relay Chat (IRC)"
 msgstr "Internet Relay Chat (IRC)"
 
 #: C/irc-manage.page:37(p) C/account-irc.page:39(p)
-#| msgid ""
-#| "You must have the <sys>telepathy-idle</sys> package installed in order to "
-#| "use IRC in <app>Empathy</app>."
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -1413,7 +1581,7 @@ msgstr "Stanze di conversazione e conversazioni"
 msgid "Common IRC Problems"
 msgstr "Problemi comuni con IRC"
 
-#: C/irc-manage.page:52(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Problemi comuni"
 
@@ -1481,28 +1649,30 @@ msgid "Join a protected IRC chat room"
 msgstr "Entrare in una stanza di conversazione IRC protetta"
 
 #: C/irc-join-pwd.page:27(p)
+#| msgid ""
+#| "On some IRC networks, private IRC rooms may be protected with a password."
 msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password."
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
 msgstr ""
 "In alcune reti IRC, le stanze IRC private possono essere protette tramite "
-"una password."
+"una password. Se si conosce la password della stanza, procedere come segue:"
 
-#: C/irc-join-pwd.page:30(p)
-msgid "To join such a room, if you know the password:"
-msgstr "Per entrare in tali stanze, se si conosce la password:"
-
-#: C/irc-join-pwd.page:35(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link>."
+#: C/irc-join-pwd.page:33(p)
+#| msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
 msgstr "<link xref=\"irc-join-room\">Entrare nella stanza</link>."
 
-#: C/irc-join-pwd.page:40(p)
+#: C/irc-join-pwd.page:38(p)
+#| msgid ""
+#| "In the <gui>This room is protected by a password</gui> text box, type the "
+#| "IRC room password, and click on <gui style=\"button\">Join</gui>."
 msgid ""
-"In the <gui>This room is protected by a password</gui> text box, type the "
-"IRC room password, and click on <gui style=\"button\">Join</gui>."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
-"Nella casella di testo <gui>Questa stanza è protetta da una password</gui>, "
-"digitare la password della stanza e fare clic su <gui style=\"button"
-"\">Entra</gui>."
+"Verrà richiesto di inserire una password. Digitare la password per quella "
+"stanza e fare clic su <gui style=\"button\">Entra</gui>."
 
 #: C/irc-commands.page:7(desc)
 msgid "The supported IRC commands."
@@ -1527,7 +1697,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:48(None)
+#: C/introduction.page:41(None)
 msgid ""
 "@@image: 'figures/empathy-main-window.png'; "
 "md5=489ba00b0fc377aba4c691210b6e0650"
@@ -1538,21 +1708,27 @@ msgid "Introduction to the <app>Empathy</app> instant messenger."
 msgstr ""
 "Introduzione al programma di messaggistica istantanea <app>Empathy</app>."
 
-#: C/introduction.page:28(title)
+#: C/introduction.page:21(title)
 msgid "Introduction"
 msgstr "Introduzione"
 
-#: C/introduction.page:30(p)
+#: C/introduction.page:23(p)
+#| msgid ""
+#| "<app>Empathy</app> is an instant messaging application for the GNOME "
+#| "Desktop. It supports text messaging, voice &amp; video call, file "
+#| "transfers and all the most used messaging systems such as MSN and Google "
+#| "Talk."
 msgid ""
 "<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video call, file transfers "
-"and all the most used messaging systems such as MSN and Google Talk."
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
 msgstr ""
 "<app>Empathy</app> è un'applicazione per la messaggistica istantanea per lo "
 "GNOME Desktop. Supporta messaggi testuali, chiamate audio e video, invio di "
 "file e tutti i più usati sistemi di messaggistica come MSN e Google Talk."
 
-#: C/introduction.page:35(p)
+#: C/introduction.page:28(p)
 msgid ""
 "<app>Empathy</app> includes features that help you better collaborate while "
 "at work, and that let you easily keep in touch with your friends."
@@ -1561,66 +1737,75 @@ msgstr ""
 "meglio quando si è al lavoro e di mantenere facilmente i contatti con i "
 "propri amici."
 
-#: C/introduction.page:39(p)
+#: C/introduction.page:32(p)
+#| msgid ""
+#| "You can group all the conversations in a single window, or have multiple "
+#| "windows for different kind of conversations; easily search through your "
+#| "previous conversations, and share your desktop in just two clicks."
 msgid ""
-"You can group all the conversations in a single window, or have multiple "
-"windows for different kind of conversations; easily search through your "
-"previous conversations, and share your desktop in just two clicks."
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
 msgstr ""
-"È possibile raggruppare le conversazioni in una singola finestra o avere "
-"diverse finestre in base al tipo di conversazione; è possibile eseguire "
-"ricerche tra le conversazioni precedenti e condividere il proprio desktop in "
-"pochi clic."
+"Utilizzando <app>Empathy</app> è possibile raggruppare le conversazioni in "
+"una singola finestra o avere diverse finestre in base al tipo di "
+"conversazione; è possibile eseguire ricerche tra le conversazioni precedenti "
+"e condividere il proprio desktop in pochi clic."
 
-#: C/introduction.page:46(title)
+#: C/introduction.page:39(title)
 msgid "<gui>Contact List</gui> window"
 msgstr "Finestra <gui>Elenco contatti</gui>"
 
-#: C/introduction.page:47(desc)
+#: C/introduction.page:40(desc)
 msgid "<app>Empathy</app> main window"
 msgstr "La finestra principale di <app>Empathy</app>"
 
-#: C/introduction.page:49(p)
+#: C/introduction.page:42(p)
 msgid "<app>Empathy</app> main window."
 msgstr "Finestra principale di <app>Empathy</app>."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:27(None)
+#: C/index.page:28(None)
 msgid ""
 "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
 msgstr "non serve"
 
 #: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Instant Messenger"
-msgstr "Messaggistica istantanea Empathy"
+#| msgid "Empathy Instant Messenger"
+msgid "Empathy Internet Messenger"
+msgstr "Messaggistica Internet Empathy"
 
-#: C/index.page:26(title)
+#: C/index.page:27(title)
+#| msgid ""
+#| "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+#| "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
 msgstr ""
 "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logo di Messaggistica istantanea Empathy</media> Messaggistica istantanea "
+"\">Logo di Messaggistica Internet Empathy</media> Messaggistica Internet "
 "Empathy"
 
-#: C/index.page:32(title)
+#: C/index.page:35(title)
+msgid "Account Management"
+msgstr "Gestione degli account"
+
+#: C/index.page:39(title)
+msgid "Contact Management"
+msgstr "Gestione dei contatti"
+
+#: C/index.page:43(title)
 msgid "Text Conversations"
 msgstr "Conversazioni testuali"
 
-#: C/index.page:36(title)
+#: C/index.page:47(title)
 msgid "Audio and Video Conversations"
 msgstr "Conversazioni audio e video"
 
-#: C/index.page:40(title)
-msgid "Contact Management"
-msgstr "Gestione dei contatti"
-
-#: C/index.page:44(title)
-msgid "Account Management"
-msgstr "Gestione degli account"
-
-#: C/index.page:48(title)
+#: C/index.page:51(title)
 msgid "Advanced Actions"
 msgstr "Operazioni avanzate"
 
@@ -1760,7 +1945,7 @@ msgid ""
 "From the <gui>Account</gui> drop-down list, select the account you want to "
 "use for the group conversation."
 msgstr ""
-"Dall'elenco a discesa <gui>Account</gui>, scegliere l'account da usare per "
+"Dall'elenco a discesa <gui>Account</gui>, selezionare l'account da usare per "
 "la conversazione di gruppo."
 
 #: C/group-conversations.page:69(p)
@@ -1806,7 +1991,8 @@ msgstr ""
 #: C/group-conversations.page:97(p)
 msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
 msgstr ""
-"Fare clic sul nome del contatto e scegliere <gui>Invita nella stanza</gui>."
+"Fare clic col pulsante destro del mouse sul nome del contatto e scegliere "
+"<gui>Invita nella stanza</gui>."
 
 #: C/group-conversations.page:102(p)
 msgid ""
@@ -1933,14 +2119,18 @@ msgstr ""
 "<gui>Ridurre la precisione della posizione geografica</gui>."
 
 #: C/geolocation-turn.page:61(p)
+#| msgid ""
+#| "If you have an external device like a GPS or want to send a more accurate "
+#| "position, select the appropriate option in the <gui>Geoclue Settings</"
+#| "gui> section."
 msgid ""
 "If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
 "section."
 msgstr ""
 "Se si dispone di un dispositivo esterno come un GPS o per inviare "
 "informazioni più precise sulla posizione, selezionare le opzioni appropriate "
-"nella sezione <gui>Impostazioni Geoclue</gui> section."
+"nella sezione <gui>Sorgenti per la posizione</gui>."
 
 #: C/geolocation-supported.page:7(desc)
 msgid "Services that supports geolocation and compatibility."
@@ -2295,7 +2485,7 @@ msgid ""
 "Select the account you wish to disable from the accounts list on the left "
 "side of the window."
 msgstr ""
-"Selezionare l'account da disabilitare dall'elenco degli account nella parte "
+"Selezionare l'account da disabilitare dall'elenco degli account nel riquadro "
 "sinistra della finestra."
 
 #: C/disable-account.page:56(p)
@@ -2338,10 +2528,15 @@ msgstr ""
 "\">aggiungere un account</link>."
 
 #: C/create-account.page:41(p)
+#| msgid ""
+#| "This page provides information on creating a new account for various "
+#| "types of accounts. Your account provider should give you a login ID and a "
+#| "password, as well as any additional information you need to connect with "
+#| "<app>Empathy</app>."
 msgid ""
 "This page provides information on creating a new account for various types "
 "of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect with "
+"password, as well as any additional information you need to connect using "
 "<app>Empathy</app>."
 msgstr ""
 "Questa pagina fornisce informazioni su come creare un nuovo account per "
@@ -2350,34 +2545,40 @@ msgstr ""
 "informazioni necessarie per potersi collegare utilizzando <app>Empathy</app>."
 
 #: C/create-account.page:46(title)
-#| msgid "Facebook Chat"
 msgid "Facebook"
 msgstr "Facebook"
 
 #: C/create-account.page:47(p)
+#| msgid ""
+#| "Facebook is one of the most used social network. It provides users with "
+#| "the opportunity to create their own profile, and to communicate with "
+#| "their friends."
 msgid ""
-"Facebook is one of the most used social network. It provides users with the "
-"opportunity to create their own profile, and to communicate with their "
-"friends."
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
 msgstr ""
 "Facebook è uno dei più utilizzati social network. Consente agli utenti di "
-"creare un proprio profili e di comunicare con i propri amici."
+"creare un proprio profilo e di comunicare con i propri amici."
 
-#: C/create-account.page:52(p)
+#: C/create-account.page:51(p)
+#| msgid ""
+#| "In order to use Facebook to communicate with your friends, you will need "
+#| "to create a new account from the website: <link href=\"http://www."
+#| "facebook.com\">www.facebook.com</link>."
 msgid ""
-"In order to use Facebook to communicate with your friends, you will need to "
-"create a new account from the website: <link href=\"http://www.facebook.com"
-"\">www.facebook.com</link>."
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 msgstr ""
 "Per poter utilizzare Facebook per comunicare con i propri amici, è "
 "necessario creare un nuovo account dal sito web: <link href=\"http://www."
 "facebook.com\">www.facebook.com</link>."
 
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
+#: C/create-account.page:59(title) C/audio-video.page:170(p)
 msgid "Jabber"
 msgstr "Jabber"
 
-#: C/create-account.page:62(p)
+#: C/create-account.page:61(p)
 msgid ""
 "Jabber is an open instant messaging system. Like email, Jabber allows you to "
 "choose your account provider and communicate with all other Jabber users, "
@@ -2387,7 +2588,7 @@ msgstr ""
 "di scegliere il proprio fornitore di servizio e di comunicare con tutti gli "
 "altri utenti Jabber, indipendentemente dal loro fornitore."
 
-#: C/create-account.page:66(p)
+#: C/create-account.page:65(p)
 msgid ""
 "You will need to create a new account with a Jabber provider. There are many "
 "free providers; one popular provider is <link href=\"http://register.jabber."
@@ -2397,7 +2598,7 @@ msgstr ""
 "disponibili molti fornitori, uno molto diffuso è <link href=\"http://"
 "register.jabber.org/\">Jabber.org</link>."
 
-#: C/create-account.page:71(p)
+#: C/create-account.page:70(p)
 msgid ""
 "If you use Google Mail or Google Talk, you already have a Jabber account. "
 "Google Talk is a Jabber service. Simply use your Google Mail address and "
@@ -2407,11 +2608,11 @@ msgstr ""
 "Google Talk è un servizio Jabber. Basta semplicemente usare l'indirizzo "
 "email e la password di Google in <app>Empathy</app>."
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
+#: C/create-account.page:77(title) C/audio-video.page:190(p)
 msgid "People Nearby"
 msgstr "Persone nelle vicinanze"
 
-#: C/create-account.page:80(p)
+#: C/create-account.page:79(p)
 msgid ""
 "You do not need to create an account with a service provider to use this "
 "feature. This service works whenever you are connected to a local network, "
@@ -2424,15 +2625,15 @@ msgstr ""
 "automaticamente tutti gli utenti che utilizzano lo stesso servizio "
 "all'interno della rete."
 
-#: C/create-account.page:85(p)
+#: C/create-account.page:84(p)
 msgid "For more information, see <link xref=\"salut-protocol\"/>."
 msgstr "Per maggiori informazioni, consultare <link xref=\"salut-protocol\"/>."
 
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
+#: C/create-account.page:88(title) C/audio-video.page:205(p)
 msgid "SIP"
 msgstr "SIP"
 
-#: C/create-account.page:91(p)
+#: C/create-account.page:90(p)
 msgid ""
 "SIP is an open system which allows users to have audio and video "
 "conversations over the Internet. You need to create an account with a SIP "
@@ -2444,7 +2645,7 @@ msgstr ""
 "servizi SIP. È possibile comunicare con tutti gli utenti SIP "
 "indipendentemente dal fornitore SIP utilizzato."
 
-#: C/create-account.page:96(p)
+#: C/create-account.page:95(p)
 msgid ""
 "There are a number of popular free SIP account providers; one popular "
 "provider is <link href=\"https://signup.sipphone.com/new-users/app?"
@@ -2454,7 +2655,7 @@ msgstr ""
 "\"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start"
 "\">Sipphone</link>."
 
-#: C/create-account.page:101(p)
+#: C/create-account.page:100(p)
 msgid ""
 "Due to technical differences, the free <link href=\"https://www.ekiga.net/"
 "index.php?page=register\">Ekiga.net</link> service does not currently work "
@@ -2464,7 +2665,7 @@ msgstr ""
 "<ulink type=\"http\" url=\"https://www.ekiga.net/index.php?page=register"
 "\">Ekiga</ulink> non funziona con <app>Empathy</app>."
 
-#: C/create-account.page:106(p)
+#: C/create-account.page:105(p)
 msgid ""
 "Some SIP providers allow you to call normal phones from your computer. "
 "Generally, you will need to subscribe to a paid service for this feature."
@@ -2473,11 +2674,11 @@ msgstr ""
 "normali dal proprio computer. Generalmente è necessario abbonarsi a un "
 "servizio a pagamento per poter usufruire di questa possibilità."
 
-#: C/create-account.page:111(title) C/audio-video.page:165(p)
+#: C/create-account.page:110(title) C/audio-video.page:165(p)
 msgid "IRC"
 msgstr "IRC"
 
-#: C/create-account.page:113(p)
+#: C/create-account.page:112(p)
 msgid ""
 "You do not need to register for an account to use IRC. Although you specify "
 "a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
@@ -2490,11 +2691,7 @@ msgstr ""
 "colleghi. Se un altro utente sta usando quel soprannome, è necessario "
 "sceglierne un altro."
 
-#: C/create-account.page:118(p)
-#| msgid ""
-#| "Some IRC networks use a service called NickServ to allow users to protect "
-#| "thier nicknames. See <link xref=\"irc-nick-password\"/> for more "
-#| "information."
+#: C/create-account.page:117(p)
 msgid ""
 "Some IRC networks use a service called NickServ to allow users to protect "
 "their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
@@ -2503,7 +2700,7 @@ msgstr ""
 "consentire agli utenti di proteggere il proprio soprannome. Per maggiori "
 "informazioni, consultare <link xref=\"irc-nick-password\"/>."
 
-#: C/create-account.page:121(p)
+#: C/create-account.page:120(p)
 msgid ""
 "Some IRC servers are password protected. You will need to know the password "
 "to connect to these servers. Generally, these are private IRC networks."
@@ -2511,11 +2708,11 @@ msgstr ""
 "Alcuni server IRC sono protetti da password ed è necessario conoscere la "
 "password per potersi collegare. Generalmente queste sono reti IRC private."
 
-#: C/create-account.page:126(title)
+#: C/create-account.page:125(title)
 msgid "Proprietary Services"
 msgstr "Servizi proprietari"
 
-#: C/create-account.page:128(p)
+#: C/create-account.page:127(p)
 msgid ""
 "There are many proprietary instant messaging services that have been "
 "developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2529,19 +2726,19 @@ msgstr ""
 "Per creare un nuovo account con uno di questi servizi, è necessario "
 "visitarne il sito web e acconsentire ai termini d'uso."
 
-#: C/create-account.page:137(link) C/audio-video.page:135(p)
+#: C/create-account.page:136(link) C/audio-video.page:135(p)
 msgid "AIM"
 msgstr "AIM"
 
-#: C/create-account.page:142(link) C/audio-video.page:160(p)
+#: C/create-account.page:141(link) C/audio-video.page:160(p)
 msgid "ICQ"
 msgstr "ICQ"
 
-#: C/create-account.page:147(link) C/audio-video.page:175(p)
+#: C/create-account.page:146(link) C/audio-video.page:175(p)
 msgid "MSN"
 msgstr "MSN"
 
-#: C/create-account.page:152(link) C/audio-video.page:210(p)
+#: C/create-account.page:151(link) C/audio-video.page:210(p)
 msgid "Yahoo!"
 msgstr "Yahoo!"
 
@@ -2597,7 +2794,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None) C/audio-call.page:47(None)
+#: C/audio-video.page:58(None)
 msgid ""
 "@@image: 'figures/audio-input-microphone.png'; "
 "md5=8d89026b66a263a3bc5b1f0665948567"
@@ -2793,11 +2990,11 @@ msgstr "zephyr"
 msgid "Call your contacts over the Internet."
 msgstr "Chiamare i propri contatti via Internet."
 
-#: C/audio-call.page:33(title)
+#: C/audio-call.page:27(title)
 msgid "Start an audio conversation"
 msgstr "Avviare una conversazione audio"
 
-#: C/audio-call.page:35(p)
+#: C/audio-call.page:29(p)
 msgid ""
 "You can call your contacts and have an audio conversation with them. This "
 "features only works with certain types of accounts, and it requires the "
@@ -2808,33 +3005,53 @@ msgstr ""
 "account ed è necessario che l'altra persona abbia un'applicazione in grado "
 "di supportare le chiamate audio."
 
-#: C/audio-call.page:46(p)
+#: C/audio-call.page:34(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
 msgid ""
 "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
-"media> icon next to the name of the contact you wish to call and choose <gui "
-"style=\"menuitem\">Audio Call</gui>. Alternatively, right click the contact "
-"and choose <gui style=\"menuitem\">Audio Call</gui>."
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
 "Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media type="
-"\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
-"\">della conversazione audio</media> a fianco del nome del contatto da "
-"chiamare e scegliere <gui style=\"menuitem\">Chiamata audio</gui>. In "
-"alternativa, fare clic col pulsante destro del mouse sul contatto e "
-"scegliere <gui style=\"menuitem\">Chiamata audio</gui>."
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata "
+"video</media> a fianco del nome del contatto da chiamare e scegliere <gui "
+"style=\"menuitem>Chiamata video</gui>."
 
-#: C/audio-call.page:63(p)
+#: C/audio-call.page:55(p)
+#| msgid ""
+#| "To turn an audio conversation into a video conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to select it."
 msgid ""
 "To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to select it."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
 "Per convertire una conversazione audio in una conversazione video, scegliere "
-"<guiseq><gui style=\"menu\">Chiamata</gui><gui style=\"menuitem\">Invia "
-"video</gui></guiseq> oppure fare clic sul pulsante <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata video</"
-"media> nella barra degli strumenti."
+"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Abilitato</"
+"gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Avviare una conversazione audio con un meta-contatto"
+
+#: C/audio-call.page:71(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr ""
+"Selezionare il contatto con cui iniziare una conversazione e dal menù "
+"selezionare <gui>Chiamata audio</gui>."
 
 #: C/add-contact.page:9(desc)
 msgid "Add someone to the contact list."
@@ -2947,7 +3164,6 @@ msgstr ""
 "<link xref=\"accounts-window#details\"/>."
 
 #: C/add-account.page:71(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
 msgid "Click <gui style=\"button\">Log in</gui>."
 msgstr "Fare clic su <gui style=\"button\">Accedi</gui>."
 
@@ -2998,7 +3214,6 @@ msgid "Advanced options for Jabber and Google Talk accounts."
 msgstr "Opzioni avanzate degli account Jabber e Google Talk."
 
 #: C/account-jabber.page:29(title)
-#| msgid "Jabber Account Details"
 msgid "Jabber account details"
 msgstr "Dettagli per l'account Jabber"
 
@@ -3123,7 +3338,6 @@ msgid "Additional information necessary for connecting to IRC networks."
 msgstr "Informazioni necessarie per collegarsi alle reti IRC."
 
 #: C/account-irc.page:31(title)
-#| msgid "IRC Account Details"
 msgid "IRC account details"
 msgstr "Dettagli per l'account IRC"
 
@@ -3192,17 +3406,24 @@ msgid "NickServ Passwords"
 msgstr "Password del NickServ"
 
 #: C/account-irc.page:66(p)
+#| msgid ""
+#| "On some networks, nicknames can be registered using a service known as "
+#| "NickServ. <app>Empathy</app> does not directly support nickname "
+#| "passwords. On some networks, including the popular FreeNode network, "
+#| "server passwords are automatically forwarded to NickServ, allowing you to "
+#| "set this field to identify yourself with NickServ. See <link xref=\"irc-"
+#| "nick-password\"/> for more details."
 msgid ""
 "On some networks, nicknames can be registered using a service known as "
 "NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular FreeNode network, server passwords "
+"On some networks, including the popular freenode network, server passwords "
 "are automatically forwarded to NickServ, allowing you to set this field to "
 "identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
 "more details."
 msgstr ""
 "All'interno di alcune reti è possibile registrare i soprannomi utilizzando "
 "un servizio chiamato «NickServ». <app>Empathy</app> non supporta direttamente "
-"le password per i soprannomi, ma alcune reti, compresa la molto diffusa "
+"le password per i soprannomi, ma con alcune reti, compresa la molto diffusa "
 "FreeNode, le password relative al server vengono inoltrare al «NickServ», "
 "consentendo di usare questo campo per identificarsi con il «NickServ». Per "
 "maggiori informazioni, consultare <link xref=\"irc-nick-password\"/>."
@@ -3371,3 +3592,20 @@ msgstr ""
 #: C/index.page:0(None)
 msgid "translator-credits"
 msgstr "Milo Casagrande <milo@ubuntu.com>"
+
+#~ msgid "To join such a room, if you know the password:"
+#~ msgstr "Per entrare in tali stanze, se si conosce la password:"
+
+#~ msgid ""
+#~ "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#~ "mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
+#~ "media> icon next to the name of the contact you wish to call and choose "
+#~ "<gui style=\"menuitem\">Audio Call</gui>. Alternatively, right click the "
+#~ "contact and choose <gui style=\"menuitem\">Audio Call</gui>."
+#~ msgstr ""
+#~ "Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media "
+#~ "type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
+#~ "\">della conversazione audio</media> a fianco del nome del contatto da "
+#~ "chiamare e scegliere <gui style=\"menuitem\">Chiamata audio</gui>. In "
+#~ "alternativa, fare clic col pulsante destro del mouse sul contatto e "
+#~ "scegliere <gui style=\"menuitem\">Chiamata audio</gui>."
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 6516225..921e8d7 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -363,7 +363,6 @@ empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact)
 	return item;
 }
 
-/* FIXME  we should check if the contact supports vnc stream tube */
 GtkWidget *
 empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact)
 {
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 7747435..b1237cf 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -133,6 +133,8 @@ individual_menu_add_personas (GtkMenuShell *menu,
           folks_persona_get_display_id (FOLKS_PERSONA (persona)), account);
 
       contact_item = gtk_image_menu_item_new_with_label (label);
+      gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (contact_item),
+                                                 TRUE);
       contact_submenu = gtk_menu_new ();
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (contact_item), contact_submenu);
       image = gtk_image_new_from_icon_name (
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 517ae9e..13727db 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -260,10 +260,13 @@ real_start_verification (EmpathyTLSVerifier *self)
       /* if the last certificate is self-signed, and we have a list of
        * trusted CAs, ignore it, as we want to check the chain against our
        * trusted CAs list first.
+       * if we have only one certificate in the chain, don't ignore it though,
+       * as it's the CA certificate itself.
        */
       last_cert = g_ptr_array_index (priv->cert_chain, num_certs - 1);
 
-      if (gnutls_x509_crt_check_issuer (last_cert, last_cert) > 0)
+      if (gnutls_x509_crt_check_issuer (last_cert, last_cert) > 0 &&
+          num_certs > 1)
         num_certs--;
     }
 
diff --git a/po/el.po b/po/el.po
index c21b403..9f24a49 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,20 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 21:37+0300\n"
-"PO-Revision-Date: 2010-09-27 21:39+0200\n"
-"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
+"POT-Creation-Date: 2010-09-30 15:11+0300\n"
+"PO-Revision-Date: 2010-09-30 15:11+0300\n"
+"Last-Translator: Simos Xenitellis <simos@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Lokalize 1.0\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Συζητήστε στα Google Talk, Facebook, MSN και σε πολλές άλλες υπηρεσίες συζητήσεων"
+msgstr ""
+"Συζητήστε στα Google Talk, Facebook, MSN και σε πολλές άλλες υπηρεσίες "
+"συζητήσεων"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
@@ -37,23 +39,32 @@ msgstr "Μηνύματα διαδικτύου Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
-msgstr "Λογισμικό αποστολής άμεσων μηνυμάτων (Google Talk, MSN, Yahoo!, Facebook και άλλα)"
+msgstr ""
+"Λογισμικό αποστολής άμεσων μηνυμάτων (Google Talk, MSN, Yahoo!, Facebook και "
+"άλλα)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Να γίνεται πάντα άνοιγμα των νέων συζητήσεων σε ξεχωριστό παράθυρο."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Ο χαρακτήρας που πρέπει να προστίθεται μετά από το ψευδώνυμο κατά τη χρήση της ολοκλήρωσης ψευδώνυμου (tab) στις ομαδικές συζητήσεις."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Ο χαρακτήρας που πρέπει να προστίθεται μετά από το ψευδώνυμο κατά τη χρήση "
+"της ολοκλήρωσης ψευδώνυμου (tab) στις ομαδικές συζητήσεις."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "Θέμα παραθύρων συζήτησης"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Λίστα γλωσσών για ορθογραφικό έλεγχο, χωρισμένη με κόμματα (πχ. \"en, el, fr\"). "
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Λίστα γλωσσών για ορθογραφικό έλεγχο, χωρισμένη με κόμματα (πχ. \"en, el, fr"
+"\"). "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
@@ -84,8 +95,12 @@ msgid "Display incoming events in the status area"
 msgstr "Εμφάνιση εισερχόμενων γεγονότων στην περιοχή κατάστασης"
 
 #: ../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 "Εμφάνιση εισερχομένων γεγονότων στην περιοχή κατάστασης. Αν ορισθεί σε ψευδές (false) τα παρουσιάζει αμέσως στο χρήστη."
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Εμφάνιση εισερχομένων γεγονότων στην περιοχή κατάστασης. Αν ορισθεί σε "
+"ψευδές (false) τα παρουσιάζει αμέσως στο χρήστη."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
@@ -97,7 +112,8 @@ msgstr "Να χρησιμοποιείται το GPS για να μαντέψε
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Να χρησιμοποιείται το δίκτυο κινητής τηλ/νίας για να μαντέψει την τοποθεσία"
+msgstr ""
+"Να χρησιμοποιείται το δίκτυο κινητής τηλ/νίας για να μαντέψει την τοποθεσία"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
@@ -129,7 +145,9 @@ msgstr "Να μειώνεται η ακρίβεια της τοποθεσίας
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Να χρησιμοποιείται η προσωπική εικόνα της επαφής ως εικονίδιο του παραθύρου συζήτησης"
+msgstr ""
+"Να χρησιμοποιείται η προσωπική εικόνα της επαφής ως εικονίδιο του παραθύρου "
+"συζήτησης"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable WebKit Developer Tools"
@@ -165,7 +183,9 @@ msgstr "Διαδρομή του θέματος Adium"
 
 #: ../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 "Διαδρομή του θέματος Adium, αν χρησιμοποιείται το θέμα Adium για τις συζητήσεις."
+msgstr ""
+"Διαδρομή του θέματος Adium, αν χρησιμοποιείται το θέμα Adium για τις "
+"συζητήσεις."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for incoming messages"
@@ -245,11 +265,14 @@ msgstr "Η θέση του πλευρικού πλαισίου του παραθ
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Η αποθηκευμένη θέση (σε εικονοστοιχεία) του πλευρικού πλαισίου του παραθύρου συζητήσεων."
+msgstr ""
+"Η αποθηκευμένη θέση (σε εικονοστοιχεία) του πλευρικού πλαισίου του παραθύρου "
+"συζητήσεων."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Το θέμα που χρησιμοποιείται για την εμφάνιση της συζήτησης στα παράθυρα."
+msgstr ""
+"Το θέμα που χρησιμοποιείται για την εμφάνιση της συζήτησης στα παράθυρα."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use graphical smileys"
@@ -265,7 +288,9 @@ msgstr "Χρήση θέματος για τα δωμάτια συζήτησης"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Αν το Empathy θα μπορεί να δημοσιεύει την τοποθεσία του χρήστη στις επαφές του."
+msgstr ""
+"Αν το Empathy θα μπορεί να δημοσιεύει την τοποθεσία του χρήστη στις επαφές "
+"του."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the GPS to guess the location."
@@ -273,7 +298,9 @@ msgstr "Αν το Empathy θα χρησιμοποιεί το GPS για να μ
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Αν το Empathy θα χρησιμοποιεί το δίκτυο κινητής τηλ/νίας για να μαντέψει την τοποθεσία."
+msgstr ""
+"Αν το Empathy θα χρησιμοποιεί το δίκτυο κινητής τηλ/νίας για να μαντέψει την "
+"τοποθεσία."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy can use the network to guess the location."
@@ -281,7 +308,8 @@ msgstr "Αν το Empathy θα χρησιμοποιεί το δίκτυο για
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Αν το Empathy έχει ζητήσει την εισαγωγή λογαριασμών από άλλα προγράμματα."
+msgstr ""
+"Αν το Empathy έχει ζητήσει την εισαγωγή λογαριασμών από άλλα προγράμματα."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether Empathy has migrated butterfly logs."
@@ -289,30 +317,47 @@ msgstr "Εάν το Empathy έχει μετακινήσει τα αρχεία κ
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Αν το Empathy θα συνδέεται αυτόματα στους λογαριασμούς σας κατά την εκκίνηση."
+msgstr ""
+"Αν το Empathy θα συνδέεται αυτόματα στους λογαριασμούς σας κατά την εκκίνηση."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Αν το Empathy θα πηγαίνει αυτόματα σε κατάσταση «Απουσιάζει» όταν ο χρήστης είναι αδρανής."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Αν το Empathy θα πηγαίνει αυτόματα σε κατάσταση «Απουσιάζει» όταν ο χρήστης "
+"είναι αδρανής."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Αν το Empathy θα μειώνει την ακρίβεια της τοποθεσίας για λόγους απορρήτου."
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Αν το Empathy θα μειώνει την ακρίβεια της τοποθεσίας για λόγους απορρήτου."
 
 #: ../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 "Αν το Empathy θα χρησιμοποιεί την προσωπική εικόνα της επαφής ως εικονίδιο του παραθύρου συζήτησης."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Αν το Empathy θα χρησιμοποιεί την προσωπική εικόνα της επαφής ως εικονίδιο "
+"του παραθύρου συζήτησης."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Αν θα είναι ενεργοποιημένα τα εργαλεία προγραμματισμού του WebKit, π.χ. ο Επιθεωρητής Ιστού."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Αν θα είναι ενεργοποιημένα τα εργαλεία προγραμματισμού του WebKit, π.χ. ο "
+"Επιθεωρητής Ιστού."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Αν θα χρησιμοποιούνται οι εφαρμογές διαχείρισης συνδέσεων για αυτόματη αποσύνδεση/επανασύνδεση."
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Αν θα χρησιμοποιούνται οι εφαρμογές διαχείρισης συνδέσεων για αυτόματη "
+"αποσύνδεση/επανασύνδεση."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to check words typed against the languages you want to check with."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr "Αν θα γίνεται ορθογραφικός έλεγχος στις γλώσσες που έχετε επιλέξει."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
@@ -321,11 +366,15 @@ msgstr "Αν θα μετατρέπονται τα χαμόγελα σε εικο
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν μια επαφή συνδέεται στο δίκτυο."
+msgstr ""
+"Αν θα αναπαράγονται ήχοι ειδοποίησης όταν μια επαφή συνδέεται στο δίκτυο."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν μια επαφή αποσυνδέεται από το δίκτυο."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Αν θα αναπαράγονται ήχοι ειδοποίησης όταν μια επαφή αποσυνδέεται από το "
+"δίκτυο."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of events."
@@ -345,35 +394,47 @@ msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης γ
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play a sound when logging into a network."
-msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν γίνεται σύνδεση σε ένα δίκτυο."
+msgstr ""
+"Αν θα αναπαράγονται ήχοι ειδοποίησης όταν γίνεται σύνδεση σε ένα δίκτυο."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound when logging out of a network."
-msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν γίνεται αποσύνδεση από ένα δίκτυο."
+msgstr ""
+"Αν θα αναπαράγονται ήχοι ειδοποίησης όταν γίνεται αποσύνδεση από ένα δίκτυο."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to play sound notifications when away or busy."
-msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν απουσιάζετε ή είστε απασχολημένοι."
+msgstr ""
+"Αν θα αναπαράγονται ήχοι ειδοποίησης όταν απουσιάζετε ή είστε απασχολημένοι."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν αποσυνδέεται μια επαφή."
+msgstr ""
+"Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν αποσυνδέεται μια επαφή."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν συνδέεται μια επαφή."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν λαμβάνονται νέα μηνύματα, ακόμη και αν το παράθυρο συζήτησης είναι ήδη ανοιχτό, αλλά όχι εστιασμένο."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν λαμβάνονται νέα μηνύματα, "
+"ακόμη και αν το παράθυρο συζήτησης είναι ήδη ανοιχτό, αλλά όχι εστιασμένο."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν λαμβάνονται νέα μηνύματα."
+msgstr ""
+"Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν λαμβάνονται νέα μηνύματα."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Αν θα εμφανίζονται οι προσωπικές εικόνες των επαφών στη λίστα επαφών και τα παράθυρα συζήτησης."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Αν θα εμφανίζονται οι προσωπικές εικόνες των επαφών στη λίστα επαφών και τα "
+"παράθυρα συζήτησης."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show contacts that are offline in the contact list."
@@ -381,7 +442,9 @@ msgstr "Αν θα εμφανίζονται οι επαφές εκτός σύνδ
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show popup notifications when away or busy."
-msgstr "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν απουσιάζετε ή είστε απασχολημένοι."
+msgstr ""
+"Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν απουσιάζετε ή είστε "
+"απασχολημένοι."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show protocols for contacts in the contact list."
@@ -396,16 +459,26 @@ msgid "Whether to show the contact list in compact mode."
 msgstr "Αν η λίστα επαφών θα εμφανίζεται σε συμπτυγμένη μορφή."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Αν θα εμφανίζεται διάλογος επιβεβαίωσης πριν το κλείσιμο του κύριου παραθύρου, όταν πατιέται το κουμπί 'x' στη γραμμή τίτλου."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Αν θα εμφανίζεται διάλογος επιβεβαίωσης πριν το κλείσιμο του κύριου "
+"παραθύρου, όταν πατιέται το κουμπί 'x' στη γραμμή τίτλου."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to use the theme for chat rooms."
 msgstr "Αν το θέμα θα χρησιμοποιείται για τα δωμάτια συζήτησης."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "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 "Το κριτήριο που θα χρησιμοποιείται κατά την ταξινόμηση της λίστας επαφών. Η προεπιλεγμένη τιμή \"όνομα\" ταξινομεί τα ονόματα των επαφών με βάση το όνομα. Η τιμή \"κατάσταση\" ταξινομεί τη λίστα επαφών με βάση την κατάσταση."
+msgid ""
+"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 ""
+"Το κριτήριο που θα χρησιμοποιείται κατά την ταξινόμηση της λίστας επαφών. Η "
+"προεπιλεγμένη τιμή \"όνομα\" ταξινομεί τα ονόματα των επαφών με βάση το "
+"όνομα. Η τιμή \"κατάσταση\" ταξινομεί τη λίστα επαφών με βάση την κατάσταση."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -413,7 +486,7 @@ msgstr "Διαχείριση λογαριασμών μηνυμάτων και τ
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2156
 msgid "Messaging and VoIP Accounts"
 msgstr "Λογαριασμοί μηνυμάτων και τηλεφωνίας"
 
@@ -461,8 +534,7 @@ msgstr "Σφάλμα κατά τη μεταφορά του αρχείου"
 msgid "The other participant is unable to transfer the file"
 msgstr "Ο συνομιλητής σας δεν μπορεί να μεταφέρει το αρχείο"
 
-#: ../libempathy/empathy-tp-file.c:420
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"
 
@@ -486,12 +558,9 @@ msgstr "Αόρατος"
 msgid "Offline"
 msgstr "Εκτός σύνδεσης"
 
-#: ../libempathy/empathy-utils.c:257
-#: ../src/empathy-call-window.c:1903
-#: ../src/empathy-call-window.c:1904
-#: ../src/empathy-call-window.c:1905
-#: ../src/empathy-call-window.c:1906
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -499,23 +568,19 @@ msgstr "Άγνωστο"
 msgid "No reason specified"
 msgstr "Δε διευκρινίστηκε αιτία"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
 msgid "Status is set to offline"
 msgstr "Η κατάσταση έχει καθορισθεί σε ανενεργός"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
 msgid "Network error"
 msgstr "Σφάλμα σύνδεσης στο δίκτυο"
 
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
 msgid "Authentication failed"
 msgstr "Η πιστοποίηση απέτυχε"
 
-#: ../libempathy/empathy-utils.c:304
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
 msgid "Encryption error"
 msgstr "Σφάλμα κρυπτογράφησης"
 
@@ -523,38 +588,31 @@ msgstr "Σφάλμα κρυπτογράφησης"
 msgid "Name in use"
 msgstr "Χρησιμοποιούμενο όνομα"
 
-#: ../libempathy/empathy-utils.c:308
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate not provided"
 msgstr "Δεν παρέχεται πιστοποιητικό"
 
-#: ../libempathy/empathy-utils.c:310
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
 msgid "Certificate untrusted"
 msgstr "Μη έμπιστο πιστοποιητικό"
 
-#: ../libempathy/empathy-utils.c:312
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
 msgid "Certificate expired"
 msgstr "Το πιστοποιητικό έχει λήξει"
 
-#: ../libempathy/empathy-utils.c:314
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
 msgid "Certificate not activated"
 msgstr "Το πιστοποιητικό δεν είναι ενεργοποιημένο"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
 msgid "Certificate hostname mismatch"
 msgstr "Αναντιστοιχία ονόματος συστήματος και πιστοποιητικού"
 
-#: ../libempathy/empathy-utils.c:318
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
 msgid "Certificate fingerprint mismatch"
 msgstr "Αναντιστοιχία αποτυπώματος και πιστοποιητικού"
 
-#: ../libempathy/empathy-utils.c:320
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
 msgid "Certificate self-signed"
 msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό "
 
@@ -587,7 +645,8 @@ msgid "This resource is already connected to the server"
 msgstr "Αυτός ο πόρος είναι ήδη συνδεδεμένος στον διακομιστή"
 
 #: ../libempathy/empathy-utils.c:368
-msgid "Connection has been replaced by a new connection using the same resource"
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
 msgstr "Η σύνδεση αντικαταστάθηκε από νέα σύνδεση με χρήση του ίδιου πόρου"
 
 #: ../libempathy/empathy-utils.c:371
@@ -603,12 +662,20 @@ msgid "Certificate has been revoked"
 msgstr "Το πιστοποιητικό έχει ανακληθεί"
 
 #: ../libempathy/empathy-utils.c:377
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "Το πιστοποιητικό χρησιμοποιεί ανασφαλές αλγόριθμο ή είναι κρυπτογραφικά αδύναμο"
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Το πιστοποιητικό χρησιμοποιεί ανασφαλές αλγόριθμο ή είναι κρυπτογραφικά "
+"αδύναμο"
 
 #: ../libempathy/empathy-utils.c:380
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "Το μήκος του πιστοποιητικού του διακομιστή ή το μέγεθος της αλυσίδας πιστοποιητικών, υπερβαίνει τα όρια που τίθενται από τη βιβλιοθήκη κρυπτογράφησης"
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Το μήκος του πιστοποιητικού του διακομιστή ή το μέγεθος της αλυσίδας "
+"πιστοποιητικών, υπερβαίνει τα όρια που τίθενται από τη βιβλιοθήκη "
+"κρυπτογράφησης"
 
 #: ../libempathy/empathy-utils.c:544
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
@@ -961,12 +1028,14 @@ msgstr "_Πόρος:"
 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."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 msgstr ""
 "Αυτό είναι το όνομα χρήστη σας, όχι το όνομα λογαριασμού \n"
 "που χρησιμοποιείτε για να συνδεθείτε στο Facebook. Αν είστε \n"
 "ο facebook.com/<b>kanenas</b>, εισάγετε <b>kanenas</b>.\n"
-"Χρησιμοποιήστε <a href=\"http://www.facebook.com/username/\">αυτή τη σελίδα</a> για να αποκτήσετε λογαριασμό στο Facebook, \n"
+"Χρησιμοποιήστε <a href=\"http://www.facebook.com/username/\">αυτή τη σελίδα</"
+"a> για να αποκτήσετε λογαριασμό στο Facebook, \n"
 "αν δεν έχετε ήδη."
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
@@ -1140,7 +1209,8 @@ msgstr "Δεν ήταν δυνατή η μετατροπή της εικόνας
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:444
 msgid "None of the accepted image formats are supported on your system"
-msgstr "Το σύστημά σας δεν υποστηρίζει κανέναν από τους επιτρεπτούς τύπους εικόνων."
+msgstr ""
+"Το σύστημά σας δεν υποστηρίζει κανέναν από τους επιτρεπτούς τύπους εικόνων."
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
@@ -1207,12 +1277,22 @@ msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <μήνυμα>: Αποστολή μηνύματος ΕΝΕΡΓΕΙΑΣ στην τρέχουσα συζήτηση"
 
 #: ../libempathy-gtk/empathy-chat.c:849
-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 <μήνυμα>: Αποστολή του <μήνυμα> στην τρέχουσα συζήτηση. Χρησιμοποιείται για την αποστολή μηνυμάτων που ξεκινούν από '/'. Π.χ.: \"/say /join - χρησιμοποιείται για είσοδο σε νέο δωμάτιο\""
+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 <μήνυμα>: Αποστολή του <μήνυμα> στην τρέχουσα συζήτηση. Χρησιμοποιείται "
+"για την αποστολή μηνυμάτων που ξεκινούν από '/'. Π.χ.: \"/say /join - "
+"χρησιμοποιείται για είσοδο σε νέο δωμάτιο\""
 
 #: ../libempathy-gtk/empathy-chat.c:854
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
-msgstr "/help [<εντολή>]: Εμφάνιση όλων των υποστηριζόμενων εντολών. Αν έχει οριστεί συγκεκριμένη <εντολή>, εμφάνιση του τρόπου χρήσης της."
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<εντολή>]: Εμφάνιση όλων των υποστηριζόμενων εντολών. Αν έχει οριστεί "
+"συγκεκριμένη <εντολή>, εμφάνιση του τρόπου χρήσης της."
 
 #: ../libempathy-gtk/empathy-chat.c:864
 #, c-format
@@ -1225,7 +1305,8 @@ msgstr "Άγνωστη εντολή"
 
 #: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Unknown command; see /help for the available commands"
-msgstr "Άγνωστη εντολή. Πληκτρολογήστε /help για να δείτε τις διαθέσιμες εντολές"
+msgstr ""
+"Άγνωστη εντολή. Πληκτρολογήστε /help για να δείτε τις διαθέσιμες εντολές"
 
 #: ../libempathy-gtk/empathy-chat.c:1152
 msgid "offline"
@@ -1256,8 +1337,7 @@ msgstr "άγνωστο"
 msgid "Error sending message '%s': %s"
 msgstr "Σφάλμα κατά την αποστολή του μηνύματος '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282
-#: ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "Θέμα:"
 
@@ -1348,8 +1428,7 @@ msgstr "Ο/Η %s μπήκε στο δωμάτιο συζήτησης"
 msgid "%s is now known as %s"
 msgstr "Ο/Η %s ονομάζεται πλέον %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287
-#: ../src/empathy-call-window.c:1947
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
 msgid "Disconnected"
 msgstr "Εκτός σύνδεσης"
 
@@ -1396,17 +1475,17 @@ msgstr "Ά_νοιγμα συνδέσμου"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Επεξεργασία πληροφοριών επαφής"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "Νέα επαφή"
 
@@ -1420,7 +1499,7 @@ msgstr "Αίτηση εγγραφής"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
-msgstr ""
+msgstr "Μη ομαδοποιημένα"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
@@ -1497,7 +1576,7 @@ msgid "Share My Desktop"
 msgstr "Κοινή χρήση της επιφάνειας εργασίας μου"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
 #: ../libempathy-gtk/empathy-individual-menu.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
@@ -1528,153 +1607,153 @@ msgstr "_Πρόσκληση στο δωμάτιο συζήτησης"
 msgid "Select a contact"
 msgstr "Επιλογή επαφής"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
 #: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "Πλήρες όνομα:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
 #: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "Αριθμός τηλεφώνου:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
 #: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "Ηλ. διεύθυνση:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
 #: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "Ιστότοπος:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
 #: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "Γενέθλια:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-contact-widget.c:609
 #: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "Κωδικός ISO χώρας:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-contact-widget.c:611
 #: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "Χώρα:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-contact-widget.c:613
 #: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "Πολιτεία:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:615
 #: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "Πόλη:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-contact-widget.c:617
 #: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "Περιοχή:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-contact-widget.c:619
 #: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "Ταχ. κώδικας:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-contact-widget.c:621
 #: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "Οδός:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-contact-widget.c:623
 #: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "Κτίριο:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-contact-widget.c:625
 #: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "Όροφος:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-contact-widget.c:627
 #: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:629
 #: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "Κείμενο:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:631
 #: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "Περιγραφή:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-contact-widget.c:633
 #: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-contact-widget.c:635
 #: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "Επίπεδο ακρίβειας:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:637
 #: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "Σφάλμα:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-contact-widget.c:639
 #: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "Κάθετο σφάλμα (σε μέτρα):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-contact-widget.c:641
 #: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "Οριζόντιο σφάλμα (σε μέτρα):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-contact-widget.c:643
 #: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "Ταχύτητα:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-contact-widget.c:645
 #: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "Προσανατολισμός:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-contact-widget.c:647
 #: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "Ταχύτητα ανάβασης:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-contact-widget.c:649
 #: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "Τελευταία ενημέρωση στις:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-contact-widget.c:651
 #: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "Γεωγρ. μήκος:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-contact-widget.c:653
 #: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "Γεωγρ. πλάτος:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:655
 #: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "Υψόμετρο:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
 #: ../libempathy-gtk/empathy-individual-widget.c:582
 #: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
@@ -1682,23 +1761,23 @@ msgid "Location"
 msgstr "Τοποθεσία"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-contact-widget.c:737
 #: ../libempathy-gtk/empathy-individual-widget.c:601
 #, c-format
 msgid "%s, %s"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y στις %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 #: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "Αποθήκευση προσωπικής εικόνας"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-contact-widget.c:928
 #: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "Αδυναμία αποθήκευσης προσωπικής εικόνας"
@@ -1751,8 +1830,12 @@ msgid "Groups"
 msgstr "Ομάδες"
 
 #: ../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 "Επιλέξτε τις ομάδες στις οποίες θέλετε να εμφανίζεται η επαφή. Μπορείτε να επιλέξετε πολλαπλές ομάδες ή και καμία."
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Επιλέξτε τις ομάδες στις οποίες θέλετε να εμφανίζεται η επαφή. Μπορείτε να "
+"επιλέξετε πολλαπλές ομάδες ή και καμία."
 
 #: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
@@ -1769,7 +1852,7 @@ msgid "Group"
 msgstr "Ομάδα"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
 msgstr "Συνδεδεμένες επαφές"
 
@@ -1783,7 +1866,8 @@ msgstr "Προεπισκόπηση νέας επαφής"
 
 #: ../libempathy-gtk/empathy-individual-linker.c:472
 msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Οι επαφές που επιλέχθηκαν στην αριστερή λίστα θα συνδεθούν μεταξύ τους."
+msgstr ""
+"Οι επαφές που επιλέχθηκαν στην αριστερή λίστα θα συνδεθούν μεταξύ τους."
 
 #. 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
@@ -1801,10 +1885,9 @@ msgstr "_Επεξεργασία"
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
 #: ../libempathy-gtk/empathy-individual-menu.c:863
-#, fuzzy
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr "_Σύνδεση επαφών..."
+msgstr "_Σύνδεση επαφών…"
 
 #: ../libempathy-gtk/empathy-individual-widget.c:1569
 #, c-format
@@ -1836,41 +1919,46 @@ msgstr "SSL"
 #. 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:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
-msgstr "Σύνδεση επαφών"
+msgstr "Ένωση επαφών"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-#, fuzzy
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
-msgstr "Α_ποσύνδεση..."
+msgstr "Διά_σπαση επαφής…"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
-msgid "Completely split the displayed meta-contact into the contacts it contains."
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
 msgstr ""
+"Πλήρης διάσπαση της εμφανιζόμενης μετά-επαφής στις επαφές που περιέχει."
 
 #. 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:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
-msgstr "_Σύνδεση"
+msgstr "Έ_νωση"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
 #, c-format
 msgid "Unlink meta-contact '%s'?"
-msgstr ""
+msgstr "Διάσπαση μετα-επαφής «%s»;"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink this meta-contact? This will completely split the meta-contact into the contacts it contains."
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
 msgstr ""
+"Θέλετε σίγουρα να διασπάσετε τη μετα-επαφή; Η διαδικασία αυτή θα διασπάσει "
+"τη μετα-επαφή στις επαφές που περιέχει."
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
-msgstr "_Αποσύνδεση"
+msgstr "_Διάσπαση"
 
 #: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
@@ -2057,7 +2145,8 @@ msgstr "Μπλε"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Η ταυτότητα που παρήχε ο διακομιστής συζητήσεων δεν μπορεί να επαληθευτεί.\n"
+msgstr ""
+"Η ταυτότητα που παρήχε ο διακομιστής συζητήσεων δεν μπορεί να επαληθευτεί.\n"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:156
 msgid "The certificate is not signed by a Certification Authority"
@@ -2077,7 +2166,9 @@ msgstr "Το πιστοποιητικό δεν έχει το αναμενόμε
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:169
 msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "Το όνομα που επαληθεύεται από το πιστοποιητικό δεν ταιριάζει με το όνομα του διακομιστή"
+msgstr ""
+"Το όνομα που επαληθεύεται από το πιστοποιητικό δεν ταιριάζει με το όνομα του "
+"διακομιστή"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:173
 msgid "The certificate is self-signed"
@@ -2334,16 +2425,39 @@ msgid "- Empathy IM Client"
 msgstr "- Αποστολέας άμεσων μηνυμάτων Empathy"
 
 #: ../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 Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Το Empathy είναι ελεύθερο λογισμικό· επιτρέπεται η αναδιανομή ή/και τροποποίησή του υπό τους όρους της Γενικής Άδειας Δημόσιας Χρήσης GNU (GPL), όπως αυτή έχει δημοσιευτεί από το Ίδρυμα Ελεύθερου Λογισμικού (FSF) — είτε της έκδοσης 2 της Άδειας, είτε (κατ' επιλογήν σας) οποιασδήποτε μεταγενέστερης έκδοσης."
+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 "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Το Empathy είναι ελεύθερο λογισμικό· επιτρέπεται η αναδιανομή ή/και "
+"τροποποίησή του υπό τους όρους της Γενικής Άδειας Δημόσιας Χρήσης GNU (GPL), "
+"όπως αυτή έχει δημοσιευτεί από το Ίδρυμα Ελεύθερου Λογισμικού (FSF) — είτε "
+"της έκδοσης 2 της Άδειας, είτε (κατ' επιλογήν σας) οποιασδήποτε "
+"μεταγενέστερης έκδοσης."
 
 #: ../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 FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Το Empathy διανέμεται με την ελπίδα ότι θα αποδειχθεί χρήσιμο, παρόλα αυτά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ — χωρίς ούτε και την σιωπηρή εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΙΔΙΚΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες ανατρέξτε στη Γενική Άδεια Δημόσιας Χρήσης GNU (GPL)."
+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 "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Το Empathy διανέμεται με την ελπίδα ότι θα αποδειχθεί χρήσιμο, παρόλα αυτά "
+"ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ — χωρίς ούτε και την σιωπηρή εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή "
+"ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΙΔΙΚΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες ανατρέξτε στη "
+"Γενική Άδεια Δημόσιας Χρήσης GNU (GPL)."
 
 #: ../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 Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr "Θα πρέπει να έχετε λάβει ένα αντίγραφο της Γενικής Άδειας Δημόσιας Χρήσης GNU (GPL) μαζί με το Empathy. Αν όχι, γράψτε στο Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+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 "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Θα πρέπει να έχετε λάβει ένα αντίγραφο της Γενικής Άδειας Δημόσιας Χρήσης "
+"GNU (GPL) μαζί με το Empathy. Αν όχι, γράψτε στο Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 #: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
@@ -2382,11 +2496,16 @@ msgid "The error message was: %s"
 msgstr "Το μήνυμα σφάλματος ήταν: %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 "Μπορείτε να γυρίσετε πίσω και να προσπαθήσετε να εισάγετε ξανά τα στοιχεία των λογαριασμών σας, ή να εγκαταλείψετε το βοηθό και να προσθέσετε τους λογαριασμούς αργότερα, από το μενού Επεξεργασία."
+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 ""
+"Μπορείτε να γυρίσετε πίσω και να προσπαθήσετε να εισάγετε ξανά τα στοιχεία "
+"των λογαριασμών σας, ή να εγκαταλείψετε το βοηθό και να προσθέσετε τους "
+"λογαριασμούς αργότερα, από το μενού Επεξεργασία."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "Παρουσιάστηκε σφάλμα"
 
@@ -2395,108 +2514,133 @@ msgstr "Παρουσιάστηκε σφάλμα"
 #. 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
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
 #, c-format
 msgid "New %s account"
 msgstr "Νέος λογαριασμός %s"
 
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:514
 msgid "What kind of chat account do you have?"
 msgstr "Τι είδους λογαριασμό έχετε;"
 
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:520
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Θέλετε να ρυθμίσετε και άλλους λογαριασμούς σας;"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
 msgid "Enter your account details"
 msgstr "Εισάγετε τα στοιχεία του λογαριασμού σας"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:531
 msgid "What kind of chat account do you want to create?"
 msgstr "Τι είδους λογαριασμό θέλετε να δημιουργήσετε;"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
 msgid "Do you want to create other chat accounts?"
 msgstr "Θέλετε να δημιουργήσετε άλλους λογαριασμούς;"
 
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:544
 msgid "Enter the details for the new account"
 msgstr "Εισάγετε τα στοιχεία του νέου λογαριασμού"
 
-#: ../src/empathy-account-assistant.c:660
-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 "Με το Empathy μπορείτε να συζητάτε με συνδεδεμένα γειτονικά άτομα, καθώς και με φίλους και συναδέλφους που χρησιμοποιούν Google Talk, AIM, Windows Live και πολλά άλλα προγράμματα αυτού του τύπου. Αν έχετε μικρόφωνο ή κάμερα, μπορείτε επίσης να κάνετε φωνητικές κλήσεις ή βιντεοκλήσεις."
+#: ../src/empathy-account-assistant.c:659
+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 ""
+"Με το Empathy μπορείτε να συζητάτε με συνδεδεμένα γειτονικά άτομα, καθώς και "
+"με φίλους και συναδέλφους που χρησιμοποιούν Google Talk, AIM, Windows Live "
+"και πολλά άλλα προγράμματα αυτού του τύπου. Αν έχετε μικρόφωνο ή κάμερα, "
+"μπορείτε επίσης να κάνετε φωνητικές κλήσεις ή βιντεοκλήσεις."
 
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:676
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Έχετε ήδη λογαριασμό που χρησιμοποιούσατε με άλλο πρόγραμμα μηνυμάτων;"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:699
 msgid "Yes, import my account details from "
 msgstr "Ναι, να γίνει εισαγωγή των στοιχείων του λογαριασμού μου από το "
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:720
 msgid "Yes, I'll enter my account details now"
 msgstr "Ναι, θα εισάγω τα στοιχεία του λογαριασμού μου"
 
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:742
 msgid "No, I want a new account"
 msgstr "Όχι, θέλω να δημιουργήσω νέο λογαριασμό"
 
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:752
 msgid "No, I just want to see people online nearby for now"
-msgstr "Όχι, αλλά προς το παρόν θέλω μόνο να βλέπω τα συνδεδεμένα γειτονικά άτομα"
+msgstr ""
+"Όχι, αλλά προς το παρόν θέλω μόνο να βλέπω τα συνδεδεμένα γειτονικά άτομα"
 
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:773
 msgid "Select the accounts you want to import:"
 msgstr "Επιλέξτε τους λογαριασμούς που θέλετε να εισάγετε:"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
 #: ../src/empathy-new-chatroom-dialog.c:609
 #: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "Ναι"
 
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:864
 msgid "No, that's all for now"
 msgstr "Όχι, αυτά προς το παρόν"
 
-#: ../src/empathy-account-assistant.c:1130
-msgid "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 "Το Empathy μπορεί να ανακαλύπτει αυτόματα και να επιτρέπει συζητήσεις με άτομα συνδεδεμένα στο ίδιο δίκτυο με εσάς. Αν επιθυμείτε να χρησιμοποιήσετε αυτή τη δυνατότητα, παρακαλώ ελέγξτε την ακρίβεια των παρακάτω στοιχείων. Φυσικά, μπορείτε πολύ εύκολα να αλλάξετε τα στοιχεία ή να απενεργοποιήσετε την υπηρεσία από το διάλογο 'Λογαριασμοί'."
-
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1129
+msgid ""
+"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 ""
+"Το Empathy μπορεί να ανακαλύπτει αυτόματα και να επιτρέπει συζητήσεις με "
+"άτομα συνδεδεμένα στο ίδιο δίκτυο με εσάς. Αν επιθυμείτε να χρησιμοποιήσετε "
+"αυτή τη δυνατότητα, παρακαλώ ελέγξτε την ακρίβεια των παρακάτω στοιχείων. "
+"Φυσικά, μπορείτε πολύ εύκολα να αλλάξετε τα στοιχεία ή να απενεργοποιήσετε "
+"την υπηρεσία από το διάλογο 'Λογαριασμοί'."
+
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "Επεξεργασία->Λογαριασμοί"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "Προς το παρόν δεν επιθυμώ να ενεργοποιήσω αυτή τη δυνατότητα"
 
-#: ../src/empathy-account-assistant.c:1188
-msgid "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 "Δε θα μπορείτε να συζητάτε με άτομα συνδεδεμένα στο τοπικό σας δίκτυο, γιατί δεν είναι εγκατεστημένο το telepathy-salut. Αν επιθυμείτε να ενεργοποιήσετε αυτή τη δυνατότητα, παρακαλώ εγκαταστήστε το πακέτο telepathy-salut και δημιουργήστε λογαριασμό 'Γειτονικά άτομα' από το διάλογο Λογαριασμοί"
+#: ../src/empathy-account-assistant.c:1187
+msgid ""
+"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 ""
+"Δε θα μπορείτε να συζητάτε με άτομα συνδεδεμένα στο τοπικό σας δίκτυο, γιατί "
+"δεν είναι εγκατεστημένο το telepathy-salut. Αν επιθυμείτε να ενεργοποιήσετε "
+"αυτή τη δυνατότητα, παρακαλώ εγκαταστήστε το πακέτο telepathy-salut και "
+"δημιουργήστε λογαριασμό 'Γειτονικά άτομα' από το διάλογο Λογαριασμοί"
 
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1193
 msgid "telepathy-salut not installed"
 msgstr "Δεν είναι εγκατεστημένο το telepathy-salut"
 
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Βοηθός λογαριασμών για άμεσα μηνύματα και VoIP"
 
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "Καλώς ήλθατε στο Empathy"
 
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "Εισαγωγή λογαριασμών"
 
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1300
 msgid "Please enter personal details"
 msgstr "Παρακαλώ εισάγετε τα προσωπικά σας στοιχεία"
 
@@ -2513,8 +2657,7 @@ msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές στο 
 msgid "Your new account has not been saved yet."
 msgstr "Ο νέος λογαριασμός δεν έχει αποθηκευτεί ακόμη."
 
-#: ../src/empathy-accounts-dialog.c:281
-#: ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
 msgid "Connecting…"
 msgstr "Γίνεται σύνδεση…"
 
@@ -2540,7 +2683,7 @@ msgstr "Άγνωστη κατάσταση"
 msgid "Offline — Account Disabled"
 msgstr "Εκτός σύνδεσης — απενεργοποιημένος λογαριασμός"
 
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:810
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2548,16 +2691,16 @@ msgstr ""
 "Αν δημιουργήσετε νέο λογαριασμό, θα απορριφθούν \n"
 "οι αλλαγές σας. Σίγουρα θέλετε να συνεχίσετε;"
 
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1157
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Θέλετε να διαγράψετε το '%s' από τον υπολογιστή;"
 
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1161
 msgid "This will not remove your account on the server."
 msgstr "Ο λογαριασμός σας δε θα διαγραφεί από τον εξυπηρετητή."
 
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1399
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2565,7 +2708,7 @@ msgstr ""
 "Αν επιλέξετε άλλο λογαριασμό, θα απορριφθούν \n"
 "οι αλλαγές σας. Σίγουρα θέλετε να συνεχίσετε;"
 
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:2002
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2586,8 +2729,12 @@ msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
 #: ../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."
-msgstr "Για να προσθέσετε νέο λογαριασμό, πρέπει πρώτα να εγκαταστήσετε ένα σύστημα υποστήριξης για κάθε πρωτόκολλο που θέλετε να χρησιμοποιήσετε."
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Για να προσθέσετε νέο λογαριασμό, πρέπει πρώτα να εγκαταστήσετε ένα σύστημα "
+"υποστήριξης για κάθε πρωτόκολλο που θέλετε να χρησιμοποιήσετε."
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid "_Add…"
@@ -2698,35 +2845,59 @@ msgstr "Τεχνικές λεπτομέρειες"
 
 #: ../src/empathy-call-window.c:2362
 #, c-format
-msgid "%s's software does not understand any of the audio formats supported by your computer"
-msgstr "Το λογισμικό του %s δεν υποστηρίζει καμία από τις μορφές ήχου που υποστηρίζει ο υπολογιστής σας"
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"Το λογισμικό του %s δεν υποστηρίζει καμία από τις μορφές ήχου που "
+"υποστηρίζει ο υπολογιστής σας"
 
 #: ../src/empathy-call-window.c:2367
 #, c-format
-msgid "%s's software does not understand any of the video formats supported by your computer"
-msgstr "Το λογισμικό του %s δεν υποστηρίζει καμία από τις μορφές βίντεο που υποστηρίζει ο υπολογιστής σας"
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"Το λογισμικό του %s δεν υποστηρίζει καμία από τις μορφές βίντεο που "
+"υποστηρίζει ο υπολογιστής σας"
 
 #: ../src/empathy-call-window.c:2373
 #, 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 "Αδυναμία σύνδεσης με %s. Ένας από εσάς μπορεί να χρησιμοποιεί δίκτυο που δεν επιτρέπει άμεσες συνδέσεις."
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Αδυναμία σύνδεσης με %s. Ένας από εσάς μπορεί να χρησιμοποιεί δίκτυο που δεν "
+"επιτρέπει άμεσες συνδέσεις."
 
 #: ../src/empathy-call-window.c:2379
 msgid "There was a failure on the network"
 msgstr "Παρουσιάστηκε κώλυμα στο δίκτυο"
 
 #: ../src/empathy-call-window.c:2383
-msgid "The audio formats necessary for this call are not installed on your computer"
-msgstr "Δεν είναι εγκατεστημένη η υποστήριξη για τις μορφές ήχου που απαιτεί αυτή η κλήση"
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Δεν είναι εγκατεστημένη η υποστήριξη για τις μορφές ήχου που απαιτεί αυτή η "
+"κλήση"
 
 #: ../src/empathy-call-window.c:2386
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "Δεν είναι εγκατεστημένη η υποστήριξη για τις μορφές βίντεο που απαιτεί αυτή η κλήση"
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Δεν είναι εγκατεστημένη η υποστήριξη για τις μορφές βίντεο που απαιτεί αυτή "
+"η κλήση"
 
 #: ../src/empathy-call-window.c:2396
 #, 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 "Παρουσιάστηκε μη αναμενόμενο σφάλμα σε ένα συστατικό του Telepathy. Παρακαλώ, κάνετε <a href=\"%s\">αναφορά του σφάλματος</a>, επισυνάπτοντας τις καταγραφές από το παράθυρο 'Αποσφαλμάτωση' του μενού Βοήθεια."
+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 ""
+"Παρουσιάστηκε μη αναμενόμενο σφάλμα σε ένα συστατικό του Telepathy. "
+"Παρακαλώ, κάνετε <a href=\"%s\">αναφορά του σφάλματος</a>, επισυνάπτοντας "
+"τις καταγραφές από το παράθυρο 'Αποσφαλμάτωση' του μενού Βοήθεια."
 
 #: ../src/empathy-call-window.c:2404
 msgid "There was a failure in the call engine"
@@ -2836,13 +3007,11 @@ msgstr "Προεπισκόπηση βίντεο"
 msgid "_Call"
 msgstr "_Κλήση"
 
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../src/empathy-chat-window.c:452
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -2906,8 +3075,7 @@ msgstr "Μετακίνηση καρτέλας _δεξιά"
 msgid "Notify for All Messages"
 msgstr "Ειδοποίηση για όαλ τα μηνύματα"
 
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
@@ -2919,8 +3087,7 @@ msgstr "_Συζήτηση"
 msgid "_Detach Tab"
 msgstr "Από_σπαση καρτέλας"
 
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
@@ -2928,8 +3095,7 @@ msgstr "_Επεξεργασία"
 msgid "_Favorite Chat Room"
 msgstr "_Αγαπημένο δωμάτιο συζήτησης"
 
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "_Βοήθεια"
 
@@ -2941,8 +3107,7 @@ msgstr "_Επόμενη καρτέλα"
 msgid "_Previous Tab"
 msgstr "_Προηγούμενη καρτέλα"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "Εμφάνιση _λίστας επαφών"
 
@@ -2988,8 +3153,7 @@ msgstr "Ο/Η %s σας καλεί για βιντεοκλήση. Θέλετε 
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Ο/Η %s σας καλεί. Θέλετε να απαντήσετε;"
 
-#: ../src/empathy-event-manager.c:476
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Εισερχόμενη κλήση από: %s"
@@ -3146,19 +3310,16 @@ msgstr "Το \"%s\" στάλθηκε στον/στην %s"
 msgid "File transfer completed"
 msgstr "Ολοκληρώθηκε η μεταφορά του αρχείου"
 
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "Αναμένεται η απάντηση του συνομιλητή σας"
 
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Έλεγχος ακεραιότητας του \"%s\""
 
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Υπολογισμός hash του \"%s\""
@@ -3181,11 +3342,16 @@ msgstr "Μεταφορές αρχείων"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Διαγραφή ολοκληρωμένων, ακυρωμένων και αποτυχημένων μεταφορών από τη λίστα"
+msgstr ""
+"Διαγραφή ολοκληρωμένων, ακυρωμένων και αποτυχημένων μεταφορών από τη λίστα"
 
 #: ../src/empathy-import-dialog.c:84
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Δε βρέθηκαν λογαριασμοί για εισαγωγή. Προς το παρόν, το Empathy υποστηρίζει μόνο εισαγωγή από το Pidgin."
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Δε βρέθηκαν λογαριασμοί για εισαγωγή. Προς το παρόν, το Empathy υποστηρίζει "
+"μόνο εισαγωγή από το Pidgin."
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
@@ -3252,8 +3418,7 @@ msgstr "Διαχείριση αγαπημένων"
 msgid "N_ormal Size"
 msgstr "_Κανονικό μέγεθος"
 
-#: ../src/empathy-main-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Νέα _κλήση…"
 
@@ -3297,8 +3462,7 @@ msgstr "Μετα_φορές αρχείων"
 msgid "_Join…"
 msgstr "_Σύνδεση…"
 
-#: ../src/empathy-main-window.ui.h:22
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Νέα _συζήτηση…"
 
@@ -3355,12 +3519,19 @@ msgid "Couldn't load room list"
 msgstr "Αδυναμία φόρτωσης της λίστας δωματίων"
 
 #: ../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 "Εισάγετε το όνομα του δωματίου στο οποίο θέλετε να συνδεθείτε ή επιλέξτε ένα ή περισσότερα δωμάτια από τη λίστα."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Εισάγετε το όνομα του δωματίου στο οποίο θέλετε να συνδεθείτε ή επιλέξτε ένα "
+"ή περισσότερα δωμάτια από τη λίστα."
 
 #: ../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"
-msgstr "Εισάγετε τον εξυπηρετητή που παρέχει το δωμάτιο συζήτησης, ή αφήστε το κενό αν το δωμάτιο είναι στον τρέχοντα εξυπηρετητή του λογαριασμού"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Εισάγετε τον εξυπηρετητή που παρέχει το δωμάτιο συζήτησης, ή αφήστε το κενό "
+"αν το δωμάτιο είναι στον τρέχοντα εξυπηρετητή του λογαριασμού"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -3475,8 +3646,14 @@ msgid "Privacy"
 msgstr "Απόρρητο"
 
 #: ../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 "Η μείωση της ακρίβειας της τοποθεσίας σημαίνει ότι οι μόνες πληροφορίες που θα δημοσιεύονται θα είναι η πόλη, η περιοχή και η χώρα σας. Οι συντεταγμένες GPS θα έχουν ακρίβεια ενός δεκαδικού ψηφίου."
+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 ""
+"Η μείωση της ακρίβειας της τοποθεσίας σημαίνει ότι οι μόνες πληροφορίες που "
+"θα δημοσιεύονται θα είναι η πόλη, η περιοχή και η χώρα σας. Οι συντεταγμένες "
+"GPS θα έχουν ακρίβεια ενός δεκαδικού ψηφίου."
 
 #: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
@@ -3495,8 +3672,12 @@ msgid "Spell Checking"
 msgstr "Ορθογραφικός έλεγχος"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Η λίστα γλωσσών περιέχει μόνο τις γλώσσες για τις οποίες υπάρχει εγκατεστημένο λεξικό."
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Η λίστα γλωσσών περιέχει μόνο τις γλώσσες για τις οποίες υπάρχει "
+"εγκατεστημένο λεξικό."
 
 #: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
@@ -3595,8 +3776,7 @@ msgstr "Αποσφαλμάτωση"
 msgid "Info"
 msgstr "Πληροφορίες"
 
-#: ../src/empathy-debug-window.c:1519
-#: ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
 msgid "Message"
 msgstr "Μήνυμα"
 
@@ -3629,8 +3809,12 @@ msgid "Level"
 msgstr "Επίπεδο"
 
 #: ../src/empathy-debug-window.c:1600
-msgid "The selected connection manager does not support the remote debugging extension."
-msgstr "Η επιλεγμένη εφαρμογή διαχείρισης συνδέσεων δεν υποστηρίζει την επέκταση απομακρυσμένης αποσφαλμάτωσης."
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Η επιλεγμένη εφαρμογή διαχείρισης συνδέσεων δεν υποστηρίζει την επέκταση "
+"απομακρυσμένης αποσφαλμάτωσης."
 
 #: ../src/empathy-invite-participant-dialog.c:34
 #: ../src/empathy-invite-participant-dialog.c:48
@@ -3647,15 +3831,19 @@ msgstr "Πρόσκληση"
 
 #: ../src/empathy-accounts.c:182
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Να μην εμφανιστούν διάλογοι. Εκτέλεση των εργασιών (π.χ. εισαγωγή) κα έξοδος"
+msgstr ""
+"Να μην εμφανιστούν διάλογοι. Εκτέλεση των εργασιών (π.χ. εισαγωγή) κα έξοδος"
 
 #: ../src/empathy-accounts.c:186
 msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Απενεργοποίηση προβολής κάθε διαλόγου εάν υπάρχουν λογαριασμοί που δεν είναι τύπου salut"
+msgstr ""
+"Απενεργοποίηση προβολής κάθε διαλόγου εάν υπάρχουν λογαριασμοί που δεν είναι "
+"τύπου salut"
 
 #: ../src/empathy-accounts.c:190
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Αρχικά, επιλογή δοσμένου λογαριασμού (π.χ., gabble/jabber/bla_40bla_2bla0)"
+msgstr ""
+"Αρχικά, επιλογή δοσμένου λογαριασμού (π.χ., gabble/jabber/bla_40bla_2bla0)"
 
 #: ../src/empathy-accounts.c:192
 msgid "<account-id>"
@@ -3675,8 +3863,8 @@ msgstr "Αποσφαλματωτής Empathy"
 
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "Χρήση _Yahoo! Ιαπωνίας"
-#~ msgctxt "Link individual (contextual menu)"
 
+#~ msgctxt "Link individual (contextual menu)"
 #~ msgid "_Link…"
 #~ msgstr "_Σύνδεση…"
 
diff --git a/po/es.po b/po/es.po
index 6e4cf53..42d50b5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,15 +1,15 @@
-# translation of empathy.HEAD.po to Español
+# translation of empathy.gnome-2-32.es.po to Español
 # Copyright (C) 2003 Free Software Foundation
 # This file is distributed under the same license as the Gossip package.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.master\n"
+"Project-Id-Version: empathy.gnome-2-32\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-21 07:37+0000\n"
-"PO-Revision-Date: 2010-09-21 23:09+0200\n"
+"POT-Creation-Date: 2010-09-29 11:53+0000\n"
+"PO-Revision-Date: 2010-10-01 12:22+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -491,7 +491,7 @@ msgstr "Gestionar las cuentas de mensajería y Voz IP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2156
 msgid "Messaging and VoIP Accounts"
 msgstr "Cuentas de mensajería y Voz IP"
 
@@ -563,9 +563,9 @@ msgstr "Invisible"
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -779,7 +779,7 @@ msgstr "Nombre de usuario:"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1521
 msgid "A_pply"
-msgstr "_Aplilcar"
+msgstr "_Aplicar"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1551
 msgid "L_og in"
@@ -1363,7 +1363,7 @@ msgstr "Insertar emoticono"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
 msgid "_Send"
 msgstr "E_nviar"
 
@@ -1431,7 +1431,7 @@ msgstr "%s ha entrado en la sala"
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
 msgid "Disconnected"
 msgstr "Desconectado"
 
@@ -1478,17 +1478,17 @@ msgstr "_Abrir enlace"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Editar información del contacto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
@@ -1505,7 +1505,6 @@ msgid "Ungrouped"
 msgstr "Sin grupo"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
-#| msgid "Favorite"
 msgid "Favorite People"
 msgstr "Gente favorita"
 
@@ -1580,7 +1579,7 @@ msgid "Share My Desktop"
 msgstr "Compartir mi escritorio"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
 #: ../libempathy-gtk/empathy-individual-menu.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
@@ -1611,153 +1610,153 @@ msgstr "_Invitar a sala de chat"
 msgid "Select a contact"
 msgstr "Seleccionar un contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
 #: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "Nombre completo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
 #: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "Número de teléfono:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
 #: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "Dirección de correo-e:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
 #: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "Página web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
 #: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:578
+#: ../libempathy-gtk/empathy-contact-widget.c:609
 #: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:580
+#: ../libempathy-gtk/empathy-contact-widget.c:611
 #: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:582
+#: ../libempathy-gtk/empathy-contact-widget.c:613
 #: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:615
 #: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-contact-widget.c:617
 #: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:588
+#: ../libempathy-gtk/empathy-contact-widget.c:619
 #: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:590
+#: ../libempathy-gtk/empathy-contact-widget.c:621
 #: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "Calle:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:592
+#: ../libempathy-gtk/empathy-contact-widget.c:623
 #: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "Edificio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:594
+#: ../libempathy-gtk/empathy-contact-widget.c:625
 #: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:596
+#: ../libempathy-gtk/empathy-contact-widget.c:627
 #: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "Habitación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:629
 #: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:631
 #: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-contact-widget.c:633
 #: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:604
+#: ../libempathy-gtk/empathy-contact-widget.c:635
 #: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:637
 #: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-contact-widget.c:639
 #: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-contact-widget.c:641
 #: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "Error horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-contact-widget.c:643
 #: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-contact-widget.c:645
 #: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "Retardo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-contact-widget.c:647
 #: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "Velocidad de ascenso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-contact-widget.c:649
 #: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "Actualizado por última vez:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-contact-widget.c:651
 #: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "Longitud_"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-contact-widget.c:653
 #: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:655
 #: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
 #: ../libempathy-gtk/empathy-individual-widget.c:582
 #: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
@@ -1765,23 +1764,23 @@ msgid "Location"
 msgstr "Ubicación geográfica"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-contact-widget.c:737
 #: ../libempathy-gtk/empathy-individual-widget.c:601
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 #: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-contact-widget.c:928
 #: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
@@ -1856,7 +1855,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
 msgstr "Contactos enlazados"
 
@@ -1924,16 +1923,16 @@ msgstr "SSL"
 #. 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:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
 msgstr "Enlazar contactos"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
 msgstr "_Desenlazar…"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed meta-contact into the contacts it contains."
 msgstr ""
@@ -1944,16 +1943,16 @@ msgstr ""
 #. 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:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
 msgstr "_Enlazar"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
 #, c-format
 msgid "Unlink meta-contact '%s'?"
 msgstr "¿Desenlazar el metacontacto «%s»?"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
 msgid ""
 "Are you sure you want to unlink this meta-contact? This will completely "
 "split the meta-contact into the contacts it contains."
@@ -1961,7 +1960,7 @@ msgstr ""
 "¿Está seguro de que quiere desenlazar este metacontacto? Esto separará "
 "completamente la información del metacontacto en los contactos que contiene."
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desenlazar"
@@ -1976,10 +1975,12 @@ msgid "Conversations"
 msgstr "Conversaciones"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find Next"
 msgstr "Buscar siguiente"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgid "Find Previous"
 msgstr "Buscar anterior"
 
@@ -2063,15 +2064,15 @@ msgstr "Establecer su presencia y estado actual"
 msgid "Custom messages…"
 msgstr "Mensajes personalizados…"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "Buscar:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "Match case"
 msgstr "Coincidir con capitalización"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
 msgstr "No se encontró la frase"
 
@@ -2220,15 +2221,15 @@ msgstr "Recordar esta opción para futuras conexiones"
 msgid "Certificate Details"
 msgstr "Detalles del certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo entrante de %s"
@@ -2501,7 +2502,7 @@ msgstr ""
 "Editar."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "Ocurrió un error"
 
@@ -2515,31 +2516,31 @@ msgstr "Ocurrió un error"
 msgid "New %s account"
 msgstr "Cuenta de %s nueva"
 
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:514
 msgid "What kind of chat account do you have?"
 msgstr "¿Qué tipo de cuenta tiene?"
 
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:520
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
 msgid "Enter your account details"
 msgstr "Introducir los detalles de su cuenta"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:531
 msgid "What kind of chat account do you want to create?"
 msgstr "¿Qué tipo de cuenta quiere crear?"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
 msgid "Do you want to create other chat accounts?"
 msgstr "¿Quiere crear otras cuentas de chat?"
 
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:544
 msgid "Enter the details for the new account"
 msgstr "Introducir los detalles para la cuenta nueva"
 
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:659
 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 "
@@ -2550,41 +2551,41 @@ msgstr ""
 "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
 "micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
 
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:676
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:699
 msgid "Yes, import my account details from "
 msgstr "Sí, importar los detalles de mi cuenta desde "
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:720
 msgid "Yes, I'll enter my account details now"
 msgstr "Sí, introduciré ahora los detalles de mi cuenta"
 
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:742
 msgid "No, I want a new account"
 msgstr "No, quiero crear una cuenta nueva"
 
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:752
 msgid "No, I just want to see people online nearby for now"
 msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
 
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:773
 msgid "Select the accounts you want to import:"
 msgstr "Seleccione las cuentas que quiere importar:"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
 #: ../src/empathy-new-chatroom-dialog.c:609
 #: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:864
 msgid "No, that's all for now"
 msgstr "No, eso es todo por ahora"
 
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1129
 msgid ""
 "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 "
@@ -2597,16 +2598,16 @@ msgstr ""
 "estos detalles posteriormente o desactivar esta característica usando el "
 "diálogo «Cuentas»."
 
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "Editar->Cuentas"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "No quiero activar esta característica por ahora"
 
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1187
 msgid ""
 "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 "
@@ -2618,23 +2619,23 @@ msgstr ""
 "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
 "diálogo Cuentas."
 
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1193
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut no está instalado"
 
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Asistente de cuentas de mensajería y Voz IP"
 
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "Bienvenido a Empathy"
 
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "Importar sus cuentas existentes"
 
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1300
 msgid "Please enter personal details"
 msgstr "Introduzca los detalles personales"
 
@@ -2677,7 +2678,7 @@ msgstr "Estado desconocido"
 msgid "Offline — Account Disabled"
 msgstr "Desconectado: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:810
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2685,16 +2686,16 @@ msgstr ""
 "Va a crear una cuenta nueva que descartará sus cambios.\n"
 "¿Seguro que quiere continuar?"
 
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1157
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "¿Quiere quitar %s de su equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1161
 msgid "This will not remove your account on the server."
 msgstr "Esto no quitará su cuenta del servidor."
 
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1399
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2702,7 +2703,7 @@ msgstr ""
 "Va a seleccionar otra cuenta lo que descartará sus cambios.\n"
 "¿Seguro que quiere continuar?"
 
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:2002
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2774,70 +2775,70 @@ msgstr "Gamma"
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1175
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1194
 msgid "Audio input"
 msgstr "Entrada de voz"
 
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1198
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1202
 msgid "Dialpad"
 msgstr "Teclado de llamada"
 
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1207
 msgid "Details"
 msgstr "Detalles"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1275
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1354
 msgid "Call"
 msgstr "Llamar"
 
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1508
 msgid "The IP address as seen by the machine"
 msgstr "La dirección IP como la ve la máquina"
 
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1510
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La dirección IP como la ve el servidor de Internet"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1512
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La dirección IP del par como la ve la otra parte"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1514
 msgid "The IP address of a relay server"
 msgstr "La dirección IP de un servidor de desvío"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1516
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2263
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2324
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2362
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -2846,7 +2847,7 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2367
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -2855,7 +2856,7 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2373
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2864,25 +2865,25 @@ msgstr ""
 "No se puede establecer una conexión con %s. Uno de los dos puede estar en "
 "una red que no acepta conexiones directas."
 
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2379
 msgid "There was a failure on the network"
 msgstr "Hubo un fallo en la red"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2383
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "No están instalados en su equipo los formatos de sonido necesarios para esta "
 "llamada"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2386
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "No están instalados en su equipo los formatos de vídeo necesarios para esta "
 "llamada"
 
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2396
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2893,19 +2894,19 @@ msgstr ""
 "\">Informe de este error</a> y añada los registros obtenidos de la ventana "
 "de «Depuración» en el menú de Ayuda."
 
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2404
 msgid "There was a failure in the call engine"
 msgstr "Hubo un fallo en el motor de llamadas"
 
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2407
 msgid "The end of the stream was reached"
 msgstr "Se llegó al final del flujo"
 
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2447
 msgid "Can't establish audio stream"
 msgstr "No se puede establecer el flujo de voz"
 
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2457
 msgid "Can't establish video stream"
 msgstr "No se puede establecer el flujo de vídeo"
 
diff --git a/po/lt.po b/po/lt.po
index 159f6e5..3fc61dd 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,16 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-15 12:05+0000\n"
-"PO-Revision-Date: 2010-09-17 23:41+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-29 14:16+0200\n"
+"PO-Revision-Date: 2010-09-29 14:16+0200\n"
 "Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.6.1\n"
@@ -129,7 +128,6 @@ msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy perkėlė butterfly žurnalus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-#| msgid "Empathy should auto-connect on startup"
 msgid "Empathy should auto-away when idle"
 msgstr "Nenaudojant Empathy, turėtų būti nustatoma nebuvimo būsena"
 
@@ -307,8 +305,6 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Ar Empathy turėtų automatiškai prisijungti prie paskyrų ją paleidus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-#| msgid ""
-#| "Whether Empathy should automatically log into your accounts on startup."
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
@@ -460,7 +456,7 @@ msgstr "Tvarkyti pokalbių ir VoIP paskyras"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2156
 msgid "Messaging and VoIP Accounts"
 msgstr "Pokalbių ir VoIP paskyros"
 
@@ -532,11 +528,9 @@ msgstr "Nematomas (-a)"
 msgid "Offline"
 msgstr "Atsijungęs (-usi)"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
-#| msgctxt "file transfer percent"
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "Nežinoma"
 
@@ -601,27 +595,22 @@ msgid "Encryption is not available"
 msgstr "Šifravimas neprieinamas"
 
 #: ../libempathy/empathy-utils.c:358
-#| msgid "Certificate not activated"
 msgid "Certificate is invalid"
 msgstr "Liudijimas netinkamas"
 
 #: ../libempathy/empathy-utils.c:360
-#| msgid "Connection managers should be used"
 msgid "Connection has been refused"
 msgstr "Ryšys atmestas"
 
 #: ../libempathy/empathy-utils.c:362
-#| msgid "Connection managers should be used"
 msgid "Connection can't be established"
 msgstr "Nepavyko užmegzti ryšio"
 
 #: ../libempathy/empathy-utils.c:364
-#| msgid "Connection managers should be used"
 msgid "Connection has been lost"
 msgstr "Ryšys nutrūko"
 
 #: ../libempathy/empathy-utils.c:366
-#| msgid "This account already exists on the server"
 msgid "This resource is already connected to the server"
 msgstr "Šis išteklius jau prisijungęs prie serverio"
 
@@ -631,7 +620,6 @@ msgid ""
 msgstr "Ryšį pakeitė naujas ryšys, naudojantis tą patį išteklių"
 
 #: ../libempathy/empathy-utils.c:371
-#| msgid "This account already exists on the server"
 msgid "The account already exists on the server"
 msgstr "Ši paskyra jau yra serveryje"
 
@@ -640,7 +628,6 @@ msgid "Server is currently too busy to handle the connection"
 msgstr "Serveris šiuo metu per daug užimtas, kad galėtų apdoroti šį ryšį"
 
 #: ../libempathy/empathy-utils.c:375
-#| msgid "Certificate not provided"
 msgid "Certificate has been revoked"
 msgstr "Liudijimas atšauktas"
 
@@ -660,6 +647,7 @@ msgstr ""
 "kriptografijos bibliotekos numatytas ribas"
 
 #: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Žmonės netoliese"
 
@@ -734,7 +722,6 @@ msgid "Account"
 msgstr "Paskyra"
 
 #: ../libempathy-gtk/empathy-account-widget.c:515
-#| msgid "Password:"
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -777,7 +764,6 @@ msgid "Account:"
 msgstr "Paskyra:"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1628
-#| msgid "Enabled"
 msgid "_Enabled"
 msgstr "Įj_ungta"
 
@@ -896,7 +882,6 @@ msgstr "<b>Pavyzdys:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-#| msgid "Character set:"
 msgid "Ch_aracter set:"
 msgstr "_Simbolių koduotė:"
 
@@ -978,7 +963,6 @@ msgid "Servers"
 msgstr "Serveriai"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-#| msgid "What is your AIM screen name?"
 msgid "What is your IRC nickname?"
 msgstr "Koks jūsų IRC slapyvardis?"
 
@@ -995,12 +979,10 @@ msgid "<b>Example:</b> user@jabber.org"
 msgstr "<b>Pavyzdys:</b> naudotojas@jabber.org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#| msgid "_Encryption required (TLS/SSL)"
 msgid "Encr_yption required (TLS/SSL)"
 msgstr "_Reikalingas šifravimas (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-#| msgid "_Ignore SSL certificate errors"
 msgid "I_gnore SSL certificate errors"
 msgstr "_Nepaisyti SSL liudijimo klaidų"
 
@@ -1009,7 +991,6 @@ msgid "Override server settings"
 msgstr "Nepaisyti serverio parametrų"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-#| msgid "Pri_ority:"
 msgid "Priori_ty:"
 msgstr "Pri_oritetas:"
 
@@ -1079,12 +1060,10 @@ msgid "What is your Windows Live password?"
 msgstr "Koks jūsų Windows Live slaptažodis?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-#| msgid "E-mail address:"
 msgid "E-_mail address:"
 msgstr "El. pašto adresas:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-#| msgid "Nickname:"
 msgid "Nic_kname:"
 msgstr "Slapy_vardis:"
 
@@ -1177,7 +1156,6 @@ msgid "_Username:"
 msgstr "_Naudotojo vardas:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#| msgid "_Ignore conference and chat room invitations"
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Nepaisyti konferencijų ir pokalbių kambarių kvietimų"
 
@@ -1354,7 +1332,7 @@ msgstr "Įterpti šypsenėlę"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
 msgid "_Send"
 msgstr "_Siųsti"
 
@@ -1422,7 +1400,7 @@ msgstr "%s prisijungė prie pokalbių kambario"
 msgid "%s is now known as %s"
 msgstr "%s dabar žinomas (-a) kaip %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
 msgid "Disconnected"
 msgstr "Atsijungęs(-usi)"
 
@@ -1469,17 +1447,17 @@ msgstr "_Atverti nuorodą"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d (%A)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Taisyti adresato informaciją"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "Naujas adresatas"
 
@@ -1491,6 +1469,14 @@ msgstr "Nuspręsti _vėliau"
 msgid "Subscription Request"
 msgstr "Prenumeratos prašymas"
 
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Nesugrupuota"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Mėgiami žmonės"
+
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
 #: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
@@ -1553,18 +1539,16 @@ msgstr "_Ankstesni pokalbiai"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
 #: ../libempathy-gtk/empathy-individual-menu.c:683
-#| msgid "Send file"
 msgid "Send File"
 msgstr "Siųsti failą"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:375
 #: ../libempathy-gtk/empathy-individual-menu.c:725
-#| msgid "Share my desktop"
 msgid "Share My Desktop"
 msgstr "Dalintis mano darbastaliu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
 #: ../libempathy-gtk/empathy-individual-menu.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
@@ -1588,7 +1572,6 @@ msgstr "Jus kviečia į šį kambarį"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:575
 #: ../libempathy-gtk/empathy-individual-menu.c:1017
-#| msgid "_Invite to chat room"
 msgid "_Invite to Chat Room"
 msgstr "_Pakviesti į pokalbių kambarį"
 
@@ -1596,153 +1579,153 @@ msgstr "_Pakviesti į pokalbių kambarį"
 msgid "Select a contact"
 msgstr "Pasirinkite adresatą"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
 #: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "Vardas ir pavardė:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
 #: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "Telefono numeris:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
 #: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "El. pašto adresas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
 #: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "Tinklalapis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
 #: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "Gimtadienis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:609
 #: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "Šalies ISO kodas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:611
 #: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "Šalis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:613
 #: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "Būsena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:615
 #: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "Miestas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:617
 #: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "Sritis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:619
 #: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "Pašto kodas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:621
 #: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "Gatvė:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:623
 #: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "Pastatas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:625
 #: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "Aukštas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:627
 #: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:629
 #: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "Tekstas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:631
 #: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:633
 #: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:635
 #: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "Tikslumo lygis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:637
 #: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "Paklaida:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:639
 #: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "Vertikali paklaida (metrais):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:641
 #: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "Horizontali paklaida (metrais):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:643
 #: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:645
 #: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "Azimutas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:647
 #: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "Kilimo greitis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:649
 #: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "Paskutinįkart atnaujinta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:651
 #: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "Ilguma:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:653
 #: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "Platuma:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:655
 #: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "Altitudė:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
 #: ../libempathy-gtk/empathy-individual-widget.c:582
 #: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
@@ -1750,24 +1733,23 @@ msgid "Location"
 msgstr "Vietovė"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:737
 #: ../libempathy-gtk/empathy-individual-widget.c:601
 #, c-format
-#| msgid "%s of %s"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 #: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "Išsaugoti pseudoportretą"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:928
 #: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "Nepavyko išsaugoti pseudoportreto"
@@ -1842,18 +1824,15 @@ msgid "Group"
 msgstr "Grupė"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
 msgstr "Susieti adresatai"
 
 #: ../libempathy-gtk/empathy-individual-linker.c:354
-#| msgid "Select a contact"
 msgid "Select contacts to link"
 msgstr "Pasirinkite susietinus adresatus"
 
 #: ../libempathy-gtk/empathy-individual-linker.c:428
-#| msgid "New Contact"
 msgid "New contact preview"
 msgstr "Naujo adresato peržiūra"
 
@@ -1866,12 +1845,10 @@ msgstr "Kairėje esančiame sąraše pažymėti adresatai bus susieti kartu."
 #. * of the user's account IDs (e.g. me@hotmail.com).
 #: ../libempathy-gtk/empathy-individual-menu.c:132
 #, c-format
-#| msgid " (%s)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:837
-#| msgid "_Edit"
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Taisyti"
@@ -1879,7 +1856,6 @@ msgstr "_Taisyti"
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
 #: ../libempathy-gtk/empathy-individual-menu.c:863
-#| msgid "_Add Contact…"
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Susieti adresatus…"
@@ -1893,7 +1869,6 @@ msgstr[1] "Metaadresatas, apimantis %u adresatus"
 msgstr[2] "Metaadresatas, apimantis %u adresatų"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#| msgid "<b>Location</b> at (date)\t"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Vietovė</b> (data)"
 
@@ -1916,18 +1891,16 @@ msgstr "SSL"
 #. 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:116
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
 msgstr "Susieti adresatus"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-#| msgid "_Join…"
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
 msgstr "_Išskaidyti…"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed meta-contact into the contacts it contains."
 msgstr "Visiškai išskaidyti parodytą metaadresatą į jo apimamus adresatus."
@@ -1936,17 +1909,16 @@ msgstr "Visiškai išskaidyti parodytą metaadresatą į jo apimamus adresatus."
 #. 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:137
-#| msgid "_Open Link"
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
 msgstr "_Susieti"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
 #, c-format
 msgid "Unlink meta-contact '%s'?"
 msgstr "Išskaidyti metaadresatą „%s“?"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
 msgid ""
 "Are you sure you want to unlink this meta-contact? This will completely "
 "split the meta-contact into the contacts it contains."
@@ -1954,7 +1926,7 @@ msgstr ""
 "Ar tikrai norite išskaityti šį metaadresatą? Metaadresatas bus visiškai "
 "išskaidytas į jo apimamus pavienius adresatus."
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Išskaityti"
@@ -1969,11 +1941,12 @@ msgid "Conversations"
 msgstr "Pokalbiai"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find Next"
 msgstr "Ieškoti kito"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#| msgid "Video Preview"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgid "Find Previous"
 msgstr "Ieškoti ankstesnio"
 
@@ -2057,15 +2030,15 @@ msgstr "Nurodykite savo buvimą ir dabartinę būseną"
 msgid "Custom messages…"
 msgstr "Pasirinktinės žinutės…"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "Ieškoti:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "Match case"
 msgstr "Skirti raidžių registrą"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
 msgstr "Frazė nerasta"
 
@@ -2150,12 +2123,10 @@ msgid "The certificate is not signed by a Certification Authority"
 msgstr "Liudijimo nepasirašiusi jokia liudijimo įstaiga"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:160
-#| msgid "Certificate expired"
 msgid "The certificate has expired"
 msgstr "Liudijimas nebegalioja"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:163
-#| msgid "Certificate not activated"
 msgid "The certificate hasn't yet been activated"
 msgstr "Liudijimas dar neaktyvuotas"
 
@@ -2168,7 +2139,6 @@ msgid "The hostname verified by the certificate doesn't match the server name"
 msgstr "Liudijimo patvirtinamas kompiuterio vardas nesutampa su serverio vardu"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:173
-#| msgid "Certificate self-signed"
 msgid "The certificate is self-signed"
 msgstr "Savo pačių pasirašytas liudijimas"
 
@@ -2185,24 +2155,20 @@ msgid "The certificate length exceeds verifiable limits"
 msgstr "Liudijimo ilgis viršija patikrinamas ribas"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:187
-#| msgid "Certificate expired"
 msgid "The certificate is malformed"
 msgstr "Liudijimas yra netinkamai suformuotas"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:205
 #, c-format
-#| msgid "Certificate hostname mismatch"
 msgid "Expected hostname: %s"
 msgstr "Laukta kompiuterio vardo: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:208
 #, c-format
-#| msgid "Certificate hostname mismatch"
 msgid "Certificate hostname: %s"
 msgstr "Liudijimo kompiuterio vardas: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:263
-#| msgid "Context"
 msgid "Continue"
 msgstr "Tęsti"
 
@@ -2215,21 +2181,19 @@ msgid "Remember this choice for future connections"
 msgstr "Atsiminti šį pasirinkimą ateityje"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:294
-#| msgid "Certificate expired"
 msgid "Certificate Details"
 msgstr "Liudijimo informacija"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
 msgid "Unable to open URI"
 msgstr "Nepavyko atverti URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
 msgid "Select a file"
 msgstr "Pasirinkite failą"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
 #, c-format
-#| msgid "Incoming call from %s"
 msgid "Incoming file from %s"
 msgstr "Failas jums nuo %s"
 
@@ -2502,7 +2466,7 @@ msgstr ""
 "uždaryti šį pagelbiklį ir pridėti paskyras vėliau, naudojantis meniu Taisyti."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "Įvyko klaida"
 
@@ -2516,31 +2480,31 @@ msgstr "Įvyko klaida"
 msgid "New %s account"
 msgstr "Nauja %s paskyra"
 
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:514
 msgid "What kind of chat account do you have?"
 msgstr "Kokio tipo pokalbių paskyrą turite?"
 
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:520
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Ar turite kokių nors kitų pokalbių paskyrų, kurias norite nustatyti?"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
 msgid "Enter your account details"
 msgstr "Įveskite savo paskyros informaciją"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:531
 msgid "What kind of chat account do you want to create?"
 msgstr "Kokio tipo pokalbių paskyrą norite sukurti?"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
 msgid "Do you want to create other chat accounts?"
 msgstr "Ar norite sukurti kitų pokalbių paskyrų?"
 
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:544
 msgid "Enter the details for the new account"
 msgstr "Įveskite naujosios paskyros informaciją"
 
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:659
 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 "
@@ -2552,42 +2516,42 @@ msgstr ""
 "pokalbių programomis. Jeigu turite mikrofoną arba internetine kamerą, taip "
 "pat galite naudotis garsinių ir vaizdinių pokalbių galimybe."
 
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:676
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
 "Ar turite paskyrą, kuria naudojotės anksčiau su kita pokalbių programa?"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:699
 msgid "Yes, import my account details from "
 msgstr "Taip, importuoti mano paskyros informaciją iš"
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:720
 msgid "Yes, I'll enter my account details now"
 msgstr "Taip, įvesiu savo paskyros informaciją dabar"
 
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:742
 msgid "No, I want a new account"
 msgstr "Ne, noriu sukurti naują paskyrą"
 
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:752
 msgid "No, I just want to see people online nearby for now"
 msgstr "Ne, kol kas noriu tik matyti netoliese prisijungusius asmenis"
 
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:773
 msgid "Select the accounts you want to import:"
 msgstr "Pasirinkite pageidaujamas importuoti paskyras:"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
 #: ../src/empathy-new-chatroom-dialog.c:609
 #: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "Taip"
 
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:864
 msgid "No, that's all for now"
 msgstr "Ne, kol kas viskas"
 
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1129
 msgid ""
 "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 "
@@ -2599,16 +2563,16 @@ msgstr ""
 "pažiūrėkite, ar žemiau esantys duomenys yra teisingi. Galite juos pataisyti "
 "bet kada vėliau arba išjungti šią funkciją paskyrų dialoge"
 
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "Taisa → Paskyros"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "Ne, kol kas nenoriu įjungti šios funkcijos"
 
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1187
 msgid ""
 "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 "
@@ -2620,23 +2584,23 @@ msgstr ""
 "telepathy-salut paketą ir sukurkite paskyrų dialoge paskyrą „Žmonės "
 "netoliese“"
 
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1193
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut neįdiegta"
 
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Tikralaikių pokalbių ir VoIP paskyrų vediklis"
 
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "Sveikame paleidus Empathy"
 
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "Importuokite savo egzistuojančią paskyrą"
 
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1300
 msgid "Please enter personal details"
 msgstr "Įveskite savo asmeninius duomenis"
 
@@ -2679,7 +2643,7 @@ msgstr "Nežinoma būsena"
 msgid "Offline — Account Disabled"
 msgstr "Neprisijungta – Paskyra išjungta"
 
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:810
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2687,16 +2651,16 @@ msgstr ""
 "Ketinate sukurti naują paskyrą, bus prarasti jūsų pakeitimai!\n"
 "Ar tikrai norite tęsti?"
 
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1157
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ar tikrai norite pašalinti %s iš savo kompiuterio?"
 
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1161
 msgid "This will not remove your account on the server."
 msgstr "Jūsų paskyros serveryje nebus pašalintos."
 
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1399
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2704,7 +2668,7 @@ msgstr ""
 "Ketinate pasirinkti kitą paskyrą, bus prarasti jūsų pakeitimai.\n"
 "Ar tikrai norite tęsti?"
 
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:2002
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2713,7 +2677,6 @@ msgstr ""
 "Ar tikrai norite tęsti?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#| msgid "Edit Contact Information"
 msgid "Loading account information"
 msgstr "Įkeliama adresato informacija"
 
@@ -2742,12 +2705,10 @@ msgid "_Import…"
 msgstr "_Importuoti…"
 
 #: ../src/empathy-auth-client.c:217
-#| msgid "- Empathy IM Client"
 msgid " - Empathy authentication client"
 msgstr " – Empathy tapatybės nustatymo klientas"
 
 #: ../src/empathy-auth-client.c:233
-#| msgid "Authentication failed"
 msgid "Empathy authentication client"
 msgstr "Empathy tapatybės nustatymo klientas"
 
@@ -2756,12 +2717,10 @@ msgid "People nearby"
 msgstr "Žmonės netoliese"
 
 #: ../src/empathy-av.c:133
-#| msgid "- Empathy IM Client"
 msgid "- Empathy Audio/Video Client"
 msgstr "– Empathy garso/vaizdo transliavimo klientas"
 
 #: ../src/empathy-av.c:149
-#| msgid "Empathy IM Client"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy garso/vaizdo transliavimo klientas"
 
@@ -2781,71 +2740,70 @@ msgstr "Gama"
 msgid "Volume"
 msgstr "Garsumas"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1175
 msgid "_Sidebar"
 msgstr "Š_oninė juosta"
 
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1194
 msgid "Audio input"
 msgstr "Garso įvestis"
 
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1198
 msgid "Video input"
 msgstr "Vaizdo įvestis"
 
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1202
 msgid "Dialpad"
 msgstr "Tel. klaviatūra"
 
-#: ../src/empathy-call-window.c:1205
-#| msgid "Contact Details"
+#: ../src/empathy-call-window.c:1207
 msgid "Details"
 msgstr "Išsami informacija"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1275
 #, c-format
 msgid "Call with %s"
 msgstr "Skambinti su %s"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1354
 msgid "Call"
 msgstr "Skambutis"
 
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1508
 msgid "The IP address as seen by the machine"
 msgstr "Kompiuterio matomas IP adresas"
 
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1510
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Interneto serverio matomas IP adresas"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1512
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Kitos pusės matomas lygiarangio IP adresas"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1514
 msgid "The IP address of a relay server"
 msgstr "Perdavimo serverio IP adresas"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1516
 msgid "The IP address of the multicast group"
 msgstr "Daugiaadresio perdavimo grupės IP adresas"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2263
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Prisijunta – %d:%02dm"
 
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2324
 msgid "Technical Details"
 msgstr "Techninė informacija"
 
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2362
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -2854,7 +2812,7 @@ msgstr ""
 "Adresato %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
 "formatų"
 
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2367
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -2863,7 +2821,7 @@ msgstr ""
 "Adresato %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
 "vaizdo įrašų formatų"
 
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2373
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2872,23 +2830,23 @@ msgstr ""
 "Nepavyko užmegzti ryšio su %s. Gali būti, kad vienas iš jūsų yra tinkle, "
 "nepriimančiame tiesioginių prisijungimų."
 
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2379
 msgid "There was a failure on the network"
 msgstr "Tinkle yra triktis"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2383
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Jūsų kompiuteryje neįdiegti garso įrašų formatai, reikalingi šiam skambučiui"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2386
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Jūsų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi šiam skambučiui"
 
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2396
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2899,24 +2857,23 @@ msgstr ""
 "apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba "
 "„Derinimo“ lange."
 
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2404
 msgid "There was a failure in the call engine"
 msgstr "Skambinimo posistemėje yra triktis"
 
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2407
 msgid "The end of the stream was reached"
 msgstr "Pasiekta srauto pabaiga"
 
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2447
 msgid "Can't establish audio stream"
 msgstr "Nepavyko sukurti garso srauto"
 
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2457
 msgid "Can't establish video stream"
 msgstr "Nepavyko sukurti vaizdo srauto"
 
 #: ../src/empathy-call-window.ui.h:1
-#| msgid "Auto"
 msgid "Audio"
 msgstr "Garsas"
 
@@ -2989,7 +2946,6 @@ msgid "V_ideo"
 msgstr "Va_izdas"
 
 #: ../src/empathy-call-window.ui.h:20
-#| msgid "V_ideo"
 msgid "Video"
 msgstr "Vaizdas"
 
@@ -3078,7 +3034,6 @@ msgid "Move Tab _Right"
 msgstr "Perkelti kortelę _dešinėn"
 
 #: ../src/empathy-chat-window.ui.h:8
-#| msgid "No error message"
 msgid "Notify for All Messages"
 msgstr "Įspėti apie visus pranešimus"
 
@@ -3184,7 +3139,6 @@ msgstr "Kvietimas į pokalbių kambarį"
 
 #: ../src/empathy-event-manager.c:697
 #, c-format
-#| msgid "%s invited you to join %s"
 msgid "Invitation to join %s"
 msgstr "Kvietimas prisijungti prie %s"
 
@@ -3209,7 +3163,6 @@ msgstr "%s pakvietė jus prisijungti %s"
 
 #: ../src/empathy-event-manager.c:749
 #, c-format
-#| msgid "%s invited you to join %s"
 msgid "You have been invited to join %s"
 msgstr "Jūs kviečiami prisijungti prie %s"
 
@@ -3379,7 +3332,6 @@ msgid "Source"
 msgstr "Šaltinis"
 
 #: ../src/empathy-main-window.c:383
-#| msgid "No topic defined"
 msgid "No match found"
 msgstr "Nerasta atitikmenų"
 
@@ -3499,11 +3451,6 @@ msgstr "Nariai"
 #. yes/no, yes/no and a number.
 #: ../src/empathy-new-chatroom-dialog.c:607
 #, c-format
-#| msgid ""
-#| "<b>%s</b>\n"
-#| "Invite required: %s\n"
-#| "Password required: %s\n"
-#| "Members: %s"
 msgid ""
 "%s\n"
 "Invite required: %s\n"
@@ -3644,7 +3591,6 @@ msgid "Location sources:"
 msgstr "Vietovės šaltiniai:"
 
 #: ../src/empathy-preferences.ui.h:14
-#| msgid "Conversations"
 msgid "Log conversations"
 msgstr "Vesti pokalbių žurnalus"
 
@@ -3696,7 +3642,6 @@ msgid "Themes"
 msgstr "Temos"
 
 #: ../src/empathy-preferences.ui.h:25
-#| msgid "Automatically _connect on startup "
 msgid "_Automatically connect on startup"
 msgstr "_Automatiškai prisijungti paleidimo metu"
 
@@ -3738,22 +3683,18 @@ msgid "Respond"
 msgstr "Atsakyti"
 
 #: ../src/empathy-status-icon.c:147
-#| msgid "_Reject"
 msgid "Reject"
 msgstr "Atmesti"
 
 #: ../src/empathy-status-icon.c:151
-#| msgid "_Answer"
 msgid "Answer"
 msgstr "Atsiliepti"
 
 #: ../src/empathy-status-icon.c:158
-#| msgid "_Decline"
 msgid "Decline"
 msgstr "Atsisakyti"
 
 #: ../src/empathy-status-icon.c:162
-#| msgid "Account"
 msgid "Accept"
 msgstr "Priimti"
 
@@ -3841,7 +3782,6 @@ msgid "Choose a contact to invite into the conversation:"
 msgstr "Pasirinkite į pokalbį pakviestiną adresatą:"
 
 #: ../src/empathy-invite-participant-dialog.c:45
-#| msgid "Invisible"
 msgid "Invite"
 msgstr "Pakviesti"
 
@@ -3850,7 +3790,6 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Nerodyti jokių dialogų, atlikti norimas užduotis (pvz., importuoti)"
 
 #: ../src/empathy-accounts.c:186
-#| msgid "Don't display any dialogs if there are any non-salut accounts"
 msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgstr "Nerodyti jokių dialogų, jei yra ne Salut paskyrų"
 
diff --git a/po/sv.po b/po/sv.po
index 90696b7..0932824 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 15:30+0200\n"
-"PO-Revision-Date: 2010-09-06 15:32+0100\n"
+"POT-Creation-Date: 2010-10-02 05:50+0200\n"
+"PO-Revision-Date: 2010-10-02 05:50+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -413,7 +414,7 @@ msgstr "Hantera konton för meddelanden och VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2156
 msgid "Messaging and VoIP Accounts"
 msgstr "Meddelande och VoIP-konton"
 
@@ -462,163 +463,164 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Den andra deltagaren kunde inte överföra filen"
 
 #: ../libempathy/empathy-tp-file.c:420
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:324
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../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
+#: ../libempathy/empathy-utils.c:257
+#: ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906
 #: ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "Okänt"
 
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
 msgid "No reason specified"
 msgstr "Ingen anledning angavs"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:354
 msgid "Status is set to offline"
 msgstr "Status är inställd till frånkopplad"
 
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:334
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:336
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../libempathy/empathy-utils.c:304
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate not provided"
 msgstr "Certifikat inte tillhandahållet"
 
-#: ../libempathy/empathy-utils.c:306
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:342
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../libempathy/empathy-utils.c:308
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:344
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../libempathy/empathy-utils.c:310
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"
 
-#: ../libempathy/empathy-utils.c:312
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:348
 msgid "Certificate hostname mismatch"
 msgstr "Värdnamnet i certifikatet stämmer inte"
 
-#: ../libempathy/empathy-utils.c:314
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:350
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:352
 msgid "Certificate self-signed"
 msgstr "Självsignerat certifikat"
 
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
 msgid "Encryption is not available"
 msgstr "Kryptering är inte tillgängligt"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
 msgid "Certificate is invalid"
 msgstr "Certifikatet är ogiltigt"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
 msgid "Connection has been refused"
 msgstr "Anslutningen vägrades"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
 msgid "Connection can't be established"
 msgstr "Anslutningen kunde inte etableras"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
 msgid "Connection has been lost"
 msgstr "Anslutningen förlorades"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
 msgid "This resource is already connected to the server"
 msgstr "Denna resurs är redan ansluten till servern"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
 msgid "The account already exists on the server"
 msgstr "Kontot finns redan på servern"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
 msgid "Server is currently too busy to handle the connection"
 msgstr "Servern är för tillfället för upptagen för att hantera anslutningen"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
 msgid "Certificate has been revoked"
 msgstr "Certifikatet har spärrats"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag"
 
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket"
 
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
 msgid "Facebook Chat"
 msgstr "Facebook-chatt"
 
@@ -702,16 +704,16 @@ msgstr "%s:"
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1521
 msgid "A_pply"
 msgstr "V_erkställ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1551
 msgid "L_og in"
 msgstr "L_ogga in"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1617
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-individual-widget.c:1401
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -720,19 +722,19 @@ msgstr "L_ogga in"
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1628
 msgid "_Enabled"
 msgstr "_Aktiverad"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:1693
 msgid "This account already exists on the server"
 msgstr "Detta konto finns redan på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:1696
 msgid "Create a new account on the server"
 msgstr "Skapa ett nytt konto på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:1789
 msgid "Ca_ncel"
 msgstr "Av_bryt"
 
@@ -741,19 +743,19 @@ msgstr "Av_bryt"
 #. * like: "MyUserName on freenode".
 #. * 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:2078
+#: ../libempathy-gtk/empathy-account-widget.c:2077
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %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:2104
+#: ../libempathy-gtk/empathy-account-widget.c:2103
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2107
 msgid "New account"
 msgstr "Nytt konto"
 
@@ -800,7 +802,7 @@ msgstr "Vad är ditt AIM-skärmnamn?"
 #: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -809,7 +811,7 @@ msgstr "_Port:"
 #: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Server:"
@@ -1115,22 +1117,18 @@ msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorera inbjudningar till konferenser och chattrum"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Använd _Yahoo! Japan"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "Vad är ditt Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! password?"
 msgstr "Vad är ditt Yahoo!-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "Yahoo! I_D:"
 msgstr "Yahoo!-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Room List locale:"
 msgstr "Lokalanpassning för _rumslista:"
 
@@ -1281,7 +1279,7 @@ msgstr "Infoga smilis"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -1350,7 +1348,7 @@ msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
 #: ../libempathy-gtk/empathy-chat.c:2287
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-call-window.c:1947
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
@@ -1397,17 +1395,17 @@ msgstr "_Öppna länk"
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Redigera kontaktinformation"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "Ny kontakt"
 
@@ -1419,6 +1417,14 @@ msgstr "Bestäm _senare"
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Ogrupperade"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Favoritpersoner"
+
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
 #: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
@@ -1490,7 +1496,7 @@ msgid "Share My Desktop"
 msgstr "Dela ut mitt skrivbord"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
 #: ../libempathy-gtk/empathy-individual-menu.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
@@ -1521,154 +1527,154 @@ msgstr "_Bjud in till chattrum"
 msgid "Select a contact"
 msgstr "Välj en kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
 #: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "Fullständigt namn:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
 #: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "Telefonnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
 #: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "E-postadress:"
 
 # "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
 #: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "Webbplats:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
 #: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "Födelsedag:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:609
 #: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "Landets ISO-kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:611
 #: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:613
 #: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "Län:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:615
 #: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "Stad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:617
 #: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:619
 #: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:621
 #: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "Gata:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:623
 #: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "Byggnad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:625
 #: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "Våning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:627
 #: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:629
 #: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:631
 #: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:633
 #: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:635
 #: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "Precisionsnivå:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:637
 #: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "Fel:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:639
 #: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "Vertikalt fel (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:641
 #: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "Horisontellt fel (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:643
 #: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:645
 #: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "Riktning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:647
 #: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "Höjdökning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:649
 #: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "Senast uppdaterad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:651
 #: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "Longitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:653
 #: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:655
 #: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "Höjd:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
 #: ../libempathy-gtk/empathy-individual-widget.c:582
 #: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
@@ -1676,23 +1682,23 @@ msgid "Location"
 msgstr "Plats"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:737
 #: ../libempathy-gtk/empathy-individual-widget.c:601
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y klockan %H.%M UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 #: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "Spara profilbild"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:928
 #: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "Kunde inte spara profilbild"
@@ -1763,7 +1769,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
 msgstr "Länkade kontakter"
 
@@ -1874,10 +1880,12 @@ msgid "Conversations"
 msgstr "Samtal"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find Next"
 msgstr "Sök nästa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgid "Find Previous"
 msgstr "Sök föregående"
 
@@ -1961,15 +1969,15 @@ msgstr "Ange din närvaro och aktuell status"
 msgid "Custom messages…"
 msgstr "Anpassade meddelanden..."
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "Sök:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "Match case"
 msgstr "Matcha skiftläge"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
 msgstr "Frasen hittades inte"
 
@@ -2116,15 +2124,15 @@ msgstr "Kom ihåg detta val för framtida anslutningar"
 msgid "Certificate Details"
 msgstr "Certifikatinformation"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
 msgid "Unable to open URI"
 msgstr "Kunde inte öppna uri"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Inkommande fil från %s"
@@ -2377,7 +2385,7 @@ msgid "You can either go back and try to enter your accounts' details again or q
 msgstr "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen eller avsluta denna guide och lägga till konton senare från Redigera-menyn."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "Ett fel inträffade"
 
@@ -2392,102 +2400,102 @@ msgstr "Ett fel inträffade"
 msgid "New %s account"
 msgstr "Nytt %s-konto"
 
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:514
 msgid "What kind of chat account do you have?"
 msgstr "Vilken typ av chattkonto har du?"
 
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:520
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
 
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:526
 msgid "Enter your account details"
 msgstr "Ange dina kontouppgifter"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:531
 msgid "What kind of chat account do you want to create?"
 msgstr "Vilken typ av chattkonto vill du skapa?"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:537
 msgid "Do you want to create other chat accounts?"
 msgstr "Vill du skapa andra chattkonton?"
 
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:544
 msgid "Enter the details for the new account"
 msgstr "Ange uppgifterna för det nya kontot"
 
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:659
 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 "Med Empathy kan du chatta med anslutna personer i närheten och med vänner och kollegor som använder Google Talk, AIM, Windows Live och många andra chattprogram. Du kan även använda ljud- och videosamtal om du har en mikrofon eller webbkamera."
 
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:676
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Har du ett konto som du har använt med andra chattprogram?"
 
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:699
 msgid "Yes, import my account details from "
 msgstr "Ja, importera mina kontouppgifter från "
 
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:720
 msgid "Yes, I'll enter my account details now"
 msgstr "Ja, jag vill ange mina kontouppgifter nu"
 
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:742
 msgid "No, I want a new account"
 msgstr "Nej, jag vill ha ett nytt konto"
 
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:752
 msgid "No, I just want to see people online nearby for now"
 msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
 
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:773
 msgid "Select the accounts you want to import:"
 msgstr "Välj de konton som du vill importera:"
 
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:857
 #: ../src/empathy-new-chatroom-dialog.c:609
 #: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:864
 msgid "No, that's all for now"
 msgstr "Nej, det är allt för stunden"
 
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1129
 msgid "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 "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta. Du kan enkelt ändra dessa uppgifter senare eller inaktivera denna funktion genom att använda \"Konton\"-dialogrutan"
 
-#: ../src/empathy-account-assistant.c:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "Redigera->Konton"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "Jag vill inte aktivera denna funktion just nu"
 
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1187
 msgid "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 "Du kommer inte att kunna chatta med personer som är anslutna till ditt lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill aktivera denna funktion så installera paketet telepathy-salut och skapa ett Personer i närheten-konto från Konto-dialogrutan"
 
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1193
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut är inte installerat"
 
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Guide för meddelanden och VoIP-konton"
 
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "Välkommen till Empathy"
 
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "Importera dina befintliga konton"
 
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1300
 msgid "Please enter personal details"
 msgstr "Ange personlig information"
 
@@ -2505,7 +2513,7 @@ msgid "Your new account has not been saved yet."
 msgstr "Ditt nya konto har inte sparats än."
 
 #: ../src/empathy-accounts-dialog.c:281
-#: ../src/empathy-call-window.c:808
+#: ../src/empathy-call-window.c:818
 msgid "Connecting…"
 msgstr "Ansluter..."
 
@@ -2531,7 +2539,7 @@ msgstr "Okänd status"
 msgid "Offline — Account Disabled"
 msgstr "Frånkopplad — Kontot är inaktiverat"
 
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:810
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2539,16 +2547,16 @@ msgstr ""
 "Du är på väg att skapa ett nytt konto vilket kommer att\n"
 "förkasta dina ändringar. Är du säker att du vill fortsätta?"
 
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1157
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vill du ta bort %s från din dator?"
 
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1161
 msgid "This will not remove your account on the server."
 msgstr "Detta kommer inte att ta bort ditt konto på servern."
 
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1399
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2556,7 +2564,7 @@ msgstr ""
 "Du är på väg att välja ett annat konto vilket kommer att\n"
 "förkasta dina ändringar. Är du säker att du vill fortsätta?"
 
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2002
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2624,114 +2632,114 @@ msgstr "Gamma"
 msgid "Volume"
 msgstr "Volym"
 
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1175
 msgid "_Sidebar"
 msgstr "_Sidopanel"
 
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1194
 msgid "Audio input"
 msgstr "Ljudingång"
 
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1198
 msgid "Video input"
 msgstr "Videoingång"
 
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1202
 msgid "Dialpad"
 msgstr "Knappsats"
 
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1207
 msgid "Details"
 msgstr "Detaljer"
 
 #. 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
+#: ../src/empathy-call-window.c:1275
 #, c-format
 msgid "Call with %s"
 msgstr "Ring med %s"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1354
 msgid "Call"
 msgstr "Ring"
 
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1508
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses av datorn"
 
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1510
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses av en server på Internet"
 
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1512
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen för klienten som den ses av andra sidan"
 
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1514
 msgid "The IP address of a relay server"
 msgstr "IP-adressen för en reläserver"
 
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1516
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen för multicast-gruppen"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2263
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Ansluten — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2324
 msgid "Technical Details"
 msgstr "Tekniska detaljer"
 
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2362
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
 
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2367
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
 
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2373
 #, 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 "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
 
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2379
 msgid "There was a failure on the network"
 msgstr "Det inträffade ett fel på nätverket"
 
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2383
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
 
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2386
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2396
 #, 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 "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
 
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2404
 msgid "There was a failure in the call engine"
 msgstr "Det uppstod ett fel i samtalsmotorn"
 
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2407
 msgid "The end of the stream was reached"
 msgstr "Slutet på strömmen nåddes"
 
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2447
 msgid "Can't establish audio stream"
 msgstr "Kan inte etablera ljudström"
 
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2457
 msgid "Can't establish video stream"
 msgstr "Kan inte etablera videoström"
 
@@ -3665,6 +3673,8 @@ msgstr "Empathy-konton"
 msgid "Empathy Debugger"
 msgstr "Empathy-felsökare"
 
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Använd _Yahoo! Japan"
 #~ msgctxt "Link individual (contextual menu)"
 #~ msgid "_Link…"
 #~ msgstr "_Länka…"
diff --git a/release.py b/release.py
index 98dd24a..3723697 100755
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ import time
 from string import Template
 from optparse import OptionParser
 
-last_tag_pattern = 'EMPATHY_2_31*'
+last_tag_pattern = 'EMPATHY_2_32*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 9a336a3..04d1480 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -385,6 +385,9 @@ main_window_row_deleted_cb (GtkTreeModel      *model,
 			gtk_label_set_markup (GTK_LABEL (priv->no_entry_label), tmp);
 			g_free (tmp);
 
+			gtk_label_set_ellipsize (GTK_LABEL (priv->no_entry_label),
+				PANGO_ELLIPSIZE_END);
+
 			gtk_notebook_set_current_page (
 					GTK_NOTEBOOK (priv->notebook), PAGE_NO_MATCH);
 		}
