[empathy] Updated Aragonese translation



commit bab2f093d6053a62736697021c16f937f1349cf1
Author: Daniel Martinez Cucalon <dmartinez src gnome org>
Date:   Sat Sep 29 00:29:32 2012 +0200

    Updated Aragonese translation

 po/an.po | 3797 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1889 insertions(+), 1908 deletions(-)
---
diff --git a/po/an.po b/po/an.po
index 308bf98..efd0ec8 100644
--- a/po/an.po
+++ b/po/an.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-04-02 17:52+0000\n"
-"PO-Revision-Date: 2012-04-16 20:19+0200\n"
+"POT-Creation-Date: 2012-09-28 14:44+0000\n"
+"PO-Revision-Date: 2012-09-29 00:28+0200\n"
 "Last-Translator: Daniel Martinez <entaltoaragon gmail com>\n"
 "Language-Team: AragonÃs <softaragones googlegroups com>\n"
+"Language: an\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: an\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-DamnedLies-Scope: partial\n"
 
@@ -35,22 +35,11 @@ msgstr "Client de mensacheria instantania Empathy"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "Charra en Google Talk, Facebook, MSN, y muitos atros servicios de chat"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2550
-msgid "Messaging and VoIP Accounts"
-msgstr "Cuentas de mensacheria y VoIP"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Chestionar cuentas de mensacheria y VoIP"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-#| msgid "Connection has been lost"
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "S'habrÃan d'usar chestors de connexiÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -58,42 +47,42 @@ msgstr ""
 "Dice si s'han de fer servir chestors de conectividat ta enchegar-se/"
 "reenchegar-se automaticament."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy s'enchegarà automaticament al prencipie"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Dice si Empathy ha d'encetar seson en as suyas cuentas automaticament en "
 "dentrar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy se meterà ausent automaticament cuan siga inactivo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Dice si Empathy ha d'entrar en modo de ausencia automaticament cuan l'usario "
 "ye inactivo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
 msgstr "Carpeta predeterminada de descargas d'Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "A carpeta predeterminada an alzar os fichers transferius."
 
 #. 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:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
 "Numero machico usau ta comprebar si s'han d'executar quefers de limpieza"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 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."
@@ -102,239 +91,182 @@ msgstr ""
 "no os quefers de limpieza. Os usuarios no han de cambiar ista clau "
 "manualment."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "Amostrar contactos desenchegaus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indica si se debe amostrar os contactos que son desenchegaus en a lista de "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Show avatars"
-msgstr "Amostrar avatars"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-#| msgid ""
-#| "Whether Empathy should use the avatar of the contact as the chat window "
-#| "icon."
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Indica si s'han d'amostrar os avatares ta os contactos en a lista de "
-"contactos y finestras de chat."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Show protocols"
-msgstr "Amostrar protocols"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Indica si s'han d'amostrar os protocolos ta os contactos en a lista de "
-"contactos."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
 msgstr "Amostrar credito en a lista de contactos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-#| msgid "Show Balance in contact list"
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 msgid "Whether to show account balances in the contact list."
 msgstr "Indica si s'han d'amostrar os creditos en a lista de contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Compact contact list"
-msgstr "Lista de contactos preta"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Whether to show the contact list in compact mode."
-msgstr "Indica si s'ha d'amostrar a lista de contactos en modo compacto."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "Amagar finestra prencipal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "Amagar a finestra prencipal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "Directorio por defecto d'an trigar un avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
 msgstr "O zaguero directorio d'an s'ha trigau un avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "Ubrir nuevas charradas en finestras separadas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 msgid "Always open a separate chat window for new chats."
 msgstr "Ubrir una finestra direrent ta nuevas charradas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "Amostrar os eventos dentrantes en l'area d'estau"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-#| msgid "Display incoming events in the status area"
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "Amostrar os eventos dentrantes en l'area d'estau"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "A posiciÃn ta o panel lateral d'a finestra de charrada"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "A posiciÃn almagazenada (en pixels) d'o panel lateral d'a finestra de "
 "charrada."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-#| msgid "Show contact list in rooms"
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "Amostrar lista de contactos en salas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 msgid "Whether to show groups in the contact list."
 msgstr "Indica si s'han d'amostrar os grupos en a lista de contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Contact list sort criterion"
-msgstr "Criterio d'ordinaciÃn d'a lista de contactos"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-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 ""
-"Quà criterio fer servir en ordenar a lista de contactos. O predeterminau ye "
-"ordenar por l'estau d'o contacto con a valor Âstate (estau). Una valor "
-"Ânombre (nombre) ordenarà a lista por o nombre."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "Fer servir sons de notificaciÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica si s'ha de reproducir un son ta notificar eventos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "Desactivar sons cuan siga ausent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-#| msgid "Disable popup notifications when away"
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica si s'han de reproducir sons de notificacions quan se sÃa ausent u "
 "aqueferau."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "Fer sentir un son ta os mensaches dentrants"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-#| msgid "Play a sound for incoming messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Indica si s'ha de reproducir un son ta notificar mensaches entrantes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "Fer sentir un son ta os mensaches salients"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-#| msgid "Play a sound for outgoing messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica si s'ha de reproducir un son ta notificar mensaches salientes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "Fer sentir un son ta as nuevas charradas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-#| msgid "Play a sound for new conversations"
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica si s'ha de reproducir un son ta notificar conversacions nuevas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "Fer sentir un son cuando un contacto s'enchega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica si s'ha de reproducir un son ta notificar os inicios de sesiÃn d'os "
 "contactos en o ret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "Fer sentir un son cuando un contacto se desenchega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indica si s'ha de reproducir un son ta notificar as finalizacions de sesiÃn "
 "d'os contactos en o ret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#| msgid "Play a sound when a contact logs in"
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "Reproducir un son quan encieto sesiÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 msgid "Whether to play a sound when logging into a network."
 msgstr "Indica si s'ha de reproducir un son en encetar sesiÃn en un ret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-#| msgid "Play a sound when a contact logs out"
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "Reproducir un son en rematar una sesiÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica si s'ha de reproducir un son en rematar sesiÃn en un ret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "Activar notificacions emerchents ta mensaches nuevos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-#| msgid "Enable popup notifications for new messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica si s'han d'amostrar notificacions emerchents en recibir un mensache "
 "nuevo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "Desactivar notificacions emerchents cuan siga ausent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-#| msgid "Disable popup notifications when away"
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica si s'han d'amostrar as notificacions emerchents quan se sÃa ausent u "
 "aqueferau."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-#| msgid "Enable notifications when the _chat is not focused"
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 "Amostrar notificacions emerchents si a finestra de chat no tiene o foco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -342,92 +274,91 @@ msgstr ""
 "Indica si d'han d'amostrar notificacions emerchents en recibir un mensache "
 "nuevo mesmo si a finestra de chat ya ye ubierta pero no tiene o foco."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-#| msgid "Enable notifications when a contact comes online"
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr "Amostrar notificacions emerchents quan un contacto se connecta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-#| msgid "Enable notifications when a contact comes online"
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica si s'han d'amostrar as notificacions emerchents quan un contacto se "
 "connecta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-#| msgid "Enable notifications when a contact comes online"
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr "Amostrar notificacions emerchents quan un contacto se desconnecta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-#| msgid "Enable notifications when a contact goes offline"
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica si s'han d'amostrar as notificacions emerchents quan un contacto se "
 "desconnecta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "Fer servir emoticons graficos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica si s'han de convertir os emoticonos en imachens graficas en as "
 "conversacions."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "Amostrar lista de contactos en salas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-#| msgid "Show contact list in rooms"
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica si s'ha d'amostrar a lista de contactos en salas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "Tema d'a finestra de chat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema que s'usarà ta amostrar a conversaciÃn en as finestras de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 msgid "Chat window theme variant"
 msgstr "Variante d'o tema d'a finestra de chat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "A variante d'o tema que s'usarà ta amostrar a conversaciÃn en as finestras "
 "de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 msgid "Path of the Adium theme to use"
 msgstr "Rota d'o tema Adium que usar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Rota a o tema Adium que usar si o tema usau ta o chat ye Adium."
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+#| msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Rota a o tema Adium que usar si o tema usau ta o chat ye Adium. Obsoleto."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ainas de desembolicador Webkit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Dice si as ainas de desembolique de WebKit, como l'inspector web, han "
 "d'activar-se."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "Informar a atros usuarios de quÃn les ista escribindo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../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."
@@ -435,42 +366,41 @@ msgstr ""
 "Indica si ninviar os estaus de chat Âescribindo u Âen pausaÂ. No afecta a o "
 "estau ÂausentÂ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "Fer servir tema ta salas de charrada"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-#| msgid "Use theme for chat rooms"
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica si s'ha d'usar o tema para salas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "Idiomas ta revisiÃn ortografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Lista separada por minches d'idiomas que s'usarÃn en a revisiÃn ortografica "
 "(eix. Âan, es, enÂ)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "Activar comprebador ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indica si s'han de revisar as parolas tecleadas respective a os idiomas con "
 "os quals quiere comprebar-lo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "Caracter de completau d'embotada"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -478,58 +408,58 @@ msgstr ""
 "Caracter que adhibir dimpuÃs d'a embotada quan s'usa o completau d'embotadas "
 "(tab) en salas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy ferà servir l'avatar d'o contacto como o icono d'a finestra de chat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Dice si Empathy ha d'usar lo avatar d'o contacto como l'icono d'a finestra "
 "de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
 msgid "Last account selected in Join Room dialog"
 msgstr "Zaguera cuenta seleccionada en o dialogo Unir a sala"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 "Rota de l'obchecto D-Bus d'a zaguera cuenta seleccionada ta unir a una sala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "Dispositivo de camara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "O dispositivo de camera predeterminau que usar en as gritadas de video, "
 "eix. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "Posicion de la camara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr "PosiciÃn an estar la vista previa d'a camera entre una gritada."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "Suporte de cancelaciÃn d'eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Indica si s'ha d'activar o filtro de cancelaciÃn d'eco de Pulseaudio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "Amostrar consello sobre cÃmo zarrar a finestra prencipal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../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."
@@ -537,247 +467,306 @@ msgstr ""
 "Indica si s'ha d'amostrar un mensache de dialogo sobre cÃmo zarrar a "
 "finestra prencipal con o botÃn Âx en a barra de titol."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
 msgstr "Empathy puede publicar a localizaciÃn d'o usuario"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Dice si Empathy puede publicar a localizacion d'o usuario a os suyos "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy puede fer servir o rete ta suposar a localizaciÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Dice si Empathy puede fer servir o rete ta suposar a localizacioÌn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy puede fer servir o rete movil ta suposar a localizaciÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Dice si Empathy puede fer servir o rete movil ta suposar a localizaciÃn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy puede fer servir o GPS ta suposar a localizaciÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Dice si Empathy puede usar o GPS ta suposar a localizaciÃn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy reducirà a precisiÃn d'a localizaciÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Dice si Empathy habrÃa de reducir a precision d'a ubicacion por motivos de "
 "privacidad."
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
 msgstr "No s'ha especificau una razÃn"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "The change in state was requested"
 msgstr "S'ha demandau o cambeo d'estau"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "You canceled the file transfer"
 msgstr "Has cancelau a transferencia d'archivo"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "The other participant canceled the file transfer"
 msgstr "L'atro participant ha cancelau a transferencia d'archivo"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "Error while trying to transfer the file"
 msgstr "Error prebando de transferir l'archivo"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "The other participant is unable to transfer the file"
 msgstr "L'atro participant no puede transferir l'archivo"
 
-#: ../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 "RazÃn desconoxida"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:914
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Trasferencia d'archivo rematada, pero l'archivo ye corrupto."
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1200
 msgid "File transfer not supported by remote contact"
 msgstr "O contacto remoto no soporta a transferencia d'archivos"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1256
 msgid "The selected file is not a regular file"
 msgstr "L'archivo trigau no ye un archivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1265
 msgid "The selected file is empty"
 msgstr "L'archivo trigau ye buedo"
 
-#: ../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 "No se trobà a clau"
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Clau d'a cuenta IM ta %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Clau ta la sala de chat Â%s en la conta %s (%s)"
+
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "Gritada perdida de %s"
 
 #. 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 "Grità %s"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:410
 #, c-format
 msgid "Call from %s"
 msgstr "Gritada de %s"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "fa %d segundo"
+msgstr[1] "fa %d segundos"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "fa %d menuto"
+msgstr[1] "fa %d menutos"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "fa %d hora"
+msgstr[1] "fa %d horas"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "fa %d diya"
+msgstr[1] "fa %d diyas"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "fa %d semana"
+msgstr[1] "fa %d semanas"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "fa %d mes"
+msgstr[1] "fa %d meses"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "en l'esvenidero"
+
+#: ../libempathy/empathy-utils.c:226
 msgid "Available"
 msgstr "Disposable"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:228
 msgid "Busy"
 msgstr "Aqueferau"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:231
 msgid "Away"
 msgstr "Ausent"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:233
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:235
 msgid "Offline"
 msgstr "Desenchegau"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:238
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconoxiu"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:278
 msgid "No reason specified"
 msgstr "Denguna razÃn especificada"
 
-#: ../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 "L'estau s'ha meso como desenchegau"
 
-#: ../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 "Error de rete"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
 msgid "Authentication failed"
 msgstr "Error d'autenticaciÃn"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
 msgid "Encryption error"
 msgstr "Error de cifrau"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:288
 msgid "Name in use"
 msgstr "Nome en uso"
 
-#: ../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 "Certificau no proporcionau"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate untrusted"
 msgstr "Certificau no seguro"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate expired"
 msgstr "Certificau caducau"
 
-#: ../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 "Certificau no activau"
 
-#: ../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 "O nome d'o equipo d'o certificau no coincide"
 
-#: ../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 "O rastro d'o certificau no coincide"
 
-#: ../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 "Certificau firmau consigo mesmo"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:304
 msgid "Certificate error"
 msgstr "Error de certificau"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption is not available"
 msgstr "Cifrau no disposable"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate is invalid"
 msgstr "O certificau no ye valido"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been refused"
 msgstr "Se refusà a connexiÃn"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:344
 msgid "Connection can't be established"
 msgstr "No se puede establir a conixiÃn"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been lost"
 msgstr "A conixiÃn s'ha perdiu"
 
-#: ../libempathy/empathy-utils.c:355
-#| msgid "This account already exists on the server"
+#: ../libempathy/empathy-utils.c:348
 msgid "This account is already connected to the server"
 msgstr "Ista cuenta ya ye connectada a lo servidor"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "S'ha reemplazau a connexiÃn por una connexiÃn nueva fendo servir o mesmo "
 "recurso"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:353
 msgid "The account already exists on the server"
 msgstr "A cuenta ya existe en o servidor"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:355
 msgid "Server is currently too busy to handle the connection"
 msgstr "O servidor ye masiau aqueferau ta manellar a conixiÃn"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:357
 msgid "Certificate has been revoked"
 msgstr "Se revocà o certificau"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:359
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificau usa un algorismo de zifrau inseguro u ye criptograficament feble"
 
-#: ../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"
@@ -786,176 +775,49 @@ msgstr ""
 "servidor de certificaus exceden os limites imposaus por a biblioteca "
 "criptogrÃfica"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:366
 msgid "Your software is too old"
 msgstr "O suyo software ye masiau antigo"
 
-#: ../libempathy/empathy-utils.c:375
-#| msgid "Encryption error"
+#: ../libempathy/empathy-utils.c:368
 msgid "Internal error"
 msgstr "Error interna"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:497
+#: ../libempathy-gtk/empathy-roster-model.h:30
 msgid "People Nearby"
 msgstr "Chent amÃn"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:502
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ChapÃn"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:531
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:532
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "fa %d segundo"
-msgstr[1] "fa %d segundos"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "fa %d menuto"
-msgstr[1] "fa %d menutos"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "fa %d hora"
-msgstr[1] "fa %d horas"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "fa %d diya"
-msgstr[1] "fa %d diyas"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "fa %d semana"
-msgstr[1] "fa %d semanas"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "fa %d mes"
-msgstr[1] "fa %d meses"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "en l'esvenidero"
-
-#: ../libempathy/empathy-keyring.c:75
-#| msgid "Phrase not found"
-msgid "Password not found"
-msgstr "No se trobà a clau"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Clau d'a cuenta IM ta %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Clau ta la sala de chat Â%s en la conta %s (%s)"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:692
+#: ../libempathy-gtk/empathy-account-chooser.c:689
 msgid "All accounts"
 msgstr "Todas as cuentas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:323
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:683
-msgid "Password"
-msgstr "Clau de paso"
-
-#: ../libempathy-gtk/empathy-account-widget.c:684
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
-msgid "Port"
-msgstr "Puerto"
-
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../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:16
-msgid "Username:"
-msgstr "Nome d'usuario:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1710
-msgid "A_pply"
-msgstr "A_plicar"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1739
-msgid "L_og in"
-msgstr "Encetar _sesion"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1812
-msgid "This account already exists on the server"
-msgstr "Ista cuenta ya existe en o servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1816
-msgid "Create a new account on the server"
-msgstr "Creyar una nueva cuenta en o servidor"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * 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
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s en %2$s"
-
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2267
-#, c-format
-msgid "%s Account"
-msgstr "Cuenta de %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2271
-msgid "New account"
-msgstr "Cuenta nueva"
-
 #: ../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
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
+#| msgid "Pass_word:"
+msgid "Pass_word"
 msgstr "Cla_u de paso:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name:"
-msgstr "_Nome en pantalla:"
+#| msgid "Screen _Name:"
+msgid "Screen _Name"
+msgstr "_Nome en pantalla"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "<b>Example:</b> MyScreenName"
@@ -976,30 +838,30 @@ msgstr "Remerar clau de paso"
 #: ../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:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Puerto:"
+#| msgid "_Port:"
+msgid "_Port"
+msgstr "_Puerto"
 
 #: ../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:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "_Server:"
-msgstr "_Servidor:"
+#| msgid "_Server:"
+msgid "_Server"
+msgstr "_Servidor"
 
 #: ../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:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../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 "Avanzau"
@@ -1017,40 +879,117 @@ msgstr "ÂCuala ye la tuya clau d'AIM?"
 #: ../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:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "Remember Password"
 msgstr "Remerar clau de paso"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D:"
-msgstr "_ID de sesion:"
+#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:322
+msgid "Account"
+msgstr "Cuenta"
 
-#: ../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>Exemplo:</b> nomedusuario"
+#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "Clau de paso"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "ÂCualo ye lo tuyo ID d'usuario de GroupWise?"
+#: ../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 "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "ÂCuala ye la tuya clau de GroupWise?"
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "Puerto"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN:"
-msgstr "_UIN d'ICQ:"
+#: ../libempathy-gtk/empathy-account-widget.c:762
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:817
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1429
+msgid "Username:"
+msgstr "Nome d'usuario:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1746
+msgid "A_pply"
+msgstr "A_plicar"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1775
+msgid "L_og in"
+msgstr "Encetar _sesion"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1845
+msgid "This account already exists on the server"
+msgstr "Ista cuenta ya existe en o servidor"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1849
+msgid "Create a new account on the server"
+msgstr "Creyar una nueva cuenta en o servidor"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * 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:2270
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s en %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2296
+#, c-format
+msgid "%s Account"
+msgstr "Cuenta de %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2300
+msgid "New account"
+msgstr "Cuenta nueva"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#| msgid "Login I_D:"
+msgid "Login I_D"
+msgstr "I_D de sesion"
+
+#: ../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>Exemplo:</b> nomedusuario"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "ÂCualo ye lo tuyo ID d'usuario de GroupWise?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
+msgstr "ÂCuala ye la tuya clau de GroupWise?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#| msgid "ICQ _UIN:"
+msgid "ICQ _UIN"
+msgstr "_UIN d'ICQ"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exemplo:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
+#| msgid "Ch_aracter set:"
+msgid "Ch_aracter set"
 msgstr "Conchunto de c_aracteres"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
@@ -1061,53 +1000,21 @@ msgstr "ÂCualo ye lo tuyo ICQ UIN?"
 msgid "What is your ICQ password?"
 msgstr "ÂCuala ye la tuya clau d'ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:205
-#: ../libempathy-gtk/empathy-account-widget-sip.c:238
-msgid "Auto"
-msgstr "Automatico"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:208
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:211
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:214
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:243
-msgid "Register"
-msgstr "Rechistrar"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:248
-msgid "Options"
-msgstr "Opcions"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:251
-msgid "None"
-msgstr "Denguna"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "Rete"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Network:"
-msgstr "Rete:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
+#| msgid "Character set:"
+msgid "Character set"
 msgstr "Conchunto de caracteres"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "_Anyadirâ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../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
@@ -1116,21 +1023,20 @@ msgid "Remove"
 msgstr "Sacar"
 
 #. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "Puyar"
 
 #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-#| msgid "Domain"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "Abaixo"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../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."
@@ -1138,27 +1044,31 @@ msgstr ""
 "A mayorÃa d'os servidors IRC no amenesten una clau, de tal forma que si no "
 "ye seguro, no introduzca una clau."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Nickname:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#| msgid "Nickname:"
+msgid "Nickname"
 msgstr "Embotada:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Password:"
-msgstr "Clau de paso:"
+#| msgid "Quit message:"
+msgid "Quit message"
+msgstr "Mensache de surtida"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Quit message:"
-msgstr "Mensache de surtida:"
+#| msgid "Real name:"
+msgid "Real name"
+msgstr "Nome reyal"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Real name:"
-msgstr "Nome reyal:"
+#| msgid "Username:"
+msgid "Username"
+msgstr "Nome d'usuario"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "ÂCualo rete de IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "QuÃl ye a suya embotada de l'IRC?"
 
@@ -1204,25 +1114,27 @@ msgid "I_gnore SSL certificate errors"
 msgstr "No parar cuenta d'as errors de certificau SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
-msgstr "Priorida_t:"
+#| msgid "Priori_ty:"
+msgid "Priori_ty"
+msgstr "Priorida_t"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
-msgstr "Re_curso:"
+#| msgid "Reso_urce:"
+msgid "Reso_urce"
+msgstr "Re_curso"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "Encr_yption required (TLS/SSL)"
 msgstr "S'amenista cifrau (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Use old SS_L"
-msgstr "Fer servir SS_L viello"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
 msgstr "Sobreescribir os achustes d'o servidor"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "Fer servir SS_L viello"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ÂCualo ye lo tuyo Jabber ID?"
@@ -1239,6 +1151,36 @@ msgstr "ÂCuala ye la tuya clau de Jabber?"
 msgid "What is your desired Jabber password?"
 msgstr "ÂCuala clau de Jabber quiers?"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#| msgid "Nic_kname:"
+msgid "Nic_kname"
+msgstr "Embota_da:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+#| msgid "_Last Name:"
+msgid "_Last Name"
+msgstr "_Apellius:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#| msgid "_First Name:"
+msgid "_First Name"
+msgstr "_Nome:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#| msgid "_Published Name:"
+msgid "_Published Name"
+msgstr "Nome _publicau"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#| msgid "_Jabber ID:"
+msgid "_Jabber ID"
+msgstr "_Jabber ID:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+#| msgid "E-_mail address:"
+msgid "E-_mail address"
+msgstr "Adreza de e-_mail:"
+
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>Exemplo:</b> usuario hotmail com"
@@ -1251,32 +1193,38 @@ msgstr "ÂCualo ye lo tuyo ID de Windows Live?"
 msgid "What is your Windows Live password?"
 msgstr "ÂCuala ye la tuya clau de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname:"
-msgstr "Embota_da:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "Automatico"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name:"
-msgstr "_Apellius:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
-msgstr "_Nome:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name:"
-msgstr "Nome _publicau:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "Rechistrar"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
-msgstr "Adreza de e-_mail:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "Opcions"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "Denguna"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
+#| msgid "_Username:"
+msgid "_Username"
 msgstr "Nome d'_usuario:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
@@ -1300,7 +1248,8 @@ msgid "Miscellaneous Options"
 msgstr "Opcions de miscelania"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
+#| msgid "STUN Server:"
+msgid "STUN Server"
 msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
@@ -1311,17 +1260,13 @@ msgstr "Descubrir o servidor STUN automaticament"
 msgid "Discover Binding"
 msgstr "Descubrir vinculaciÃn"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Servidor:"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Keep-Alive Options"
 msgstr "Opcions de ÂkeepaliveÂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism:"
+#| msgid "Mechanism:"
+msgid "Mechanism"
 msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
@@ -1329,12 +1274,14 @@ msgid "Interval (seconds)"
 msgstr "Intervalo (segundos)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username:"
-msgstr "Nome d'usuario d'autenticaciÃn:"
+#| msgid "Authentication username:"
+msgid "Authentication username"
+msgstr "Nome d'usuario d'autenticaciÃn"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
-msgstr "Transporte:"
+#| msgid "Transport:"
+msgid "Transport"
+msgstr "Transporte"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Loose Routing"
@@ -1344,18 +1291,23 @@ msgstr "Enrutau impreciso"
 msgid "Ignore TLS Errors"
 msgstr "Ignorar errors TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Port:"
-msgstr "Puerto:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#| msgid "E-mail address"
+msgid "Local IP Address"
+msgstr "Adreza IP local"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ÂCualo ye lo tuyo ID de login SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "ÂCuala ye la tuya clau d'a cuenta SIP?"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Cla_u de paso:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Yahoo! I_D:"
 msgstr "I_D de Yahoo!:"
@@ -1368,6 +1320,14 @@ msgstr "_Ignorar invitacions a conferencias y salas de chat"
 msgid "_Room List locale:"
 msgstr "ConfiguraciÃn d'a lista de _salas:"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "Conchunto de c_aracteres"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Puerto:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ÂCualo ye o tuyo ID de Yahoo!?"
@@ -1376,36 +1336,36 @@ msgstr "ÂCualo ye o tuyo ID de Yahoo!?"
 msgid "What is your Yahoo! password?"
 msgstr "ÂCuala ye la tuya clau de Yahoo!?"
 
-#: ../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 "No s'ha puesto convertir a imachen"
 
-#: ../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 "O suyo sistema no suporta garra d'os formatos d'imachen acceptaus"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "No s'ha puesto alzar a imachen a un archivo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "Trigar a tuya imachen d'Avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "Prener una imachenâ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "Sin imachen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "Imachens"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "Totz os archivos"
 
@@ -1413,6 +1373,35 @@ msgstr "Totz os archivos"
 msgid "Click to enlarge"
 msgstr "Prete ta engrandar"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentification failed for account <b>%s</b>"
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "Fallà l'autenticaciÃn ta la cuenta <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3724
+msgid "Retry"
+msgstr "Prebar atra vegada"
+
+#: ../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 ""
+"Mete a tuya clau de paso ta la cuenta\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "Trigarâ"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "_Trigar"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1438,40 +1427,40 @@ msgstr "Iste protocolo no suporta gritadas d'emerchencia"
 msgid "You don't have enough credit in order to place this call"
 msgstr "No tiene credito suficient ta fer ista gritada"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:727
 msgid "Failed to open private chat"
 msgstr "No s'ha puesto ubrir chat privau"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:785
 msgid "Topic not supported on this conversation"
 msgstr "O tema no ye suportau en ista conversaciÃn"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "You are not allowed to change the topic"
 msgstr "No le ye permitiu cambiar o tema"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "%s no ye un identificador de contacto valido"
+#: ../libempathy-gtk/empathy-chat.c:967
+#| msgid "invalid contact"
+msgid "Invalid contact ID"
+msgstr "ID de contacto no valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1054
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpiar totz os mensaches d'a conversaciÃn actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1057
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: establir o tema ta la conversaciÃn actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id de sala de chat>: unir-se a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id de sala de chat>: unir-se a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1479,23 +1468,23 @@ msgstr ""
 "/part [<ID d'a sala de chat>] [<razÃn>]: abandonar la sala de chat, l'actual "
 "de traza predeterminada"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id d'o contacto> [<mensache>]: ubrir un chat privau"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id d'o contacto> <mensache>: ubrir un chat privau"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <embotada>: cambiar a suya embotada en o servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensache>: ninviar un mensache d'ACCIÃN a la conversaciÃn actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1083
 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 "
@@ -1505,11 +1494,11 @@ msgstr ""
 "ta ninviar un mensache prencipiando por una Â/Â. Por eixemplo: Â/say /join "
 "s'usa ta unir a una sala de chat nuevaÂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID d'o contacto>: amostrar informaciÃn sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1517,128 +1506,127 @@ msgstr ""
 "/help [<comando>]: amostrar totz os comandos suportaus. Si <comando> ye "
 "definiu, amuestra o suyo uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1110
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "Unknown command"
 msgstr "Comando desconoxiu"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1281
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconoixiu; consulte /help ta veyer os comandos disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1538
 msgid "insufficient balance to send message"
 msgstr "no tiene credito suficient ta ninviar o mensache"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1619
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error ninviando lo mensache '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error ninviando lo mensache: %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:1550
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "no tiene credito suficient ta ninviar o mensache. <a href='%s'>Recargar</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1590
 msgid "not capable"
 msgstr "no ye posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1597
 msgid "offline"
 msgstr "desenchegau"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "invalid contact"
 msgstr "contacto no valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "permission denied"
 msgstr "permiso denegau"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "too long message"
 msgstr "mensache masiau gran"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "not implemented"
 msgstr "sin implementar"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "unknown"
 msgstr "desconoxiu"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:974
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1695
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema meso a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1697
 #, c-format
-#| msgid "Topic set to: %s"
 msgid "Topic set by %s to: %s"
 msgstr "Tema meso por %s a: %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:1702
 msgid "No topic defined"
 msgstr "Tema sin definir"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2218
 msgid "(No Suggestions)"
 msgstr "(Sin de sucherencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2286
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Anyadir '%s' a o diccionario"
 
 #. 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:2323
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Anyadir '%s' a lo dicionario de '%s'"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2393
 msgid "Insert Smiley"
 msgstr "Meter emoticon"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2411
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "_Ninviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2468
 msgid "_Spelling Suggestions"
 msgstr "_Sucherencias ortograficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "Failed to retrieve recent logs"
 msgstr "Fallà en recibir os rechistros recientz"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2718
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s s'ha desenchegau"
@@ -1646,12 +1634,12 @@ msgstr "%s s'ha desenchegau"
 #. 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:2725
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s echà a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2728
 #, c-format
 msgid "%s was kicked"
 msgstr "%s estià echau"
@@ -1659,17 +1647,17 @@ msgstr "%s estià echau"
 #. 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:2736
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s vetà a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2739
 #, c-format
 msgid "%s was banned"
 msgstr " %s estià vetau"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dixau la sala"
@@ -1679,17 +1667,17 @@ msgstr "%s ha dixau la sala"
 #. * 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:2752
 #, c-format
 msgid " (%s)"
 msgstr "(%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2777
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha dentrau en a sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2802
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Agora %s se dice %s"
@@ -1697,55 +1685,50 @@ msgstr "Agora %s se dice %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:1466
-#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
+#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
+#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
 msgid "Disconnected"
 msgstr "Desenchegau"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Would you like to store this password?"
 msgstr "Te cuacaria alzar ista clau?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3670
 msgid "Remember"
 msgstr "Remerar"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3680
 msgid "Not now"
 msgstr "Agora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "Prebar atra vegada"
-
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3728
 msgid "Wrong password; please try again:"
 msgstr "Clau de paso incorrecta; prebe atra vegada:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3858
 msgid "This room is protected by a password:"
 msgstr "Ista sala ye protechida mediantes d'una clau de paso:"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3885
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "Chuntar-se"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
 msgid "Connected"
 msgstr "Enchegau"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4132
 msgid "Conversation"
 msgstr "Charrada"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4137
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1770,17 +1753,16 @@ msgstr "Permiso denegau"
 msgid "Could not block contact"
 msgstr "No s'ha puesto bloqueyar lo contacto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr "Editar contactos bloqueayaus"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:503
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "Cuenta:"
 
@@ -1788,369 +1770,157 @@ msgstr "Cuenta:"
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueyaus"
 
-#. 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 "_Copiar l'adreza d'o entrastre"
-
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_Ubrir enrastre"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+msgid "Full name"
+msgstr "Nome completo"
 
-#. 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 %B %d %Y"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr "Numero de telefono"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "Nuevo contacto"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "E-mail address"
+msgstr "Adreza de e-mail"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "Bloqueyar a %s?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Website"
+msgstr "Pachina web"
 
-#: ../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 "Ye seguro que quiere bloqueyar a Â%s ta que no le torne a contactar?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr "Cabo d'aÃo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "_Bloqueyar"
+#. 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:111
+msgid "Last seen:"
+msgstr "Zaguera actividat:"
 
-#: ../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] "Info_rmar d'iste contacto como abusivo"
-msgstr[1] "Info_rmar d'istos contactos como abusivos"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+msgid "Server:"
+msgstr "Servidor:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "PeticiÃn de suscripciÃn"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Connected from:"
+msgstr "Enchegau dende:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "_Bloqueyar usuario"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+msgid "Away message:"
+msgstr "Mensache d'ausencia:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "Decidir _dimpuÃs"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+msgid "work"
+msgstr "treballo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
+msgstr "personal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
+msgstr "mÃvil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
+msgstr "voz"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "preferred"
+msgstr "preferiu"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
+msgstr "grupo"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:496
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:526
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "Buscar:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:584
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "_Anyadir contacto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "No s'han trobau contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:618
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "O suyo mensache de presentaciÃn:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:626
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Dixa-me veyer cuan ye enchegau. Gracias."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "Canals:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:747
-#: ../libempathy-gtk/empathy-individual-widget.c:455
-msgid "Country ISO Code:"
-msgstr "Codigo ISO de pais:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:749
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "PaÃs:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:751
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "Estau:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:753
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "Ciudat:"
-
-#: ../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 "Codigo postal:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "Carrera:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "Edificio:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "Planta:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:765
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "Cambra:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:767
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "Texto:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:769
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "Descripcion:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:771
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URI:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:773
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "Ran de precisiÃn:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:775
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "Error:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:777
-#: ../libempathy-gtk/empathy-individual-widget.c:485
-msgid "Vertical Error (meters):"
-msgstr "Error vertical (metros):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "Error horizontal (metros):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:781
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "Velocidat:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:783
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "Retardo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:785
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "Velocidat d'ascenso:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:787
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-msgid "Last Updated on:"
-msgstr "Esviellau por zaguera vegada en:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "Lonchitut:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:791
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "Latitut:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:793
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "Altitut:"
-
-#: ../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:35
-msgid "Location"
-msgstr "Localizacion"
-
-#. 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 "%e de %B de %Y a las %R UTC"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:997
+#: ../libempathy-gtk/empathy-contact-widget.c:168
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Alzar avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
+#: ../libempathy-gtk/empathy-contact-widget.c:224
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "No s'ha puesto alzar o avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1455
-#| msgid "Technical Details"
-msgid "Personal Details"
-msgstr "Detalles personals"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1458
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Detalles d'o contacto"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-#| msgid "Full name:"
-msgid "Full name"
-msgstr "Nome completo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-#| msgid "Phone number:"
-msgid "Phone number"
-msgstr "Numero de telefono"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-#| msgid "E-mail address:"
-msgid "E-mail address"
-msgstr "Adreza de e-mail"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-#| msgid "Website:"
-msgid "Website"
-msgstr "Pachina web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-#| msgid "Birthday:"
-msgid "Birthday"
-msgstr "Cabo d'aÃo"
-
-#. 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
-msgid "Last seen:"
-msgstr "Zaguera actividat:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
-msgid "Connected from:"
-msgstr "Enchegau dende:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
-msgid "Away message:"
-msgstr "Mensache d'ausencia:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-#| msgid "Work"
-msgid "work"
-msgstr "treballo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-#| msgid "Romeo"
-msgid "home"
-msgstr "personal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-#| msgid "Mobile"
-msgid "mobile"
-msgstr "mÃvil"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-#| msgid "Favorite"
-msgid "voice"
-msgstr "voz"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-#| msgid "Preferences"
-msgid "preferred"
-msgstr "preferiu"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "postal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-#| msgid "Appearance"
-msgid "parcel"
-msgstr "grupo"
-
 #. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
+#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Identificador:"
+#: ../libempathy-gtk/empathy-user-info.c:444
+#| msgid "Identifier:"
+msgid "Identifier"
+msgstr "Identificador"
 
-#. Alias
+#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "Embotada:"
+#: ../libempathy-gtk/empathy-user-info.c:449
+#| msgid "Alias:"
+msgid "Alias"
+msgstr "Embotada"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Puesto</b> en (calendata)\t"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles d'o contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requestedâ"
 msgstr "InformaciÃn solicitadaâ"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Puesto</b> en (calendata)\t"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Client Information"
 msgstr "Informacion d'o client"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS:"
-msgstr "Sistema operativo:"
+#| msgid "OS:"
+msgid "OS"
+msgstr "Sistema operativo"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Version:"
-msgstr "Version:"
+#| msgid "Version:"
+msgid "Version"
+msgstr "Version"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client:"
-msgstr "Client:"
+#| msgid "Client:"
+msgid "Client"
+msgstr "Client"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
@@ -2174,179 +1944,332 @@ msgid "Select"
 msgstr "Trigar"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:403
-#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Colla"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "Nuevo contacto"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "Bloqueyar a %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 "Ye seguro que quiere bloqueyar a Â%s ta que no le torne a contactar?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Se bloqueyarà a siguient identidat:"
 msgstr[1] "Se bloqueyarÃn a siguients identidatz:"
 
-#: ../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] "No se puede bloqueyar a siguient identidat:"
 msgstr[1] "No se pueden bloqueyar a siguients identidatz:"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "_Bloqueyar"
+
+#: ../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] "Info_rmar d'iste contacto como abusivo"
+msgstr[1] "Info_rmar d'istos contactos como abusivos"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Editar a informaciÃn d'o contacto"
 
 #. 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 "Contactos enlazaus"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts no ye instalau"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instale gnome-contacts ta accedir a os detalles d'os contactos."
+
 #. 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 "Seleccionar a cuenta que fer servir ta realizar a gritada"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-individual-menu.c:357
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Gritar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
+#: ../libempathy-gtk/empathy-individual-menu.c:422
 msgid "Mobile"
 msgstr "MÃvil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:424
 msgid "Work"
 msgstr "Treballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:426
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:667
 msgid "_Block Contact"
 msgstr "_Bloqueyar contacto"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:723
+msgid "Delete and _Block"
+msgstr "Eliminar y _bloqueyar"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:785
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Realment quiere sacar o contacto Â%sÂ?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:794
+#, 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 ""
+"Realment quiere sacar o contacto enlazau Â%sÂ? Tienga en cuenta que isto "
+"sacarà totz os contactos que componen iste contacto enlazau."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:805
+msgid "Removing contact"
+msgstr "Borrando contacto"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:869
+#: ../libempathy-gtk/empathy-individual-view.c:2453
+msgid "_Remove"
+msgstr "Borra_r"
+
 #. 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:1
+#: ../libempathy-gtk/empathy-individual-menu.c:1232
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "_Charrada"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+#: ../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:1300
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Gritada de vo_z"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1333
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Gritada de _vidio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../libempathy-gtk/empathy-individual-menu.c:1374
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Charradas _anteriors"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1403
 msgid "Send File"
 msgstr "Ninviar archivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1433
 msgid "Share My Desktop"
 msgstr "Compartir o mio escritorio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1459
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
 msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
-#| msgid "telepathy-salut not installed"
-msgid "gnome-contacts not installed"
-msgstr "gnome-contacts no ye instalau"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
-msgid "Please install gnome-contacts to access contacts details."
-msgstr "Instale gnome-contacts ta accedir a os detalles d'os contactos."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1488
 msgid "Infor_mation"
 msgstr "Infor_maciÃn"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1537
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1653
+#: ../src/empathy-chat-window.c:1240
 msgid "Inviting you to this room"
 msgstr "Convidando-le a ista sala"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1699
 msgid "_Invite to Chat Room"
 msgstr "_Convidar a sala de chat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:5
+#: ../libempathy-gtk/empathy-individual-menu.c:1895
 msgid "_Add Contactâ"
 msgstr "_Anyadir contactoâ"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
-msgid "Delete and _Block"
-msgstr "Eliminar y _bloqueyar"
-
-#: ../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 "Realment quiere sacar o grupo Â%sÂ?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 msgid "Removing group"
 msgstr "Borrando colla"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
-msgid "_Remove"
-msgstr "Borra_r"
+#: ../libempathy-gtk/empathy-individual-view.c:2444
+#| msgid "Real name:"
+msgid "Re_name"
+msgstr "Re_nombrar"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Realment quiere sacar o contacto Â%sÂ?"
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "Canals:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "Codigo ISO de pais:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "PaÃs:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "Estau:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "Ciudat:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "Codigo postal:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "Carrera:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Edificio:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Planta:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "Cambra:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "Texto:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "Descripcion:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "Ran de precisiÃn:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "Error:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "Error vertical (metros):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "Error horizontal (metros):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "Velocidat:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "Retardo:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "Velocidat d'ascenso:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "Esviellau por zaguera vegada en:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "Lonchitut:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "Latitut:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "Altitut:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "Localizacion"
+
+#. 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 ""
-"Realment quiere sacar o contacto enlazau Â%sÂ? Tienga en cuenta que isto "
-"sacarà totz os contactos que componen iste contacto enlazau."
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e de %B de %Y a las %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "Embotada:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-msgstr "Borrando contacto"
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2386,30 +2309,53 @@ msgstr "nuevo servidor"
 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 ""
+"Empathy puede automaticament detectar y charrar con la chent conectada en o "
+"mesmo rete que tu. Si quiers fer servir ista caracteristica, por favor "
+"compreba que os siguients detalles con correctos."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+msgid "People nearby"
+msgstr "Chent amÃn"
+
+#: ../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 ""
+"Puede cambiar facilment istos detalles posteriorment u desactivar ista "
+"caracteristica trigando <span style=\"italic\">Editar â Cuentas</span> en a "
+"lista de contactos."
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Amostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Charre en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Charrada con %s"
 
-#: ../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:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y a las %X"
@@ -2427,95 +2373,95 @@ msgstr "<i>* %s %s</i>"
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s menuto"
 msgstr[1] "%s menutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "A gritada duro %s, rematà a las %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "Hue"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "Ayere"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:3471
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "Cualsiquier hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1942
-#: ../libempathy-gtk/empathy-log-window.c:2401
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "Cualsiquiera"
 
-#: ../libempathy-gtk/empathy-log-window.c:2714
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "Qui"
 
-#: ../libempathy-gtk/empathy-log-window.c:2923
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "Quan"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "Cualsiquier cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3041
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "Charradas de testo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3043
-#: ../src/empathy-preferences.ui.h:25
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Gritadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "Gritadas dentrantz"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "Gritadas salientz"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "Gritadas perdidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3072
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Ye seguro que quiere eliminar totz os rechistros de conversacions anteriors?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3768
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "Escoscar tot"
 
-#: ../libempathy-gtk/empathy-log-window.c:3775
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "Borrar de:"
 
@@ -2525,7 +2471,6 @@ msgstr "_Archivo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2538,13 +2483,12 @@ msgid "Profile"
 msgstr "Perfil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-streamed-media-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:24
 msgid "Video"
 msgstr "Vidio"
 
@@ -2556,131 +2500,124 @@ msgstr "pachina 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Cargandoâ</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
-#| msgid "The specified contact is offline"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "Quà tipo de cuenta tiene?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "Adhibindo cuenta nueva"
+
+#: ../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 "Introduzca l'identificador d'un contacto u un numero de telefono:"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "Gritada de _vidio"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "Gritada de vo_z"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "Gritada nueva"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "O contacto ye desenchegau"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
-#| msgid "The specified contact is not valid"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "O contacto especificau ye desconoxiu u no ye valido"
 
-#: ../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 "O contacto no suporta iste tipo de conversaciÃn"
 
-#: ../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 "A funcionalidat requerida no ye implementada ta ixe protocolo"
 
-#: ../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 "No se podià encetar una conversaciÃn con o contacto dau"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "Se le ha bloqueyau en ista canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "Ista canal ye completa"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
-#| msgid "You have been invited to join %s"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "Ha d'estar convidau ta unir-se a ista canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
-#| msgid "Contact disconnected"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "No se puede proceder entre que sÃa desconnectau"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "Permiso denegau"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
-#| msgid "There was an error starting the call"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
 msgstr "Habià una error en prencipiar a gritada"
 
-#: ../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 "Introduzca l'identificador d'un contacto u un numero de telefono:"
-
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "Nueva charrada"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
-#| msgctxt "menu item"
-#| msgid "_Video Call"
-msgid "_Video Call"
-msgstr "Gritada de _vidio"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
-#| msgctxt "menu item"
-#| msgid "_Audio Call"
-msgid "_Audio Call"
-msgstr "Gritada de vo_z"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
-msgid "New Call"
-msgstr "Gritada nueva"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, c-format
-#| msgid "Authentication failed"
-msgid "Authentification failed for account <b>%s</b>"
-msgstr "Fallà l'autenticaciÃn ta la conta <b>%s</b> "
-
-#: ../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 ""
-"Mete a tuya clau de paso ta la cuenta\n"
-"<b>%s</b>"
-
 #. 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 "Mensache presonalizauâ"
 
-#: ../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 "Editar mensaches personalizausâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:341
 msgid "Click to remove this status as a favorite"
 msgstr "Prete ta eliminar iste estau d'os favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:350
 msgid "Click to make this status a favorite"
 msgstr "Prete ta fer iste estau un favorito"
 
-#: ../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>Mensache actual: %s</b>\n"
+"<small><i>Prete Intro ta establir o mensache nuevo u Esc ta cancelar.</i></"
+"small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:393
 msgid "Set status"
 msgstr "Meter estau"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1101
 msgid "Custom messagesâ"
 msgstr "Mensaches presonalizausâ"
 
@@ -2688,11 +2625,15 @@ msgstr "Mensaches presonalizausâ"
 #. 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 "Nueva cuenta de %s"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Coincidir con capitalizacioÌn"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Trobar:"
@@ -2757,31 +2698,35 @@ msgstr "Rematà a gritada de voz"
 msgid "Edit Custom Messages"
 msgstr "Editar mensaches presonalizaus"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "PeticiÃn de suscripciÃn"
+
+#: ../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 quiere permiso ta veyer quÃn ye en linia"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:729
+msgid "_Decline"
+msgstr " _Refusar"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "_Aceptar"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1125
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensache editau a las %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1841
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "Clasico"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "Simple"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "Escoscau"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "Azul"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
@@ -2841,7 +2786,6 @@ msgid "Certificate hostname: %s"
 msgstr "Nombre d'o servidor de certificaus: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-#| msgid "Continue"
 msgid "C_ontinue"
 msgstr "C_ontinar"
 
@@ -2861,19 +2805,19 @@ msgstr "Recordar ista opciÃn ta futuras connexions"
 msgid "Certificate Details"
 msgstr "Detalles de certificau"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "No s'ha puesto ubrir l'URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "Trigar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "No bi ha espacio suficient ta alzar l'archivo"
 
-#: ../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. "
@@ -2882,11 +2826,30 @@ msgstr ""
 "Cal %s d'espacio libre ta alzar iste archivo, pero solo que bi ha %s "
 "disposable. Trie atro puesto."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo dentrant de %s"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "Connectar ta editar a suya informaciÃn personal."
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+#| msgid "Personal Details"
+msgid "<b>Personal Details</b>"
+msgstr "<b>Detalles personals</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "_Copiar l'adreza d'o entrastre"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "_Ubrir enrastre"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Configuracion rechional actual"
@@ -3054,54 +3017,23 @@ msgstr "Occidental"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "Select..."
-msgstr "Trigarâ"
+#: ../libempathy-gtk/empathy-roster-model.h:29
+#| msgid "Contact"
+msgid "Top Contacts"
+msgstr "Contactos importants"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "_Select"
-msgstr "_Trigar"
+#: ../libempathy-gtk/empathy-roster-model.h:31
+msgid "Ungrouped"
+msgstr "Sin colla"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "Sin mensache d'error"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "Mensache instantaneo (Empathy)"
 
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "No enchegar-se automaticament en dentrar"
-
-#: ../src/empathy.c:439
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "No amostrar a lista de contactos u cualsiquier atro dialogo en dentrar"
-
-#: ../src/empathy.c:454
-msgid "- Empathy IM Client"
-msgstr "Client de mensacheria instantanea Empathy"
-
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "Error a o contactar con o chestor de cuentas"
-
-#: ../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 ""
-"Habià una error en prebar de conectar con o chestor de cuentas Telepathy. La "
-"error estiÃ:\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3144,22 +3076,49 @@ msgstr "Un client de mensacheria instantanea ta GNOME"
 msgid "translator-credits"
 msgstr "Daniel Martinez <entaltoaragon gmail com>"
 
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"No amostrar garra dialogo; realizar qualsiquier treballo (eix. importar) y "
+"salir"
+
+#: ../src/empathy-accounts.c:186
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"No amostrar garra dialogo de no estar que solament existan contas ÂChent "
+"amÃnÂ"
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "Cuenta proporcionada inicialment trigada (eix. gabble/jabber/eixemplo)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<id-de-cuenta>"
+
+#: ../src/empathy-accounts.c:197
+msgid "- Empathy Accounts"
+msgstr "- Cuentas d'empathy"
+
+#: ../src/empathy-accounts.c:240
+msgid "Empathy Accounts"
+msgstr "Cuentas d'empathy"
+
 #. 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 "Bi ha modificacions en a tuya cuenta de %s sin guardar."
 
 #. 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 "Encara no s'ha alzau a suya cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
 msgid "Connectingâ"
 msgstr "Conectandoâ"
 
@@ -3195,32 +3154,23 @@ msgid "Offline â Account Disabled"
 msgstr "Desenchegau: cuenta desactivada"
 
 #: ../src/empathy-accounts-dialog.c:608
-#| msgid "Connection has been lost"
 msgid "Edit Connection Parameters"
 msgstr "Editar os parametros d'a connexiÃn"
 
-#: ../src/empathy-accounts-dialog.c:773
-msgid "Failed to retrieve your personal information from the server."
-msgstr "Fallà en recuperar a suya informaciÃn personal d'o servidor."
-
-#: ../src/empathy-accounts-dialog.c:779
-msgid "Go online to edit your personal information."
-msgstr "Connectar ta editar a suya informaciÃn personal."
-
-#: ../src/empathy-accounts-dialog.c:866
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar os parametros d'a connexiÃnâ"
 
-#: ../src/empathy-accounts-dialog.c:1362
+#: ../src/empathy-accounts-dialog.c:1266
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Quiere sacar %s d'o suyo equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1366
+#: ../src/empathy-accounts-dialog.c:1270
 msgid "This will not remove your account on the server."
 msgstr "Isto no sacarà a suya cuenta d'o servidor."
 
-#: ../src/empathy-accounts-dialog.c:1602
+#: ../src/empathy-accounts-dialog.c:1475
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3228,25 +3178,26 @@ msgstr ""
 "Va a seleccionar unatra cuenta, o que descartarà os suyos cambeos.\n"
 "Seguro que quiere continar?"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1779
-msgid "_Enable"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1666
+msgid "_Enabled"
 msgstr "_Activau"
 
-#: ../src/empathy-accounts-dialog.c:1780
-msgid "_Disable"
-msgstr "_Desactivau"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1689
+#| msgid "Real name:"
+msgid "Rename"
+msgstr "Renombrar"
 
-#: ../src/empathy-accounts-dialog.c:2221
+#: ../src/empathy-accounts-dialog.c:2105
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../src/empathy-accounts-dialog.c:2225
-#| msgid "Connected"
+#: ../src/empathy-accounts-dialog.c:2109
 msgid "_Connect"
 msgstr "En_chegar"
 
-#: ../src/empathy-accounts-dialog.c:2402
+#: ../src/empathy-accounts-dialog.c:2288
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3254,6 +3205,11 @@ msgstr ""
 "Va a zarrar a finestra, o que descartarà os suyos cambeos.\n"
 "Seguro que quiere continar?"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2431
+msgid "Messaging and VoIP Accounts"
+msgstr "Cuentas de mensacheria y VoIP"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "_Importarâ"
@@ -3271,117 +3227,146 @@ msgstr ""
 "protocolo que quiera usar."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-#| msgid "No protocol installed"
 msgid "No protocol backends installed"
 msgstr "No bi ha \"backends\" de protocols instalaus"
 
-#: ../src/empathy-auth-client.c:288
+#: ../src/empathy-auth-client.c:296
 msgid " - Empathy authentication client"
 msgstr " - Client d'autenticaciÃn d'Empathy"
 
-#: ../src/empathy-auth-client.c:304
+#: ../src/empathy-auth-client.c:312
 msgid "Empathy authentication client"
 msgstr "Client d'autenticaciÃn d'Empathy"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+#: ../src/empathy.c:427
+msgid "Don't connect on startup"
+msgstr "No enchegar-se automaticament en dentrar"
+
+#: ../src/empathy.c:431
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "No amostrar a lista de contactos u cualsiquier atro dialogo en dentrar"
+
+#: ../src/empathy.c:447
+msgid "- Empathy IM Client"
+msgstr "Client de mensacheria instantanea Empathy"
+
+#: ../src/empathy.c:623
+msgid "Error contacting the Account Manager"
+msgstr "Error a o contactar con o chestor de cuentas"
+
+#: ../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 ""
+"Habià una error en prebar de conectar con o chestor de cuentas Telepathy. La "
+"error estiÃ:\n"
+"%s"
+
+#: ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client d'audio/vidio Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Client d'audio/vidio Empathy"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "Contraste"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "Brillo"
-
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "Gamma"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s prebà de gritar-le, pero yera en atra gritada."
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "Voz"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+msgid "i"
+msgstr "Informacion"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "Barra _lateral"
+#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+msgid "Incoming call"
+msgstr "Gritada dentrant"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "Dentrada d'audio"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Gritada de video entrante de %s"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "Dentrada de vidio"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Gritada dentrant de %s"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "Teclau"
+#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "Refusar"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "Detalles"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+msgstr "Responder"
 
 #. 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:1861
 #, c-format
 msgid "Call with %s"
 msgstr "Gritar con %s"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2105
+#: ../src/empathy-call-window.c:2113
 msgid "The IP address as seen by the machine"
 msgstr "L'adreza IP como la veye a maquina"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2115
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'adreza IP como la veye o servidor d'Internet"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2117
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'adreza IP d'o par como la veye l'atra parti"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2111
+#: ../src/empathy-call-window.c:2119
 msgid "The IP address of a relay server"
 msgstr "L'adreza IP d'un servidor d'esbarro"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2121
 msgid "The IP address of the multicast group"
 msgstr "L'adreza IP d'o grupo multicast"
 
-#: ../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
-#| msgid "Unknown"
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "Desconoxiu"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2874
+msgid "On hold"
+msgstr "En aspera"
+
+#: ../src/empathy-call-window.c:2878
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2880
+msgid "Duration"
+msgstr "Duracion"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2883
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "Enchegau â %d:%02dm"
+msgid "%s â %d:%02dm"
+msgstr "%s: %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2964
+#: ../src/empathy-call-window.c:2979
 msgid "Technical Details"
 msgstr "Detalles tecnicos"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3003
+#: ../src/empathy-call-window.c:3018
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3390,8 +3375,7 @@ msgstr ""
 "O software de Â%s no entiende garra d'os formatos de video suportaus por o "
 "suyo equipo"
 
-#: ../src/empathy-streamed-media-window.c:2242
-#: ../src/empathy-call-window.c:3008
+#: ../src/empathy-call-window.c:3023
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3400,8 +3384,7 @@ msgstr ""
 "O software de Â%s no entiende garra d'os formatos de video suportaus por o "
 "suyo equipo"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3014
+#: ../src/empathy-call-window.c:3029
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3410,29 +3393,25 @@ msgstr ""
 "No se puede establir una connexiÃn con %s. Un d'os dos puede estar en un ret "
 "que no accepta connexions directas."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3020
+#: ../src/empathy-call-window.c:3035
 msgid "There was a failure on the network"
 msgstr "I habià un fallo en o ret"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3024
+#: ../src/empathy-call-window.c:3039
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "No son instalaus en o suyo equipo os formatos de son necesarios ta ista "
 "gritada"
 
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3027
+#: ../src/empathy-call-window.c:3042
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "No son instalaus en o suyo equipo os formatos de video necesarios ta ista "
 "gritada"
 
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3054
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3443,28 +3422,36 @@ msgstr ""
 "\">Informe d'ista error</a> y anyada os rechistros obtenius d'a finestra de "
 "ÂDepuraciÃn en o menà d'Aduya."
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3063
 msgid "There was a failure in the call engine"
 msgstr "I habià un fallo en o motor de gritadas"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3051
+#: ../src/empathy-call-window.c:3066
 msgid "The end of the stream was reached"
 msgstr "Se plegà a la fin d'o fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3091
+#: ../src/empathy-call-window.c:3106
 msgid "Can't establish audio stream"
 msgstr "No se puede establir o fluxo de voz"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3101
-msgid "Can't establish video stream"
-msgstr "No se puede establir o fluxo de video"
+#: ../src/empathy-call-window.c:3116
+msgid "Can't establish video stream"
+msgstr "No se puede establir o fluxo de video"
+
+#: ../src/empathy-call-window.c:3153
+#, c-format
+msgid "Your current balance is %s."
+msgstr "o suyo balanz actual ye %s."
+
+#: ../src/empathy-call-window.c:3157
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "No tiene credito suficient ta fer ista gritada."
+
+#: ../src/empathy-call-window.c:3159
+msgid "Top Up"
+msgstr "Recargar"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "_Gritar"
 
@@ -3481,23 +3468,18 @@ msgid "_Settings"
 msgstr "_ConfiguracioÌn"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Veyer"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "Ad_uya"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_Contenius"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_Depurar"
 
@@ -3518,12 +3500,10 @@ msgid "Disable camera"
 msgstr "Desactivar camara"
 
 #: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:2
 msgid "Hang up"
 msgstr "Colgar"
 
 #: ../src/empathy-call-window.ui.h:15
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Hang up current call"
 msgstr "Colgar a gritada actual"
 
@@ -3548,61 +3528,58 @@ msgid "Display the dialpad"
 msgstr "Amostrar o teclau"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "Ninviar vidio"
-
-#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle video transmission"
 msgstr "Commutar a transmisiÃn de video"
 
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Send Audio"
-msgstr "Ninviar audio"
-
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-streamed-media-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle audio transmission"
 msgstr "Commutar a transmisiÃn de voz"
 
-#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:25
 msgid "Encoding Codec:"
 msgstr "CÃdec de codificaciÃn:"
 
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515
-#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517
-msgid "Unknown"
-msgstr "Desconoxiu"
-
-#: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:27
 msgid "Decoding Codec:"
 msgstr "CÃdec de descodificaciÃn:"
 
-#: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:28
 msgid "Remote Candidate:"
 msgstr "Candidato remoto:"
 
-#: ../src/empathy-call-window.ui.h:31
-#: ../src/empathy-streamed-media-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:29
 msgid "Local Candidate:"
 msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-chat-window.c:289
-#| msgid "Hide the main window."
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Client de mensacheria instantanea Empathy"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Sala"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Autoenchegar"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Chestionar salas favoritas"
+
+#: ../src/empathy-chat-window.c:282
 msgid "Close this window?"
 msgstr "Zarrar ista finestra?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:288
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3611,7 +3588,7 @@ msgstr ""
 "Zarrar ista finestra ferà que abandone %s. No recibirà mas mensaches dica "
 "que s'una de nuevo."
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:301
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3626,67 +3603,65 @@ msgstr[1] ""
 "Zarrar ista finestra ferà que abandone %u salas de chat. No recibirà mas "
 "mensaches dica que s'una a ellas de nuevo."
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:312
 #, c-format
-#| msgid "Level "
 msgid "Leave %s?"
 msgstr "Zarrar %s?"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:314
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "No recibirà mas mensaches d'iste chat dica que s'una de nuevo."
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:333
 msgid "Close window"
 msgstr "Zarrar a finestra"
 
-#: ../src/empathy-chat-window.c:334
-#| msgid "Level "
+#: ../src/empathy-chat-window.c:333
 msgid "Leave room"
 msgstr "Abandonar a sala"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:672 ../src/empathy-chat-window.c:695
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sin leyer)"
 msgstr[1] "%s (%d sin leyer)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:687
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (y otra)"
 msgstr[1] "%s (y %u atras)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:703
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sin leyer d'atros)"
 msgstr[1] "%s (%d sin leyer d'atros)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:712
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sin leer de totz)"
 msgstr[1] "%s (%d sin leer de totz)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:949
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:957
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Ninviando %d mensache"
 msgstr[1] "Ninviando %d mensaches"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:977
 msgid "Typing a message."
 msgstr "Escribindo un mensache"
 
@@ -3750,112 +3725,163 @@ msgstr "Mover a pestanya a la _dreita"
 msgid "_Detach Tab"
 msgstr "_Desacoplar pestanya"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "Nome"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Amostrar un servicio en particular"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "Sala"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Debugger d'Empathy"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "Autoenchegar"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Debugger d'Empathy"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "Chestionar salas favoritas"
+#: ../src/empathy-debug-window.c:1599
+msgid "Save"
+msgstr "Guardar"
+
+#: ../src/empathy-debug-window.c:1659
+msgid "Pastebin link"
+msgstr "Vinclo a pastebin"
+
+#: ../src/empathy-debug-window.c:1668
+msgid "Pastebin response"
+msgstr "Respuesta de pastebin"
+
+#: ../src/empathy-debug-window.c:1675
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datos masiau largos ta un apegau sencillo. Alce o rechistro en un fichero."
+
+#: ../src/empathy-debug-window.c:1856
+msgid "Debug Window"
+msgstr "Finestra de depuracion"
+
+#: ../src/empathy-debug-window.c:1916
+msgid "Send to pastebin"
+msgstr "Ninviar a pastebin"
+
+#: ../src/empathy-debug-window.c:1960
+msgid "Pause"
+msgstr "Pausar"
+
+#: ../src/empathy-debug-window.c:1972
+msgid "Level "
+msgstr "Ran"
+
+#: ../src/empathy-debug-window.c:1991
+msgid "Debug"
+msgstr "Depurar"
+
+#: ../src/empathy-debug-window.c:1996
+msgid "Info"
+msgstr "Informacion"
+
+#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+msgid "Message"
+msgstr "Mensache"
+
+#: ../src/empathy-debug-window.c:2006
+msgid "Warning"
+msgstr "Alvertencia"
+
+#: ../src/empathy-debug-window.c:2011
+msgid "Critical"
+msgstr "Critico"
+
+#: ../src/empathy-debug-window.c:2016
+msgid "Error"
+msgstr "Error"
+
+#: ../src/empathy-debug-window.c:2035
+msgid "Time"
+msgstr "Hora"
+
+#: ../src/empathy-debug-window.c:2038
+msgid "Domain"
+msgstr "Dominio"
+
+#: ../src/empathy-debug-window.c:2041
+msgid "Category"
+msgstr "Categoria"
+
+#: ../src/empathy-debug-window.c:2044
+msgid "Level"
+msgstr "Ran"
+
+#: ../src/empathy-debug-window.c:2073
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"O chestor de connexions seleccionau no suporta a extensiÃn de depuraciÃn "
+"remota."
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:508
 msgid "Incoming video call"
 msgstr "Gritada de vidio dentrant"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483
-msgid "Incoming call"
-msgstr "Gritada dentrant"
-
-#: ../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 le ye gritando con video. Quiere responder?"
 
-#: ../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 le ye gritando. Quiere responder?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Gritada dentrant de %s"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:541
 msgid "_Reject"
 msgstr "_Refusar"
 
-#: ../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 "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:557
 msgid "_Answer with video"
 msgstr "_Responder con video"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1489
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "Gritada de video entrante de %s"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:712
 msgid "Room invitation"
 msgstr "Convite a una sala"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:714
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:721
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ye convidando-te a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:854
-msgid "_Decline"
-msgstr " _Refusar"
-
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#: ../src/empathy-event-manager.c:734
 msgid "_Join"
 msgstr "_Chuntar-se"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s t'ha convidau a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "T'han convidau a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Trasferencia d'archivo dentrant de %s"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
 msgid "Password required"
 msgstr "S'amenista clau de paso"
 
-#: ../src/empathy-event-manager.c:1216
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s quiere permiso ta veyer quÃn ye en linia"
-
-#: ../src/empathy-event-manager.c:1222
+#: ../src/empathy-event-manager.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -3978,210 +4004,61 @@ msgstr ""
 "lista"
 
 #: ../src/empathy-import-dialog.c:76
-#| msgid "Import"
 msgid "_Import"
 msgstr "_Importar"
 
 #: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"No se pueden trobar denguna cuenta ta importar. Actualment Empathy  soporta "
-"importar solo que cuentas de Pidgin."
-
-#: ../src/empathy-import-dialog.c:209
-msgid "Import Accounts"
-msgstr "Importar cuentas"
-
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:303
-msgid "Import"
-msgstr "Importar"
-
-#: ../src/empathy-import-widget.c:312
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../src/empathy-import-widget.c:336
-msgid "Source"
-msgstr "Fuent"
-
-#: ../src/empathy-roster-window.c:391
-msgid "Provide Password"
-msgstr "Escriba a suya clau"
-
-#: ../src/empathy-roster-window.c:397
-msgid "Disconnect"
-msgstr "Desenchegar"
-
-#: ../src/empathy-roster-window.c:657
-msgid "You need to setup an account to see contacts here."
-msgstr "Debe configurar una cuenta ta veyer contactos aquÃ."
-
-#: ../src/empathy-roster-window.c:673
-msgid "No match found"
-msgstr "No s'ha trobau garra concidencia"
-
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr ""
-"As cuentas de %s no se pueden fer servir dica que no s'haiga actualizau o "
-"suyo software de %s."
-
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "Esviellar softwareâ"
-
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "Trancar"
-
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "Reenchegar"
-
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "Editar cuenta"
-
-#. 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 "Recargar %s (%s)â"
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
-msgstr "Recargar o saldo d'a cuenta"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "Recargarâ"
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "Contacto"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-msgstr "Ha d'activar una d'as suyas cuentas ta veyer contactos aquÃ."
-
-#. 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 "Ha d'activar %s ta veyer contactos aquiÌ."
-
-#: ../src/empathy-roster-window.c:2460
-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: ../src/empathy-roster-window.ui.h:1
-#| msgid "_Accounts"
-msgid "Account settings"
-msgstr "ConfiguraciÃn d'a cuenta"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "_Nueva conversacionâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "_Gritada nuevaâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Search for Contactsâ"
-msgstr "Bu_scar contactosâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_File Transfers"
-msgstr "_Transferencias d'archivos"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Offline Contacts"
-msgstr "Contactos _desenchegaus"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Show P_rotocols"
-msgstr "Amostrar p_rotocols"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Credit Balance"
-msgstr "Credito"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Contacts on a _Map"
-msgstr "Contactos en o _mapa"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Cuentas"
-
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Blocked Contacts"
-msgstr "Contactos _bloqueyaus"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "P_references"
-msgstr "P_referencias"
-
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "Find in Contact _List"
-msgstr "Buscar en a _lista de contacto"
-
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "Sort by _Name"
-msgstr "Ordenar por _nome"
-
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "Sort by _Status"
-msgstr "Ordenar por es_tau"
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"No se pueden trobar denguna cuenta ta importar. Actualment Empathy  soporta "
+"importar solo que cuentas de Pidgin."
 
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "Normal Size With _Avatars"
-msgstr "Tamanyo normal con _avatars"
+#: ../src/empathy-import-dialog.c:209
+msgid "Import Accounts"
+msgstr "Importar cuentas"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "N_ormal Size"
-msgstr "Tamanyo n_ormal"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:302
+msgid "Import"
+msgstr "Importar"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "Tamanyo _preto"
+#: ../src/empathy-import-widget.c:311
+msgid "Protocol"
+msgstr "Protocolo"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "_Sala"
+#: ../src/empathy-import-widget.c:335
+msgid "Source"
+msgstr "Fuent"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
-msgid "_Joinâ"
-msgstr "_Chuntar-seâ"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "Convidar participant"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "Chuntar-se a _favoritas"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Trigar un contacto ta convidar a la conversaciÃn:"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "Chestionar favoritos"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "Convidar"
 
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "Sala de chat"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "Miembros"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:410
+#| msgid "Failed to retrieve recent logs"
+msgid "Failed to list rooms"
+msgstr "Fallà en listar as salas"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4194,40 +4071,43 @@ msgstr ""
 "Cal clau de paso: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
-#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
-#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:666
-msgid "Could not start room listing"
-msgstr "No s'ha puesto encetar a lista d'a sala"
-
-#: ../src/empathy-new-chatroom-dialog.c:676
-msgid "Could not stop room listing"
-msgstr "No s'ha puesto aturar a lista d'a sala"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "Chuntar-se a la sala"
 
-#: ../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 ""
 "Introduzca o nombre de la sala a la quala unir u prete en una u mas salas "
 "d'a lista."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../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's server"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"Introduzca o servidor que alocha la sala u deixe-lo vuedo si la sala ye en a "
+"cuenta d'o servidor actual"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4235,576 +4115,686 @@ msgstr ""
 "Introduzca o servidor que alocha la sala u deixe-lo vuedo si la sala ye en a "
 "cuenta d'o servidor actual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "_Servidor:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Couldn't load room list"
 msgstr "No s'ha puesto cargar a lista d'a sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "Respuesta"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "Responder con video"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "Refusar"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "Aceptar"
+
+#. 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 "Proporcionar"
+
+#: ../src/empathy-preferences.c:143
 msgid "Message received"
 msgstr "Mensache recibiu"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:144
 msgid "Message sent"
 msgstr "Mensache ninviau"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:145
 msgid "New conversation"
 msgstr "Nueva charrada"
 
-#: ../src/empathy-preferences.c:169
-#| msgid "Contact goes online"
+#: ../src/empathy-preferences.c:146
 msgid "Contact comes online"
 msgstr "O contacto s'enchega"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:147
 msgid "Contact goes offline"
 msgstr "Contacto se desenchega"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:148
 msgid "Account connected"
 msgstr "Cuenta enchegada"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:149
 msgid "Account disconnected"
 msgstr "Cuenta desenchegada"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:386
 msgid "Language"
 msgstr "Luenga"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:724
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr "Chulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:650
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ÂOh, Romeo, Romeo!, Âan yes que no te veigo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:654
 msgid "Deny thy father and refuse thy name;"
 msgstr "Niega a o tuyo pai y rehÃsa o tuyo nombre;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:657
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "U, si no en quiers, churame solo que m'aimas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:660
 msgid "And I'll no longer be a Capulet."
 msgstr "Y dixarà yo de estar una Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:663
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "He de sentir mas, u contestar a lo dito?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:666
 msgid "Juliet has disconnected"
 msgstr "Chulieta s'ha desenchegau"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1032
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Show _smileys as images"
-msgstr "Amostrar os _emoticons como imachens"
-
 #: ../src/empathy-preferences.ui.h:2
-msgid "Show contact _list in rooms"
-msgstr "Amostrar _lista de contactos en salas"
+#| msgid "Show contact groups"
+msgid "Show groups"
+msgstr "Amostrar grupos"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "Apariencia"
+#| msgid "Your current balance is %s."
+msgid "Show account balances"
+msgstr "Amostrar os balances d'as cuentas"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+msgid "Contact List"
+msgstr "Lista de contactos"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "Encetar chats en:"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
 msgstr "pestanyas nue_vas"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
 msgstr "fin_estras nuevas"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Display incoming events in the notification area"
-msgstr "Amostrar os eventos entrantes en l'aria de notificaciÃn"
-
 #: ../src/empathy-preferences.ui.h:8
-msgid "_Automatically connect on startup"
-msgstr "Conectar _automaticament en dentrar"
+msgid "Show _smileys as images"
+msgstr "Amostrar os _emoticons como imachens"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "Amostrar _lista de contactos en salas"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Log conversations"
 msgstr "Rechistrar charradas"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
+msgid "Display incoming events in the notification area"
+msgstr "Amostrar os eventos entrantes en l'aria de notificaciÃn"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "_Automatically connect on startup"
+msgstr "Conectar _automaticament en dentrar"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "Cheneral"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
 msgid "_Enable bubble notifications"
 msgstr "_Activar notificacions de burbuxa"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:17
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar notificacions en _ausentar-se u estar ocupau"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificacions cuan a _conversacion no tiene lo foco"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificacions cuan s'enchega un contacto"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificacions cuan se desenchega un contacto"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid "_Enable sound notifications"
 msgstr "_Activar notificacions de son"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar sons en _ausentar-se u estar ocupau"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Play sound for events"
 msgstr "Fer sentir un son ta eventos"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Usar cancelaciÃn de _eco ta amillorar a calidat d'as gritadas"
 
-#: ../src/empathy-preferences.ui.h:23
-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 ""
-"A cancelaciÃn d'eco le aduya a que l'atra persona sienta a suya voz de forma "
-"mas clara pero puede causar problemas en qualques equipos. Si vustà u l'atra "
-"persona sienten ruidos u tienen problemas entre as gritadas, intente "
-"desactivar a cancelaciÃn d'eco y reiniciar a gritada."
+#: ../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 ""
+"A cancelaciÃn d'eco le aduya a que l'atra persona sienta a suya voz de forma "
+"mas clara pero puede causar problemas en qualques equipos. Si vustà u l'atra "
+"persona sienten ruidos u tienen problemas entre as gritadas, intente "
+"desactivar a cancelaciÃn d'eco y reiniciar a gritada."
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Publish location to my contacts"
+msgstr "_Publicar a mÃa ubicaciÃn a os mÃos contactos"
+
+#: ../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 "
+"decimal place."
+msgstr ""
+"Reducir a precisiÃn d'a ubicaciÃn significa que no se publicarà brenca mas "
+"preciso que a suya ciudat, estau y paÃs. As coordenadas GPS tendrÃn una "
+"valor aleatoria adhibida 1 puesto decimal."
+
+#. 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 "_Reducir a precisiÃn d'a ubicaciÃn"
+
+#: ../src/empathy-preferences.ui.h:34
+msgid "Privacy"
+msgstr "Privacidat"
+
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Cellphone"
+msgstr "_Movil"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Rete (IP, Wi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "Orichens d'as ubicacions:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"A lista d'idiomas reflexa solament os idiomas ta os quals tiene un "
+"diccionario instalau."
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Enable spell checking for languages:"
+msgstr "Activar a revisiÃn ortografica ta luengas:"
+
+#: ../src/empathy-preferences.ui.h:42
+msgid "Spell Checking"
+msgstr "RevisiÃn ortografica"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "_Tema d'a charrada:"
+
+#: ../src/empathy-preferences.ui.h:44
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "Temas"
+
+#: ../src/empathy-roster-window.c:242
+msgid "Provide Password"
+msgstr "Escriba a suya clau"
+
+#: ../src/empathy-roster-window.c:248
+msgid "Disconnect"
+msgstr "Desenchegar"
+
+#: ../src/empathy-roster-window.c:442
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar una cuenta ta veyer contactos aquÃ."
+
+#: ../src/empathy-roster-window.c:518
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr ""
+"As cuentas de %s no se pueden fer servir dica que no s'haiga actualizau o "
+"suyo software de %s."
+
+#: ../src/empathy-roster-window.c:636
+msgid "Update software..."
+msgstr "Esviellar softwareâ"
+
+#: ../src/empathy-roster-window.c:642
+msgid "Reconnect"
+msgstr "Reenchegar"
+
+#: ../src/empathy-roster-window.c:646
+msgid "Edit Account"
+msgstr "Editar cuenta"
+
+#: ../src/empathy-roster-window.c:651
+msgid "Close"
+msgstr "Trancar"
+
+#: ../src/empathy-roster-window.c:788
+#| msgid "Top up account credit"
+msgid "Top up account"
+msgstr "Recargar cuenta"
+
+#: ../src/empathy-roster-window.c:1470
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Ha d'activar una d'as suyas cuentas ta veyer contactos aquÃ."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1478
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Ha d'activar %s ta veyer contactos aquiÌ."
+
+#: ../src/empathy-roster-window.c:1556
+#| msgid "You need to enable %s to see contacts here."
+msgid "Change your presence to see contacts here"
+msgstr "Cambie a suya presencia ta veyer contactos aqui"
+
+#: ../src/empathy-roster-window.c:1565
+msgid "No match found"
+msgstr "No s'ha trobau garra concidencia"
+
+#: ../src/empathy-roster-window.c:1570
+#| msgid "Show offline contacts"
+msgid "No online contacts"
+msgstr "Contactos desenchegaus"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+#| msgid "New Conversation"
+msgid "_New Conversation..."
+msgstr "_Nueva conversacionâ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#| msgid "New Call"
+msgid "New _Call..."
+msgstr "_Gritada nuevaâ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#| msgid "Contact"
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+#| msgid "_Add Contact"
+msgid "_Add Contacts..."
+msgstr "_Anyadir contactosâ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+#| msgid "_Search for Contactsâ"
+msgid "_Search for Contacts..."
+msgstr "Bu_scar contactosâ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueyaus"
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Publish location to my contacts"
-msgstr "_Publicar a mÃa ubicaciÃn a os mÃos contactos"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#| msgid "_Room"
+msgid "_Rooms"
+msgstr "_Salas"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Reducir a precisiÃn d'a ubicaciÃn significa que no se publicarà brenca mas "
-"preciso que a suya ciudat, estau y paÃs. As coordenadas GPS tendrÃn una "
-"valor aleatoria adhibida 1 puesto decimal."
+#: ../src/empathy-roster-window-menubar.ui.h:8
+#| msgid "_Join"
+msgid "_Join..."
+msgstr "_Chuntar-seâ"
 
-#. 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:29
-msgid "_Reduce location accuracy"
-msgstr "_Reducir a precisiÃn d'a ubicaciÃn"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "Chuntar-se a _favoritas"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Privacy"
-msgstr "Privacidat"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+#| msgid "Manage Favorites"
+msgid "_Manage Favorites"
+msgstr "_Chestionar favoritos"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_GPS"
-msgstr "_GPS"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "_Transferencias d'archivos"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Cellphone"
-msgstr "_Movil"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Cuentas"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rete (IP, Wi-Fi)"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "P_referencias"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "Location sources:"
-msgstr "Orichens d'as ubicacions:"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+#| msgid "_Help"
+msgid "Help"
+msgstr "Aduya"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"A lista d'idiomas reflexa solament os idiomas ta os quals tiene un "
-"diccionario instalau."
+#: ../src/empathy-roster-window-menubar.ui.h:16
+#| msgid "Empathy"
+msgid "About Empathy"
+msgstr "Arredol d'Empathy"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "Enable spell checking for languages:"
-msgstr "Activar a revisiÃn ortografica ta luengas:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Surtir"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "Spell Checking"
-msgstr "RevisiÃn ortografica"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "ConfiguraciÃn d'a cuenta"
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "Chat Th_eme:"
-msgstr "_Tema d'a charrada:"
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr "_Enchegar-se"
 
-#: ../src/empathy-preferences.ui.h:40
-msgid "Variant:"
-msgstr "Variant:"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Nueva conversacionâ"
 
-#: ../src/empathy-preferences.ui.h:41
-msgid "Themes"
-msgstr "Temas"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "_Gritada nuevaâ"
 
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estau"
 
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "_Surtir"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "Feito"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "Tornar a marcar"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#| msgid "Enter your account details"
+msgid "Please enter your account details"
+msgstr "Por favor, mete os detalles d'a suya cuenta"
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "V_idio"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+#| msgid "Loading account information"
+msgid "Edit %s account options"
+msgstr "Editar as opcions d'a cuenta %s"
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "Vidio amortau"
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+#| msgid "Enter your account details"
+msgid "Integrate your IM accounts"
+msgstr "Importar as suyas cuentas de mensacheria instantanea"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "Vista preliminar d'o video"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "Chestionar cuentas de mensacheria y VoIP"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "Vidio enchegau"
+#~ msgid "Show avatars"
+#~ msgstr "Amostrar avatars"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "Tornar a gritar a lo contacto"
+#~| msgid ""
+#~| "Whether Empathy should use the avatar of the contact as the chat window "
+#~| "icon."
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr ""
+#~ "Indica si s'han d'amostrar os avatares ta os contactos en a lista de "
+#~ "contactos y finestras de chat."
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "Camara amortada"
+#~ msgid "Show protocols"
+#~ msgstr "Amostrar protocols"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar a camara y aturar de ninviar vidio"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr ""
+#~ "Indica si s'han d'amostrar os protocolos ta os contactos en a lista de "
+#~ "contactos."
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "Previsualizar"
+#~ msgid "Compact contact list"
+#~ msgstr "Lista de contactos preta"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "Activar a camara pero no ninviar vidio"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "Indica si s'ha d'amostrar a lista de contactos en modo compacto."
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "Camara enchegada"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "Criterio d'ordinaciÃn d'a lista de contactos"
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "Activar a camara y ninviar vidio"
+#~ 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 ""
+#~ "Quà criterio fer servir en ordenar a lista de contactos. O predeterminau "
+#~ "ye ordenar por l'estau d'o contacto con a valor Âstate (estau). Una "
+#~ "valor Ânombre (nombre) ordenarà a lista por o nombre."
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "Vista d'o mapa de contactos"
+#~ msgid "Network:"
+#~ msgstr "Rete:"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "Guardar"
+#~ msgid "Password:"
+#~ msgstr "Clau de paso:"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "Vinclo a pastebin"
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "Respuesta de pastebin"
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "%s no ye un identificador de contacto valido"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr ""
-"Datos masiau largos ta un apegau sencillo. Alce o rechistro en un fichero."
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %B %d %Y"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "Finestra de depuracion"
+#~ msgid "_Block User"
+#~ msgstr "_Bloqueyar usuario"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "Ninviar a pastebin"
+#~ msgid "Decide _Later"
+#~ msgstr "Decidir _dimpuÃs"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "Pausar"
+#~ msgid "Classic"
+#~ msgstr "Clasico"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "Ran"
+#~ msgid "Simple"
+#~ msgstr "Simple"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "Depurar"
+#~ msgid "Clean"
+#~ msgstr "Escoscau"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "Informacion"
+#~ msgid "Blue"
+#~ msgstr "Azul"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "Mensache"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "Fallà en recuperar a suya informaciÃn personal d'o servidor."
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "Alvertencia"
+#~ msgid "_Enable"
+#~ msgstr "_Activau"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "Critico"
+#~ msgid "_Disable"
+#~ msgstr "_Desactivau"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "Error"
+#~ msgid "Contrast"
+#~ msgstr "Contraste"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "Hora"
+#~ msgid "Brightness"
+#~ msgstr "Brillo"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "Dominio"
+#~ msgid "Gamma"
+#~ msgstr "Gamma"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "Categoria"
+#~ msgid "Volume"
+#~ msgstr "Voz"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "Ran"
+#~ msgid "_Sidebar"
+#~ msgstr "Barra _lateral"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"O chestor de connexions seleccionau no suporta a extensiÃn de depuraciÃn "
-"remota."
+#~ msgid "Audio input"
+#~ msgstr "Dentrada d'audio"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "Convidar participant"
+#~ msgid "Video input"
+#~ msgstr "Dentrada de vidio"
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "Trigar un contacto ta convidar a la conversaciÃn:"
+#~ msgid "Dialpad"
+#~ msgstr "Teclau"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "Convidar"
+#~ msgid "Details"
+#~ msgstr "Detalles"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"No amostrar garra dialogo; realizar qualsiquier treballo (eix. importar) y "
-"salir"
+#~| msgid "Unknown"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconoxiu"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
-"No amostrar garra dialogo de no estar que solament existan contas ÂChent "
-"amÃnÂ"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "Enchegau â %d:%02dm"
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Cuenta proporcionada inicialment trigada (eix. gabble/jabber/eixemplo)"
+#~ msgid "Send Video"
+#~ msgstr "Ninviar vidio"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<id-de-cuenta>"
+#~ msgid "Send Audio"
+#~ msgstr "Ninviar audio"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Cuentas d'empathy"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "Recargar %s (%s)â"
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Cuentas d'empathy"
+#~ msgid "Top Up..."
+#~ msgstr "Recargarâ"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "Amostrar un servicio en particular"
+#~ msgid "_Offline Contacts"
+#~ msgstr "Contactos _desenchegaus"
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Debugger d'Empathy"
+#~ msgid "Show P_rotocols"
+#~ msgstr "Amostrar p_rotocols"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Debugger d'Empathy"
+#~ msgid "Credit Balance"
+#~ msgstr "Credito"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr "- Client de mensacheria instantanea Empathy"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "Contactos en o _mapa"
 
-#: ../src/empathy-notifications-approver.c:190
-msgid "Respond"
-msgstr "Respuesta"
+#~ msgid "Find in Contact _List"
+#~ msgstr "Buscar en a _lista de contacto"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1493
-msgid "Reject"
-msgstr "Refusar"
+#~ msgid "Sort by _Name"
+#~ msgstr "Ordenar por _nome"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1494
-msgid "Answer"
-msgstr "Responder"
+#~ msgid "Sort by _Status"
+#~ msgstr "Ordenar por es_tau"
 
-#: ../src/empathy-notifications-approver.c:214
-msgid "Answer with video"
-msgstr "Responder con video"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Tamanyo normal con _avatars"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
-msgid "Decline"
-msgstr "Refusar"
+#~ msgid "N_ormal Size"
+#~ msgstr "Tamanyo n_ormal"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
-msgid "Accept"
-msgstr "Aceptar"
+#~ msgid "_Compact Size"
+#~ msgstr "Tamanyo _preto"
 
-#. 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:247
-msgid "Provide"
-msgstr "Proporcionar"
+#~ msgid "_Joinâ"
+#~ msgstr "_Chuntar-seâ"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s prebà de gritar-le, pero yera en atra gritada."
+#~ msgid "Could not start room listing"
+#~ msgstr "No s'ha puesto encetar a lista d'a sala"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "Informacion"
+#~ msgid "Could not stop room listing"
+#~ msgstr "No s'ha puesto aturar a lista d'a sala"
 
-#: ../src/empathy-call-window.c:2860
-msgid "On hold"
-msgstr "En aspera"
+#~ msgid "Appearance"
+#~ msgstr "Apariencia"
 
-#: ../src/empathy-call-window.c:2863
-msgid "Mute"
-msgstr "Silenciar"
+#~ msgid "Redial"
+#~ msgstr "Tornar a marcar"
 
-#: ../src/empathy-call-window.c:2865
-msgid "Duration"
-msgstr "Duracion"
+#~ msgid "V_ideo"
+#~ msgstr "V_idio"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2868
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s: %d:%02dm"
+#~ msgid "Video Off"
+#~ msgstr "Vidio amortau"
 
-#: ../src/empathy-call-window.c:3138
-#, c-format
-msgid "Your current balance is %s."
-msgstr "o suyo balanz actual ye %s."
+#~ msgid "Video Preview"
+#~ msgstr "Vista preliminar d'o video"
 
-#: ../src/empathy-call-window.c:3142
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "No tiene credito suficient ta fer ista gritada."
+#~ msgid "Video On"
+#~ msgstr "Vidio enchegau"
 
-#: ../src/empathy-call-window.c:3144
-#| msgid "Top Up..."
-msgid "Top Up"
-msgstr "Recargar"
+#~ msgid "Call the contact again"
+#~ msgstr "Tornar a gritar a lo contacto"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "_Coincidir con capitalizacioÌn"
+#~ msgid "Camera Off"
+#~ msgstr "Camara amortada"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Quà tipo de cuenta tiene?"
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "Desactivar a camara y aturar de ninviar vidio"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
-msgid "Adding new account"
-msgstr "Adhibindo cuenta nueva"
+#~ msgid "Preview"
+#~ msgstr "Previsualizar"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "Chent amÃn"
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "Activar a camara pero no ninviar vidio"
 
-#: ../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. You can easily change these details "
-#| "later or disable this feature by using the 'Accounts' dialog"
-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 ""
-"Empathy puede automaticament detectar y charrar con la chent conectada en o "
-"mesmo rete que tu. Si quiers fer servir ista caracteristica, por favor "
-"compreba que os siguients detalles con correctos."
+#~ msgid "Camera On"
+#~ msgstr "Camara enchegada"
 
-#: ../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 ""
-"Puede cambiar facilment istos detalles posteriorment u desactivar ista "
-"caracteristica trigando <span style=\"italic\">Editar â Cuentas</span> en a "
-"lista de contactos."
+#~ msgid "Enable camera and send video"
+#~ msgstr "Activar a camara y ninviar vidio"
+
+#~ msgid "Contact Map View"
+#~ msgstr "Vista d'o mapa de contactos"
 
 #~| msgid "Call from %s"
 #~ msgid "Call volume"
@@ -4843,9 +4833,6 @@ msgstr ""
 #~ msgid "Personal Information"
 #~ msgstr "Informacion presonal"
 
-#~ msgid "Ungrouped"
-#~ msgstr "Sin colla"
-
 #~ msgid "Favorite People"
 #~ msgstr "Chent favorita"
 
@@ -4897,9 +4884,6 @@ msgstr ""
 #~ msgid "An error occurred"
 #~ msgstr "HabioÌ una error"
 
-#~ msgid "Enter your account details"
-#~ msgstr "Mete os detalles d'a suya cuenta"
-
 #~ msgid "No, I want a new account"
 #~ msgstr "No, quiero creyar una cuenta nueva"
 
@@ -4965,9 +4949,6 @@ msgstr ""
 #~ msgid "All"
 #~ msgstr "Tot"
 
-#~ msgid "_Enabled"
-#~ msgstr "_Activau"
-
 #~ msgid "Date"
 #~ msgstr "Calendata"
 



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