aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Cowan <bruce@bcowan.me.uk>2013-03-27 02:14:56 +0800
committerBruce Cowan <bruce@bcowan.me.uk>2013-03-27 02:14:56 +0800
commitfb6a56224900931eb93f8f4c833e349a66f09af7 (patch)
tree00cce4ddb73f05a10aceb8241f0982ae487423a3
parent292e97bd11ee81ab0c49415ff2e5fa87be32e557 (diff)
downloadgsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.tar
gsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.tar.gz
gsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.tar.bz2
gsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.tar.lz
gsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.tar.xz
gsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.tar.zst
gsoc2013-empathy-fb6a56224900931eb93f8f4c833e349a66f09af7.zip
Updated British English translation
-rw-r--r--po/en_GB.po562
1 files changed, 320 insertions, 242 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 020160357..54f73f684 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,15 +2,16 @@
# Copyright (C) 2006 Empathy's COPYRIGHT HOLDER
# This file is distributed under the same licence as the empathy package.
# David Lodge <dave@cirt.net>, 2007, 2009.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012, 2013.
# Philip Withnall <philip@tecnocode.co.uk>, 2009, 2010.
# Chris Leonard <cjl@laptop.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-12 18:58+0100\n"
-"PO-Revision-Date: 2012-10-12 18:59+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2013-03-11 16:01+0000\n"
+"PO-Revision-Date: 2013-03-26 18:14+0100\n"
"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
"Language-Team: British English <en@li.org>\n"
"Language: en_GB\n"
@@ -37,6 +38,10 @@ msgstr "Empathy Internet Messaging"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Connection managers should be used"
@@ -759,11 +764,11 @@ msgstr "People Nearby"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook Chat"
@@ -865,7 +870,7 @@ msgstr "Server"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Port"
@@ -1319,7 +1324,7 @@ msgid "Authentication failed for account <b>%s</b>"
msgstr "Authentication failed for account <b>%s</b>"
#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-chat.c:3853
msgid "Retry"
msgstr "Retry"
@@ -1366,39 +1371,39 @@ msgstr "Emergency calls are not supported on this protocol"
msgid "You don't have enough credit in order to place this call"
msgstr "You don't have enough credit in order to place this call"
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:740
msgid "Failed to open private chat"
msgstr "Failed to open private chat"
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:798
msgid "Topic not supported on this conversation"
msgstr "Topic not supported on this conversation"
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:804
msgid "You are not allowed to change the topic"
msgstr "You are not allowed to change the topic"
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:980
msgid "Invalid contact ID"
msgstr "Invalid contact ID"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: clear all messages from the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1070
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: set the topic of the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1073
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1076
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1080
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1406,23 +1411,23 @@ msgstr ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1084
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1087
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1090
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: change your nickname on the current server"
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1093
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: send an ACTION message to the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1096
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1432,11 +1437,11 @@ msgstr ""
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1101
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <contact ID>: display information about a contact"
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1104
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1444,126 +1449,126 @@ msgstr ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1123
#, c-format
msgid "Usage: %s"
msgstr "Usage: %s"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "Unknown command"
msgstr "Unknown command"
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1294
msgid "Unknown command; see /help for the available commands"
msgstr "Unknown command; see /help for the available commands"
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1551
msgid "insufficient balance to send message"
msgstr "insufficient balance to send message"
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
+#: ../libempathy-gtk/empathy-chat.c:1632
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error sending message '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
+#: ../libempathy-gtk/empathy-chat.c:1636
#, c-format
msgid "Error sending message: %s"
msgstr "Error sending message: %s"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1563
#, c-format
msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1603
msgid "not capable"
msgstr "not capable"
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1610
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1613
msgid "invalid contact"
msgstr "invalid contact"
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1616
msgid "permission denied"
msgstr "permission denied"
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1619
msgid "too long message"
msgstr "too long message"
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1622
msgid "not implemented"
msgstr "not implemented"
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1626
msgid "unknown"
msgstr "unknown"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Topic:"
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1708
#, c-format
msgid "Topic set to: %s"
msgstr "Topic set to: %s"
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1710
#, c-format
msgid "Topic set by %s to: %s"
msgstr "Topic set by %s to: %s"
#. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1702
+#: ../libempathy-gtk/empathy-chat.c:1715
msgid "No topic defined"
msgstr "No topic defined"
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2231
msgid "(No Suggestions)"
msgstr "(No Suggestions)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2299
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Add '%s' to Dictionary"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2336
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Add '%s' to %s Dictionary"
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2406
msgid "Insert Smiley"
msgstr "Insert Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
+#: ../libempathy-gtk/empathy-chat.c:2424
#: ../libempathy-gtk/empathy-ui-utils.c:1180
msgid "_Send"
msgstr "_Send"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2481
msgid "_Spelling Suggestions"
msgstr "_Spelling Suggestions"
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2592
msgid "Failed to retrieve recent logs"
msgstr "Failed to retrieve recent logs"
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2835
#, c-format
msgid "%s has disconnected"
msgstr "%s has disconnected"
@@ -1571,12 +1576,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2842
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s was kicked by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2845
#, c-format
msgid "%s was kicked"
msgstr "%s was kicked"
@@ -1584,17 +1589,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2853
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s was banned by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2856
#, c-format
msgid "%s was banned"
msgstr "%s was banned"
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2860
#, c-format
msgid "%s has left the room"
msgstr "%s has left the room"
@@ -1604,17 +1609,17 @@ msgstr "%s has left the room"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2869
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2894
#, c-format
msgid "%s has joined the room"
msgstr "%s has joined the room"
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2919
#, c-format
msgid "%s is now known as %s"
msgstr "%s is now known as %s"
@@ -1622,50 +1627,50 @@ msgstr "%s is now known as %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Disconnected"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3793
msgid "Would you like to store this password?"
msgstr "Would you like to store this password?"
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3799
msgid "Remember"
msgstr "Remember"
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3809
msgid "Not now"
msgstr "Not now"
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3857
msgid "Wrong password; please try again:"
msgstr "Wrong password; please try again:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3987
msgid "This room is protected by a password:"
msgstr "This room is protected by a password:"
-#: ../libempathy-gtk/empathy-chat.c:3885
+#: ../libempathy-gtk/empathy-chat.c:4014
#: ../src/empathy-new-chatroom-dialog.c:780
msgid "Join"
msgstr "Join"
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
msgid "Connected"
msgstr "Connected"
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4261
msgid "Conversation"
msgstr "Conversation"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4266
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1697,7 +1702,7 @@ msgstr "Edit Blocked Contacts"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1802,12 +1807,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "Please let me see when you're online. Thanks!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "Save Avatar"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
@@ -1951,7 +1956,7 @@ msgstr "Select account to use to place the call"
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Call"
@@ -2034,7 +2039,7 @@ msgid "Share My Desktop"
msgstr "Share My Desktop"
#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "Favourite"
@@ -2049,7 +2054,7 @@ msgstr "_Edit"
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Inviting you to this room"
@@ -2191,16 +2196,16 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "Alias:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identifier:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2219,15 +2224,15 @@ msgstr "Online from a phone or mobile device"
msgid "New Network"
msgstr "New Network"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
msgid "Choose an IRC network"
msgstr "Choose an IRC network"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
msgid "Reset _Networks List"
msgstr "Reset _Networks List"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Select"
@@ -2236,7 +2241,7 @@ msgstr "Select"
msgid "new server"
msgstr "new server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2285,112 +2290,112 @@ msgid "Chat with %s"
msgstr "Chat with %s"
#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e %B %Y %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s second"
msgstr[1] "%s seconds"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s minute"
msgstr[1] "%s minutes"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Call took %s, ended at %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "Today"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "Yesterday"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%e %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "Anytime"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "Anyone"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "Who"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "When"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "Anything"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "Text chats"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "Calls"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "Incoming calls"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "Outgoing calls"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "Missed calls"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "What"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "Are you sure you want to delete all logs of previous conversations?"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "Clear All"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "Delete from:"
@@ -2412,12 +2417,12 @@ msgid "Profile"
msgstr "Profile"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Chat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -2645,12 +2650,12 @@ msgstr "_Decline"
msgid "_Accept"
msgstr "_Accept"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1219
#, c-format
msgid "Message edited at %s"
msgstr "Message edited at %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1921
msgid "Normal"
msgstr "Normal"
@@ -2766,15 +2771,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Personal Details</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Open Link"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Inspect HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Current Locale"
@@ -2950,6 +2960,14 @@ msgstr "Top Contacts"
msgid "Ungrouped"
msgstr "Ungrouped"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+#| msgid "Select a contact"
+msgid "Server cannot find contact: %s"
+msgstr "Server cannot find contact: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "No error message"
@@ -3044,7 +3062,7 @@ msgstr "There are unsaved modifications to your %s account."
msgid "Your new account has not been saved yet."
msgstr "Your new account has not been saved yet."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
msgid "Connecting…"
msgstr "Connecting…"
@@ -3084,20 +3102,20 @@ msgstr "Offline — Account Disabled"
msgid "Edit Connection Parameters"
msgstr "Edit Connection Parameters"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Edit Connection Parameters…"
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Do you want to remove %s from your computer?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
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:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3106,24 +3124,24 @@ msgstr ""
"your changes. Are you sure you want to proceed?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_Enabled"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Rename"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_Skip"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Connect"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3132,7 +3150,7 @@ msgstr ""
"your changes. Are you sure you want to proceed?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Messaging and VoIP Accounts"
@@ -3193,11 +3211,16 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "In a call"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy Audio/Video Client"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy Audio/Video Client"
@@ -3206,33 +3229,27 @@ msgstr "Empathy Audio/Video Client"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s just tried to call you, but you were in another call."
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Incoming call"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Incoming video call from %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Incoming call from %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1564
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Reject"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1565
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3240,60 +3257,60 @@ msgstr "Answer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1934
#, c-format
msgid "Call with %s"
msgstr "Call with %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2186
msgid "The IP address as seen by the machine"
msgstr "The IP address as seen by the machine"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2188
msgid "The IP address as seen by a server on the Internet"
msgstr "The IP address as seen by a server on the Internet"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2190
msgid "The IP address of the peer as seen by the other side"
msgstr "The IP address of the peer as seen by the other side"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2192
msgid "The IP address of a relay server"
msgstr "The IP address of a relay server"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2194
msgid "The IP address of the multicast group"
msgstr "The IP address of the multicast group"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Unknown"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2966
msgid "On hold"
msgstr "On hold"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2970
msgid "Mute"
msgstr "Mute"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2972
msgid "Duration"
msgstr "Duration"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2975
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3071
msgid "Technical Details"
msgstr "Technical Details"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3110
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3302,7 +3319,7 @@ msgstr ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3115
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3311,7 +3328,7 @@ msgstr ""
"%s's software does not understand any of the video formats supported by your "
"computer"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3121
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3320,23 +3337,23 @@ 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:3035
+#: ../src/empathy-call-window.c:3127
msgid "There was a failure on the network"
msgstr "There was a failure on the network"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3131
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:3042
+#: ../src/empathy-call-window.c:3134
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:3054
+#: ../src/empathy-call-window.c:3146
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3347,32 +3364,32 @@ msgstr ""
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3155
msgid "There was a failure in the call engine"
msgstr "There was a failure in the call engine"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3158
msgid "The end of the stream was reached"
msgstr "The end of the stream was reached"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3198
msgid "Can't establish audio stream"
msgstr "Can't establish audio stream"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3208
msgid "Can't establish video stream"
msgstr "Can't establish video stream"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3245
#, c-format
msgid "Your current balance is %s."
msgstr "Your current balance is %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3249
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Sorry, you don’t have enough credit for that call."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3251
msgid "Top Up"
msgstr "Top Up"
@@ -3409,78 +3426,86 @@ msgid "_Debug"
msgstr "_Debug"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Swap camera"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimise me"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maximise me"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Disable camera"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Hang up"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Hang up current call"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Video call"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Start a video call"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Start an audio call"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Show dialpad"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Display the dialpad"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Toggle video transmission"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Toggle audio transmission"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Encoding Codec:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Decoding Codec:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Remote Candidate:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Local Candidate:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Audio"
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- Empathy Chat Client"
@@ -3500,11 +3525,11 @@ msgstr "Auto-Connect"
msgid "Manage Favorite Rooms"
msgstr "Manage Favourite Rooms"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Close this window?"
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3513,7 +3538,7 @@ msgstr ""
"Closing this window will leave %s. You will not receive any further messages "
"until you rejoin it."
-#: ../src/empathy-chat-window.c:307
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3528,12 +3553,12 @@ msgstr[1] ""
"Closing this window will leave %u chat rooms. You will not receive any "
"further messages until you rejoin them."
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Leave %s?"
-#: ../src/empathy-chat-window.c:320
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3541,54 +3566,54 @@ msgstr ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Close window"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Leave room"
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d unread)"
msgstr[1] "%s (%d unread)"
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:692
#, 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:709
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d unread from others)"
msgstr[1] "%s (%d unread from others)"
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d unread from all)"
msgstr[1] "%s (%d unread from all)"
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:963
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Sending %d message"
msgstr[1] "Sending %d messages"
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Typing a message."
@@ -3680,63 +3705,91 @@ msgstr "Pastebin response"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "Data too large for a single paste. Please save logs to file."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Debug Window"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Send to pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Level "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Message"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Warning"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Critical"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+#| msgid ""
+#| "Even if they don't display passwords, logs can contain sensible "
+#| "information such as your list of contacts or the messages you recently "
+#| "sent or received.\n"
+#| "If you don't want to see such information available in a public bug "
+#| "report, you can choose to limit the visibility of your bug to Empathy "
+#| "developpers when reporting it by displaying the advanced fields in the <a "
+#| "href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug "
+#| "report</a>."
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a "
+"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug "
+"report</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Time"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domain"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Category"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Level"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3803,7 +3856,7 @@ msgstr "You have been invited to join %s"
msgid "Incoming file transfer from %s"
msgstr "Incoming file transfer from %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Password required"
@@ -4155,7 +4208,7 @@ msgstr "Show groups"
msgid "Show account balances"
msgstr "Show account balances"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
msgid "Contact List"
msgstr "Contact List"
@@ -4322,62 +4375,84 @@ msgstr "Variant:"
msgid "Themes"
msgstr "Themes"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Provide Password"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Disconnect"
-#: ../src/empathy-roster-window.c:441
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "You need to setup an account to see contacts here."
-#: ../src/empathy-roster-window.c:517
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
-#: ../src/empathy-roster-window.c:635
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:674
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s account requires authorisation"
+
+#: ../src/empathy-roster-window.c:700
+msgid "Online Accounts"
+msgstr "Online Accounts"
+
+#: ../src/empathy-roster-window.c:747
msgid "Update software..."
msgstr "Update software…"
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:753
msgid "Reconnect"
msgstr "Reconnect"
-#: ../src/empathy-roster-window.c:645
+#: ../src/empathy-roster-window.c:757
msgid "Edit Account"
msgstr "Edit Account"
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:762
msgid "Close"
msgstr "Close"
-#: ../src/empathy-roster-window.c:787
+#: ../src/empathy-roster-window.c:904
msgid "Top up account"
msgstr "Top up account"
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1590
msgid "You need to enable one of your accounts to see contacts here."
msgstr "You need to enable one of your accounts to see contacts here."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1598
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "You need to enable %s to see contacts here."
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1676
msgid "Change your presence to see contacts here"
msgstr "Change your presence to see contacts here"
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1685
msgid "No match found"
msgstr "No match found"
-#: ../src/empathy-roster-window.c:1569
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "You haven't added any contact yet"
+
+#: ../src/empathy-roster-window.c:1695
msgid "No online contacts"
msgstr "No online contacts"
@@ -4454,6 +4529,15 @@ msgstr "Account settings"
msgid "Go _Online"
msgstr "Go _Online"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Show _Offline Contacts"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "_Add Contact…"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_New Conversation…"
@@ -4466,12 +4550,12 @@ msgstr "New _Call…"
msgid "Status"
msgstr "Status"
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
msgid "Done"
msgstr "Done"
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
msgid "Please enter your account details"
msgstr "Please enter your account details"
@@ -4484,6 +4568,9 @@ msgstr "Edit %s account options"
msgid "Integrate your IM accounts"
msgstr "Integrate your IM accounts"
+#~ msgid "i"
+#~ msgstr "i"
+
#~ msgid "Manage Messaging and VoIP accounts"
#~ msgstr "Manage Messaging and VoIP accounts"
@@ -4731,9 +4818,6 @@ msgstr "Integrate your IM accounts"
#~ msgid "_Edit"
#~ msgstr "_Edit"
-#~ msgid "Select a contact"
-#~ msgstr "Select a contact"
-
#~ msgid "Select contacts to link"
#~ msgstr "Select contacts to link"
@@ -5078,9 +5162,6 @@ msgstr "Integrate your IM accounts"
#~ msgid "_Import&#x2026;"
#~ msgstr "_Import&#x2026;"
-#~ msgid " Accounts"
-#~ msgstr " Accounts"
-
#~ msgid "Whether the Salut account has been created on the first Empathy run."
#~ msgstr ""
#~ "Whether the Salut account has been created on the first Empathy run."
@@ -5345,9 +5426,6 @@ msgstr "Integrate your IM accounts"
#~ msgid "Join _New..."
#~ msgstr "Join _New…"
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "Show _Offline Contacts"
-
#~ msgid "Browse:"
#~ msgstr "Browse:"