Update British English translation

1 files changed, 110 insertions, 93 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 970390e1..9c1e9b74 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-26 20:34+0100\n"
+"POT-Creation-Date: 2010-08-28 10:36+0100\n"
 "PO-Revision-Date: 2010-03-17 22:22+0100\n"
 "Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Virtaal 0.5.2\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
 
 #: ../data/empathy.desktop.in.in.h:2
@@ -86,10 +86,11 @@ msgstr "Display incoming events in the status area"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 msgstr ""
-"Display incoming events in the status area. If false, present them to the user immediately."
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
@@ -299,8 +300,10 @@ msgstr ""
 "Whether Empathy should automatically log into your accounts on startup."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
-msgstr "Whether Empathy should go into away mode automatically if the user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
@@ -636,7 +639,7 @@ msgstr ""
 #: ../libempathy/empathy-utils.c:376
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
-"chain exceed the limits imposed by the crypto library"
+"chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -720,7 +723,7 @@ msgstr "L_og in"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-account-widget.c:1556
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1393
+#: ../libempathy-gtk/empathy-individual-widget.c:1397
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -923,7 +926,7 @@ msgid "Servers"
 msgstr "Servers"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "What is your IRC nick?"
+msgid "What is your IRC nickname?"
 msgstr "What is your IRC nickname?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
@@ -1433,85 +1436,85 @@ msgid "Subscription Request"
 msgstr "Subscription Request"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2089
+#: ../libempathy-gtk/empathy-individual-view.c:2218
 #, 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:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2092
+#: ../libempathy-gtk/empathy-individual-view.c:2221
 msgid "Removing group"
 msgstr "Removing group"
 
 #. Remove
 #: ../libempathy-gtk/empathy-contact-list-view.c:2055
 #: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2146
-#: ../libempathy-gtk/empathy-individual-view.c:2231
+#: ../libempathy-gtk/empathy-individual-view.c:2275
+#: ../libempathy-gtk/empathy-individual-view.c:2360
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "_Remove"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2177
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 #, 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:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2179
+#: ../libempathy-gtk/empathy-individual-view.c:2308
 msgid "Removing contact"
 msgstr "Removing contact"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:360
+#: ../libempathy-gtk/empathy-individual-menu.c:364
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contact…"
 msgstr "_Add Contact…"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:463
+#: ../libempathy-gtk/empathy-individual-menu.c:467
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "_Chat"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:504
+#: ../libempathy-gtk/empathy-individual-menu.c:508
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audio Call"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:546
+#: ../libempathy-gtk/empathy-individual-menu.c:550
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video Call"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:604
+#: ../libempathy-gtk/empathy-individual-menu.c:608
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "_Previous Conversations"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../libempathy-gtk/empathy-individual-menu.c:649
 msgid "Send File"
 msgstr "Send File"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:691
 msgid "Share My Desktop"
 msgstr "Share My Desktop"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1537
-#: ../libempathy-gtk/empathy-individual-menu.c:721
-#: ../libempathy-gtk/empathy-individual-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-widget.c:1288
 msgid "Favorite"
 msgstr "Favourite"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:748
+#: ../libempathy-gtk/empathy-individual-menu.c:752
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
@@ -1521,13 +1524,13 @@ msgid "_Edit"
 msgstr "_Edit"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:945
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "Inviting you to this room"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:981
+#: ../libempathy-gtk/empathy-individual-menu.c:992
 msgid "_Invite to Chat Room"
 msgstr "_Invite to Chat Room"
 
@@ -1681,28 +1684,32 @@ msgid "Altitude:"
 msgstr "Altitude:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-contact-widget.c:705
 #: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-individual-widget.c:595
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "Location"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:594
-msgid "<b>Location</b>, "
-msgstr "<b>Location</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:597
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:642
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:646
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:838
-#: ../libempathy-gtk/empathy-individual-widget.c:833
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:837
 msgid "Save Avatar"
 msgstr "Save Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:894
-#: ../libempathy-gtk/empathy-individual-widget.c:891
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:895
 msgid "Unable to save avatar"
 msgstr "Unable to save avatar"
 
@@ -1712,7 +1719,7 @@ msgstr "<b>Location</b> at (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1219
+#: ../libempathy-gtk/empathy-individual-widget.c:1223
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1732,7 +1739,7 @@ msgstr "Contact Details"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1423
+#: ../libempathy-gtk/empathy-individual-widget.c:1427
 msgid "Identifier:"
 msgstr "Identifier:"
 
@@ -1770,7 +1777,7 @@ msgid "Select"
 msgstr "Select"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1240
+#: ../src/empathy-main-window.c:1247
 msgid "Group"
 msgstr "Group"
 
@@ -1784,34 +1791,39 @@ msgstr "_Unlink"
 msgid "Linked Contacts"
 msgstr "Linked Contacts"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:247
+#: ../libempathy-gtk/empathy-individual-linker.c:319
 msgid "Select contacts to link"
 msgstr "Select contacts to link"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:304
+#: ../libempathy-gtk/empathy-individual-linker.c:384
 msgid "New contact preview"
 msgstr "New contact preview"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:344
+#: ../libempathy-gtk/empathy-individual-linker.c:428
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Contacts selected in the list on the left will be linked together."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:108
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:112
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:799
+#: ../libempathy-gtk/empathy-individual-menu.c:803
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:829
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:835
 msgctxt "Link individual (contextual menu)"
 msgid "_Link…"
 msgstr "_Link…"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1561
+#: ../libempathy-gtk/empathy-individual-widget.c:1565
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1838,12 +1850,18 @@ msgstr "Port"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:92
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:95
 msgid "Link Contacts"
 msgstr "Link Contacts"
 
 #. Add button
-#: ../libempathy-gtk/empathy-linking-dialog.c:102
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:108
 msgid "_Link"
 msgstr "_Link"
 
@@ -1862,11 +1880,11 @@ msgid "Conversations"
 msgstr "Conversations"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Find next"
+msgid "Find Next"
 msgstr "Find Next"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "Find previous"
+msgid "Find Previous"
 msgstr "Find Previous"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
@@ -2042,7 +2060,7 @@ msgid "The certrificate is not signed by a Certification Authority"
 msgstr "The certrificate is not signed by a Certification Authority"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate is expired"
+msgid "The certificate has expired"
 msgstr "The certificate has expired"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:163
@@ -2063,7 +2081,8 @@ msgstr "The certificate is self-signed"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:176
 msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "The certificate has been revoked by the issuing Certification Authority"
+msgstr ""
+"The certificate has been revoked by the issuing Certification Authority"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:180
 msgid "The certificate is cryptographically weak"
@@ -2092,7 +2111,7 @@ msgid "Continue"
 msgstr "Continue"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:269
-msgid "This connection is untrusted, would you like to continue anyway?"
+msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "This connection is untrusted. Would you like to continue anyway?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:286
@@ -2295,8 +2314,7 @@ msgstr "The selected contact is offline."
 msgid "No error message"
 msgstr "No error message"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
 msgstr "Instant Message (Empathy)"
 
@@ -2462,8 +2480,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Select the accounts you want to import:"
 
 #: ../src/empathy-account-assistant.c:852
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "Yes"
 
@@ -2597,8 +2615,8 @@ msgstr ""
 "your changes. Are you sure you want to proceed?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "<b><span size='xx-large'>Loading account information</span></b>"
-msgstr "<b><span size='xx-large'>Loading account information</span></b>"
+msgid "Loading account information"
+msgstr "Loading account information"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "No protocol installed"
@@ -2624,18 +2642,6 @@ msgstr "_Add…"
 msgid "_Import…"
 msgstr "_Import…"
 
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "page 1"
-msgstr "page 1"
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "page 2"
-msgstr "page 2"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "page 3"
-msgstr "page 3"
-
 #: ../src/empathy-auth-client.c:217
 msgid " - Empathy authentication client"
 msgstr " - Empathy authentication client"
@@ -3259,32 +3265,31 @@ msgstr "Protocol"
 msgid "Source"
 msgstr "Source"
 
-#. Labels for empty contact list
-#: ../src/empathy-main-window.c:95
+#: ../src/empathy-main-window.c:383
 msgid "No match found"
 msgstr "No match found"
 
-#: ../src/empathy-main-window.c:528
+#: ../src/empathy-main-window.c:535
 msgid "Reconnect"
 msgstr "Reconnect"
 
-#: ../src/empathy-main-window.c:534
+#: ../src/empathy-main-window.c:541
 msgid "Edit Account"
 msgstr "Edit Account"
 
-#: ../src/empathy-main-window.c:540
+#: ../src/empathy-main-window.c:547
 msgid "Close"
 msgstr "Close"
 
-#: ../src/empathy-main-window.c:1222
+#: ../src/empathy-main-window.c:1229
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/empathy-main-window.c:1547
+#: ../src/empathy-main-window.c:1554
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../src/empathy-main-window.c:1656
+#: ../src/empathy-main-window.c:1663
 msgid "Show and edit accounts"
 msgstr "Show and edit accounts"
 
@@ -3378,29 +3383,29 @@ msgstr "Members"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
 #, c-format
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
 msgid "Could not start room listing"
 msgstr "Could not start room listing"
 
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
 msgid "Could not stop room listing"
 msgstr "Could not stop room listing"
 
@@ -3723,7 +3728,7 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
 
 #: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgstr "Don't display any dialogues if there are any non-Salut accounts"
 
 #: ../src/empathy-accounts.c:190
@@ -3747,6 +3752,21 @@ msgstr "Empathy Accounts"
 msgid "Empathy Debugger"
 msgstr "Empathy Debugger"
 
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>Location</b>, "
+
+#~ msgid "<b><span size='xx-large'>Loading account information</span></b>"
+#~ msgstr "<b><span size='xx-large'>Loading account information</span></b>"
+
+#~ msgid "page 1"
+#~ msgstr "page 1"
+
+#~ msgid "page 2"
+#~ msgstr "page 2"
+
+#~ msgid "page 3"
+#~ msgstr "page 3"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "Send and receive messages"
 
@@ -4031,9 +4051,6 @@ msgstr "Empathy Debugger"
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>Groups</b>"
 
-#~ msgid "Contact information"
-#~ msgstr "Contact information"
-
 #~ msgid "Save message"
 #~ msgstr "Save message"