[empathy] Updated British English translation
- From: Bruce Cowan <bcowan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Updated British English translation
- Date: Fri, 9 Mar 2012 13:44:44 +0000 (UTC)
commit 10990e3efb856060a6893a77d3b15790ca08f286
Author: Bruce Cowan <bruce bcowan me uk>
Date: Fri Mar 9 13:44:36 2012 +0000
Updated British English translation
po/en_GB.po | 4029 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 2127 insertions(+), 1902 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 5da43e2..6da0e7d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,14 +2,14 @@
# Copyright (C) 2006 Empathy's COPYRIGHT HOLDER
# This file is distributed under the same licence as the empathy package.
# David Lodge <dave cirt net>, 2007, 2009.
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012.
# Philip Withnall <philip tecnocode co uk>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-16 14:46+0100\n"
-"PO-Revision-Date: 2011-10-16 14:47+0100\n"
+"POT-Creation-Date: 2012-03-09 13:39+0000\n"
+"PO-Revision-Date: 2012-03-09 13:43+0100\n"
"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
"Language-Team: British English <en li org>\n"
"Language: en_GB\n"
@@ -17,506 +17,558 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1-rc1\n"
+"X-Generator: Virtaal 0.7.1\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
-
-#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
msgstr "Empathy"
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
+
#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
msgstr "Empathy Internet Messaging"
#: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM Client"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Manage Messaging and VoIP accounts"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Call volume"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Call volume, as a percentage."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Camera device"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Camera position"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Chat window theme"
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Chat window theme variant"
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magic number used to check if sanity cleaning tasks should be run"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Compact contact list"
+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."
+msgstr ""
+"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."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Connection managers should be used"
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Contact list sort criterion"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+msgid "Show avatars"
+msgstr "Show avatars"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Default directory to select an avatar image from"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Disable popup notifications when away"
+msgid "Show protocols"
+msgstr "Show protocols"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Disable sounds when away"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Display incoming events in the status area"
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Echo cancellation support"
+msgid "Compact contact list"
+msgstr "Compact contact list"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy can publish the user's location"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Whether to show the contact list in compact mode."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy can use the GPS to guess the location"
+msgid "Hide main window"
+msgstr "Hide main window"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy can use the mobile phone network to guess the location"
+msgid "Hide the main window."
+msgstr "Hide the main window."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy can use the network to guess the location"
+msgid "Default directory to select an avatar image from"
+msgstr "Default directory to select an avatar image from"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy default download folder"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy has migrated butterfly logs"
+msgid "Open new chats in separate windows"
+msgstr "Open new chats in separate windows"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy should auto-away when idle"
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy should auto-connect on startup"
+msgid "Display incoming events in the status area"
+msgstr "Display incoming events in the status area"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy should reduce the location's accuracy"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy should use the avatar of the contact as the chat window icon"
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Enable WebKit Developer Tools"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Enable popup notifications for new messages"
+msgid "Show contact groups"
+msgstr "Show contact groups"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Enable spell checker"
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Hide main window"
+msgid "Contact list sort criterion"
+msgstr "Contact list sort criterion"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Hide the main window."
+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 ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort the "
+"contact list by name."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Nick completed character"
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Open new chats in separate windows"
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Path of the Adium theme to use"
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound for incoming messages"
msgstr "Play a sound for incoming messages"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Play a sound for new conversations"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound for outgoing messages"
msgstr "Play a sound for outgoing messages"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Play a sound when a contact logs in"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Play a sound when a contact logs out"
+msgid "Play a sound for new conversations"
+msgstr "Play a sound for new conversations"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Play a sound when we log in"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Play a sound when we log out"
+msgid "Play a sound when a contact logs in"
+msgstr "Play a sound when a contact logs in"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Pop up notifications if the chat isn't focused"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Pop up notifications when a contact logs in"
+msgid "Play a sound when a contact logs out"
+msgstr "Play a sound when a contact logs out"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Pop up notifications when a contact logs out"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Position the camera preview should be during a call."
+msgid "Play a sound when we log in"
+msgstr "Play a sound when we log in"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Show Balance in contact list"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Show avatars"
+msgid "Play a sound when we log out"
+msgstr "Play a sound when we log out"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Show contact list in rooms"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Show hint about closing the main window"
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Show protocols"
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "The default folder to save file transfers in."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "The last directory that an avatar image was chosen from."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "The position for the chat window side pane"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "The stored position (in pixels) of the chat window side pane."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use graphical smileys"
msgstr "Use graphical smileys"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Use theme for chat rooms"
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Whether Empathy can publish the user's location to their contacts."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Whether Empathy can use the GPS to guess the location."
+msgid "Chat window theme"
+msgstr "Chat window theme"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Whether Empathy can use the mobile phone network to guess the location."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Whether Empathy can use the network to guess the location."
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Whether Empathy has migrated butterfly logs."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Whether Empathy should automatically log into your accounts on startup."
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
+
#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
msgstr ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Whether to convert smileys into graphical images in conversations."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Whether to enable Pulseaudio's echo cancellation filter."
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"Whether to play a sound to notify of contacts logging into the network."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Whether to play a sound to notify of events."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Whether to play a sound to notify of incoming messages."
+msgid "Nick completed character"
+msgstr "Nick completed character"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Whether to play a sound to notify of new conversations."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Whether to play a sound to notify of outgoing messages."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Whether to play a sound when logging into a network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Whether to play a sound when logging out of a network."
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialogue"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Whether to play sound notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus object path of the last account selected to join a room."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Whether to show a popup notification when a contact goes offline."
+msgid "Camera device"
+msgstr "Camera device"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+msgid "Camera position"
+msgstr "Camera position"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Whether to show a popup notification when receiving a new message."
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Whether to show account balances in the contact list."
+msgid "Echo cancellation support"
+msgstr "Echo cancellation support"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellation filter."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Whether to show contacts that are offline in the contact list."
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Whether to show the message dialogue about closing the main window with the "
+"'x' button in the title bar."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Whether to show protocols for contacts in the contact list."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Whether to show the contact list in chat rooms."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Whether to show the contact list in compact mode."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Whether to show the message dialogue about closing the main window with the "
-"'x' button in the title bar."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Whether to use the theme for chat rooms."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the mobile phone network to guess the location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Whether Empathy can use the mobile phone network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Manage Messaging and VoIP accounts"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "No reason was specified"
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Messaging and VoIP Accounts"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "The change in state was requested"
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "You cancelled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant cancelled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Error while trying to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "The other participant is unable to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../libempathy/empathy-ft-handler.c:919
msgid "File transfer completed, but the file was corrupted"
msgstr "File transfer completed, but the file was corrupted"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
msgid "File transfer not supported by remote contact"
msgstr "File transfer not supported by remote contact"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
msgid "The selected file is not a regular file"
msgstr "The selected file is not a regular file"
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
msgid "The selected file is empty"
msgstr "The selected file is empty"
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
#, c-format
msgid "Missed call from %s"
msgstr "Missed call from %s"
@@ -532,170 +584,139 @@ msgstr "Called %s"
msgid "Call from %s"
msgstr "Call from %s"
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Socket type not supported"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "No reason was specified"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "The change in state was requested"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "You cancelled the file transfer"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "The other participant cancelled the file transfer"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Error while trying to transfer the file"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "The other participant is unable to transfer the file"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
msgid "Available"
msgstr "Available"
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
msgid "Busy"
msgstr "Busy"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
msgid "Away"
msgstr "Away"
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
msgid "Invisible"
msgstr "Invisible"
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
msgid "Offline"
msgstr "Offline"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
msgctxt "presence"
msgid "Unknown"
msgstr "Unknown"
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
msgid "No reason specified"
msgstr "No reason specified"
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
msgid "Status is set to offline"
msgstr "Status is set to offline"
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
msgid "Network error"
msgstr "Network error"
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
msgid "Encryption error"
msgstr "Encryption error"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
msgid "Name in use"
msgstr "Name in use"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
msgid "Certificate not provided"
msgstr "Certificate not provided"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
msgid "Certificate untrusted"
msgstr "Certificate untrusted"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
msgid "Certificate expired"
msgstr "Certificate expired"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
msgid "Certificate not activated"
msgstr "Certificate not activated"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
msgid "Certificate hostname mismatch"
msgstr "Certificate hostname mismatch"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
msgid "Certificate fingerprint mismatch"
msgstr "Certificate fingerprint mismatch"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
msgid "Certificate self-signed"
msgstr "Certificate self-signed"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
msgid "Certificate error"
msgstr "Certificate error"
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
msgid "Encryption is not available"
msgstr "Encryption is not available"
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
msgid "Certificate is invalid"
msgstr "Certificate is invalid"
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
msgid "Connection has been refused"
msgstr "Connection has been refused"
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
msgid "Connection can't be established"
msgstr "Connection can't be established"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
msgid "Connection has been lost"
msgstr "Connection has been lost"
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "This resource is already connected to the server"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"Connection has been replaced by a new connection using the same resource"
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
msgid "The account already exists on the server"
msgstr "The account already exists on the server"
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
msgid "Server is currently too busy to handle the connection"
msgstr "Server is currently too busy to handle the connection"
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
msgid "Certificate has been revoked"
msgstr "Certificate has been revoked"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Certificate uses an insecure cypher algorithm or is cryptographically weak"
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -703,283 +724,262 @@ msgstr ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Your software is too old"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internal error"
+
+#: ../libempathy/empathy-utils.c:534
msgid "People Nearby"
msgstr "People Nearby"
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
msgid "Facebook Chat"
msgstr "Facebook Chat"
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d second ago"
msgstr[1] "%d seconds ago"
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d minute ago"
msgstr[1] "%d minutes ago"
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d hour ago"
msgstr[1] "%d hours ago"
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d day ago"
msgstr[1] "%d days ago"
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d week ago"
msgstr[1] "%d weeks ago"
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d month ago"
msgstr[1] "%d months ago"
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
msgid "in the future"
msgstr "in the future"
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
msgid "All accounts"
msgstr "All accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
msgid "Account"
msgstr "Account"
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
msgid "Password"
msgstr "Password"
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "My Web Accounts"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "The account %s is edited via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "The account %s cannot be edited in Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Launch My Web Accounts"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Edit %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Username:"
msgstr "Username:"
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
msgid "A_pply"
msgstr "A_pply"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
msgid "L_og in"
msgstr "L_og in"
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
msgid "This account already exists on the server"
msgstr "This account already exists on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
msgid "Create a new account on the server"
msgstr "Create a new account on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "Ca_ncel"
-
#. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s on %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:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
#, c-format
msgid "%s Account"
msgstr "%s Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
msgid "New account"
msgstr "New account"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Example:</b> MyScreenName"
+#: ../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:"
+msgstr "Pass_word:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Advanced"
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Remember Password"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Remember password"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Screen _Name:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "What is your AIM password?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Advanced"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
msgid "What is your AIM screen name?"
-msgstr "What is your AIM screen name?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgstr "What is your AIM screen name?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Example:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Remember Password"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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 "Login I_D:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../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>Example:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise User ID?"
msgstr "What is your GroupWise User ID?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
msgid "What is your GroupWise password?"
msgstr "What is your GroupWise password?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "<b>Example:</b> 123456789"
msgstr "<b>Example:</b> 123456789"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Ch_aracter set:"
msgstr "Ch_aracter set:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
msgid "What is your ICQ UIN?"
msgstr "What is your ICQ UIN?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
msgid "What is your ICQ password?"
msgstr "What is your ICQ password?"
@@ -1016,11 +1016,23 @@ msgstr "Options"
msgid "None"
msgstr "None"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Network"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Network:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
msgid "Character set:"
msgstr "Character set:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servers"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid ""
"Most IRC servers don't need a password, so if you're not sure, don't enter a "
"password."
@@ -1028,14 +1040,6 @@ msgstr ""
"Most IRC servers don't need a password, so if you're not sure, don't enter a "
"password."
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Network"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Network:"
-
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Nickname:"
@@ -1052,48 +1056,20 @@ msgstr "Quit message:"
msgid "Real name:"
msgstr "Real name:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servers"
-
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "What is your IRC nickname?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Which IRC network?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr "<b>Example:</b> user gmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr "<b>Example:</b> user jabber org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Encr_yption required (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnore SSL certificate errors"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Override server settings"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_ty:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Reso_urce:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1105,179 +1081,203 @@ msgstr ""
"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
"Facebook username if you don't have one."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Use old SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "What is your Facebook password?"
msgstr "What is your Facebook password?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "What is your Facebook username?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "What is your Google ID?"
msgstr "What is your Google ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>Example:</b> user gmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "What is your Google password?"
msgstr "What is your Google password?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>Example:</b> user jabber org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Reso_urce:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Override server settings"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your Jabber ID?"
msgstr "What is your Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "What is your Jabber password?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
msgid "What is your desired Jabber ID?"
msgstr "What is your desired Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
msgid "What is your desired Jabber password?"
msgstr "What is your desired Jabber password?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "<b>Example:</b> user hotmail com"
msgstr "<b>Example:</b> user hotmail com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
msgid "What is your Windows Live ID?"
msgstr "What is your Windows Live ID?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
msgid "What is your Windows Live password?"
msgstr "What is your Windows Live password?"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_mail address:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
msgid "Nic_kname:"
msgstr "Nic_kname:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Last Name:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "_First Name:"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Published Name:"
+
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Last Name:"
+msgid "E-_mail address:"
+msgstr "E-_mail address:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Username:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
msgid "<b>Example:</b> user my sip server"
msgstr "<b>Example:</b> user my sip server"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Authentication username:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Discover Binding"
-
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Discover the STUN server automatically"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignore TLS Errors"
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Interval (seconds)"
+msgid "Proxy Options"
+msgstr "Proxy Options"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive Options"
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Loose Routeing"
+msgid "STUN Server:"
+msgstr "STUN Server:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanism:"
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Miscellaneous Options"
+msgid "Discover Binding"
+msgstr "Discover Binding"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT Traversal Options"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanism:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxy Options"
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Authentication username:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN Server:"
+msgid "Loose Routing"
+msgstr "Loose Routeing"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Use this account to call _landlines and mobile phones"
+msgid "Port:"
+msgstr "Port:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "What is your SIP account password?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "What is your SIP login ID?"
msgstr "What is your SIP login ID?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Username:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "I_gnore conference and chat room invitations"
msgstr "I_gnore conference and chat room invitations"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "What is your Yahoo! ID?"
msgstr "What is your Yahoo! ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "What is your Yahoo! password?"
msgstr "What is your Yahoo! password?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Room List locale:"
-
#: ../libempathy-gtk/empathy-avatar-chooser.c:471
#: ../libempathy-gtk/empathy-avatar-chooser.c:556
msgid "Couldn't convert image"
@@ -1315,61 +1315,65 @@ msgstr "All Files"
msgid "Click to enlarge"
msgstr "Click to enlarge"
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
#: ../libempathy-gtk/empathy-call-utils.c:60
msgid "There was an error starting the call"
msgstr "There was an error starting the call"
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "The specified contact doesn't support calls"
msgstr "The specified contact doesn't support calls"
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
msgid "The specified contact is offline"
msgstr "The specified contact is offline"
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
msgid "The specified contact is not valid"
msgstr "The specified contact is not valid"
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
msgid "Emergency calls are not supported on this protocol"
msgstr "Emergency calls are not supported on this protocol"
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
+
+#: ../libempathy-gtk/empathy-chat.c:729
msgid "Failed to open private chat"
msgstr "Failed to open private chat"
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
msgid "Topic not supported on this conversation"
msgstr "Topic not supported on this conversation"
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
msgid "You are not allowed to change the topic"
msgstr "You are not allowed to change the topic"
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
#, c-format
msgid "â%sâ is not a valid contact ID"
msgstr "â%sâ is not a valid contact ID"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: clear all messages from the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: set the topic of the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1377,23 +1381,23 @@ msgstr ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: change your nickname on the current server"
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: send an ACTION message to the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
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 "
@@ -1403,11 +1407,11 @@ msgstr ""
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <contact ID>: display information about a contact"
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1415,113 +1419,126 @@ msgstr ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
#, c-format
msgid "Usage: %s"
msgstr "Usage: %s"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "Unknown command"
msgstr "Unknown command"
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
msgid "Unknown command; see /help for the available commands"
msgstr "Unknown command; see /help for the available commands"
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
msgid "insufficient balance to send message"
msgstr "insufficient balance to send message"
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
msgid "not capable"
msgstr "not capable"
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
msgid "invalid contact"
msgstr "invalid contact"
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
msgid "permission denied"
msgstr "permission denied"
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
msgid "too long message"
msgstr "too long message"
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
msgid "not implemented"
msgstr "not implemented"
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
msgid "unknown"
msgstr "unknown"
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Error sending message '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Error sending message: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
msgid "Topic:"
msgstr "Topic:"
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
#, c-format
msgid "Topic set to: %s"
msgstr "Topic set to: %s"
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
msgid "No topic defined"
msgstr "No topic defined"
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
msgid "(No Suggestions)"
msgstr "(No Suggestions)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Add '%s' to Dictionary"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Add '%s' to %s Dictionary"
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
msgid "Insert Smiley"
msgstr "Insert Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
msgid "_Send"
msgstr "_Send"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
msgid "_Spelling Suggestions"
msgstr "_Spelling Suggestions"
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
msgid "Failed to retrieve recent logs"
msgstr "Failed to retrieve recent logs"
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
#, c-format
msgid "%s has disconnected"
msgstr "%s has disconnected"
@@ -1529,12 +1546,12 @@ msgstr "%s has disconnected"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s was kicked by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
#, c-format
msgid "%s was kicked"
msgstr "%s was kicked"
@@ -1542,17 +1559,17 @@ msgstr "%s was kicked"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s was banned by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
#, c-format
msgid "%s was banned"
msgstr "%s was banned"
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
#, c-format
msgid "%s has left the room"
msgstr "%s has left the room"
@@ -1562,17 +1579,17 @@ msgstr "%s has left the room"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
#, c-format
msgid "%s has joined the room"
msgstr "%s has joined the room"
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
#, c-format
msgid "%s is now known as %s"
msgstr "%s is now known as %s"
@@ -1580,90 +1597,90 @@ msgstr "%s is now known as %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:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
msgid "Disconnected"
msgstr "Disconnected"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
msgid "Would you like to store this password?"
msgstr "Would you like to store this password?"
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
msgid "Remember"
msgstr "Remember"
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
msgid "Not now"
msgstr "Not now"
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
msgid "Retry"
msgstr "Retry"
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
msgid "Wrong password; please try again:"
msgstr "Wrong password; please try again:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "This room is protected by a password:"
msgstr "This room is protected by a password:"
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
msgid "Join"
msgstr "Join"
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
msgid "Connected"
msgstr "Connected"
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
msgid "Conversation"
msgstr "Conversation"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
msgid "Unknown or invalid identifier"
msgstr "Unknown or invalid identifier"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
msgid "Contact blocking temporarily unavailable"
msgstr "Contact blocking temporarily unavailable"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
msgid "Contact blocking unavailable"
msgstr "Contact blocking unavailable"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
msgid "Permission Denied"
msgstr "Permission Denied"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
msgid "Could not block contact"
msgstr "Could not block contact"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
msgid "Edit Blocked Contacts"
msgstr "Edit Blocked Contacts"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "Account:"
msgstr "Account:"
@@ -1673,463 +1690,368 @@ msgstr "Blocked Contacts"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
#: ../src/empathy-chatrooms-window.ui.h:3
msgid "Remove"
msgstr "Remove"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
#: ../libempathy-gtk/empathy-webkit-utils.c:277
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Open Link"
msgstr "_Open Link"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Edit Contact Information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personal Information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
msgid "New Contact"
msgstr "New Contact"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
#, c-format
msgid "Block %s?"
msgstr "Block %s?"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Are you sure you want to block '%s' from contacting you again?"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "_Block"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Report this contact as abusive"
msgstr[1] "_Report these contacts as abusive"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decide _Later"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
msgid "Subscription Request"
msgstr "Subscription Request"
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
msgid "_Block User"
msgstr "_Block User"
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ungrouped"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favourite People"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Do you really want to remove the group '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Removing group"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Do you really want to remove the contact '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Removing contact"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "_Add Contactâ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Block Contact"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio Call"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video Call"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Previous Conversations"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Send File"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Share My Desktop"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favourite"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mation"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviting you to this room"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decide _Later"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
msgid "Search contacts"
msgstr "Search contacts"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
msgid "Search: "
msgstr "Search: "
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
msgid "_Add Contact"
msgstr "_Add Contact"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
msgid "No contacts found"
msgstr "No contacts found"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
msgid "Your message introducing yourself:"
msgstr "Your message introducing yourself:"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
msgid "Please let me see when you're online. Thanks!"
msgstr "Please let me see when you're online. Thanks!"
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Select a contact"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Full name:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Phone number:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail address:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Website:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Birthday:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Last seen:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Connected from:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Away message:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
msgid "Channels:"
msgstr "Channels:"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country ISO Code:"
msgstr "Country ISO Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "Country:"
msgstr "Country:"
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "State:"
msgstr "County:"
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "City:"
msgstr "City:"
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Postal Code:"
msgstr "Postal Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Street:"
msgstr "Street:"
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Building:"
msgstr "Building:"
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Floor:"
msgstr "Floor:"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Room:"
msgstr "Room:"
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Description:"
msgstr "Description:"
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Accuracy Level:"
msgstr "Accuracy Level:"
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Vertical Error (meters):"
msgstr "Vertical Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Horizontal Error (meters):"
msgstr "Horizontal Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Speed:"
msgstr "Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Bearing:"
msgstr "Bearing:"
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Climb Speed:"
msgstr "Climb Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Last Updated on:"
msgstr "Last Updated on:"
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
msgid "Location"
msgstr "Location"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
msgid "Save Avatar"
msgstr "Save Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Location</b> at (date)\t"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personal Details"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Contact Details"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Full name"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Phone number"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Website"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Birthday"
+
+#. 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 "Last seen:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. 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 "Away message:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "work"
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Alias:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "home"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Client Information"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobile"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Client:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voice"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Contact Details"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferred"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
msgid "Identifier:"
msgstr "Identifier:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
msgid "Information requestedâ"
msgstr "Information requestedâ"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
msgid "OS:"
msgstr "OS:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Version:"
msgstr "Version:"
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
msgid "Groups"
msgstr "Groups"
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -2137,105 +2059,170 @@ msgstr ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
msgid "_Add Group"
msgstr "_Add Group"
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Select"
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
msgid "Group"
msgstr "Group"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "The following identity will be blocked:"
msgstr[1] "The following identities will be blocked:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "The following identity can not be blocked:"
msgstr[1] "The following identities can not be blocked:"
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Linked Contacts"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Select contacts to link"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "New contact preview"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Contacts selected in the list on the left will be linked together."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
#. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
msgid "Select account to use to place the call"
msgstr "Select account to use to place the call"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Call"
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
msgid "Mobile"
msgstr "Mobile"
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
msgid "Work"
msgstr "Work"
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
msgid "HOME"
msgstr "HOME"
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mation"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contactsâ"
-msgstr "_Link Contactsâ"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contactâ"
+msgstr "_Add Contactâ"
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
msgid "Delete and _Block"
msgstr "Delete and _Block"
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Removing group"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2244,7 +2231,11 @@ msgstr ""
"Do you really want to remove the linked contact '%s'? Note that this will "
"remove all the contacts which make up this linked contact."
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Removing contact"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2255,23 +2246,23 @@ msgstr[1] "Linked contacts containing %u contacts"
msgid "<b>Location</b> at (date)"
msgstr "<b>Location</b> at (date)"
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Online from a phone or mobile device"
msgstr "Online from a phone or mobile device"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
msgid "New Network"
msgstr "New Network"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
msgid "Choose an IRC network"
msgstr "Choose an IRC network"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
msgid "Reset _Networks List"
msgstr "Reset _Networks List"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Select"
@@ -2284,249 +2275,251 @@ msgstr "new server"
msgid "SSL"
msgstr "SSL"
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Linkâ"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Link Contacts"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlinkâ"
-msgstr "_Unlinkâ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Completely split the displayed linked contacts into the separate contacts."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Link"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Unlink linked contacts '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Unlink"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
msgid "History"
msgstr "History"
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
msgid "Show"
msgstr "Show"
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
msgid "Search"
msgstr "Search"
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
#, c-format
msgid "Chat in %s"
msgstr "Chat in %s"
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
#, c-format
msgid "Chat with %s"
msgstr "Chat with %s"
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e %B %Y %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s second"
msgstr[1] "%s seconds"
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s minute"
msgstr[1] "%s minutes"
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Call took %s, ended at %s"
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
msgid "Today"
msgstr "Today"
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
msgid "Yesterday"
msgstr "Yesterday"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
msgid "%e %B %Y"
msgstr "%e %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
msgid "Anytime"
msgstr "Anytime"
#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
msgid "Anyone"
msgstr "Anyone"
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
msgid "Who"
msgstr "Who"
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
msgid "When"
msgstr "When"
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
msgid "Anything"
msgstr "Anything"
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
msgid "Text chats"
msgstr "Text chats"
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
msgid "Calls"
msgstr "Calls"
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
msgid "Incoming calls"
msgstr "Incoming calls"
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
msgid "Outgoing calls"
msgstr "Outgoing calls"
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Missed calls"
msgstr "Missed calls"
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "What"
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "Are you sure you want to delete all logs of previous conversations?"
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
msgid "Clear All"
msgstr "Clear All"
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
msgid "Delete from:"
msgstr "Delete from:"
#: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Loadingâ</span>"
+msgid "_File"
+msgstr "_File"
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../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 "_Edit"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
msgid "Delete All History..."
msgstr "Delete All Historyâ"
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
msgid "Profile"
msgstr "Profile"
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Edit"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
#: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_File"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "page 2"
msgstr "page 2"
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Contact ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loadingâ</span>"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "The contact is offline"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#: ../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 "Enter a contact identifier or phone number:"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
msgid "New Conversation"
msgstr "New Conversation"
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Send _Video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video Call"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "C_all"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio Call"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
msgid "New Call"
msgstr "New Call"
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Authentication failed for account <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"
@@ -2563,12 +2556,8 @@ msgstr "Click to make this status a favourite"
msgid "Set status"
msgstr "Set status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Set your presence and current status"
-
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
msgid "Custom messagesâ"
msgstr "Custom messagesâ"
@@ -2576,7 +2565,7 @@ msgstr "Custom messagesâ"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
#, c-format
msgid "New %s account"
msgstr "New %s account"
@@ -2586,20 +2575,20 @@ msgid "Find:"
msgstr "Find:"
#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Mat_ch case"
+msgid "_Previous"
+msgstr "_Previous"
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Phrase not found"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "_Next"
msgstr "_Next"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Previous"
+msgid "Phrase not found"
+msgstr "Phrase not found"
#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
@@ -2645,12 +2634,12 @@ msgstr "Voice call ended"
msgid "Edit Custom Messages"
msgstr "Edit Custom Messages"
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
#, c-format
msgid "Message edited at %s"
msgstr "Message edited at %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
msgid "Normal"
msgstr "Normal"
@@ -2728,34 +2717,38 @@ msgid "Certificate hostname: %s"
msgstr "Certificate hostname: %s"
#: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continue"
+msgid "C_ontinue"
+msgstr "C_ontinue"
#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "This connection is untrusted. Would you like to continue anyway?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
msgid "Remember this choice for future connections"
msgstr "Remember this choice for future connections"
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
msgid "Certificate Details"
msgstr "Certificate Details"
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
msgid "Unable to open URI"
msgstr "Unable to open URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
msgid "Select a file"
msgstr "Select a file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
msgid "Insufficient free space to save file"
msgstr "Insufficient free space to save file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2764,7 +2757,7 @@ msgstr ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
#, c-format
msgid "Incoming file from %s"
msgstr "Incoming file from %s"
@@ -2936,39 +2929,31 @@ msgstr "Western"
msgid "Vietnamese"
msgstr "Vietnamese"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "The selected contact cannot receive files."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "The selected contact is offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
msgid "No error message"
msgstr "No error message"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
msgid "Instant Message (Empathy)"
msgstr "Instant Message (Empathy)"
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
msgid "Don't connect on startup"
msgstr "Don't connect on startup"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Don't display the contact list or any other dialogues on startup"
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
msgid "- Empathy IM Client"
msgstr "- Empathy IM Client"
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
msgid "Error contacting the Account Manager"
msgstr "Error contacting the Account Manager"
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3012,236 +2997,97 @@ msgid ""
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
msgstr ""
"You should have received a copy of the GNU General Public Licence along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-
-#: ../src/empathy-about-dialog.c:107
-msgid "An Instant Messaging client for GNOME"
-msgstr "An Instant Messaging client for GNOME"
-
-#: ../src/empathy-about-dialog.c:113
-msgid "translator-credits"
-msgstr ""
-"David Lodge <dave cirt net>\n"
-"Philip Withnall <philip tecnocode co uk>\n"
-"Bruce Cowan <bruce bcowan me uk>"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "There was an error while importing the accounts."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "There was an error while parsing the account details."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "There was an error while creating the account."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "There was an error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "The error message was: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "An error occurred"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "What kind of chat account do you have?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Do you have any other chat accounts you want to set up?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Enter your account details"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "What kind of chat account do you want to create?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Do you want to create other chat accounts?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Enter the details for the new account"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Do you have an account you've been using with another chat program?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Yes, import my account details from "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Yes, I'll enter my account details now"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "No, I want a new account"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, I just want to see people online nearby for now"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Select the accounts you want to import:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Yes"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "No, that's all for now"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy 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' dialogue"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Edit->Accounts"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "I do _not want to enable this feature for now"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialogue"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut not installed"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Messaging and VoIP Accounts Assistant"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Welcome to Empathy"
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Import your existing accounts"
+#: ../src/empathy-about-dialog.c:109
+msgid "An Instant Messaging client for GNOME"
+msgstr "An Instant Messaging client for GNOME"
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Please enter personal details"
+#: ../src/empathy-about-dialog.c:115
+msgid "translator-credits"
+msgstr ""
+"David Lodge <dave cirt net>\n"
+"Philip Withnall <philip tecnocode co uk>\n"
+"Bruce Cowan <bruce bcowan me uk>"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "There are unsaved modifications to your %s account."
#. 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:68
+#: ../src/empathy-accounts-dialog.c:76
msgid "Your new account has not been saved yet."
msgstr "Your new account has not been saved yet."
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
msgid "Connectingâ"
msgstr "Connectingâ"
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
#, c-format
msgid "Offline â %s"
msgstr "Offline â %s"
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
#, c-format
msgid "Disconnected â %s"
msgstr "Disconnected â %s"
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
msgid "Offline â No Network Connection"
msgstr "Offline â No Network Connection"
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
msgid "Unknown Status"
msgstr "Unknown Status"
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+
+#: ../src/empathy-accounts-dialog.c:468
msgid "Offline â Account Disabled"
msgstr "Offline â Account Disabled"
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parameters"
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Failed to retrieve your personal information from the server."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parametersâ"
+
+#: ../src/empathy-accounts-dialog.c:1322
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Do you want to remove %s from your computer?"
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
msgid "This will not remove your account on the server."
msgstr "This will not remove your account on the server."
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3250,15 +3096,23 @@ msgstr ""
"your changes. Are you sure you want to proceed?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
msgid "_Enable"
msgstr "_Enable"
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
msgid "_Disable"
msgstr "_Disable"
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Skip"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Connect"
+
+#: ../src/empathy-accounts-dialog.c:2303
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3270,19 +3124,15 @@ msgstr ""
msgid "Addâ"
msgstr "Addâ"
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Loading account information"
-
#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "No protocol installed"
+msgid "_Importâ"
+msgstr "_Importâ"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "Loading account information"
+msgstr "Loading account information"
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -3290,132 +3140,116 @@ msgstr ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Importâ"
-msgstr "_Importâ"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "No protocol backends installed"
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
msgid " - Empathy authentication client"
msgstr " - Empathy authentication client"
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
msgid "Empathy authentication client"
msgstr "Empathy authentication client"
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "People nearby"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy Audio/Video Client"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
msgid "Empathy Audio/Video Client"
msgstr "Empathy Audio/Video Client"
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
msgid "Contrast"
msgstr "Contrast"
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
msgid "Brightness"
msgstr "Brightness"
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
msgid "_Sidebar"
msgstr "_Sidebar"
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
msgid "Audio input"
msgstr "Audio input"
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
msgid "Video input"
msgstr "Video input"
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
msgid "Dialpad"
msgstr "Dialpad"
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
msgid "Details"
msgstr "Details"
#. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
#, c-format
msgid "Call with %s"
msgstr "Call with %s"
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
msgid "The IP address as seen by the machine"
msgstr "The IP address as seen by the machine"
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
msgid "The IP address as seen by a server on the Internet"
msgstr "The IP address as seen by a server on the Internet"
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
msgid "The IP address of the peer as seen by the other side"
msgstr "The IP address of the peer as seen by the other side"
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
msgid "The IP address of a relay server"
msgstr "The IP address of a relay server"
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
msgid "The IP address of the multicast group"
msgstr "The IP address of the multicast group"
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Unknown"
-
#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
msgid "Unknown"
msgstr "Unknown"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
#, c-format
msgid "Connected â %d:%02dm"
msgstr "Connected â %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
msgid "Technical Details"
msgstr "Technical Details"
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3424,8 +3258,8 @@ msgstr ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3434,8 +3268,8 @@ msgstr ""
"%s's software does not understand any of the video formats supported by your "
"computer"
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3444,27 +3278,27 @@ msgstr ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
msgid "There was a failure on the network"
msgstr "There was a failure on the network"
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"The audio formats necessary for this call are not installed on your computer"
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"The video formats necessary for this call are not installed on your computer"
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3475,263 +3309,312 @@ msgstr ""
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
msgid "There was a failure in the call engine"
msgstr "There was a failure in the call engine"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
msgid "The end of the stream was reached"
msgstr "The end of the stream was reached"
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
msgid "Can't establish audio stream"
msgstr "Can't establish audio stream"
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
msgid "Can't establish video stream"
msgstr "Can't establish video stream"
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
#: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Call"
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Decoding Codec:"
+msgid "_Microphone"
+msgstr "_Microphone"
#: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Disable camera"
+msgid "_Camera"
+msgstr "_Camera"
#: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Display the dialpad"
+msgid "_Settings"
+msgstr "_Settings"
#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Encoding Codec:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_View"
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Hang up"
+#: ../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 "_Help"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Hang up current call"
+#: ../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 "_Contents"
#: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Local Candidate:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debug"
#: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximise me"
+msgid "Swap camera"
+msgstr "Swap camera"
#: ../src/empathy-call-window.ui.h:11
msgid "Minimise me"
msgstr "Minimise me"
#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Remote Candidate:"
+msgid "Maximise me"
+msgstr "Maximise me"
#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send Audio"
+msgid "Disable camera"
+msgstr "Disable camera"
#: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Send Video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Hang up"
#: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Show dialpad"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Hang up current call"
#: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video call"
+
+#: ../src/empathy-call-window.ui.h:17
msgid "Start a video call"
msgstr "Start a video call"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start an audio call"
msgstr "Start an audio call"
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Swap camera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Toggle audio transmission"
-
#: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Toggle video transmission"
+msgid "Show dialpad"
+msgstr "Show dialpad"
#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Unknown"
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send Video"
#: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video call"
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Call"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send Audio"
#: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Camera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Contents"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Debug"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Help"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
#: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Microphone"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
#: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Settings"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_View"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Close window"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Leave room"
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d unread)"
msgstr[1] "%s (%d unread)"
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (and %u other)"
msgstr[1] "%s (and %u others)"
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d unread from others)"
msgstr[1] "%s (%d unread from others)"
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d unread from all)"
msgstr[1] "%s (%d unread from all)"
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Sending %d message"
msgstr[1] "Sending %d messages"
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
msgid "Typing a message."
msgstr "Typing a message."
#: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "C_lear"
+msgid "_Conversation"
+msgstr "_Conversation"
#: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontact"
+msgid "C_lear"
+msgstr "C_lear"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
msgid "Insert _Smiley"
msgstr "Insert _Smiley"
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
+
#: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "Invite _Participantâ"
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
#: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+msgid "Invite _Participantâ"
+msgstr "Invite _Participantâ"
#: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notify for All Messages"
+msgid "C_ontact"
+msgstr "C_ontact"
#: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversation"
+msgid "_Tabs"
+msgstr "_Tabs"
#: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favourite Chat Room"
-
-#: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "_Next Tab"
-
-#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "_Previous Tab"
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
-
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Tabs"
-
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "_Next Tab"
+
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Undo Close Tab"
msgstr "_Undo Close Tab"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
+
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
+
#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Name"
@@ -3744,100 +3627,100 @@ msgstr "Room"
msgid "Auto-Connect"
msgstr "Auto-Connect"
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
msgid "Manage Favorite Rooms"
msgstr "Manage Favourite Rooms"
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "Incoming video call"
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
msgid "Incoming call"
msgstr "Incoming call"
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s is video calling you. Do you want to answer?"
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s is calling you. Do you want to answer?"
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
#, c-format
msgid "Incoming call from %s"
msgstr "Incoming call from %s"
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "_Reject"
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "_Answer"
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
msgid "_Answer with video"
msgstr "_Answer with video"
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
#, c-format
msgid "Incoming video call from %s"
msgstr "Incoming video call from %s"
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Room invitation"
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Invitation to join %s"
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s is inviting you to join %s"
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "_Decline"
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "_Join"
msgstr "_Join"
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s invited you to join %s"
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "You have been invited to join %s"
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Incoming file transfer from %s"
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
msgid "Password required"
msgstr "Password required"
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s would like permission to see when you are online"
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
#, c-format
msgid ""
"\n"
@@ -3847,105 +3730,105 @@ msgstr ""
"Message: %s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Unknown"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s of %s at %s/s"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%s of %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Receiving \"%s\" from %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Sending \"%s\" to %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Error receiving \"%s\" from %s"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "Error receiving a file"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Error sending \"%s\" to %s"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "Error sending a file"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" received from %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" sent to %s"
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "File transfer completed"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
msgid "Waiting for the other participant's response"
msgstr "Waiting for the other participant's response"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Checking integrity of \"%s\""
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Hashing \"%s\""
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
msgid "File"
msgstr "File"
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
msgid "Remaining"
msgstr "Remaining"
@@ -3957,7 +3840,11 @@ msgstr "File Transfers"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "Remove completed, cancelled and failed file transfers from the list"
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Import"
+
+#: ../src/empathy-import-dialog.c:88
msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
@@ -3965,171 +3852,195 @@ msgstr ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
msgid "Import Accounts"
msgstr "Import Accounts"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
msgid "Import"
msgstr "Import"
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
msgid "Protocol"
msgstr "Protocol"
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
msgid "Source"
msgstr "Source"
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
msgid "Provide Password"
msgstr "Provide Password"
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
msgid "Disconnect"
msgstr "Disconnect"
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
+
+#: ../src/empathy-roster-window.c:673
msgid "No match found"
msgstr "No match found"
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "Sorry, %s accounts canât be used until your %s software is updated."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Update softwareâ"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Close"
+
+#: ../src/empathy-roster-window.c:960
msgid "Reconnect"
msgstr "Reconnect"
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
msgid "Edit Account"
msgstr "Edit Account"
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Close"
-
#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
#, c-format
msgid "Top up %s (%s)..."
msgstr "Top up %s (%s)â"
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
msgid "Top up account credit"
msgstr "Top up account credit"
#. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
msgid "Top Up..."
msgstr "Top Upâ"
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
msgid "Contact"
msgstr "Contact"
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
+
+#. 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 "You need to enable %s to see contacts here."
+
+#: ../src/empathy-roster-window.c:2460
msgid "Contact List"
msgstr "Contact List"
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contacts on a _Map"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Credit Balance"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_New Conversationâ"
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Find in Contact _List"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "New _Callâ"
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Join _Favourites"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contactsâ"
+msgstr "_Search for Contactsâ"
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Manage Favourites"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_File Transfers"
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal Size"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Offline Contacts"
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "New _Callâ"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal Size With _Avatars"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Credit Balance"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contacts on a _Map"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
msgid "P_references"
msgstr "P_references"
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Show P_rotocols"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
msgid "Sort by _Name"
msgstr "Sort by _Name"
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
msgid "Sort by _Status"
msgstr "Sort by _Status"
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal Size With _Avatars"
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blocked Contacts"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal Size"
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
msgid "_Compact Size"
msgstr "_Compact Size"
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_File Transfers"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Room"
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
msgid "_Joinâ"
msgstr "_Joinâ"
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "_New Conversationâ"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Offline Contacts"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personal Information"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Room"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contactsâ"
-msgstr "_Search for Contactsâ"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
msgid "Chat Room"
msgstr "Chat Room"
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
msgid "Members"
msgstr "Members"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
#, c-format
msgid ""
"%s\n"
@@ -4142,22 +4053,27 @@ msgstr ""
"Password required: %s\n"
"Members: %s"
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
msgid "Could not start room listing"
msgstr "Could not start room listing"
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
msgid "Could not stop room listing"
msgstr "Could not stop room listing"
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Couldn't load room list"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Join Room"
#: ../src/empathy-new-chatroom-dialog.ui.h:3
msgid ""
@@ -4166,6 +4082,10 @@ msgstr ""
"Enter the room name to join here or click on one or more rooms in the list."
#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Room:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account's server"
@@ -4173,378 +4093,395 @@ msgstr ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account's server"
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Join Room"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "Room List"
msgstr "Room List"
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Room:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
msgid "Message received"
msgstr "Message received"
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
msgid "Message sent"
msgstr "Message sent"
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
msgid "New conversation"
msgstr "New conversation"
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Contact comes online"
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
msgid "Contact goes offline"
msgstr "Contact goes offline"
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
msgid "Account connected"
msgstr "Account connected"
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
msgid "Account disconnected"
msgstr "Account disconnected"
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
msgid "Language"
msgstr "Language"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
msgid "Juliet"
msgstr "Juliet"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
msgid "Romeo"
msgstr "Romeo"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
msgid "Deny thy father and refuse thy name;"
msgstr "Deny thy father and refuse thy name;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Or if thou wilt not, be but sworn my love"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
msgid "And I'll no longer be a Capulet."
msgstr "And I'll no longer be a Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Shall I hear more, or shall I speak at this?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
msgid "Juliet has disconnected"
msgstr "Juliet has disconnected"
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
msgid "Preferences"
msgstr "Preferences"
#: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
+
+#: ../src/empathy-preferences.ui.h:3
msgid "Appearance"
msgstr "Appearance"
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Behaviour"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Start chats in:"
#: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Chat Th_eme:"
+msgid "new ta_bs"
+msgstr "new ta_bs"
#: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Disable notifications when _away or busy"
+msgid "new _windows"
+msgstr "new _windows"
#: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Disable sounds when _away or busy"
-
-#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Display incoming events in the notification area"
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
+
#: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"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."
+msgid "Log conversations"
+msgstr "Log conversations"
#: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Enable notifications when a contact comes online"
+msgid "Behavior"
+msgstr "Behaviour"
#: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Enable notifications when a contact goes offline"
+msgid "General"
+msgstr "General"
#: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Enable notifications when the _chat is not focused"
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
#: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Enable spell checking for languages:"
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
#: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "General"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Input level:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
#: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Input volume:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifications"
#: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Location sources:"
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
#: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Log conversations"
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
#: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notifications"
-
-#: ../src/empathy-preferences.ui.h:21
msgid "Play sound for events"
msgstr "Play sound for events"
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sounds"
+
#: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privacy"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellation to improve call quality"
#: ../src/empathy-preferences.ui.h:23
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."
+"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 ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"county and country will be published. GPS coordinates will be accurate to 1 "
-"decimal place."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Show _smileys as images"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Show contact _list in rooms"
+"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."
#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sounds"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Spell Checking"
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:27
msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"county and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+#. 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 "Themes"
-msgstr "Themes"
+msgid "_Reduce location accuracy"
+msgstr "_Reduce location accuracy"
#: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Use _echo cancellation to improve call quality"
+msgid "Privacy"
+msgstr "Privacy"
#: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Variant:"
+msgid "_GPS"
+msgstr "_GPS"
#: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "_Automatically connect on startup"
-
-#: ../src/empathy-preferences.ui.h:33
msgid "_Cellphone"
msgstr "_Mobile phone"
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "_Enable bubble notifications"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "_Enable sound notifications"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Location sources:"
#: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Network (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
#: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+msgid "Spell Checking"
+msgstr "Spell Checking"
#: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publish location to my contacts"
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
-#. 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:41
-msgid "_Reduce location accuracy"
-msgstr "_Reduce location accuracy"
+msgid "Themes"
+msgstr "Themes"
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
msgid "Status"
msgstr "Status"
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
msgid "_Quit"
msgstr "_Quit"
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Call the contact again"
-
#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Camera Off"
+msgid "Redial"
+msgstr "Redial"
#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Camera On"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video Off"
#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Disable camera and stop sending video"
+msgid "Video Preview"
+msgstr "Video Preview"
#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Enable camera and send video"
+msgid "Video On"
+msgstr "Video On"
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Enable camera but don't send video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Call the contact again"
#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Preview"
+msgid "Camera Off"
+msgstr "Camera Off"
#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Redial"
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Preview"
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video Off"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video On"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Camera On"
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video Preview"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
msgid "Contact Map View"
msgstr "Contact Map View"
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
msgid "Save"
msgstr "Save"
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin link"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin response"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Data too large for a single paste. Please save logs to file."
+
+#: ../src/empathy-debug-window.c:1912
msgid "Debug Window"
msgstr "Debug Window"
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Send to pastebin"
+
+#: ../src/empathy-debug-window.c:2009
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
msgid "Level "
msgstr "Level "
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
msgid "Message"
msgstr "Message"
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
msgid "Warning"
msgstr "Warning"
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
msgid "Critical"
msgstr "Critical"
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
msgid "Time"
msgstr "Time"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
msgid "Domain"
msgstr "Domain"
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
msgid "Category"
msgstr "Category"
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
msgid "Level"
msgstr "Level"
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4552,131 +4489,428 @@ msgstr ""
"The selected connection manager does not support the remote debugging "
"extension."
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
msgid "Invite Participant"
msgstr "Invite Participant"
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
msgid "Choose a contact to invite into the conversation:"
msgstr "Choose a contact to invite into the conversation:"
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
msgid "Invite"
msgstr "Invite"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
"Don't display any dialogues unless there are only \"People Nearby\" accounts"
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
msgid "- Empathy Accounts"
msgstr "- Empathy Accounts"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
msgid "Empathy Accounts"
msgstr "Empathy Accounts"
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
msgid "Show a particular service"
msgstr "Show a particular service"
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
msgid "- Empathy Debugger"
msgstr "- Empathy Debugger"
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
msgid "Empathy Debugger"
msgstr "Empathy Debugger"
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
msgid "- Empathy Chat Client"
msgstr "- Empathy Chat Client"
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
msgid "Respond"
msgstr "Respond"
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
msgid "Reject"
msgstr "Reject"
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
msgid "Answer"
msgstr "Answer"
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
msgid "Answer with video"
msgstr "Answer with video"
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
msgid "Decline"
msgstr "Decline"
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
msgid "Accept"
msgstr "Accept"
#. 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:260
+#: ../src/empathy-notifications-approver.c:246
msgid "Provide"
msgstr "Provide"
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s just tried to call you, but you were in another call."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
msgid "On hold"
msgstr "On hold"
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
msgid "Mute"
msgstr "Mute"
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
msgid "Duration"
msgstr "Duration"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
#, c-format
msgid "%s â %d:%02dm"
msgstr "%s â %d:%02dm"
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "Sorry, you donât have enough credit for that call."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Top Up"
+
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "_Match case"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adding new account"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "People nearby"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"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."
+
+#: ../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 ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
+
+#~ msgid "Call volume"
+#~ msgstr "Call volume"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Call volume, as a percentage."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy has migrated butterfly logs"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Whether Empathy has migrated butterfly logs."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket type not supported"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "My Web Accounts"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "The account %s is edited via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "The account %s cannot be edited in Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Launch My Web Accounts"
+
+#~ msgid "Edit %s"
+#~ msgstr "Edit %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Ca_ncel"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personal Information"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Ungrouped"
+
+#~ msgid "Favorite People"
+#~ msgstr "Favourite People"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
+
+#~ msgid "Select a contact"
+#~ msgstr "Select a contact"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Linked Contacts"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Select contacts to link"
+
+#~ msgid "New contact preview"
+#~ msgstr "New contact preview"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Contacts selected in the list on the left will be linked together."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contactsâ"
+#~ msgstr "_Link Contactsâ"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Link Contacts"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlinkâ"
+#~ msgstr "_Unlinkâ"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+
+#~ msgid "_Link"
+#~ msgstr "_Link"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Unlink linked contacts '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Unlink"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Contact ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
+
+#~ msgid "Send _Video"
+#~ msgstr "Send _Video"
+
+#~ msgid "C_all"
+#~ msgstr "C_all"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Set your presence and current status"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "The selected contact cannot receive files."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "The selected contact is offline."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "There was an error while importing the accounts."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "There was an error while parsing the account details."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "There was an error while creating the account."
+
+#~ msgid "There was an error."
+#~ msgstr "There was an error."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "The error message was: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+
+#~ msgid "An error occurred"
+#~ msgstr "An error occurred"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Do you have any other chat accounts you want to set up?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Enter your account details"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "What kind of chat account do you want to create?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Do you want to create other chat accounts?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Enter the details for the new account"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Do you have an account you've been using with another chat program?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Yes, import my account details from "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Yes, I'll enter my account details now"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, I want a new account"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, I just want to see people online nearby for now"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Select the accounts you want to import:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, that's all for now"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Edit->Accounts"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "I do _not want to enable this feature for now"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialogue"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Messaging and VoIP Accounts Assistant"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Welcome to Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Import your existing accounts"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Please enter personal details"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocol:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personal Information"
+
+#~ msgid "Input level:"
+#~ msgstr "Input level:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Input volume:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Open new chats in separate windows"
+
#~ msgid "All"
#~ msgstr "All"
@@ -4851,9 +5085,6 @@ msgstr "_Match case"
#~ msgid "Hidden"
#~ msgstr "Hidden"
-#~ msgid "User requested disconnect"
-#~ msgstr "User requested disconnect"
-
#~ msgid "_Add Contact..."
#~ msgstr "_Add Contactâ"
@@ -5278,9 +5509,6 @@ msgstr "_Match case"
#~ msgid "View previous conversations with this contact"
#~ msgstr "View previous conversations with this contact"
-#~ msgid "Start a voice or video conversation with this contact"
-#~ msgstr "Start a voice or video conversation with this contact"
-
#~ msgid "Invalid handle"
#~ msgstr "Invalid handle"
@@ -5326,9 +5554,6 @@ msgstr "_Match case"
#~ msgid "_Use for chat rooms"
#~ msgstr "_Use for chat rooms"
-#~ msgid "ICQ account settings"
-#~ msgstr "ICQ account settings"
-
#~ msgid "irc account settings"
#~ msgstr "irc account settings"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
