[empathy] Updated Basque language



commit 049bc6abbdb6a6f6801da400250bffc954065c60
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date:   Thu Jan 31 13:13:05 2013 +0100

    Updated Basque language

 po/eu.po | 4739 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2393 insertions(+), 2346 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 72d6692..0fe156b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,127 +4,149 @@
 # This file is distributed under the same license as the gossip package.
 #
 # Mikel Olasagasti <hey_neken mundurat net>, 2003.
-# IÃaki LarraÃaga Murgoitio <dooteo euskalgnu org>, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# IÃaki LarraÃaga Murgoitio <dooteo zundan com>, 2003, 2004, 2006, 2007, 2008, 2009, 2010.
+# IÃaki LarraÃaga Murgoitio <dooteo zundan com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-27 10:14+0200\n"
-"PO-Revision-Date: 2012-03-27 10:18+0200\n"
-"Last-Translator: IÃaki LarraÃaga Murgoitio <dooteo euskalgnu org>\n"
+"POT-Creation-Date: 2013-01-31 13:03+0100\n"
+"PO-Revision-Date: 2013-01-06 23:05+0100\n"
+"Last-Translator: IÃaki LarraÃaga Murgoitio <dooteo zundan com>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
 "Language: Basque\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
-"\n"
-"\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Egin berriketa Google Talk, Facebook, MSN eta berriketako beste hainbat "
-"zerbitzutan"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "BM bezeroa"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy interneteko mezularitza"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "BM bezeroa"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Egin berriketa Google Talk, Facebook, MSN eta berriketako beste hainbat "
+"zerbitzutan"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "berriketa;bm;mezua;hitzegin;irc;voip;gtalk;facebook;jabber;"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2513
-msgid "Messaging and VoIP Accounts"
-msgstr "Mezularitzako eta VoIP-ko kontuak"
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
+msgid "Connection managers should be used"
+msgstr "Sare-kudeatzaileak erabili beharko lirateke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Ireki beti berriketa berriak beste leiho batean."
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
+"den edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Kameraren gailua"
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Kameraren posizioa"
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
+msgid "Empathy should auto-away when idle"
+msgstr ""
+"Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Karakterea goitizenaren atzean gehitzeko, taldeko berriketan goitizena "
-"osatzea (tabuladorea) erabiltzean."
+"Empathy-k 'kanpoan' moduan automatikoki jarriko den erabiltzailea inaktibo "
+"dagoenean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Berriketako leihoaren gaia"
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy-ren deskargen karpeta lehenetsia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Berriketako leihoaren gai aldakorra"
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
+msgid "The default folder to save file transfers in."
+msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
+
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Zenbaki magikoa garbiketako atazak exekutatu behar diren begiratzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
 msgstr ""
-"Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
-"zerrenda (adib. \"de, ca, eu\")."
+"'empathy-sanity-cleaning.c'-k  zenbaki hau erabiltzen du garbiketako atazak "
+"exekutatu behar diren edo ez begiratzeko. Ez da komeni erabiltzaileek gako "
+"hau eskuz aldatzea."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Trinkotu kontaktu-zerrenda"
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show offline contacts"
+msgstr "Erakutsi konektatu gabeko kontaktuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Sare-kudeatzaileak erabili beharko lirateke"
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+"Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
+"adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
+msgid "Show Balance in contact list"
+msgstr "Erakutsi balantzea kontaktuen zerrendan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
+msgid "Whether to show account balances in the contact list."
 msgstr ""
-"Hautatutako azken kontuaren D-Bus objektuaren bide-izena gela batera "
-"elkartzeko."
+"Kontaktuen zerrendan kontuaren balantzea erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Kameraren gailu lehenetsia bideo-deiak egiteko. Adib. /dev/video0."
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
+msgid "Hide main window"
+msgstr "Ezkutatu leiho nagusia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
+msgid "Hide the main window."
+msgstr "Ezkutatu leiho nagusia."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "Direktorio lehenetsia avatar baten irudia hautatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Desgaitu jakinarazpen-leihoa aldentzean"
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Desgaitu soinuak aldentzean"
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
+msgid "Open new chats in separate windows"
+msgstr "Ireki berriketa berriak beste leihoetan"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
+msgid "Always open a separate chat window for new chats."
+msgstr "Ireki beti berriketa berriak beste leiho batean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "Bistaratu sarrerako gertaerak egoeraren arean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -132,329 +154,215 @@ msgstr ""
 "Bistaratu sarrerako gertaerak egoeraren arean. False (faltsua) bada, "
 "erakutsi hauek erabiltzaileari berehala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Oihartzuna ezeztatzeko euskarria"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy-k erabiltzailearen kokalekua argitara dezake"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Empathy-ren deskargen karpeta lehenetsia"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Gaitu WebKit garatzaileen tresnak"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
+msgid "The position for the chat window side pane"
+msgstr "Berriketako leihoaren alboko panelaren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Gaitu ortografia-egiaztapena"
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Berriketako leihoaren alboko panelaren gordetako posizioa (pixeletan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Ezkutatu leiho nagusia"
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
+msgid "Show contact groups"
+msgstr "Erakutsi kontaktuen taldeak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Ezkutatu leiho nagusia."
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
+msgid "Whether to show groups in the contact list."
+msgstr "Taldeak kontaktuen zerrendan erakutsiko diren edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Inform other users when you are typing to them"
-msgstr "Informatu beste erabiltzaileei haiei idazten ari zarenean"
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
+msgid "Use notification sounds"
+msgstr "Erabili jakinarazpen-soinuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Last account selected in Join Room dialog"
-msgstr "'Elkartu gelara' elkarrizketa-koadroan hautatutako azken kontua"
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
+msgid "Whether to play a sound to notify of events."
+msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "Zenbaki magikoa garbiketako atazak exekutatu behar diren begiratzeko"
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
+msgid "Disable sounds when away"
+msgstr "Desgaitu soinuak aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Nick completed character"
-msgstr "Goitizena osatzeko karakterea"
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Open new chats in separate windows"
-msgstr "Ireki berriketa berriak beste leihoetan"
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
+msgid "Play a sound for incoming messages"
+msgstr "Jo soinua mezuak iristean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use"
-msgstr "Bide-izena Adium gaia erabiltzeko"
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
+msgid "Play a sound for outgoing messages"
+msgstr "Jo soinua mezuak bidaltzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for incoming messages"
-msgstr "Jo soinua mezuak iristean"
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "Jo soinua solasaldi berrietan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound for outgoing messages"
-msgstr "Jo soinua mezuak bidaltzean"
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Solasaldi berriak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "Jo soinua kontaktu batek saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
+"adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "Jo soinua kontaktu batek saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
+"adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "Jo soinua zuk saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
+msgid "Whether to play a sound when logging into a network."
+msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "Jo soinua zuk saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs in"
-msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Pop up notifications when a contact logs out"
-msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Position the camera preview should be during a call."
-msgstr "Kameraren aurrebista zein posiziotan egongo den deian zehar"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show Balance in contact list"
-msgstr "Erakutsi balantzea kontaktuen zerrendan"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show avatars"
-msgstr "Erakutsi avatar-ak"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show contact groups"
-msgstr "Erakutsi kontaktuen taldeak"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show contact list in rooms"
-msgstr "Erakutsi kontaktu-zerrenda geletan"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show hint about closing the main window"
-msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Show offline contacts"
-msgstr "Erakutsi konektatu gabeko kontaktuak"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Show protocols"
-msgstr "Erakutsi protokoloak"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Spell checking languages"
-msgstr "Hizkuntzen zuzentzailea"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The default folder to save file transfers in."
-msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The position for the chat window side pane"
-msgstr "Berriketako leihoaren alboko panelaren posizioa"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Berriketako leihoaren alboko panelaren gordetako posizioa (pixeletan)."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Gaia solasaldian bistaratzeko (berriketako leihoan)."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Gai aldakorra solasaldian bistaratzeko (berriketako leihoetan)."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use graphical smileys"
-msgstr "Erabili aurpegierak"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Use notification sounds"
-msgstr "Erabili jakinarazpen-soinuak"
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Use theme for chat rooms"
-msgstr "Erabili gaia berriketa-gelan"
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
+msgid "Enable popup notifications for new messages"
+msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can publish the user's location to their contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
-"Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
+"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
+"adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
+msgid "Disable popup notifications when away"
+msgstr "Desgaitu jakinarazpen-leihoa aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether Empathy should automatically log into your accounts on startup."
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
+msgid "Whether to show popup notifications when away or busy."
 msgstr ""
-"Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
+"Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
+"adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Empathy-k 'kanpoan' moduan automatikoki jarriko den erabiltzailea inaktibo "
-"dagoenean."
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
-"Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
-"duen edo ez."
+"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
+"adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
+"egon)."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
+msgid "Pop up notifications when a contact logs in"
+msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
-"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
-"ez adierazten du."
+"Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
+"duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
-"ez."
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
+msgid "Pop up notifications when a contact logs out"
+msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
-"Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
-"den edo ez adierazten du."
+"Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
+"erakutsiko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
-"hizkuntzetan)."
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
+msgid "Use graphical smileys"
+msgstr "Erabili aurpegierak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Solasaldietan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
-"Pulseaudio-ren oihartzuna ezeztatzeko iragazkia gaitu edo ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
+msgid "Show contact list in rooms"
+msgstr "Erakutsi kontaktu-zerrenda geletan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
-"adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
-"adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
+msgid "Chat window theme"
+msgstr "Berriketako leihoaren gaia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of events."
-msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Gaia solasaldian bistaratzeko (berriketako leihoan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
+msgid "Chat window theme variant"
+msgstr "Berriketako leihoaren gai aldakorra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Solasaldi berriak jakinarazteko soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Gai aldakorra solasaldian bistaratzeko (berriketako leihoetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
+msgid "Path of the Adium theme to use"
+msgstr "Bide-izena Adium gaia erabiltzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play a sound when logging into a network."
-msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium "
+"bada). Zaharkitua."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
+msgid "Enable WebKit Developer Tools"
+msgstr "Gaitu WebKit garatzaileen tresnak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
+"ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
+msgid "Inform other users when you are typing to them"
+msgstr "Informatu beste erabiltzaileei haiei idazten ari zarenean"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
@@ -462,76 +370,100 @@ msgstr ""
 "berriketako 'konposatzen' edo 'pausatuta' egoerak bidaliko diren edo ez. Ez "
 "dio 'joanda' egoerari eragiten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
-"erakutsiko duen edo ez."
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
+msgid "Use theme for chat rooms"
+msgstr "Erabili gaia berriketa-gelan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
+msgid "Whether to use the theme for chat rooms."
+msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
+msgid "Spell checking languages"
+msgstr "Hizkuntzen zuzentzailea"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
-"duen edo ez."
+"Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
+"zerrenda (adib. \"de, ca, eu\")."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
+msgid "Enable spell checker"
+msgstr "Gaitu ortografia-egiaztapena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
-"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
-"adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
-"egon)."
+"Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
+"hizkuntzetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
+msgid "Nick completed character"
+msgstr "Goitizena osatzeko karakterea"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
-"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
-"adierazten du."
+"Karakterea goitizenaren atzean gehitzeko, taldeko berriketan goitizena "
+"osatzea (tabuladorea) erabiltzean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show account balances in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
+msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
-"Kontaktuen zerrendan kontuaren balantzea erakutsi edo ez adierazten du."
+"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
-"ala ez adierazten du."
+"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
+"ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
+msgid "Last account selected in Join Room dialog"
+msgstr "'Elkartu gelara' elkarrizketa-koadroan hautatutako azken kontua"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
-"adierazten du."
+"Hautatutako azken kontuaren D-Bus objektuaren bide-izena gela batera "
+"elkartzeko."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show groups in the contact list."
-msgstr "Taldeak kontaktuen zerrendan erakutsiko diren edo ez."
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
+msgid "Camera device"
+msgstr "Kameraren gailua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
-"adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Kameraren gailu lehenetsia bideo-deiak egiteko. Adib. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak erakutsi "
-"edo ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
+msgid "Camera position"
+msgstr "Kameraren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
+msgid "Position the camera preview should be during a call."
+msgstr "Kameraren aurrebista zein posiziotan egongo den deian zehar"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
+msgid "Echo cancellation support"
+msgstr "Oihartzuna ezeztatzeko euskarria"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
-msgid "Whether to show the contact list in compact mode."
-msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Pulseaudio-ren oihartzuna ezeztatzeko iragazkia gaitu edo ez adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
+msgid "Show hint about closing the main window"
+msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -539,223 +471,304 @@ msgstr ""
 "Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
 "koadroa erakutsi ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
-msgid "Whether to use the theme for chat rooms."
-msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
+msgid "Empathy can publish the user's location"
+msgstr "Empathy-k erabiltzailearen kokalekua argitara dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
-"Zein irizpide erabiliko den kontaktu-zerrenda ordenatzean. Lehenetsia "
-"kontaktuen egoeren arabera ordenatzea da \"state\" (egoera) balioarekin. "
-"\"name\" (izena) balioak kontaktu-zerrenda izenaren arabera ordenatuko du."
+"Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"'empathy-sanity-cleaning.c'-k  zenbaki hau erabiltzen du garbiketako atazak "
-"exekutatu behar diren edo ez begiratzeko. Ez da komeni erabiltzaileek gako "
-"hau eskuz aldatzea."
+"Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
+"duen edo ez."
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
 msgstr "Ez da arrazoirik zehaztu"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "The change in state was requested"
 msgstr "Egoeraren aldaketa eskatu da"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "You canceled the file transfer"
 msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "The other participant canceled the file transfer"
 msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "Error while trying to transfer the file"
 msgstr "Errorea fitxategia transferitzen saiatzean"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "The other participant is unable to transfer the file"
 msgstr "Beste partaide batek ezin du fitxategia transferitu"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:914
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Fitxategi-transferentzia osatuta, baina fitxategia hondatuta dago"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1200
 msgid "File transfer not supported by remote contact"
 msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1256
 msgid "The selected file is not a regular file"
 msgstr "Hautatutako fitxategia ez da fitxategi arrunta"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1265
 msgid "The selected file is empty"
 msgstr "Hautatutako fitxategia hutsik dago"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+msgid "Password not found"
+msgstr "Ez da pasahitza aurkitu"
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "BM-ko '%s' kontuaren pasahitza (%s)"
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "'%s' berriketa-gelako '%s' kontuaren pasahitza (%s)"
+
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "Galdutako deia %s(e)ndik"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:407
 #, c-format
 msgid "Called %s"
 msgstr "%s(e)k deitu du"
 
-#: ../libempathy/empathy-message.c:422
-#, c-format
-msgid "Call from %s"
-msgstr "%s(e)tik deia"
+#: ../libempathy/empathy-message.c:410
+#, c-format
+msgid "Call from %s"
+msgstr "%s(e)tik deia"
+
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "Duela segundo %d"
+msgstr[1] "Duela %d segundo"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "Duela minutu %d"
+msgstr[1] "Duela %d minutu"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "Duela ordu %d"
+msgstr[1] "Duela %d ordu"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Duela egun %d"
+msgstr[1] "Duela %d egun"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "Duela aste %d"
+msgstr[1] "Duela %d aste"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "Duela hilabete %d"
+msgstr[1] "Duela %d hilabete"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "etorkizunean"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:226
 msgid "Available"
 msgstr "Astiarekin"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:228
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:231
 msgid "Away"
 msgstr "Aldendua"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:233
 msgid "Invisible"
 msgstr "Ikusezina"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:235
 msgid "Offline"
 msgstr "Deskonektatuta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:238
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:278
 msgid "No reason specified"
 msgstr "Ez da arrazoirik zehaztu"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
 msgid "Status is set to offline"
 msgstr "Egoera lineaz kanpo gisa ezarri da"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "Sareko errorea"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
 msgid "Authentication failed"
 msgstr "Autentifikazioak huts egin du"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
 msgid "Encryption error"
 msgstr "Enkriptazioaren errorea"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:288
 msgid "Name in use"
 msgstr "Izena erabilita"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate not provided"
 msgstr "Ez da ziurtagiririk eman"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate untrusted"
 msgstr "Ziurtagiria ez da fidagarria"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate expired"
 msgstr "Ziurtagiria iraungituta"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not activated"
 msgstr "Ziurtagiria aktibatu gabe"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate hostname mismatch"
 msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate fingerprint mismatch"
 msgstr "Ziurtagiriaren hatz-marka ez dator bat"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate self-signed"
 msgstr "Ziurtagiria bere buruarekin sinatuta"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:304
 msgid "Certificate error"
 msgstr "Ziurtagiriaren errorea"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption is not available"
 msgstr "Enkriptatzea ez dago erabilgarri"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate is invalid"
 msgstr "Ziurtagiria baliogabea da"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been refused"
 msgstr "Konexioa ukatu egin da"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:344
 msgid "Connection can't be established"
 msgstr "Konexioa ezin da ezarri"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been lost"
 msgstr "Konexioa galdu egin da"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:348
 msgid "This account is already connected to the server"
 msgstr "Kontu hau jadanik zerbitzariarekin konektatuta dago"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Konexioa ordeztu egin da baliabide berdina darabilen konexio berri batekin"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:353
 msgid "The account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:355
 msgid "Server is currently too busy to handle the connection"
 msgstr "Zerbitzaria oso lanpetuegia dago konexioa kudeatzeko"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:357
 msgid "Certificate has been revoked"
 msgstr "Ziurtagiria errebokatu egin da"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:359
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Ziurtagiriak zifratzeko algoritmo ez-segurua darabil, edo kriptografikoki "
 "ahula da"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:362
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -763,137 +776,160 @@ msgstr ""
 "Zerbitzariaren ziurtagiriaren luzerak, edo zerbitzariaren ziurtagiriaren "
 "katearen sakonerak, liburutegi kriptografikoak ezartzen duen muga gainditu du"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:366
 msgid "Your software is too old"
 msgstr "Darabilzun softwarea zaharregia da"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:368
 msgid "Internal error"
 msgstr "Barneko errorea"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:497
+#: ../libempathy-gtk/empathy-roster-model.h:30
 msgid "People Nearby"
 msgstr "Inguruko jendea"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:502
 msgid "Yahoo! Japan"
 msgstr "Japoniako Yahoo!"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:539
 msgid "Facebook Chat"
 msgstr "Facebook berriketa"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "Duela segundo %d"
-msgstr[1] "Duela %d segundo"
+#: ../libempathy-gtk/empathy-account-chooser.c:689
+msgid "All accounts"
+msgstr "Kontu guztiak"
 
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Duela minutu %d"
-msgstr[1] "Duela %d minutu"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Pass_word"
+msgstr "_Pasahitza"
 
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Duela ordu %d"
-msgstr[1] "Duela %d ordu"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+msgid "Screen _Name"
+msgstr "Pantaila-_izena"
 
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Duela egun %d"
-msgstr[1] "Duela %d egun"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Adibidea:</b> NirePantailaIzena"
 
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Duela aste %d"
-msgstr[1] "Duela %d aste"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Gogoratu pasahitza"
 
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "Duela hilabete %d"
-msgstr[1] "Duela %d hilabete"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "_Port"
+msgstr "_Ataka"
 
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "etorkizunean"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "_Server"
+msgstr "_Zerbitzaria"
 
-#: ../libempathy/empathy-keyring.c:75
-msgid "Password not found"
-msgstr "Ez da pasahitza aurkitu"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Aurreratua"
 
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "BM-ko '%s' kontuaren pasahitza (%s)"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
+msgstr "Zein da zure AIM pantaila-izena?"
 
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "'%s' berriketa-gelako '%s' kontuaren pasahitza (%s)"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "Zein da zure AIM pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:692
-msgid "All accounts"
-msgstr "Kontu guztiak"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+msgid "Remember Password"
+msgstr "Gogoratu pasahitza"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
+#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:322
 msgid "Account"
 msgstr "Kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:511
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
 msgid "Port"
 msgstr "Ataka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:762
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1398
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget.c:1429
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1710
+#: ../libempathy-gtk/empathy-account-widget.c:1746
 msgid "A_pply"
 msgstr "_Aplikatu"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1739
+#: ../libempathy-gtk/empathy-account-widget.c:1775
 msgid "L_og in"
 msgstr "_Saio-hasiera"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1812
+#: ../libempathy-gtk/empathy-account-widget.c:1845
 msgid "This account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1816
+#: ../libempathy-gtk/empathy-account-widget.c:1849
 msgid "Create a new account on the server"
 msgstr "Sortu kontu berria zerbitzarian"
 
@@ -902,188 +938,97 @@ msgstr "Sortu kontu berria zerbitzarian"
 #. * 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:2241
+#: ../libempathy-gtk/empathy-account-widget.c:2270
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s - %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2267
+#: ../libempathy-gtk/empathy-account-widget.c:2296
 #, c-format
 msgid "%s Account"
 msgstr "%s kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2271
+#: ../libempathy-gtk/empathy-account-widget.c:2300
 msgid "New account"
 msgstr "Kontu berria"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Adibidea:</b> NirePantailaIzena"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Aurreratua"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Pasahitza:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Gogoratu pasahitza"
-
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Gogoratu pasahitza"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Pantaila-izena:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Zein da zure AIM pasahitza?"
+msgid "Login I_D"
+msgstr "Saioaren _IDa"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Zein da zure AIM pantaila-izena?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Ataka:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Zerbitzaria:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "<b>Example:</b> username"
 msgstr "<b>Adibidea:</b> erabiltzaile-izena"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "Login I_D:"
-msgstr "Saioko _IDa:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Zein da zure GroupWise erabiltzailearen IDa?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Zein da zure GroupWise pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>Adibidea:</b> 123456789"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN"
+msgstr "ICQ _UIN"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Ch_aracter set:"
-msgstr "_Karaktere-jokoa:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-msgid "What is your ICQ UIN?"
-msgstr "Zein da zure ICQ UIN?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ password?"
-msgstr "Zein da zure ICQ pasahitza?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
-msgid "Auto"
-msgstr "Automatikoa"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
-msgid "TLS"
-msgstr "TLS"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Adibidea:</b> 123456789"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
-msgid "Register"
-msgstr "Erregistratu"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "Ch_aracter set"
+msgstr "_Karaktere-jokoa"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
-msgid "Options"
-msgstr "Aukerak"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ UIN?"
+msgstr "Zein da zure ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
-msgid "None"
-msgstr "Bat ere ez"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+msgid "What is your ICQ password?"
+msgstr "Zein da zure ICQ pasahitza?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Sarea"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Character set"
+msgstr "Karaktere-jokoa"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "Gehitu..."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
-msgstr "Karaktere-jokoa:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Kendu"
+
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Up"
+msgstr "Gora"
 
 #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "Behera"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "Servers"
+msgstr "Zerbitzariak"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1091,85 +1036,36 @@ msgstr ""
 "IRC zerbitzari gehienek ez dute pasahitzik eskatzen. Ziur ez bazaude, ez "
 "sartu pasahitzik."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-msgid "Network"
-msgstr "Sarea"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Network:"
-msgstr "Sarea:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Nickname:"
-msgstr "Goitizena:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Password:"
-msgstr "Pasahitza:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Quit message:"
-msgstr "Irteerako mezua:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Real name:"
-msgstr "Benetako izena:"
+msgid "Nickname"
+msgstr "Goitizena"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:4
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Kendu"
+msgid "Quit message"
+msgstr "Irteerako mezua"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Servers"
-msgstr "Zerbitzariak"
+msgid "Real name"
+msgstr "Benetako izena"
 
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
-msgid "Up"
-msgstr "Gora"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+msgid "Username"
+msgstr "Erabiltzaile-izena"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+msgid "Which IRC network?"
+msgstr "Zer IRC sare?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "Zein da zure IRCko goitizena?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
-msgid "Which IRC network?"
-msgstr "Zer IRC sare?"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr "<b>Adibidea:</b> erabiltzailea gmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr "<b>Adibidea:</b> erabiltzailea jabber org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Enkriptatzea behar da (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ez ikusi egin SSL ziurtagirien erroreei"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Gainidatzi zerbitzariaren ezarpenak"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Lehentasuna:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Baliabidea:"
+msgid "What is your Facebook username?"
+msgstr "Zein da zure Facebook erabiltzaile-izena?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1182,209 +1078,269 @@ msgstr ""
 "Erabili <a href=\"http://www.facebook.com/username/\";>orrialde hau</a> "
 "Facebook-eko erabiltzaile bat aukeratzeko aurrez ez badaukazu bat."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Erabili SS_L zaharra"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Zein da zure Facebook pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Zein da zure Facebook erabiltzaile-izena?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Zein da zure Google-ko IDa?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>Adibidea:</b> erabiltzailea gmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Zein da zure Google-ko pasahitza?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>Adibidea:</b> erabiltzailea jabber org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ez ikusi egin SSL ziurtagirien erroreei"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty"
+msgstr "_Lehentasuna"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce"
+msgstr "_Baliabidea"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Enkriptatzea behar da (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Override server settings"
+msgstr "Gainidatzi zerbitzariaren ezarpenak"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "Erabili SS_L zaharra"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Zein da zure Jabber IDa?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Zein da zure Jabber pasahitza?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Zein da zure Jabber ID gogokoa?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Zein da zure Jabber pasahitza?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Zein da zure Jabber pasahitz gogokoa?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname"
+msgstr "_Goitizena"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name"
+msgstr "_Abizenak"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "_First Name"
+msgstr "_Izena"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name"
+msgstr "A_rgitaratutako izena"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+msgid "_Jabber ID"
+msgstr "_Jabber IDa"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+msgid "E-_mail address"
+msgstr "_Helbide elektronikoa"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>Adibidea:</b> erabiltzailea hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Zein da zure Windows Live IDa?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Zein da zure Windows Live pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_Helbide elektronikoa:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "Automatikoa"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "_Goitizena:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
-msgstr "_Izena:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber IDa:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Abizenak:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "Erregistratu"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "A_rgitaratutako izena:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "Aukerak"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<b>Example:</b> user my sip server"
-msgstr "<b>Adibidea:</b> erabiltzailea nire sip zerbitzaria"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "Bat ere ez"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Autentifikazioaren erabiltzaile-izena:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username"
+msgstr "_Erabiltzaile-izena"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Aurkitu lotura"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user my sip server"
+msgstr "<b>Adibidea:</b> erabiltzailea nire sip zerbitzaria"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Aurkitu STUN zerbitzaria automatikoki"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Erabili kontu hau telefono _finko eta mugikorretara deitzeko"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ez ikusi egin TLS erroreei"
+msgid "NAT Traversal Options"
+msgstr "NAT zeiharbidearen aukerak"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Bitartea (seg.)"
+msgid "Proxy Options"
+msgstr "Proxy-aren aukerak"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Konexio iraunkorren aukerak"
+msgid "Miscellaneous Options"
+msgstr "Hainbat aukera"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Bideraketa ez zehatza"
+msgid "STUN Server"
+msgstr "STUN zerbitzaria"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanismoa:"
+msgid "Discover the STUN server automatically"
+msgstr "Aurkitu STUN zerbitzaria automatikoki"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Hainbat aukera"
+msgid "Discover Binding"
+msgstr "Aurkitu lotura"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT zeiharbidearen aukerak"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Konexio iraunkorren aukerak"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Ataka:"
+msgid "Mechanism"
+msgstr "Mekanismoa"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxy-aren aukerak"
+msgid "Interval (seconds)"
+msgstr "Bitartea (seg.)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username"
+msgstr "Autentifikazioaren erabiltzaile-izena"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport"
+msgstr "Garraioa"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN zerbitzaria:"
+msgid "Loose Routing"
+msgstr "Bideraketa ez zehatza"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Zerbitzaria:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Garraioa:"
+msgid "Ignore TLS Errors"
+msgstr "Ez ikusi egin TLS erroreei"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Erabili kontu hau telefono _finko eta mugikorretara deitzeko"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Zein da zure SIP kontuaren pasahitza?"
+msgid "Local IP Address"
+msgstr "IP helbide lokala"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Zein da zure SIP saio-hasierako IDa?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Erabiltzaile-izena:"
+msgid "What is your SIP account password?"
+msgstr "Zein da zure SIP kontuaren pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Pasahitza:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! _IDa:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ez ikusi egin konferentzi eta berriketa-gelen gonbiteei"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Gelen zerrenda lokala:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr "Zein da zure Yahoo! IDa?"
+msgid "Ch_aracter set:"
+msgstr "_Karaktere-jokoa:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr "Zein da zure Yahoo! pasahitza?"
+msgid "_Port:"
+msgstr "_Ataka:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! _IDa:"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "Zein da zure Yahoo! IDa?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Gelen zerrenda lokala:"
+msgid "What is your Yahoo! password?"
+msgstr "Zein da zure Yahoo! pasahitza?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "Ezin izan da irudia bihurtu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Sistemak ez du onartzen onartutako irudi-formatuetariko bat bera ere"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "Ezin izan da irudia fitxategian gorde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "Hautatu zure avatar irudia"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "Egin argazkia..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "Irudirik ez"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "Fitxategi denak"
 
@@ -1392,6 +1348,34 @@ msgstr "Fitxategi denak"
 msgid "Click to enlarge"
 msgstr "Egin klik handitzeko"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "<b>%s</b> kontuaren autentifikazioak huts egin du"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3853
+msgid "Retry"
+msgstr "Saiatu berriro"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Sartu <b>%s</b> kontuaren\n"
+"zure pasahitza"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "Hautatu..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "_Hautatu"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1417,40 +1401,39 @@ msgstr "Protokolo honek ez du larrialdietarako deirik onartzen"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Ez daukazu nahikoa krediturik dei hau egiteko"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:740
 msgid "Failed to open private chat"
 msgstr "Huts egin du berriketa pribatua irekitzean"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:798
 msgid "Topic not supported on this conversation"
 msgstr "Gaia ez dago onartuta solasaldi honetan"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:804
 msgid "You are not allowed to change the topic"
 msgstr "Ez duzu baimenik gaia aldatzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "'%s' ez da baliozko IDa"
+#: ../libempathy-gtk/empathy-chat.c:980
+msgid "Invalid contact ID"
+msgstr "Kontaktuaren IDa baliogabea"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: mezu guztiak garbitzen ditu uneko solasaldian"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <gaia>: ezarri uneko solasaldiaren gaia"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1458,23 +1441,23 @@ msgstr ""
 "/part [<berriketa-gelaren IDa>] [<arrazoia>]: utzi berriketa-gela, lehenetsi "
 "gisa unekoa"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktuaren IDa> [<mezua>]: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktuaren IDa> <mezua>: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <goitizena>: aldatu zure goitizena uneko zerbitzarian"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mezua>: bidali ekintzaren mezua uneko solasaldira"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1096
 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 "
@@ -1484,11 +1467,11 @@ msgstr ""
 "karakterearekin hasten diren mezuak bidaltzeko erabiltzen da. Adibidez, \"/"
 "say /join berriketa-gela berri batekin elkartzeko erabiltzen da\""
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1101
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontaktuaren IDa>: bistaratu kontaktuari buruzko informazioa"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1496,128 +1479,128 @@ msgstr ""
 "/help [<komandoa>]: erakutsi onartutako komando guztiak. <komandoa> "
 "definitzen bada, nola erabiltzen den erakusten du."
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1123
 #, c-format
 msgid "Usage: %s"
 msgstr "Erabilera: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "Unknown command"
 msgstr "Komando ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1294
 msgid "Unknown command; see /help for the available commands"
 msgstr "Komando ezezaguna; ikus /help komando erabilgarrientzako"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1551
 msgid "insufficient balance to send message"
 msgstr "ez dago nahikoa balantzerik mezua bidaltzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
+#: ../libempathy-gtk/empathy-chat.c:1632
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Errorea '%s' mezua bidaltzean: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
+#: ../libempathy-gtk/empathy-chat.c:1636
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Errorea mezua bidaltzean: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1577
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "ez dago nahikoa balantzerik mezua bidaltzeko. <a href='%s'>Berriro kargatu</"
 "a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "not capable"
 msgstr "ez da gai"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "offline"
 msgstr "lineaz kanpo"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "invalid contact"
 msgstr "kontaktu baliogabea"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "permission denied"
 msgstr "baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "too long message"
 msgstr "mezua luzeegia"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1622
 msgid "not implemented"
 msgstr "inplementatu gabe"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
 msgid "Topic:"
 msgstr "Gaia:"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1708
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Gaia honela ezarria: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1710
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "%s(e)k gaia honela ezarri du: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1715
 msgid "No topic defined"
 msgstr "Ez da gairik definitu"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2231
 msgid "(No Suggestions)"
 msgstr "(Iradokizunik ez)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2299
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Gehitu '%s' hiztegiari"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2350
+#: ../libempathy-gtk/empathy-chat.c:2336
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Gehitu '%s' '%s' hiztegiari"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2406
 msgid "Insert Smiley"
 msgstr "Txertatu aurpegiera"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2424
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "_Bidali"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2481
 msgid "_Spelling Suggestions"
 msgstr "Iradokizun _ortografikoak"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2592
 msgid "Failed to retrieve recent logs"
 msgstr "Huts egin du azken erregistroak eskuratzean"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s deskonektatu egin da"
@@ -1625,12 +1608,12 @@ msgstr "%s deskonektatu egin da"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2730
+#: ../libempathy-gtk/empathy-chat.c:2842
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s(e)k %1$s kanporatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2845
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kanporatua izan da"
@@ -1638,17 +1621,17 @@ msgstr "%s kanporatua izan da"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2741
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s(e)k %1$s debekatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2856
 #, c-format
 msgid "%s was banned"
 msgstr "%s debekatua izan da"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2860
 #, c-format
 msgid "%s has left the room"
 msgstr "%s(e)k gela utzi du"
@@ -1658,17 +1641,17 @@ msgstr "%s(e)k gela utzi du"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2869
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2894
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s(e)k gelara elkartzea nahi du"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2919
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s orain honela ezagutzen da: %s"
@@ -1676,55 +1659,50 @@ msgstr "%s orain honela ezagutzen da: %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3793
 msgid "Would you like to store this password?"
 msgstr "Pasahitz hau gordetzea nahi duzu?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3799
 msgid "Remember"
 msgstr "Gogoratu"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3809
 msgid "Not now"
 msgstr "Orain ez"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "Saiatu berriro"
-
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3857
 msgid "Wrong password; please try again:"
 msgstr "Okerreko pasahitza, saiatu berriro:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3987
 msgid "This room is protected by a password:"
 msgstr "Gela hau pasahitz batekin babestuta dago:"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:4014
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "Elkartu"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4261
 msgid "Conversation"
 msgstr "Solasaldia"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4266
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1749,383 +1727,175 @@ msgstr "Baimena ukatuta"
 msgid "Could not block contact"
 msgstr "Ezin izan da kontaktua blokeatu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
-msgstr "Editatu blokeatutako kontaktuak"
-
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Kontua:"
-
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-msgid "Blocked Contacts"
-msgstr "Blokeatutako kontaktuak"
-
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "_Kopiatu estekaren helbidea"
-
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_Ireki esteka"
-
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%A, %Y %B %d"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "Kontaktu berria"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "Blokeatu %s?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
-"Ziur zaude '%s' blokeatzea nahi duzula zurekin berriro harremanetan ez "
-"jartzeko?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "_Blokeatu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "_Salatu kontaktu hau iraingarri gisa"
-msgstr[1] "_Salatu kontaktu hauek iraingarri gisa"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Erabaki _beranduago"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "Harpidetza eskaera"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
-msgstr "_Blokeatu erabiltzailea"
-
-#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
-msgid "Search contacts"
-msgstr "Bilatu kontaktuak"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-msgid "Search: "
-msgstr "Bilatu: "
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
-msgid "_Add Contact"
-msgstr "_Gehitu kontaktua"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
-msgid "No contacts found"
-msgstr "Ez da kontakturik aurkitu"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
-msgid "Your message introducing yourself:"
-msgstr "Zure mezua zeure burua aurkeztuz:"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
-msgid "Please let me see when you're online. Thanks!"
-msgstr "Utzidazu ikusten linean zaudenean. Mila esker."
-
-#: ../libempathy-gtk/empathy-contact-widget.c:567
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "Kanalak:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:747
-#: ../libempathy-gtk/empathy-individual-widget.c:455
-msgid "Country ISO Code:"
-msgstr "Herrialdearen ISO kodea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:749
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "Herrialdea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:751
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "Estatua:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:753
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "Herria:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "Area:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:757
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-msgstr "Posta-kodea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "Kalea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "Eraikuntza:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "Solairua:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:765
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "Gela:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:767
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "Testua:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:769
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "Azalpena:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:771
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URIa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:773
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "Zehaztasun maila:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:775
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "Errorea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:777
-#: ../libempathy-gtk/empathy-individual-widget.c:485
-msgid "Vertical Error (meters):"
-msgstr "Errore bertikala (metroak):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "Errore horizontala (metroak):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:781
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "Abiadura:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:783
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "Atzerapena:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:785
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "Igoerako abiadura:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:787
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-msgid "Last Updated on:"
-msgstr "Azken eguneraketa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "Longitudea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:791
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "Latitudea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:793
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "Altitudea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
-msgid "Location"
-msgstr "Kokalekua"
-
-#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
-#: ../libempathy-gtk/empathy-individual-widget.c:610
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:659
-msgid "%B %e, %Y at %R UTC"
-msgstr "%Y/%B/%e, %R UTC"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:997
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "Gorde avatar-a"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
-#: ../libempathy-gtk/empathy-individual-widget.c:958
-msgid "Unable to save avatar"
-msgstr "Ezin da avatar-a gorde"
+msgstr "Editatu blokeatutako kontaktuak"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1455
-msgid "Personal Details"
-msgstr "Xehetasun pertsonalak"
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Account:"
+msgstr "Kontua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1458
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Kontaktuaren xehetasunak"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blokeatutako kontaktuak"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 msgid "Full name"
 msgstr "Izen-deiturak"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
 msgid "Phone number"
 msgstr "Telefono-zenbakia"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "E-mail address"
 msgstr "Helbide elektronikoa"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Website"
 msgstr "Webgunea"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
 msgid "Last seen:"
 msgstr "Ikusi zen azken aldia:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+msgid "Server:"
+msgstr "Zerbitzaria:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Connected from:"
 msgstr "Hemendik konektatuta:"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
 msgid "Away message:"
 msgstr "Kanpoan nagoeneko mezua:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "work"
 msgstr "lana"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "home"
 msgstr "etxea"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "mobile"
 msgstr "mugikorra"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "voice"
 msgstr "ahotsa"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "preferred"
 msgstr "hobetsia"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "postal"
 msgstr "posta"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "parcel"
 msgstr "taldea"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Kokalekua</b> (data)\t"
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+msgid "Search contacts"
+msgstr "Bilatu kontaktuak"
 
-#. Alias
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+msgid "Search: "
+msgstr "Bilatu: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+msgid "_Add Contact"
+msgstr "_Gehitu kontaktua"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+msgid "No contacts found"
+msgstr "Ez da kontakturik aurkitu"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+msgid "Your message introducing yourself:"
+msgstr "Zure mezua zeure burua aurkeztuz:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Utzidazu ikusten linean zaudenean. Mila esker."
+
+#: ../libempathy-gtk/empathy-contact-widget.c:168
+#: ../libempathy-gtk/empathy-individual-widget.c:898
+msgid "Save Avatar"
+msgstr "Gorde avatar-a"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:224
+#: ../libempathy-gtk/empathy-individual-widget.c:956
+msgid "Unable to save avatar"
+msgstr "Ezin da avatar-a gorde"
+
+#. Identifier to connect to Instant Messaging network
+#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "Aliasa:"
+#: ../libempathy-gtk/empathy-user-info.c:444
+msgid "Identifier"
+msgstr "Identifikatzailea"
 
+#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Bezeroaren informazioa"
+#: ../libempathy-gtk/empathy-user-info.c:449
+msgid "Alias"
+msgstr "Aliasa"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Bezeroa:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktuaren xehetasunak"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requestedâ"
+msgstr "Informazioa eskatuta..."
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Kokalekua</b> (data)\t"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Identifikatzailea:"
+msgid "Client Information"
+msgstr "Bezeroaren informazioa"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requestedâ"
-msgstr "Informazioa eskatuta..."
+msgid "OS"
+msgstr "SE"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "OS:"
-msgstr "SE:"
+msgid "Version"
+msgstr "Bertsioa"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Version:"
-msgstr "Bertsioa:"
+msgid "Client"
+msgstr "Bezeroa"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr "Taldeak"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2133,189 +1903,344 @@ msgstr ""
 "Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
 "gehiago hauta ditzakezu, edo talderik ez."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr "_Gehitu taldea"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 msgid "Group"
 msgstr "Taldea"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "Kontaktu berria"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "Blokeatu %s?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"Ziur zaude '%s' blokeatzea nahi duzula zurekin berriro harremanetan ez "
+"jartzeko?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Honako identitatea blokeatu egingo da:"
 msgstr[1] "Honako identitateak blokeatu egingo dira:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Honako identitatea ezingo da blokeatu:"
 msgstr[1] "Honako identitateak ezingo dira blokeatu:"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "_Blokeatu"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Salatu kontaktu hau iraingarri gisa"
+msgstr[1] "_Salatu kontaktu hauek iraingarri gisa"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Editatu kontaktuaren informazioa"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
 msgid "Linked Contacts"
 msgstr "Estekatutako kontaktuak"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ez dago instalatuta"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalatu gnome-contacts kontaktuen xehetasunak atzitzeko."
+
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:173
+#: ../libempathy-gtk/empathy-individual-menu.c:177
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:345
+#: ../libempathy-gtk/empathy-individual-menu.c:353
 msgid "Select account to use to place the call"
 msgstr "Hautatu kontua deia egitean erabiltzeko"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:349
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1290
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Deitu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
+#: ../libempathy-gtk/empathy-individual-menu.c:422
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:424
 msgid "Work"
 msgstr "Lana"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:426
 msgid "HOME"
 msgstr "Etxea"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:669
 msgid "_Block Contact"
 msgstr "_Blokeatu kontaktua"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Delete and _Block"
+msgstr "Ezabatu eta _blokeatu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:787
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:796
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Estekatutako '%s' kontaktua benetan ezabatzea nahi duzu? Jakin ezazu honek "
+"estekatutako kontaktu hau osatzen dituzten kontaktu guztiak ezabatuko "
+"dituela."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:807
+msgid "Removing contact"
+msgstr "Kontaktua kentzen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-view.c:2453
+msgid "_Remove"
+msgstr "_Kendu"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "_Berriketa"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audio-deia"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Bideo-deia"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Aurreko solasaldiak"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
 msgid "Send File"
 msgstr "Bidali fitxategia"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
 msgid "Share My Desktop"
 msgstr "Partekatu nire mahaigaina"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
 msgid "Favorite"
 msgstr "Gogokoa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
-msgid "gnome-contacts not installed"
-msgstr "gnome-contacts ez dago instalatuta"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
-msgid "Please install gnome-contacts to access contacts details."
-msgstr "Instalatu gnome-contacts kontaktuen xehetasunak atzitzeko."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
 msgid "Infor_mation"
 msgstr "_Informazioa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
 msgid "Inviting you to this room"
 msgstr "Gela honetara gonbidatzen zaituzte"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
 msgid "_Invite to Chat Room"
 msgstr "_Gonbidatu berriketa-gelara"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
 msgid "_Add Contactâ"
 msgstr "Gehitu _kontaktua..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
-msgid "Delete and _Block"
-msgstr "Ezabatu eta _blokeatu"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2373
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 msgid "Removing group"
 msgstr "Taldea kentzen"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
-msgid "_Remove"
-msgstr "_Kendu"
+#: ../libempathy-gtk/empathy-individual-view.c:2444
+msgid "Re_name"
+msgstr "Al_datu izena"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "Kanalak:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "Herrialdearen ISO kodea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "Herrialdea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "Estatua:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "Herria:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "Posta-kodea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "Kalea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Eraikuntza:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Solairua:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "Gela:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "Testua:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "Azalpena:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URIa:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "Zehaztasun maila:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "Errorea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "Errore bertikala (metroak):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "Errore horizontala (metroak):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "Abiadura:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "Atzerapena:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "Igoerako abiadura:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "Azken eguneraketa:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "Longitudea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "Latitudea:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "Altitudea:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "Kokalekua"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"Estekatutako '%s' kontaktua benetan ezabatzea nahi duzu? Jakin ezazu honek "
-"estekatutako kontaktu hau osatzen dituzten kontaktu guztiak ezabatuko "
-"dituela."
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-msgstr "Kontaktua kentzen"
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%Y/%B/%e, %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
+msgid "Alias:"
+msgstr "Aliasa:"
+
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
+msgid "Identifier:"
+msgstr "Identifikatzailea:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2326,7 +2251,7 @@ msgstr[1] "Estekatutako kontaktuak %u kontaktu ditu"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Kokalekua</b> (data)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Linean telefono edo mugikor gailu batetik"
 
@@ -2334,15 +2259,15 @@ msgstr "Linean telefono edo mugikor gailu batetik"
 msgid "New Network"
 msgstr "Sare berria"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
 msgid "Choose an IRC network"
 msgstr "Aukeratu IRC sarea"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
 msgid "Reset _Networks List"
 msgstr "Berrezarri _sareen zerrenda"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Hautatu"
@@ -2351,123 +2276,146 @@ msgstr "Hautatu"
 msgid "new server"
 msgstr "zerbitzari berria"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+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."
+msgstr ""
+"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
+"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
+"egiaztatu azpiko xehetasunak zuzenak direla."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+msgid "People nearby"
+msgstr "Inguruko jendea"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
+msgstr ""
+"Xehetasun hauek beranduago alda ditzakezu edo funtzionalitate hau desgaitu "
+"kontaktuen zerrendan <span style=\"italic\">Editatu â Kontuak</span> "
+"aukeratuz."
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Erakutsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "%s(e)n berriketan"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "%s(r)ekin berriketan"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1351
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %Y/%B/%e %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1375
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "segundo %s"
 msgstr[1] "%s segundo"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "minutu %s"
 msgstr[1] "%s minutu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1390
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Deiaren iraupena: %s; amaiera: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1721
 msgid "Today"
 msgstr "Gaur"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1725
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1740
 msgid "%e %B %Y"
 msgstr "%Y %B %e"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
 msgid "Anytime"
 msgstr "Edozer ordu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Edozein"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Nor"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Noiz"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Anything"
 msgstr "Edozer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Text chats"
 msgstr "Testuzko berriketak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Sarrerako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Irteerako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Galdutako deiak"
 
@@ -2475,170 +2423,172 @@ msgstr "Galdutako deiak"
 msgid "What"
 msgstr "Zer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3760
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Ziur zaude aurreko berriketetako egunkari guztiak ezabatzea nahi dituzula?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3764
 msgid "Clear All"
 msgstr "Garbitu denak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3771
 msgid "Delete from:"
 msgstr "Ezabatu hemendik:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Kargatzen...</span>"
+msgid "_File"
+msgstr "_Fitxategia"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Berriketa"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+msgid "_Edit"
+msgstr "_Editatu"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Ezabatu historia guztia..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profila"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Bideoa"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+msgid "Chat"
+msgstr "Berriketa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editatu"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "Bideoa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Fitxategia"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "2. orrialdea"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Kargatzen...</span>"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "Zein motako berriketa-kontua duzu?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "Kontu berria gehitzea"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "Sartu kontaktuaren identifikatzailea edo telefono-zenbakia:"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "_Bideo-deia"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "_Audio-deia"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "Dei berria"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "Kontaktua lineaz kanpo dago"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "Zehaztutako kontaktua ez da baliozkoa edo ezezaguna da"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontaktua ez dago onartuta berriketa mota honetan"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Eskatutako funtzionalitatea ez dago protokolo honentzako garatuta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr "Ezin izan da emandako kontaktuarekin berriketa hasi "
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "Kanal honetan debekua ezarri dizute"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "Kanal hau beteta dago"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "Kanal honetara elkartzeko gonbidatua izan zara"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "Ezin da aurrera jarraitu deskonektatuta dagoen bitartean"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
 msgstr "Errorea gertatu da berriketa hastean"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:200
-msgid "Enter a contact identifier or phone number:"
-msgstr "Sartu kontaktuaren identifikatzailea edo telefono-zenbakia:"
-
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "Solasaldi berria"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
-msgid "_Video Call"
-msgstr "_Bideo-deia"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
-msgid "_Audio Call"
-msgstr "_Audio-deia"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
-msgid "New Call"
-msgstr "Dei berria"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, c-format
-msgid "Authentification failed for account <b>%s</b>"
-msgstr "<b>%s</b> kontuaren autentifikazioak huts egin du"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"Sartu <b>%s</b> kontuaren\n"
-"zure pasahitza"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:164
+#: ../libempathy-gtk/empathy-presence-chooser.c:200
 msgid "Custom Messageâ"
 msgstr "Mezu pertsonalizatua..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:217
+#: ../libempathy-gtk/empathy-presence-chooser.c:219
 msgid "Edit Custom Messagesâ"
 msgstr "Editatu mezu pertsonalizatuak..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:341
 msgid "Click to remove this status as a favorite"
 msgstr "Egin klik egoera hau gogokoa izatetik kentzeko"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:350
 msgid "Click to make this status a favorite"
 msgstr "Egin klik egoera hau gogoko bihurtzeko"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>Uneko mezua: %s</b>\n"
+"<small><i>Sakatu Sartu mezu berria ezartzeko, edo Ihes bertan behera uzteko."
+"</i></small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:393
 msgid "Set status"
 msgstr "Ezarri egoera"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1101
 msgid "Custom messagesâ"
 msgstr "Mezu pertsonalizatuak..."
 
@@ -2646,30 +2596,34 @@ msgstr "Mezu pertsonalizatuak..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:608
 #, c-format
 msgid "New %s account"
 msgstr "%s kontu berria"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Maiuskula/minuskula"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Bilatu:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Maiuskula/minuskula"
+msgid "_Previous"
+msgstr "_Aurrekoa"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Ez da esaldia aurkitu"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Hurrengoa"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Maiuskula/minuskula"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Aurrekoa"
+msgid "Phrase not found"
+msgstr "Ez da esaldia aurkitu"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2715,31 +2669,34 @@ msgstr "Ahots-deia amaituta"
 msgid "Edit Custom Messages"
 msgstr "Editatu mezu pertsonalizatuak"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "Harpidetza eskaera"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1104
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s(e)k baimena eskatzen du zu linean noiz zauden ikusteko"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:729
+msgid "_Decline"
+msgstr "_Ukatu"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+msgid "_Accept"
+msgstr "_Onartu"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1219
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mezua noiz editatuta: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1921
 msgid "Normal"
 msgstr "Arrunta"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "Klasikoa"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "Soila"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "Garbia"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "Urdina"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Berriketako zerbitzariak emandako identitatea ezin da egiaztatu."
@@ -2818,19 +2775,19 @@ msgstr "Gogoratu aukera hau etorkizuneko konexioetan"
 msgid "Certificate Details"
 msgstr "Ziurtagiriaren xehetasunak"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "Ezin da URIa ireki"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "Ez dago nahikoa lekurik fitxategia gordetzeko"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2839,11 +2796,34 @@ msgstr ""
 "%s-tako leku librea behar da fitxategi hau gordetzeko, soilik %s dago ordea "
 "erabilgarri. Aukeratu beste kokaleku bat."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Sarrerako fitxategia %s(e)ndik"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "Jar zaitez linean zure informazio pertsonala editatzeko."
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+msgid "<b>Personal Details</b>"
+msgstr "<b>Xehetasun pertsonalak</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Copy Link Address"
+msgstr "_Kopiatu estekaren helbidea"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
+msgid "_Open Link"
+msgstr "_Ireki esteka"
+
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Aztertu HTML"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Uneko lokala"
@@ -3011,52 +2991,29 @@ msgstr "Mendebaldekoa"
 msgid "Vietnamese"
 msgstr "Vietnamera"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Hautatu..."
+#: ../libempathy-gtk/empathy-roster-model.h:29
+msgid "Top Contacts"
+msgstr "Goreneko kontaktuak"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Hautatu"
+#: ../libempathy-gtk/empathy-roster-model.h:31
+msgid "Ungrouped"
+msgstr "Banatuta"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Zerbitzariak ezin du kontaktua aurkitu: %s"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "Ez dago errorearen mezurik"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "Berehalako mezularitza (Empathy)"
 
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "Ez konektatu abiatzean"
-
-#: ../src/empathy.c:439
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
-"Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
-
-#: ../src/empathy.c:454
-msgid "- Empathy IM Client"
-msgstr "- Empathy BM bezeroa"
-
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "Errorea kontu-kudeatzailearekin kontaktatzean"
-
-#: ../src/empathy.c:643
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"Errore bat gertatu da Telepathy-ko kontuaren kudeatzailearekin kontaktatzean."
-"Errorea:\n"
-"\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3094,50 +3051,78 @@ msgstr ""
 msgid "An Instant Messaging client for GNOME"
 msgstr "Berehalako mezularitzako bezero bat GNOMErako"
 
-#: ../src/empathy-about-dialog.c:115
-msgid "translator-credits"
-msgstr ""
-"Mikel Olasagasti <hey_neken mundurat net>\n"
-"IÃaki LarraÃaga Murgoitio <dooteo euskalgnu org>"
+#: ../src/empathy-about-dialog.c:115
+msgid "translator-credits"
+msgstr ""
+"Mikel Olasagasti <hey_neken mundurat net>\n"
+"IÃaki LarraÃaga Murgoitio <dooteo euskalgnu org>"
+
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Ez bistaratu inolako elkarrizketa-koadrorik. Landu eginbeharrekoak (adib. "
+"inportatzea) eta irten"
+
+#: ../src/empathy-accounts.c:186
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Ez bistaratu inolako elkarrizketa-koadrorik \"Inguruko jendea\" kontuak "
+"soilik egon arte"
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<kontuaren-IDa>"
+
+#: ../src/empathy-accounts.c:197
+msgid "- Empathy Accounts"
+msgstr "- Empathy kontuak"
+
+#: ../src/empathy-accounts.c:240
+msgid "Empathy Accounts"
+msgstr "Empathy kontuak"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:68
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Gorde gabeko eraldaketak daude zure %s kontuan."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:76
+#: ../src/empathy-accounts-dialog.c:72
 msgid "Your new account has not been saved yet."
 msgstr "Zure kontu berria oraindik gorde gabe dago."
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
 msgid "Connectingâ"
 msgstr "Konektatzen..."
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline â %s"
 msgstr "Lineaz kanpo â %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr "Deskonektatuta â %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr "Lineaz kanpo â Ez dago sareko konexiorik"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "Egoera ezezaguna"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3147,36 +3132,28 @@ msgstr ""
 "oinarritzen delako. Instalatu telepathy-haze eta berrabiarazi zure saioa "
 "kontua migratzeko."
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr "Lineaz kanpo â Kontua desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:585
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr "Editatu konexioaren parametroak"
 
-#: ../src/empathy-accounts-dialog.c:750
-msgid "Failed to retrieve your personal information from the server."
-msgstr "Huts egin du zure informazio pertsonala zerbitzaritik eskuratzean."
-
-#: ../src/empathy-accounts-dialog.c:756
-msgid "Go online to edit your personal information."
-msgstr "Jar zaitez linean zure informazio pertsonala editatzeko."
-
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:735
 msgid "_Edit Connection Parameters..."
 msgstr "_Editatu konexioaren parametroak..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1268
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ziur zaude '%s' kentzea nahi duzula ordenagailutik?"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1272
 msgid "This will not remove your account on the server."
 msgstr "Honek ez du zure kontua zerbitzaritik kenduko."
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1477
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3184,24 +3161,25 @@ msgstr ""
 "Beste kontu bat hautatzera zoaz, eta ondorioz zuk egindako\n"
 "aldaketak baztertu egingo dira Ziur zaude jarraitzea nahi duzula?"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
-msgid "_Enable"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1668
+msgid "_Enabled"
 msgstr "_Gaituta"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "_Desgaituta"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1691
+msgid "Rename"
+msgstr "Aldatu izena"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2107
 msgid "_Skip"
 msgstr "_Saltatu"
 
-#: ../src/empathy-accounts-dialog.c:2188
+#: ../src/empathy-accounts-dialog.c:2111
 msgid "_Connect"
 msgstr "_Konektatu"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2290
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3209,13 +3187,18 @@ msgstr ""
 "Leihoa ixtera zoaz, eta ondorioz zuk egindako\n"
 "aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Kontaktuaren informazioa kargatzen"
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2433
+msgid "Messaging and VoIP Accounts"
+msgstr "Mezularitzako eta VoIP-ko kontuak"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol backends installed"
-msgstr "Ez da protokoloen motorrik instalatu"
+msgid "_Importâ"
+msgstr "_Inportatu..."
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Loading account information"
+msgstr "Kontaktuaren informazioa kargatzen"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3226,115 +3209,146 @@ msgstr ""
 "bakoitzaren motorra instalatu behar duzu."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Importâ"
-msgstr "_Inportatu..."
+msgid "No protocol backends installed"
+msgstr "Ez da protokoloen motorrik instalatu"
 
-#: ../src/empathy-auth-client.c:288
+#: ../src/empathy-auth-client.c:296
 msgid " - Empathy authentication client"
 msgstr " - Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-auth-client.c:304
+#: ../src/empathy-auth-client.c:312
 msgid "Empathy authentication client"
 msgstr "Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+#: ../src/empathy.c:427
+msgid "Don't connect on startup"
+msgstr "Ez konektatu abiatzean"
+
+#: ../src/empathy.c:431
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+"Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
+
+#: ../src/empathy.c:447
+msgid "- Empathy IM Client"
+msgstr "- Empathy BM bezeroa"
+
+#: ../src/empathy.c:623
+msgid "Error contacting the Account Manager"
+msgstr "Errorea kontu-kudeatzailearekin kontaktatzean"
+
+#: ../src/empathy.c:625
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Errore bat gertatu da Telepathy-ko kontuaren kudeatzailearekin kontaktatzean."
+"Errorea:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "Dei batean"
+
+#: ../src/empathy-call.c:224
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+#: ../src/empathy-call.c:248
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "Kontrastea"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "Distira"
-
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "Gamma"
-
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "Bolumena"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s(e)k zuri deitzen saiatu da, baina beste dei batean zeunden."
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "_Albo-barra"
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+msgid "Incoming call"
+msgstr "Sarrerako deia"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "Audio-sarrera"
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Sarrerako bideoko deia %s-(e)ndik"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "Bideo-sarrera"
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Sarrerako deia %s-(e)ndik"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "Dei-teklatua"
+#: ../src/empathy-call-window.c:1564
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "Baztertu"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "Xehetasunak"
+#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+msgstr "Erantzun"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1211
-#: ../src/empathy-call-window.c:1889
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Deitu honekin: %s"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address as seen by the machine"
 msgstr "Makinak IP helbidea ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2188
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP helbidea interneteko zerbitzari batek ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2190
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Parekoaren IP helbidea bestaldean ikusi da"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2192
 msgid "The IP address of a relay server"
 msgstr "Transmisioko ('relay') zerbitzariaren IP helbidea"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2194
 msgid "The IP address of the multicast group"
 msgstr "Multidifusioko taldearen IP helbidea"
 
-#: ../src/empathy-streamed-media-window.c:1837
-#: ../src/empathy-streamed-media-window.c:1840
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2966
+msgid "On hold"
+msgstr "Itxaron"
+
+#: ../src/empathy-call-window.c:2970
+msgid "Mute"
+msgstr "Mututu"
+
+#: ../src/empathy-call-window.c:2972
+msgid "Duration"
+msgstr "Iraupena"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2975
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "Konektatuta â %d:%02dm"
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
+#: ../src/empathy-call-window.c:3071
 msgid "Technical Details"
 msgstr "Xehetasun teknikoak"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3110
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3343,8 +3357,7 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen audio-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2242
-#: ../src/empathy-call-window.c:3036
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3353,8 +3366,7 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen bideo-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3121
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3363,29 +3375,25 @@ msgstr ""
 "Ezin da konexiorik ezarri %s(r)ekin. Zuetako bat zuzeneko konexioak "
 "baimentzen ez dituen sare batean dago."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3127
 msgid "There was a failure on the network"
 msgstr "Hutsegite bat egon da sarean"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3131
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren audio-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3134
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren bideo-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
+#: ../src/empathy-call-window.c:3146
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3396,165 +3404,172 @@ msgstr ""
 "genizuke <a href=\"%s\">akats honen berri emango bazenu</a> eta Laguntza "
 "menuko 'Araztu' leihotik eskuratutako erregistroak erantsiko bazenio."
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3155
 msgid "There was a failure in the call engine"
 msgstr "Hutsegite bat gertatu da deiaren motorrean"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-call-window.c:3158
 msgid "The end of the stream was reached"
 msgstr "Korrontearen amaierara iritsi da"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3198
 msgid "Can't establish audio stream"
 msgstr "Ezin da audioaren korrontea ezarri"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-call-window.c:3208
 msgid "Can't establish video stream"
 msgstr "Ezin da bideoaren korrontea ezarri"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audioa"
+#: ../src/empathy-call-window.c:3245
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Zure uneko balantzea: %s"
+
+#: ../src/empathy-call-window.c:3249
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "Ez daukazu nahikoa krediturik dei hori egiteko."
+
+#: ../src/empathy-call-window.c:3251
+msgid "Top Up"
+msgstr "Berriro kargatu..."
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "_Deitu"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Deskodeketaren kodeka:"
+msgid "_Microphone"
+msgstr "_Mikrofonoa"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Desgaitu kamera"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Bistaratu dei-teklatua"
+msgid "_Settings"
+msgstr "_Ezarpenak"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodeketaren kodeka:"
+msgid "_View"
+msgstr "_Ikusi"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Eseki"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+msgid "_Help"
+msgstr "_Laguntza"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Eseki uneko deia"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+msgid "_Contents"
+msgstr "_Edukia"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokaleko hautagaia:"
+msgid "_Debug"
+msgstr "_Araztu"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximizatu"
+msgid "_GStreamer"
+msgstr "_GStreamer"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Minimise me"
-msgstr "Minimizatu"
+msgid "_Telepathy"
+msgstr "_Telepathy"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Urruneko hautagaia:"
+msgid "Swap camera"
+msgstr "Trukatu kamera"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Bidali audioa"
+msgid "Minimise me"
+msgstr "Minimizatu"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Bidali bideoa"
+msgid "Maximise me"
+msgstr "Maximizatu"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Erakutsi dei-teklatua"
+msgid "Disable camera"
+msgstr "Desgaitu kamera"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr "Hasi bideo-deia"
+msgid "Hang up"
+msgstr "Eseki"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Start an audio call"
-msgstr "Hasi audio-deia"
+msgid "Hang up current call"
+msgstr "Eseki uneko deia"
 
 #: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Trukatu kamera"
+msgid "Video call"
+msgstr "Bideo-deia"
 
 #: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Txandakatu audioaren igorpena"
-
-#: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Txandakatu bideoaren igorpena"
+msgid "Start a video call"
+msgstr "Hasi bideo-deia"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-msgid "Unknown"
-msgstr "Ezezaguna"
+msgid "Start an audio call"
+msgstr "Hasi audio-deia"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Show dialpad"
+msgstr "Erakutsi dei-teklatua"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Bideo-deia"
+msgid "Display the dialpad"
+msgstr "Bistaratu dei-teklatua"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Deitu"
+msgid "Toggle video transmission"
+msgstr "Txandakatu bideoaren igorpena"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Edukia"
+msgid "Toggle audio transmission"
+msgstr "Txandakatu audioaren igorpena"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Araztu"
+msgid "Encoding Codec:"
+msgstr "Kodeketaren kodeka:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Laguntza"
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "Deskodeketaren kodeka:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofonoa"
+msgid "Remote Candidate:"
+msgstr "Urruneko hautagaia:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Ezarpenak"
+msgid "Local Candidate:"
+msgstr "Lokaleko hautagaia:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Ikusi"
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
+msgid "Audio"
+msgstr "Audioa"
+
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy berriketarako bezeroa"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Izena"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Gela"
 
-#: ../src/empathy-chat-window.c:289
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Konektatu automatikoki"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Kudeatu gogoko gelak"
+
+#: ../src/empathy-chat-window.c:287
 msgid "Close this window?"
 msgstr "Itxi leiho hau?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3563,7 +3578,7 @@ msgstr ""
 "Leiho hau ixtean %s utziko da. Ez duzu mezu gehiago jasoko berriro elkartu "
 "arte."
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:306
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3578,235 +3593,304 @@ msgstr[1] ""
 "Leiho hau ixtean %u berriketa-gela utziko dira. Ez duzu mezu gehiago jasoko "
 "haietara berriro elkartu arte."
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:317
 #, c-format
 msgid "Leave %s?"
 msgstr "Utzi %s?"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:319
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr ""
 "Ez duzu berriketa-gela honetatik mezu gehiago jasoko berriro elkartu arte."
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:338
 msgid "Close window"
 msgstr "Itxi leihoa"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:338
 msgid "Leave room"
 msgstr "Irten gelatik"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d irakurri gabe)"
 msgstr[1] "%s (%d irakurri gabe)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (eta beste %u)"
 msgstr[1] "%s (eta beste %u)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:708
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d irakurri gabe besteengandik)"
 msgstr[1] "%s (%d irakurri gabe besteengandik)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:717
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d irakurri gabe guztietatik)"
 msgstr[1] "%s (%d irakurri gabe guztietatik)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:954
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:962
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Mezu %d bidaltzen"
 msgstr[1] "%d mezu bidaltzen"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:982
 msgid "Typing a message."
 msgstr "Mezua idazten."
 
 #: ../src/empathy-chat-window.ui.h:1
+msgid "_Conversation"
+msgstr "_Solasaldia"
+
+#: ../src/empathy-chat-window.ui.h:2
 msgid "C_lear"
 msgstr "_Garbitu"
 
-#: ../src/empathy-chat-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Txertatu _aurpegiera"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Gogoko berriketa-gela"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Notify for All Messages"
+msgstr "Jakinarazi mezu guztientzat"
+
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Erakutsi kontaktu-zerrenda"
+
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Invite _Participantâ"
+msgstr "Gonbidatu _partaidea..."
+
+#: ../src/empathy-chat-window.ui.h:8
 msgid "C_ontact"
 msgstr "_Kontaktua"
 
-#: ../src/empathy-chat-window.ui.h:4
-msgid "Insert _Smiley"
-msgstr "Txertatu _aurpegiera"
+#: ../src/empathy-chat-window.ui.h:10
+msgid "_Tabs"
+msgstr "_Fitxak"
 
-#: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "Gonbidatu _partaidea..."
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "_Aurreko fitxa"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "_Hurrengo fitxa"
 
-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Desegin fitxa ixtea"
+
+#: ../src/empathy-chat-window.ui.h:14
 msgid "Move Tab _Left"
 msgstr "Eraman fitxa e_zkerrera"
 
-#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:15
 msgid "Move Tab _Right"
 msgstr "Eraman fitxa e_skuinera"
 
-#: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Jakinarazi mezu guztientzat"
-
-#: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Solasaldia"
-
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Detach Tab"
 msgstr "E_zabatu fitxa"
 
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Gogoko berriketa-gela"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Erakutsi zerbitzu berezi bat"
 
-#: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "_Hurrengo fitxa"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy araztailea"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Aurreko fitxa"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy araztailea"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Erakutsi kontaktu-zerrenda"
+#: ../src/empathy-debug-window.c:1599
+msgid "Save"
+msgstr "Gorde"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Fitxak"
+#: ../src/empathy-debug-window.c:1659
+msgid "Pastebin link"
+msgstr "Pastebin-en esteka"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Desegin fitxa ixtea"
+#: ../src/empathy-debug-window.c:1668
+msgid "Pastebin response"
+msgstr "Pastebin-en erantzuna"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "Izena"
+#: ../src/empathy-debug-window.c:1675
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datuak luzeegiak dira bat batean itsasteko. Gorde erregistroak fitxategian."
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "Gela"
+#: ../src/empathy-debug-window.c:1857
+msgid "Debug Window"
+msgstr "Arazketa-leihoa"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "Konektatu automatikoki"
+#: ../src/empathy-debug-window.c:1917
+msgid "Send to pastebin"
+msgstr "Bidali pastebin-era"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
-msgid "Manage Favorite Rooms"
-msgstr "Kudeatu gogoko gelak"
+#: ../src/empathy-debug-window.c:1961
+msgid "Pause"
+msgstr "Pausatu"
+
+#: ../src/empathy-debug-window.c:1973
+msgid "Level "
+msgstr "Maila: "
+
+#: ../src/empathy-debug-window.c:1992
+msgid "Debug"
+msgstr "Arazketa"
+
+#: ../src/empathy-debug-window.c:1997
+msgid "Info"
+msgstr "Informazioa"
+
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+msgid "Message"
+msgstr "Mezua"
+
+#: ../src/empathy-debug-window.c:2007
+msgid "Warning"
+msgstr "Abisua"
+
+#: ../src/empathy-debug-window.c:2012
+msgid "Critical"
+msgstr "Kritikoa"
+
+#: ../src/empathy-debug-window.c:2017
+msgid "Error"
+msgstr "Errorea"
+
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://";
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Nahiz eta haiek pasahitzak ez bistaratu, egunkariek informazio garrantzitsua "
+"eduki dezakete, hala nola zure kontaktuen zerrenda edo zuk bidali edo "
+"jasotako azken mezuak.\n"
+"Ez baduzu halako informaziorik ikusterik nahi akatsei buruzko txosten "
+"publiko batean, Empathy-ren garatzaileei akatsaren berri ematean <a href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\";>akatsaren berri "
+"emateko txostenaren</a> eremu aurreratuko bistaren zure akatsaren "
+"ikusgaitasunaren maila muga dezakezu."
+
+#: ../src/empathy-debug-window.c:2062
+msgid "Time"
+msgstr "Ordua"
+
+#: ../src/empathy-debug-window.c:2065
+msgid "Domain"
+msgstr "Domeinua"
+
+#: ../src/empathy-debug-window.c:2068
+msgid "Category"
+msgstr "Kategoria"
+
+#: ../src/empathy-debug-window.c:2071
+msgid "Level"
+msgstr "Maila"
+
+#: ../src/empathy-debug-window.c:2100
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:508
 msgid "Incoming video call"
 msgstr "Sarrerako bideo-deia"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
-msgid "Incoming call"
-msgstr "Sarrerako deia"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s bideoz deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:513
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Sarrerako deia %s-(e)ndik"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:541
 msgid "_Reject"
 msgstr "Ez ona_rtu"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
 msgid "_Answer"
 msgstr "_Erantzun"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:557
 msgid "_Answer with video"
 msgstr "_Erantzun bideoarekin"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "Sarrerako bideoko deia %s-(e)ndik"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:712
 msgid "Room invitation"
 msgstr "Gelarako gonbitea"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:714
 #, c-format
 msgid "Invitation to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbitea"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:721
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:854
-msgid "_Decline"
-msgstr "_Ukatu"
-
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:734
 msgid "_Join"
 msgstr "_Elkartu"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbidatua izan zara"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
 msgid "Password required"
 msgstr "Pasahitza behar da"
 
-#: ../src/empathy-event-manager.c:1216
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s(e)k baimena eskatzen du zu linean noiz zauden ikusteko"
-
-#: ../src/empathy-event-manager.c:1222
+#: ../src/empathy-event-manager.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -3945,190 +4029,44 @@ msgid "Import Accounts"
 msgstr "Inportatu kontuak"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:302
 msgid "Import"
 msgstr "Inportatu"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:311
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:335
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../src/empathy-roster-window.c:391
-msgid "Provide Password"
-msgstr "Eman pasahitza"
-
-#: ../src/empathy-roster-window.c:397
-msgid "Disconnect"
-msgstr "Deskonektatu"
-
-#: ../src/empathy-roster-window.c:657
-msgid "You need to setup an account to see contacts here."
-msgstr "Kontu bat konfiguratu behar duzu.kontaktuak hemen ikusteko."
-
-#: ../src/empathy-roster-window.c:673
-msgid "No match found"
-msgstr "Ez da bat datorrenik aurkitu"
-
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr "Ezin da %s kontua erabili %s softwarea eguneratu arte."
-
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "Eguneratu softwarea..."
-
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "Itxi"
-
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "Berriz konektatu"
-
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "Editatu kontua"
-
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "Berriro kargatu %s (%s)..."
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
-msgstr "Berriro kargatu kontuaren kreditua"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "Berriro kargatu..."
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "Kontaktua"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-msgstr "Zure kontuetariko bat gaitu behar duzu kontaktuak hemen ikusteko."
-
-#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr "%s gaitu behar duzu kontaktuak hemen ikusteko."
-
-#: ../src/empathy-roster-window.c:2460
-msgid "Contact List"
-msgstr "Kontaktuen zerrenda"
-
-#: ../src/empathy-roster-window.ui.h:1
-msgid "Account settings"
-msgstr "Kontuaren ezarpenak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontaktuak _mapa batean"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Kredituaren balantzea"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Bilatu kontaktuen _zerrendan"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Elkartu _gogokoetan"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Kudeatu gogokoak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamaina _normala"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "Dei _berria..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamaina normala _avatarrekin"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Hobespenak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Erakutsi p_rotokoloak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Ordenatu _izenarekiko"
-
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Ordenatu _egoerarekiko"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Kontuak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokeatutako kontaktuak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "Tamaina _trinkoa"
-
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Fitxategi-transferentziak"
-
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Joinâ"
-msgstr "_Elkartu..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "_Solasaldi berria..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Konektatu gabeko kontaktuak"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "Gonbidatu partaidea"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
-msgid "_Room"
-msgstr "_Gela"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Aukeratu kontaktua solasaldira gonbidatzeko:"
 
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Search for Contactsâ"
-msgstr "_Bilatu kontaktuak..."
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "Gonbidatu"
 
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "Berriketa-gela"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "Kideak"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:410
+msgid "Failed to list rooms"
+msgstr "Huts egin du gelak zerrendatzean"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4141,35 +4079,39 @@ msgstr ""
 "Pasahitza behar da: %s\n"
 "Kideak: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "Bai"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "Ez"
 
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "Ezin izan da gelen zerrenda abiarazi"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "Ezin izan da gelen zerrenda gelditu"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ezin izan da gelen zerrenda kargatu"
+#: ../src/empathy-new-chatroom-dialog.c:784
+msgid "Join Room"
+msgstr "Elkartu gelara"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Idatzi gelaren izena bertara elkartzeko edo egin klik gela batean edo "
 "gehiagotan zerrendan."
 
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Room:"
+msgstr "_Gela:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"Idatzi gela duen zerbitzaria, edo utzi hutsik gela ez badago uneko kontuen "
+"zerbitzarian."
+
 #: ../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 "
@@ -4179,170 +4121,231 @@ msgstr ""
 "zerbitzarian."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Elkartu gelara"
+msgid "_Server:"
+msgstr "_Zerbitzaria:"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Couldn't load room list"
+msgstr "Ezin izan da gelen zerrenda kargatu"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "Gelen zerrenda"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Gela:"
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "Erantzun"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "Erantzun bideoarekin"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "Ukatu"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "Onartu"
 
-#: ../src/empathy-preferences.c:166
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr "Eman"
+
+#: ../src/empathy-preferences.c:143
 msgid "Message received"
 msgstr "Mezua jasota"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:144
 msgid "Message sent"
 msgstr "Mezua bidalita"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:145
 msgid "New conversation"
 msgstr "Solasaldi berria"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:146
 msgid "Contact comes online"
 msgstr "Kontaktua konektatu da "
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:147
 msgid "Contact goes offline"
 msgstr "Kontaktua lineaz kanpo dago"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:148
 msgid "Account connected"
 msgstr "Kontua konektatuta"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:149
 msgid "Account disconnected"
 msgstr "Kontua deskonektatuta"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:386
 msgid "Language"
 msgstr "Hizkuntza"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:650
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, non zaude ez zaitudala ikusten Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:654
 msgid "Deny thy father and refuse thy name;"
 msgstr "Ukatu aita, ukatu izena ere;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:657
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Edo, ez baduzu nahi, zin egin maite nauzula"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:660
 msgid "And I'll no longer be a Capulet."
 msgstr "Eta ez naiz gehiago Capuletar bat izango."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:663
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Gehiago entzun behar dut, edo erantzun dezaket?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
+#: ../src/empathy-preferences.c:666
 msgid "Juliet has disconnected"
 msgstr "Julieta deskonektatu egin da"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1032
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "Itxura"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show groups"
+msgstr "Erakutsi taldeak"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Portaera"
+msgid "Show account balances"
+msgstr "Erakutsi kontuen balantzeak"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+msgid "Contact List"
+msgstr "Kontaktuen zerrenda"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Berriketa-_gaia:"
+msgid "Start chats in:"
+msgstr "Hasi berriketa hemen:"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desgaitu jakinarazpenak _aldentzean edo lanpetuta egotean"
+msgid "new ta_bs"
+msgstr "_fitxa berriak"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desgaitu soinuak _aldentzean edo lanpetuta egotean"
+msgid "new _windows"
+msgstr "_leiho berriak"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Display incoming events in the notification area"
-msgstr "Bistaratu sarrerako gertaerak jakinarazpen-arean"
+msgid "Show _smileys as images"
+msgstr "Erakutsi _aurpegierak irudi gisa"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Oihartzunaren ezeztapenak zure ahotsa garbiagoa izatea laguntzen dio beste "
-"pertsonari, baina arazoak sor ditzake ordenagailu batzuetan. Zuk (edo beste "
-"pertsonak)zarata edo karraska bitxiak entzuten badituzu, saiatu "
-"oihartzunaren ezeztapena desgaitzen eta deia berriro egiten."
+msgid "Show contact _list in rooms"
+msgstr "Erakutsi kontaktu-_zerrenda geletan"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Gaitu jakinarazpenak kontaktu bat konektatzen denean"
-
-#: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Gaitu jakinarazpenak kontaktu bat deskonektatzen denean"
+msgid "Log conversations"
+msgstr "Erregistratu solasaldiak"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Gaitu jakinarazpenak _berriketak fokua ez duenean"
+msgid "Display incoming events in the notification area"
+msgstr "Bistaratu sarrerako gertaerak jakinarazpen-arean"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Gaitu hizkuntzen zuzentzailea:"
+msgid "_Automatically connect on startup"
+msgstr "Automatikoki _konektatu abiatzean"
 
 #: ../src/empathy-preferences.ui.h:14
+msgid "Behavior"
+msgstr "Portaera"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "Orokorra"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Kokalekuaren iturburuak:"
+msgid "_Enable bubble notifications"
+msgstr "_Gaitu jakinarazpen-burbuilak"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Erregistratu solasaldiak"
+msgid "Disable notifications when _away or busy"
+msgstr "Desgaitu jakinarazpenak _aldentzean edo lanpetuta egotean"
 
 #: ../src/empathy-preferences.ui.h:18
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Gaitu jakinarazpenak _berriketak fokua ez duenean"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Enable notifications when a contact comes online"
+msgstr "Gaitu jakinarazpenak kontaktu bat konektatzen denean"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Enable notifications when a contact goes offline"
+msgstr "Gaitu jakinarazpenak kontaktu bat deskonektatzen denean"
+
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:22
+msgid "_Enable sound notifications"
+msgstr "_Gaitu soinu-jakinarazpenak"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid "Disable sounds when _away or busy"
+msgstr "Desgaitu soinuak _aldentzean edo lanpetuta egotean"
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "Play sound for events"
 msgstr "Jo soinua gertaeretan"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Pribatutasuna"
+#: ../src/empathy-preferences.ui.h:25
+msgid "Sounds"
+msgstr "Soinuak"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Erabili _oihartzunaren ezeztapena deiaren kalitatea hobetzeko"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Oihartzunaren ezeztapenak zure ahotsa garbiagoa izatea laguntzen dio beste "
+"pertsonari, baina arazoak sor ditzake ordenagailu batzuetan. Zuk (edo beste "
+"pertsonak)zarata edo karraska bitxiak entzuten badituzu, saiatu "
+"oihartzunaren ezeztapena desgaitzen eta deia berriro egiten."
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Publish location to my contacts"
+msgstr "_Erakutsi kokalekua nire kontaktuei"
+
+#: ../src/empathy-preferences.ui.h:31
 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 "
@@ -4352,399 +4355,458 @@ msgstr ""
 "soilik argitaratuko dela adierazten du. GPS koordenatuak dezimal 1eko "
 "zehaztasuna edukiko du."
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Erakutsi _aurpegierak irudi gisa"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Reduce location accuracy"
+msgstr "_Murriztu kokalekuaren zehaztasuna"
 
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Erakutsi kontaktu-_zerrenda geletan"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Privacy"
+msgstr "Pribatutasuna"
+
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Cellphone"
+msgstr "_Telefono mugikorra"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Sarea (IP, Wi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "Kokalekuaren iturburuak:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Hizkuntzen zerrendak instalatutako hiztegiei soilik dagokie."
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Enable spell checking for languages:"
+msgstr "Gaitu hizkuntzen zuzentzailea:"
+
+#: ../src/empathy-preferences.ui.h:42
+msgid "Spell Checking"
+msgstr "Zuzentzailea"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "Berriketa-_gaia:"
+
+#: ../src/empathy-preferences.ui.h:44
+msgid "Variant:"
+msgstr "Aldaera:"
+
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "Gaiak"
+
+#: ../src/empathy-roster-window.c:244
+msgid "Provide Password"
+msgstr "Eman pasahitza"
+
+#: ../src/empathy-roster-window.c:250
+msgid "Disconnect"
+msgstr "Deskonektatu"
+
+#: ../src/empathy-roster-window.c:493
+msgid "You need to setup an account to see contacts here."
+msgstr "Kontu bat konfiguratu behar duzu.kontaktuak hemen ikusteko."
+
+#: ../src/empathy-roster-window.c:569
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "Ezin da %s kontua erabili %s softwarea eguneratu arte."
+
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:674
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s kontuak baimena behar du"
+
+#: ../src/empathy-roster-window.c:700
+msgid "Online Accounts"
+msgstr "Konektatutako kontuak"
+
+#: ../src/empathy-roster-window.c:747
+msgid "Update software..."
+msgstr "Eguneratu softwarea..."
+
+#: ../src/empathy-roster-window.c:753
+msgid "Reconnect"
+msgstr "Berriz konektatu"
+
+#: ../src/empathy-roster-window.c:757
+msgid "Edit Account"
+msgstr "Editatu kontua"
+
+#: ../src/empathy-roster-window.c:762
+msgid "Close"
+msgstr "Itxi"
+
+#: ../src/empathy-roster-window.c:904
+msgid "Top up account"
+msgstr "Goreneko kontuak"
+
+#: ../src/empathy-roster-window.c:1590
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Zure kontuetariko bat gaitu behar duzu kontaktuak hemen ikusteko."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1598
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "%s gaitu behar duzu kontaktuak hemen ikusteko."
+
+#: ../src/empathy-roster-window.c:1676
+msgid "Change your presence to see contacts here"
+msgstr "Aldatu zure presentzia kontaktuak hemen ikusteko"
+
+#: ../src/empathy-roster-window.c:1685
+msgid "No match found"
+msgstr "Ez da bat datorrenik aurkitu"
+
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "Ez duzu inolako kontakturik gehitu oraindik"
+
+#: ../src/empathy-roster-window.c:1695
+msgid "No online contacts"
+msgstr "Ez dago konektatutako kontakturik"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "_Solasaldi berria..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "_Dei berria..."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Soinuak"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "Kontaktuak"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Zuzentzailea"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "_Gehitu kontaktuak..."
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "Start chats in:"
-msgstr "Hasi berriketa hemen:"
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "_Bilatu kontaktuak..."
 
-#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Hizkuntzen zerrendak instalatutako hiztegiei soilik dagokie."
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "_Blokeatutako kontaktuak"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Themes"
-msgstr "Gaiak"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "_Gelak"
 
-#: ../src/empathy-preferences.ui.h:29
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Erabili _oihartzunaren ezeztapena deiaren kalitatea hobetzeko"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "_Elkartu..."
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Aldaera:"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "Elkartu _gogokoetan"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "Automatikoki _konektatu abiatzean"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "_Kudeatu gogokoak"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Cellphone"
-msgstr "_Telefono mugikorra"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "_Fitxategi-transferentziak"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Gaitu jakinarazpen-burbuilak"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Kontuak"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "_Gaitu soinu-jakinarazpenak"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "_Hobespenak"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "Laguntza"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Sarea (IP, Wi-Fi)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "Empathy-ri buruz"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Erakutsi kokalekua nire kontaktuei"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "I_rten"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Murriztu kokalekuaren zehaztasuna"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontuaren ezarpenak"
 
-#: ../src/empathy-preferences.ui.h:40
-msgid "new _windows"
-msgstr "_leiho berriak"
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr "_Konektatu"
 
-#: ../src/empathy-preferences.ui.h:41
-msgid "new ta_bs"
-msgstr "_fitxa berriak"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Erakutsi _konektatu gabeko kontaktuak"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "Gehitu _kontaktua..."
 
 #: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Solasaldi berria..."
+
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "Dei _berria..."
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Egoera"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Quit"
-msgstr "I_rten"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "Eginda"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Deitu kontaktuari berriro"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+msgid "Please enter your account details"
+msgstr "Sartu zure kontuaren xehetasunak"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Itzali kamera"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+msgid "Edit %s account options"
+msgstr "Editatu %s kontuaren aukerak"
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Piztu kamera"
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+msgid "Integrate your IM accounts"
+msgstr "Bateratu zure BM kontuak"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desgaitu kamera eta gelditu bideoa bidaltzea"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Gaitu kamera eta bidali bideoa"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Gaitu kamera baina ez bidali bideoa"
+#~ msgid "Compact contact list"
+#~ msgstr "Trinkotu kontaktu-zerrenda"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Aurrebista"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Berriro deitu"
+#~ msgid "Show avatars"
+#~ msgstr "Erakutsi avatar-ak"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Bideoa"
+#~ msgid "Show protocols"
+#~ msgstr "Erakutsi protokoloak"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Itzali bideoa"
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr ""
+#~ "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak "
+#~ "erakutsi ala ez adierazten du."
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Piztu bideoa"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr ""
+#~ "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak "
+#~ "erakutsi edo ez adierazten du."
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Bideoaren aurrebista"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "Kontaktuen maparen ikuspegia"
+#~ msgid ""
+#~ "Which criterion to use when sorting the contact list. Default is to sort "
+#~ "by the contact's state with the value \"state\". A value of \"name\" will "
+#~ "sort the contact list by name."
+#~ msgstr ""
+#~ "Zein irizpide erabiliko den kontaktu-zerrenda ordenatzean. Lehenetsia "
+#~ "kontaktuen egoeren arabera ordenatzea da \"state\" (egoera) balioarekin. "
+#~ "\"name\" (izena) balioak kontaktu-zerrenda izenaren arabera ordenatuko du."
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "Gorde"
+#~ msgid "Network:"
+#~ msgstr "Sarea:"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "Pastebin-en esteka"
+#~ msgid "Password:"
+#~ msgstr "Pasahitza:"
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "Pastebin-en erantzuna"
+#~ msgid "Port:"
+#~ msgstr "Ataka:"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr ""
-"Datuak luzeegiak dira bat batean itsasteko. Gorde erregistroak fitxategian."
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "'%s' ez da baliozko IDa"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "Arazketa-leihoa"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A, %Y %B %d"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "Bidali pastebin-era"
+#~ msgid "Decide _Later"
+#~ msgstr "Erabaki _beranduago"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "Pausatu"
+#~ msgid "_Block User"
+#~ msgstr "_Blokeatu erabiltzailea"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "Maila: "
+#~ msgid "Classic"
+#~ msgstr "Klasikoa"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "Arazketa"
+#~ msgid "Simple"
+#~ msgstr "Soila"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "Informazioa"
+#~ msgid "Clean"
+#~ msgstr "Garbia"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "Mezua"
+#~ msgid "Blue"
+#~ msgstr "Urdina"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "Abisua"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "Huts egin du zure informazio pertsonala zerbitzaritik eskuratzean."
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "Kritikoa"
+#~ msgid "_Enable"
+#~ msgstr "_Gaituta"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "Errorea"
+#~ msgid "_Disable"
+#~ msgstr "_Desgaituta"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "Ordua"
+#~ msgid "Contrast"
+#~ msgstr "Kontrastea"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "Domeinua"
+#~ msgid "Brightness"
+#~ msgstr "Distira"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "Kategoria"
+#~ msgid "Gamma"
+#~ msgstr "Gamma"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "Maila"
+#~ msgid "Volume"
+#~ msgstr "Bolumena"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
+#~ msgid "_Sidebar"
+#~ msgstr "_Albo-barra"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "Gonbidatu partaidea"
+#~ msgid "Audio input"
+#~ msgstr "Audio-sarrera"
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "Aukeratu kontaktua solasaldira gonbidatzeko:"
+#~ msgid "Video input"
+#~ msgstr "Bideo-sarrera"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "Gonbidatu"
+#~ msgid "Dialpad"
+#~ msgstr "Dei-teklatua"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Ez bistaratu inolako elkarrizketa-koadrorik. Landu eginbeharrekoak (adib. "
-"inportatzea) eta irten"
+#~ msgid "Details"
+#~ msgstr "Xehetasunak"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
-"Ez bistaratu inolako elkarrizketa-koadrorik \"Inguruko jendea\" kontuak "
-"soilik egon arte"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "Konektatuta â %d:%02dm"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<kontuaren-IDa>"
+#~ msgid "Send Audio"
+#~ msgstr "Bidali audioa"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Empathy kontuak"
+#~ msgid "Send Video"
+#~ msgstr "Bidali bideoa"
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Empathy kontuak"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "Berriro kargatu %s (%s)..."
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "Erakutsi zerbitzu berezi bat"
+#~ msgid "Top Up..."
+#~ msgstr "Berriro kargatu..."
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Empathy araztailea"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "Kontaktuak _mapa batean"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy araztailea"
+#~ msgid "Credit Balance"
+#~ msgstr "Kredituaren balantzea"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr "- Empathy berriketarako bezeroa"
+#~ msgid "Find in Contact _List"
+#~ msgstr "Bilatu kontaktuen _zerrendan"
 
-#: ../src/empathy-notifications-approver.c:189
-msgid "Respond"
-msgstr "Erantzun"
+#~ msgid "N_ormal Size"
+#~ msgstr "Tamaina _normala"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
-msgid "Reject"
-msgstr "Baztertu"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Tamaina normala _avatarrekin"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
-msgid "Answer"
-msgstr "Erantzun"
+#~ msgid "Show P_rotocols"
+#~ msgstr "Erakutsi p_rotokoloak"
 
-#: ../src/empathy-notifications-approver.c:213
-msgid "Answer with video"
-msgstr "Erantzun bideoarekin"
+#~ msgid "Sort by _Name"
+#~ msgstr "Ordenatu _izenarekiko"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
-msgid "Decline"
-msgstr "Ukatu"
+#~ msgid "Sort by _Status"
+#~ msgstr "Ordenatu _egoerarekiko"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
-msgid "Accept"
-msgstr "Onartu"
+#~ msgid "_Compact Size"
+#~ msgstr "Tamaina _trinkoa"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
-msgid "Provide"
-msgstr "Eman"
+#~ msgid "_Joinâ"
+#~ msgstr "_Elkartu..."
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s(e)k zuri deitzen saiatu da, baina beste dei batean zeunden."
+#~ msgid "_Offline Contacts"
+#~ msgstr "_Konektatu gabeko kontaktuak"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
-msgid "i"
-msgstr "i"
+#~ msgid "Could not start room listing"
+#~ msgstr "Ezin izan da gelen zerrenda abiarazi"
 
-#: ../src/empathy-call-window.c:2888
-msgid "On hold"
-msgstr "Itxaron"
+#~ msgid "Could not stop room listing"
+#~ msgstr "Ezin izan da gelen zerrenda gelditu"
 
-#: ../src/empathy-call-window.c:2891
-msgid "Mute"
-msgstr "Mututu"
+#~ msgid "Appearance"
+#~ msgstr "Itxura"
 
-#: ../src/empathy-call-window.c:2893
-msgid "Duration"
-msgstr "Iraupena"
+#~ msgid "Call the contact again"
+#~ msgstr "Deitu kontaktuari berriro"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %d:%02dm"
+#~ msgid "Camera Off"
+#~ msgstr "Itzali kamera"
 
-#: ../src/empathy-call-window.c:3166
-#, c-format
-msgid "Your current balance is %s."
-msgstr "Zure uneko balantzea: %s"
+#~ msgid "Camera On"
+#~ msgstr "Piztu kamera"
 
-#: ../src/empathy-call-window.c:3170
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "Ez daukazu nahikoa krediturik dei hori egiteko."
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "Desgaitu kamera eta gelditu bideoa bidaltzea"
 
-#: ../src/empathy-call-window.c:3172
-msgid "Top Up"
-msgstr "Berriro kargatu..."
+#~ msgid "Enable camera and send video"
+#~ msgstr "Gaitu kamera eta bidali bideoa"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "_Maiuskula/minuskula"
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "Gaitu kamera baina ez bidali bideoa"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Zein motako berriketa-kontua duzu?"
+#~ msgid "Preview"
+#~ msgstr "Aurrebista"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-msgid "Adding new account"
-msgstr "Kontu berria gehitzea"
+#~ msgid "Redial"
+#~ msgstr "Berriro deitu"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "Inguruko jendea"
+#~ msgid "V_ideo"
+#~ msgstr "_Bideoa"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
-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."
-msgstr ""
-"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
-"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
-"egiaztatu azpiko xehetasunak zuzenak direla."
+#~ msgid "Video Off"
+#~ msgstr "Itzali bideoa"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit â Accounts</span> in the Contact List."
-msgstr ""
-"Xehetasun hauek beranduago alda ditzakezu edo funtzionalitate hau desgaitu "
-"kontaktuen zerrendan <span style=\"italic\">Editatu â Kontuak</span> "
-"aukeratuz."
+#~ msgid "Video On"
+#~ msgstr "Piztu bideoa"
+
+#~ msgid "Video Preview"
+#~ msgstr "Bideoaren aurrebista"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Contact Map View"
+#~ msgstr "Kontaktuen maparen ikuspegia"
 
 #~ msgid "Call volume"
 #~ msgstr "Deiaren bolumena"
@@ -4763,9 +4825,6 @@ msgstr ""
 #~ msgid "Socket type not supported"
 #~ msgstr "Socket mota ez dago onartuta"
 
-#~ msgid "My Web Accounts"
-#~ msgstr "Nire Web Kontuak"
-
 #~ msgid "The account %s is edited via %s."
 #~ msgstr "%s kontua '%s' bidez editatu da."
 
@@ -4784,9 +4843,6 @@ msgstr ""
 #~ msgid "Personal Information"
 #~ msgstr "Informazio pertsonala"
 
-#~ msgid "Ungrouped"
-#~ msgstr "Banatuta"
-
 #~ msgid "Favorite People"
 #~ msgstr "Gogoko jendea"
 
@@ -4794,9 +4850,6 @@ msgstr ""
 #~ msgid "_Edit"
 #~ msgstr "_Editatu"
 
-#~ msgid "Select a contact"
-#~ msgstr "Hautatu kontaktua"
-
 #~ msgid "Select contacts to link"
 #~ msgstr "Hautatu kontaktuak estekatzeko"
 
@@ -4890,9 +4943,6 @@ msgstr ""
 #~ msgid "Do you have any other chat accounts you want to set up?"
 #~ msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
 
-#~ msgid "Enter your account details"
-#~ msgstr "Sartu kontuaren xehetasunak"
-
 #~ msgid "What kind of chat account do you want to create?"
 #~ msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
 
@@ -5004,9 +5054,6 @@ msgstr ""
 #~ msgid "All"
 #~ msgstr "Denak"
 
-#~ msgid "_Enabled"
-#~ msgstr "_Gaituta"
-
 #~ msgid "Date"
 #~ msgstr "Data"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]