aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2010-01-01 01:37:58 +0800
committerPhilip Withnall <philip@tecnocode.co.uk>2010-01-01 01:37:58 +0800
commitc17337f0c17f721a10e108a683fd26ba21301660 (patch)
tree6e1aec947b21988cc1e65ac738640a9baa145254
parentd034683efc6d614ce6f07c78911a4cc2c5e63919 (diff)
downloadgsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.tar
gsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.tar.gz
gsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.tar.bz2
gsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.tar.lz
gsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.tar.xz
gsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.tar.zst
gsoc2013-empathy-c17337f0c17f721a10e108a683fd26ba21301660.zip
Updated British English translation
-rw-r--r--po/en_GB.po1761
1 files changed, 1101 insertions, 660 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index b1d0831d9..7d3abfe8c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:31+0100\n"
+"POT-Creation-Date: 2009-12-31 17:36+0000\n"
"PO-Revision-Date: 2009-08-30 23:40+0100\n"
"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
"Language-Team: British English <en@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Chat window theme"
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)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
@@ -64,7 +64,7 @@ msgid "Connection managers should be used"
msgstr "Connection managers should be used"
#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+msgid "Contact list sort criterion"
msgstr "Contact list sort criterion"
#: ../data/empathy.schemas.in.h:8
@@ -193,11 +193,11 @@ msgstr "Pop up notifications if the chat isn't focussed"
#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
-msgstr "Popup notifications when a contact sign in"
+msgstr "Pop up notifications when a contact logs in"
#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
-msgstr "Popup notifications when a contact sign out"
+msgstr "Pop up notifications when a contact logs out"
#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
@@ -220,89 +220,90 @@ msgid "Show offline contacts"
msgstr "Show offline contacts"
#: ../data/empathy.schemas.in.h:46
+msgid "Show protocols"
+msgstr "Show protocols"
+
+#: ../data/empathy.schemas.in.h:47
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
msgid "The default folder to save file transfers in."
msgstr "The default folder to save file transfers in."
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
msgid "The last directory that an avatar image was chosen from."
msgstr "The last directory that an avatar image was chosen from."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
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/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
msgid "Use graphical smileys"
msgstr "Use graphical smileys"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
msgid "Use notification sounds"
msgstr "Use notification sounds"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
msgid "Use theme for chat rooms"
msgstr "Use theme for chat rooms"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:54
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/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr ""
-"Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:56
msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:57
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr ""
-"Whether or not Empathy can use the mobile phone network to guess the "
-"location."
+"Whether Empathy can use the mobile phone network to guess the location."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:58
msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Whether or not Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
msgstr ""
"Whether Empathy has asked about importing accounts from other programs."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
msgstr ""
-"Whether Empathy should automatically log in to your accounts on startup."
+"Whether Empathy should automatically log into your accounts on startup."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
msgstr ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether or not 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/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
@@ -310,75 +311,74 @@ msgstr ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not the Salut account has been created on the first Empathy run."
msgstr "Whether the Salut account has been created on the first Empathy run."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not 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 against."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr "Whether to convert smileys into graphical images in conversations."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
msgstr ""
"Whether to play a sound to notify of contacts logging into the network."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:68
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
-msgstr "Whether to play a sound to notify of contacts logging off the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for events."
msgstr "Whether to play a sound to notify of events."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr "Whether to play a sound to notify of incoming messages."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for new conversations."
msgstr "Whether to play a sound to notify of new conversations."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr "Whether to play a sound to notify of outgoing messages."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging in a network."
msgstr "Whether to play a sound when logging into a network."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play a sound when logging off a network."
-msgstr "Whether to play a sound when logging off a network."
+msgstr "Whether to play a sound when logging out of a network."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:75
msgid "Whether or not to play sound notifications when away or busy."
msgstr "Whether to play sound notifications when away or busy."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether or not to show a popup notification when a contact goes offline."
-msgstr ""
-"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:77
msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr ""
-"Whether or not to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message "
"even if the chat is already opened, but not focused."
@@ -386,31 +386,35 @@ msgstr ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focussed."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr "Whether to show a popup notification when receiving a new message."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:80
msgid ""
"Whether or not 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/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr "Whether to show contacts that are offline in the contact list."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:82
msgid "Whether or not to show popup notifications when away or busy."
msgstr "Whether to show popup notifications when away or busy."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:83
+msgid "Whether or not to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
+
+#: ../data/empathy.schemas.in.h:84
msgid "Whether or not to show the contact list in chat rooms."
-msgstr "Whether or not to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid ""
"Whether or not to show the message dialog about closing the main window with "
"the 'x' button in the title bar."
@@ -418,27 +422,23 @@ msgstr ""
"Whether to show the message dialogue about closing the main window with the "
"'x' button in the title bar."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
msgid "Whether to show the contact list in compact mode or not."
msgstr "Whether to show the contact list in compact mode."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:87
msgid "Whether to use the theme for chat rooms or not."
msgstr "Whether to use the theme for chat rooms."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:88
msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
-msgstr ""
"Which criterion to use when sorting the contact list. Default is to use sort "
"by the contact's name with the value \"name\". A value of \"state\" will "
"sort the contact list by state."
-
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "Can't set an empty display name"
+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."
#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
@@ -456,7 +456,7 @@ msgstr "The selected file is not a regular file"
msgid "The selected file is empty"
msgstr "The selected file is empty"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
msgid "People nearby"
msgstr "People nearby"
@@ -488,39 +488,95 @@ msgstr "Error while trying to transfer the file"
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:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Available"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Busy"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
msgstr "Away"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:245
msgid "Hidden"
msgstr "Hidden"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Offline"
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "User requested disconnect"
+msgstr "User requested disconnect"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Network error"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Authentication failed"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Encryption error"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Name in use"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Certificate not provided"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Certificate untrusted"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Certificate expired"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Certificate not activated"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Certificate hostname mismatch"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Certificate fingerprint mismatch"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Certificate self-signed"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Certificate error"
+
+#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "People Nearby"
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:429
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:430
msgid "Facebook Chat"
msgstr "Facebook Chat"
@@ -570,20 +626,61 @@ msgstr[1] "%d months ago"
msgid "in the future"
msgstr "in the future"
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:450
msgid "All"
msgstr "All"
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:527
+#: ../libempathy-gtk/empathy-account-widget.c:583
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1320
+msgid "L_og in"
+msgstr "L_og in"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Account:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1398
msgid "Enabled"
msgstr "Enabled"
+#: ../libempathy-gtk/empathy-account-widget.c:1460
+msgid "This account already exists on the server"
+msgstr "This account already exists on the server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1463
+msgid "Create a new account on the server"
+msgstr "Create a new account on the server"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:1846
+#, 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:1864
+#, c-format
+msgid "%s Account"
+msgstr "%s Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1868
+msgid "New account"
+msgstr "New account"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
msgstr "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
@@ -595,7 +692,7 @@ msgstr "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
#: ../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-sip.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "Advanced"
@@ -605,7 +702,7 @@ msgstr "Advanced"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "Pass_word:"
@@ -679,15 +776,48 @@ msgstr "What is your ICQ password?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
-msgstr "_Charset:"
+msgstr "_Character set:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "New Network"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+msgid "Auto"
+msgstr "Auto"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+msgid "Register"
+msgstr "Register"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "None"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
msgid "Charset:"
-msgstr "Charset:"
+msgstr "Character set:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Network"
@@ -783,7 +913,7 @@ msgstr "What is your Windows Live password?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live user name?"
-msgstr "What is your Windows Live user name?"
+msgstr "What is your Windows Live username?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
@@ -810,37 +940,120 @@ msgid "_Published Name:"
msgstr "_Published Name:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Keep-Alive Options</b>"
+msgstr "<b>Keep-Alive Options</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "<b>Miscellaneous Options</b>"
+msgstr "<b>Miscellaneous Options</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>NAT Traversal Options</b>"
+msgstr "<b>NAT Traversal Options</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "<b>Proxy Options</b>"
+msgstr "<b>Proxy Options</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
msgstr "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Discover STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Authentication username:"
+msgstr "Authentication username:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Discover Binding"
+msgstr "Discover Binding"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Hostname of the proxy for outbound requests."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Loose Routing"
+msgstr "Loose Routing"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "Mechanism:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port of the proxy for outbound requests."
+msgstr "Port of the proxy for outbound requests."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "STUN Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN Port:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "Transport:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
msgid "What is your SIP account password?"
msgstr "What is your SIP account password?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
msgid "What is your SIP login ID?"
msgstr "What is your SIP login ID?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Username:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
-msgstr "Use _Yahoo Japan"
+msgstr "Use _Yahoo! Japan"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
@@ -852,7 +1065,7 @@ msgstr "What is your Yahoo! password?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
-msgstr "Yahoo I_D:"
+msgstr "Yahoo! I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
@@ -871,91 +1084,166 @@ msgstr "Couldn't convert image"
msgid "None of the accepted image formats is supported on your system"
msgstr "None of the accepted image formats are supported on your system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
msgstr "Select Your Avatar Image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "No Image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Images"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "All Files"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Click to enlarge"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:199
msgid "Failed to reconnect this chat"
msgstr "Failed to reconnect this chat"
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "Unsupported command"
+#: ../libempathy-gtk/empathy-chat.c:621
+msgid "Failed to join chatroom"
+msgstr "Failed to join chat room"
+
+#: ../libempathy-gtk/empathy-chat.c:639
+msgid "Failed to open private chat"
+msgstr "Failed to open private chat"
+
+#: ../libempathy-gtk/empathy-chat.c:678
+msgid "Topic not supported on this conversation"
+msgstr "Topic not supported on this conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:684
+msgid "You are not allowed to change the topic"
+msgstr "You are not allowed to change the topic"
+
+#: ../libempathy-gtk/empathy-chat.c:802
+msgid "/clear, clear all messages from the current conversation"
+msgstr "/clear: clear all messages from the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:805
+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:808
+msgid "/join <chatroom id>, join a new chatroom"
+msgstr "/join <chat room ID>: join a new chat room"
+
+#: ../libempathy-gtk/empathy-chat.c:811
+msgid "/j <chatroom id>, join a new chatroom"
+msgstr "/j <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:814
+msgid "/query <contact id> [<message>], open a private chat"
+msgstr "/query <contact ID> [<message>]: open a private chat"
+
+#: ../libempathy-gtk/empathy-chat.c:817
+msgid "/msg <contact id> <message>, open a private chat"
+msgstr "/msg <contact ID> <message>: open a private chat"
+
+#: ../libempathy-gtk/empathy-chat.c:820
+msgid "/nick <nickname>, change your nickname on current server"
+msgstr "/nick <nickname>: change your nickname on the current server"
+
+#: ../libempathy-gtk/empathy-chat.c:823
+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:826
+msgid ""
+"/say <message>, send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chatroom\""
+msgstr ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+
+#: ../libempathy-gtk/empathy-chat.c:831
+msgid ""
+"/help [<command>], show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+
+#: ../libempathy-gtk/empathy-chat.c:841
+#, c-format
+msgid "Usage: %s"
+msgstr "Usage: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+msgid "Unknown command"
+msgstr "Unknown command"
+
+#: ../libempathy-gtk/empathy-chat.c:991
+msgid "Unknown command, see /help for the available commands"
+msgstr "Unknown command; see /help for the available commands"
+
+#: ../libempathy-gtk/empathy-chat.c:1130
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1133
msgid "invalid contact"
msgstr "invalid contact"
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1136
msgid "permission denied"
msgstr "permission denied"
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1139
msgid "too long message"
msgstr "too long message"
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1142
msgid "not implemented"
msgstr "not implemented"
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1145
msgid "unknown"
msgstr "unknown"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1149
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error sending message '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1179
#, c-format
msgid "Topic set to: %s"
msgstr "Topic set to: %s"
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1181
msgid "No topic defined"
msgstr "No topic defined"
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1554
msgid "(No Suggestions)"
msgstr "(No Suggestions)"
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1608
msgid "Insert Smiley"
msgstr "Insert Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1494
+#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1657
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1660
msgid "_Spelling Suggestions"
msgstr "_Spelling Suggestions"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1775
#, c-format
msgid "%s has disconnected"
msgstr "%s has disconnected"
@@ -963,12 +1251,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:1184
+#: ../libempathy-gtk/empathy-chat.c:1782
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s was kicked by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1785
#, c-format
msgid "%s was kicked"
msgstr "%s was kicked"
@@ -976,17 +1264,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:1195
+#: ../libempathy-gtk/empathy-chat.c:1793
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s was banned by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1796
#, c-format
msgid "%s was banned"
msgstr "%s was banned"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1800
#, c-format
msgid "%s has left the room"
msgstr "%s has left the room"
@@ -996,61 +1284,81 @@ 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:1211
+#: ../libempathy-gtk/empathy-chat.c:1809
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:1834
#, c-format
msgid "%s has joined the room"
msgstr "%s has joined the room"
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1859
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
msgid "Disconnected"
msgstr "Disconnected"
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2521
+msgid "Wrong password; please try again:"
+msgstr "Wrong password; please try again:"
+
+#: ../libempathy-gtk/empathy-chat.c:2522
+msgid "Retry"
+msgstr "Retry"
+
+#: ../libempathy-gtk/empathy-chat.c:2527
+msgid "This room is protected by a password:"
+msgstr "This room is protected by a password:"
+
+#: ../libempathy-gtk/empathy-chat.c:2528
+msgid "Join"
+msgstr "Join"
+
+#: ../libempathy-gtk/empathy-chat.c:2668
msgid "Connected"
msgstr "Connected"
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2721
+#: ../libempathy-gtk/empathy-log-window.c:546
msgid "Conversation"
msgstr "Conversation"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
msgid "Topic:"
msgstr "Topic:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:317
+#: ../libempathy-gtk/empathy-theme-adium.c:817
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:824
msgid "_Open Link"
msgstr "_Open Link"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:422
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
msgid "Edit Contact Information"
msgstr "Edit Contact Information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
msgid "Personal Information"
msgstr "Personal Information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
msgid "New Contact"
msgstr "New Contact"
@@ -1062,37 +1370,37 @@ msgstr "Decide _Later"
msgid "Subscription Request"
msgstr "Subscription Request"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1557
#, 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:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1559
msgid "Removing group"
msgstr "Removing group"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1606
+#: ../libempathy-gtk/empathy-contact-list-view.c:1683
msgid "_Remove"
msgstr "_Remove"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1636
#, 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:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
msgid "Removing contact"
msgstr "Removing contact"
#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact..."
msgstr "_Add Contact…"
#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chat"
@@ -1107,8 +1415,9 @@ msgid "_Video Call"
msgstr "_Video Call"
#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "_View Previous Conversations"
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
#: ../libempathy-gtk/empathy-contact-menu.c:346
msgid "Send file"
@@ -1123,15 +1432,16 @@ msgid "Infor_mation"
msgstr "Infor_mation"
#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "_Edit"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../src/empathy-chat-window.c:864
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
+#: ../libempathy-gtk/empathy-contact-menu.c:527
msgid "_Invite to chatroom"
msgstr "_Invite to chat room"
@@ -1147,120 +1457,120 @@ msgstr "Save Avatar"
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
msgid "Select"
msgstr "Select"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:1010
+#: ../src/empathy-main-window.c:1038
msgid "Group"
msgstr "Group"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1261
msgid "Country ISO Code:"
msgstr "Country ISO Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1263
msgid "Country:"
msgstr "Country:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1265
msgid "State:"
msgstr "State:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1267
msgid "City:"
msgstr "City:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1269
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1271
msgid "Postal Code:"
msgstr "Postal Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1273
msgid "Street:"
msgstr "Street:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1275
msgid "Building:"
msgstr "Building:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1277
msgid "Floor:"
msgstr "Floor:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
msgid "Room:"
msgstr "Room:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1283
msgid "Description:"
msgstr "Description:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1285
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1287
msgid "Accuracy Level:"
msgstr "Accuracy Level:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1289
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1291
msgid "Vertical Error (meters):"
msgstr "Vertical Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1293
msgid "Horizontal Error (meters):"
msgstr "Horizontal Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1295
msgid "Speed:"
msgstr "Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1297
msgid "Bearing:"
msgstr "Bearing:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1299
msgid "Climb Speed:"
msgstr "Climb Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1301
msgid "Last Updated on:"
msgstr "Last Updated on:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1303
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:1305
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:1307
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#: ../libempathy-gtk/empathy-contact-widget.c:1368
msgid "<b>Location</b>"
msgstr "<b>Location</b>"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:1381
msgid "<b>Location</b>, "
msgstr "<b>Location</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1431
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
@@ -1268,13 +1578,6 @@ msgstr "%e %B, %Y at %R UTC"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Location</b> at (date)\t"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Account:"
-
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "Alias:"
@@ -1292,7 +1595,7 @@ msgid "Client:"
msgstr "Client:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
+#: ../src/empathy-main-window.c:1021
msgid "Contact"
msgstr "Contact"
@@ -1330,7 +1633,7 @@ msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr ""
-"Select the groups you want this contact to appear in. Note that you can "
+"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-contact-widget.ui.h:17
@@ -1339,34 +1642,34 @@ msgstr "Version:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "Web site:"
-msgstr "Web site:"
+msgstr "Website:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
msgid "_Add Group"
msgstr "_Add Group"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "new server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Account"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:556
msgid "Date"
msgstr "Date"
@@ -1386,56 +1689,70 @@ msgstr "Search"
msgid "_For:"
msgstr "_For:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "C_all"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "Contact ID:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "C_hat"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "Contact ID:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "New Conversation"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "Send _Video"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Call"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "New Call"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message..."
msgstr "Custom Message…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages..."
msgstr "Edit Custom Messages…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
msgid "Click to remove this status as a favorite"
msgstr "Click to remove this status as a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:353
msgid "Click to make this status a favorite"
msgstr "Click to make this status a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
msgid "Set status"
msgstr "Set status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:896
msgid "Set your presence and current status"
msgstr "Set your presence and current status"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+#: ../libempathy-gtk/empathy-presence-chooser.c:1083
msgid "Custom messages..."
msgstr "Custom messages…"
@@ -1479,11 +1796,11 @@ msgstr "Outgoing voice call"
msgid "Voice call ended"
msgstr "Voice call ended"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Enter Custom Message"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Edit Custom Messages"
@@ -1511,15 +1828,15 @@ msgstr "Clean"
msgid "Blue"
msgstr "Blue"
-#: ../libempathy-gtk/empathy-ui-utils.c:1396
+#: ../libempathy-gtk/empathy-ui-utils.c:1519
msgid "Unable to open URI"
msgstr "Unable to open URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1486
+#: ../libempathy-gtk/empathy-ui-utils.c:1649
msgid "Select a file"
msgstr "Select a file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
+#: ../libempathy-gtk/empathy-ui-utils.c:1709
msgid "Select a destination"
msgstr "Select a destination"
@@ -1690,76 +2007,39 @@ msgstr "Western"
msgid "Vietnamese"
msgstr "Vietnamese"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"The contact to display in the applet. Empty means no contact is displayed."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "The contact's avatar token. Empty means the contact has no avatar."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megaphone"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "Talk!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_About"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The contact selected cannot receive files."
+msgstr "The selected contact cannot receive files."
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Information"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The contact selected is offline."
+msgstr "The selected contact is offline."
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Preferences"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "No error message"
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "Please configure a contact."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "Instant Message (Empathy)"
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "Select contact…"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Presence"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "Set your own presence"
-
-#: ../src/empathy.c:742
+#: ../src/empathy.c:893
msgid "Don't connect on startup"
msgstr "Don't connect on startup"
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
-msgstr "Don't show the contact list on startup"
+#: ../src/empathy.c:897
+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:750
+#: ../src/empathy.c:901
msgid "Show the accounts dialog"
msgstr "Show the accounts dialogue"
-#: ../src/empathy.c:762
+#: ../src/empathy.c:913
msgid "- Empathy IM Client"
msgstr "- Empathy IM Client"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:84
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -1771,7 +2051,7 @@ msgstr ""
"Foundation; either version 2 of the Licence, or (at your option) any later "
"version."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:88
msgid ""
"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1783,7 +2063,7 @@ msgstr ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more "
"details."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:92
msgid ""
"You should have received a copy of the GNU General Public License along with "
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1793,11 +2073,11 @@ msgstr ""
"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:119
+#: ../src/empathy-about-dialog.c:120
msgid "An Instant Messaging client for GNOME"
msgstr "An Instant Messaging client for GNOME"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
msgid "translator-credits"
msgstr ""
"David Lodge <dave@cirt.net>\n"
@@ -1806,19 +2086,19 @@ msgstr ""
#: ../src/empathy-account-assistant.c:118
msgid "There has been an error while importing the accounts."
-msgstr "There has been an error while importing the accounts."
+msgstr "There was an error while importing the accounts."
#: ../src/empathy-account-assistant.c:121
msgid "There has been an error while parsing the account details."
-msgstr "There has been an error while parsing the account details."
+msgstr "There was an error while parsing the account details."
#: ../src/empathy-account-assistant.c:124
msgid "There has been an error while creating the account."
-msgstr "There has been an error while creating the account."
+msgstr "There was an error while creating the account."
#: ../src/empathy-account-assistant.c:126
msgid "There has been an error."
-msgstr "There has been an error."
+msgstr "There was an error."
#: ../src/empathy-account-assistant.c:141
#, c-format
@@ -1843,37 +2123,36 @@ msgstr "An error occurred"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:506
#, c-format
msgid "New %s account"
msgstr "New %s account"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:403
msgid "What kind of chat account do you have?"
msgstr "What kind of chat account do you have?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:409
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:405
+#: ../src/empathy-account-assistant.c:415
msgid "Enter your account details"
msgstr "Enter your account details"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:420
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:416
+#: ../src/empathy-account-assistant.c:426
msgid "Do you want to create other chat accounts?"
msgstr "Do you want to create other chat accounts?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:433
msgid "Enter the details for the new account"
msgstr "Enter the details for the new account"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:519
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 "
@@ -1885,77 +2164,88 @@ msgstr ""
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:536
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:549
+#: ../src/empathy-account-assistant.c:559
msgid "Yes, import my account details from "
msgstr "Yes, import my account details from "
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:580
msgid "Yes, I'll enter my account details now"
msgstr "Yes, I'll enter my account details now"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:602
msgid "No, I want a new account"
msgstr "No, I want a new account"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:612
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:623
+#: ../src/empathy-account-assistant.c:633
msgid "Select the accounts you want to import:"
msgstr "Select the accounts you want to import:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Yes"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:727
msgid "No, that's all for now"
msgstr "No, that's all for now"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:920
msgid "Welcome to Empathy"
msgstr "Welcome to Empathy"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:929
msgid "Import your existing accounts"
msgstr "Import your existing accounts"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modification regarding your %s account."
-msgstr "There are unsaved modifications regarding your %s account."
+msgstr "There are unsaved modifications to your %s account."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:69
+msgid "Your new account has not been saved yet."
+msgstr "Your new account has not been saved yet."
+
+#: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
+msgid "Connecting..."
+msgstr "Connecting…"
+
+#: ../src/empathy-accounts-dialog.c:259
#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s on %2$s"
+msgid "Disconnected - %s"
+msgstr "Disconnected — %s"
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:264
#, c-format
-msgid "%s Account"
-msgstr "%s Account"
+msgid "Offline - %s"
+msgstr "Offline — %s"
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "New account"
+#: ../src/empathy-accounts-dialog.c:277
+msgid "Offline - No Network Connection"
+msgstr "Offline — No Network Connection"
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:285
+msgid "Unknown Status"
+msgstr "Unknown Status"
+
+#: ../src/empathy-accounts-dialog.c:296
+msgid "Offline - Account disabled"
+msgstr "Offline — Account Disabled"
+
+#: ../src/empathy-accounts-dialog.c:645
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1963,30 +2253,16 @@ 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:787
+#: ../src/empathy-accounts-dialog.c:934
#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
+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:792
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+#: ../src/empathy-accounts-dialog.c:938
+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:980
+#: ../src/empathy-accounts-dialog.c:1120
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1994,7 +2270,7 @@ msgstr ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1537
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2007,18 +2283,14 @@ msgid "Accounts"
msgstr "Accounts"
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "Add new"
+msgid "No protocol installed"
+msgstr "No protocol installed"
#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "Cr_eate"
+msgid "Protocol:"
+msgstr "Protocol:"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "No protocol installed"
-
-#: ../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."
@@ -2026,110 +2298,232 @@ 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:6
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add..."
msgstr "_Add…"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "_Create a new account"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "_Reuse an existing account"
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "account"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Import..."
+msgstr "_Import…"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Contrast"
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Brightness"
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "Connecting…"
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Sidebar"
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Dialpad"
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Audio input"
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Video input"
-#. translators: Call is a noun and %s is the contact name. This string is used
-#. * in the window title
-#: ../src/empathy-call-window.c:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Call with %s"
-#. translators: Call is a noun. This string is used in the window title
-#: ../src/empathy-call-window.c:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "Call"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1437
+#: ../src/empathy-call-window.c:1700
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Connected — %d:%02dm"
+#: ../src/empathy-call-window.c:1761
+msgid "Technical Details"
+msgstr "Technical Details"
+
+#: ../src/empathy-call-window.c:1799
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+
+#: ../src/empathy-call-window.c:1810
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+
+#: ../src/empathy-call-window.c:1816
+msgid "There was a failure on the network"
+msgstr "There was a failure on the network"
+
+#: ../src/empathy-call-window.c:1820
+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-call-window.c:1823
+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-call-window.c:1833
+#, c-format
+msgid ""
+"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+
+#: ../src/empathy-call-window.c:1841
+msgid "There was a failure in the call engine"
+msgstr "There was a failure in the call engine"
+
+#: ../src/empathy-call-window.c:1880
+msgid "Can't establish audio stream"
+msgstr "Can't establish audio stream"
+
+#: ../src/empathy-call-window.c:1890
+msgid "Can't establish video stream"
+msgstr "Can't establish video stream"
+
#: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "Call the contact again"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "Camera Off"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "Camera On"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
+
+#: ../src/empathy-call-window.ui.h:7
msgid "Hang up"
msgstr "Hang up"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Hang up current call"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Preview"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
msgstr "Redial"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
msgstr "Send Audio"
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Send video"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Video preview"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "V_ideo"
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Call"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "Video Off"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "Video On"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "Video Preview"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_View"
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#, 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:447
+#, 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:463
#, c-format
-msgid "Conversations (%d)"
-msgstr "Conversations (%d)"
+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:475
+#: ../src/empathy-chat-window.c:472
+#, 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:683
msgid "Typing a message."
msgstr "Typing a message."
@@ -2138,70 +2532,74 @@ msgid "C_lear"
msgstr "C_lear"
#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "C_ontact"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Chat"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Insert _Smiley"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant..."
+msgstr "Invite _Participant…"
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Move Tab _Left"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Move Tab _Right"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Contents"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Conversation"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "_Detach Tab"
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:12
msgid "_Favorite Chatroom"
msgstr "_Favourite Chat Room"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Help"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "_Next Tab"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "_Previous Tab"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Show Contact List"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "_Tabs"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Name"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Room"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Auto-Connect"
@@ -2209,75 +2607,89 @@ msgstr "Auto-Connect"
msgid "Manage Favorite Rooms"
msgstr "Manage Favourite Rooms"
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:345
+msgid "Incoming video call"
+msgstr "Incoming video call"
+
+#: ../src/empathy-event-manager.c:345
msgid "Incoming call"
msgstr "Incoming call"
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:349
+#, 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:350
#, 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:332
+#: ../src/empathy-event-manager.c:372
msgid "_Reject"
msgstr "_Reject"
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:378
msgid "_Answer"
msgstr "_Answer"
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:495
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Incoming video call from %s"
+
+#: ../src/empathy-event-manager.c:495
#, c-format
msgid "Incoming call from %s"
msgstr "Incoming call from %s"
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:541
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s is offering you an invitation"
-#: ../src/empathy-event-manager.c:503
+#: ../src/empathy-event-manager.c:547
msgid "An external application will be started to handle it."
msgstr "An external application will be started to handle it."
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:552
msgid "You don't have the needed external application to handle it."
msgstr "You don't have the needed external application to handle it."
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:680
msgid "Room invitation"
msgstr "Room invitation"
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:683
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s is inviting you to join %s"
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:691
msgid "_Decline"
msgstr "_Decline"
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:696
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Join"
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:735
#, c-format
msgid "%s invited you to join %s"
msgstr "%s invited you to join %s"
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:761
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Incoming file transfer from %s"
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:941
#, c-format
msgid "Subscription requested by %s"
msgstr "Subscription requested by %s"
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:945
#, c-format
msgid ""
"\n"
@@ -2287,117 +2699,117 @@ msgstr ""
"Message: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:985
#, c-format
msgid "%s is now offline."
msgstr "%s is now offline."
#. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:1001
#, c-format
msgid "%s is now online."
msgstr "%s is now online."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:100
#, 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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Unknown"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s of %s at %s/s"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, 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:307
+#: ../src/empathy-ft-manager.c:306
#, 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:310
+#: ../src/empathy-ft-manager.c:309
#, 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:340
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Error receiving \"%s\" from %s"
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Error receiving a file"
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Error sending \"%s\" to %s"
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
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:490
+#: ../src/empathy-ft-manager.c:489
#, 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:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" sent to %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "File transfer completed"
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
msgstr "Waiting for the other participant's response"
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Checking integrity of \"%s\""
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Hashing \"%s\""
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "File"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "Remaining"
@@ -2422,15 +2834,15 @@ 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:290
msgid "Import"
msgstr "Import"
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Protocol"
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Source"
@@ -2439,67 +2851,19 @@ msgstr "Source"
msgid "%s account"
msgstr "%s account"
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "_Edit account"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "No error specified"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Network error"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Authentication failed"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Encryption error"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Name in use"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Certificate not provided"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Certificate untrusted"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Certificate expired"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Certificate not activated"
+#: ../src/empathy-main-window.c:431
+msgid "Reconnect"
+msgstr "Reconnect"
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Certificate hostname mismatch"
+#: ../src/empathy-main-window.c:438
+msgid "Edit Account"
+msgstr "Edit Account"
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Certificate fingerprint mismatch"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Close"
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Certificate self-signed"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Certificate error"
-
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1331
msgid "Show and edit accounts"
msgstr "Show and edit accounts"
@@ -2527,67 +2891,75 @@ msgstr "Manage Favourites"
msgid "N_ormal Size"
msgstr "N_ormal Size"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call..."
+msgstr "New _Call…"
+
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Normal Size With _Avatars"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "P_references"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Sort by _Name"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Sort by _Status"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Accounts"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Compact Size"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Debug"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "_File Transfers"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join..."
msgstr "_Join…"
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation..."
msgstr "_New Conversation…"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "_Offline Contacts"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Personal Information"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "_Previous Conversations"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Room"
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
msgstr "Chat Room"
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Members"
-#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:539
#, c-format
msgctxt ""
"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2603,16 +2975,16 @@ msgstr ""
"Password required: %s\n"
"Members: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
msgstr "Could not start room listing"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
msgstr "Could not stop room listing"
@@ -2679,112 +3051,100 @@ msgid "Language"
msgstr "Language"
#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Allow _GPS usage"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Allow _mobile phone usage"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Allow _network usage"
-
-#: ../src/empathy-preferences.ui.h:4
msgid "Appearance"
msgstr "Appearance"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
msgstr "Automatically _connect on startup "
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Behaviour"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
msgstr "Chat Th_eme:"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
msgstr "Disable notifications when _away or busy"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
msgstr "Disable sounds when _away or busy"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Enable notifications when a contact comes online"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
msgstr "Enable notifications when a contact goes offline"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr "Enable notifications when the _chat is not focussed"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Enable spell checking for languages:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "General"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue Settings"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Location"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Location sources:"
+
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
msgstr "Notifications"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
msgstr "Play sound for events"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
msgstr "Preferences"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Privacy"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:18
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
msgstr ""
"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will be accurate to 1 "
+"county and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
msgstr "Show _smileys as images"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Show contact _list in rooms"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Sounds"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -2792,18 +3152,30 @@ msgstr ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Themes"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "_Mobile phone"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
msgstr "_Enable bubble notifications"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
msgstr "_Enable sound notifications"
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wifi)"
+msgstr "_Network (IP, Wi-Fi)"
+
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
msgstr "_Open new chats in separate windows"
@@ -2816,11 +3188,15 @@ msgstr "_Publish location to my contacts"
msgid "_Reduce location accuracy"
msgstr "_Reduce location accuracy"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:179
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "_Quit"
@@ -2842,64 +3218,63 @@ msgstr ""
msgid "Contact Map View"
msgstr "Contact Map View"
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "Error"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "Critical"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "Warning"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "Message"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "Info"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "Debug"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1063
msgid "Save"
msgstr "Save"
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1185
msgid "Debug Window"
msgstr "Debug Window"
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1265
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1277
msgid "Level "
msgstr "Level "
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1297
+msgid "Debug"
+msgstr "Debug"
+
+#: ../src/empathy-debug-window.c:1303
+msgid "Info"
+msgstr "Info"
+
+#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+msgid "Message"
+msgstr "Message"
+
+#: ../src/empathy-debug-window.c:1315
+msgid "Warning"
+msgstr "Warning"
+
+#: ../src/empathy-debug-window.c:1321
+msgid "Critical"
+msgstr "Critical"
+
+#: ../src/empathy-debug-window.c:1327
+msgid "Error"
+msgstr "Error"
+
+#: ../src/empathy-debug-window.c:1346
msgid "Time"
msgstr "Time"
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1349
msgid "Domain"
msgstr "Domain"
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1351
msgid "Category"
msgstr "Category"
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1353
msgid "Level"
msgstr "Level"
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1385
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -2907,6 +3282,103 @@ msgstr ""
"The selected connection manager does not support the remote debugging "
"extension."
+#~ msgid "Can't set an empty display name"
+#~ msgstr "Can't set an empty display name"
+
+#~ msgid "Unsupported command"
+#~ msgstr "Unsupported command"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "_View Previous Conversations"
+
+#~ msgid "C_all"
+#~ msgstr "C_all"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "The contact's avatar token. Empty means the contact has no avatar."
+
+#~ msgid "Talk!"
+#~ msgstr "Talk!"
+
+#~ msgid "_Information"
+#~ msgstr "_Information"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferences"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "Please configure a contact."
+
+#~ msgid "Select contact..."
+#~ msgstr "Select contact…"
+
+#~ msgid "Presence"
+#~ msgstr "Presence"
+
+#~ msgid "Set your own presence"
+#~ msgstr "Set your own presence"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+
+#~ msgid "Add new"
+#~ msgstr "Add new"
+
+#~ msgid "Cr_eate"
+#~ msgstr "Cr_eate"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "_Reuse an existing account"
+
+#~ msgid "account"
+#~ msgstr "account"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "Conversations (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "_Contact"
+
+#~ msgid "No error specified"
+#~ msgstr "No error specified"
+
+#~ msgid "Unknown error"
+#~ msgstr "Unknown error"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "Allow _GPS usage"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "Allow _mobile phone usage"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "Allow _network usage"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue Settings"
+
#~ msgid "Empathy Instant Messenger"
#~ msgstr "Empathy Instant Messenger"
@@ -2985,9 +3457,6 @@ msgstr ""
#~ msgid "<b>New Account</b>"
#~ msgstr "<b>New Account</b>"
-#~ msgid "<b>Settings</b>"
-#~ msgstr "<b>Settings</b>"
-
#~ msgid "I already have an account I want to use"
#~ msgstr "I already have an account I want to use"
@@ -3071,9 +3540,6 @@ msgstr ""
#~ msgid "Browse:"
#~ msgstr "Browse:"
-#~ msgid "Join"
-#~ msgstr "Join"
-
#~ msgid "Join New"
#~ msgstr "Join New"
@@ -3103,9 +3569,6 @@ msgstr ""
#~ msgid "Enable sound when busy"
#~ msgstr "Enable sound when busy"
-#~ msgid "Closed"
-#~ msgstr "Closed"
-
#~ msgid "End this call?"
#~ msgstr "End this call?"
@@ -3218,9 +3681,6 @@ msgstr ""
#~ "If you do not want to add an account, simply click on the account you "
#~ "want to configure in the list on the left."
-#~ msgid "Chat with contact"
-#~ msgstr "Chat with contact"
-
#~ msgid "View contact information"
#~ msgstr "View contact information"
@@ -3341,16 +3801,9 @@ msgstr ""
#~ msgid "_Copy"
#~ msgstr "_Copy"
-#~ msgid "_Show Contacts"
-#~ msgstr "_Show Contacts"
-
#~ msgid "Enter the new topic you want to set for this room:"
#~ msgstr "Enter the new topic you want to set for this room:"
-#, fuzzy
-#~ msgid "Instant Messenger"
-#~ msgstr "- Empathy Instant Messenger"
-
#~ msgid "Contact List - Empathy"
#~ msgstr "Contact List - Empathy"
@@ -3410,9 +3863,6 @@ msgstr ""
#~ msgid "-"
#~ msgstr "-"
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personal Details</b>"
-
#~ msgid "<b>Status</b>"
#~ msgstr "<b>Status</b>"
@@ -3452,9 +3902,6 @@ msgstr ""
#~ msgstr ""
#~ "If you chose to decide later you will be asked the next time you log on."
-#~ msgid "Personal Details"
-#~ msgstr "Personal Details"
-
#~ msgid ""
#~ "Set the alias you want to use for:\n"
#~ "<b>foo@bar.baz</b>\n"
@@ -3511,15 +3958,9 @@ msgstr ""
#~ msgid "Use system pro_xy"
#~ msgstr "Use system pro_xy"
-#~ msgid "You are not subscribed to this contact."
-#~ msgstr "You are not subscribed to this contact."
-
#~ msgid "_Birthday:"
#~ msgstr "_Birthday:"
-#~ msgid "_Disconnect"
-#~ msgstr "_Disconnect"
-
#~ msgid ""
#~ "_Enter the name or contact ID of the person you want to chat to below:"
#~ msgstr ""