diff po/en_GB.po @ 32753:a801d28c4ad4

Check in the normalized versions of all the translations in the 2.x.y branch

--- a/po/en_GB.po	Mon Mar 12 09:36:42 2012 +0000
+++ b/po/en_GB.po	Mon Mar 12 09:50:30 2012 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-18 00:02-0700\n"
+"POT-Creation-Date: 2012-03-12 02:49-0700\n"
 "PO-Revision-Date: 2010-12-22 08:56-0000\n"
 "Last-Translator: Philip Hannent <[e-mail]>\n"
 "Language-Team:  <[e-mail]>\n"
@@ -3428,7 +3428,7 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plug-in that Sucks Less"
 
-#. host to connect to
+#. set up account ID as user:server
 msgid "Server"
 msgstr "Server"
 
@@ -5831,6 +5831,30 @@
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Message was not sent because an unknown error occurred."
 
+#, fuzzy, c-format
+msgid ""
+"%s (There was an error receiving this message. Converting the encoding from "
+"%s to UTF-8 failed.)"
+msgstr ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+
+#, fuzzy, c-format
+msgid ""
+"%s (There was an error receiving this message. The charset was %s, but it "
+"was not valid UTF-8.)"
+msgstr ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+
+#, fuzzy, c-format
+msgid ""
+"%s (There was an error receiving this message. The charset was missing, but "
+"it was not valid UTF-8.)"
+msgstr ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+
 msgid "Writing error"
 msgstr "Writing error"
 
@@ -8270,25 +8294,9 @@
 msgid "Topic:"
 msgstr "Topic:"
 
-msgid "No Sametime Community Server specified"
-msgstr "No Sametime Community Server specified"
-
-#, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-
-msgid "Meanwhile Connection Setup"
-msgstr "Meanwhile Connection Setup"
-
-msgid "No Sametime Community Server Specified"
-msgstr "No Sametime Community Server Specified"
-
-msgid "Connect"
-msgstr "Connect"
+#, fuzzy
+msgid "A server is required to connect this account"
+msgstr "Server closed the connection"
 
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -12530,9 +12538,15 @@
 msgid "Incoming Call"
 msgstr "Incoming Call"
 
+msgid "_Hold"
+msgstr ""
+
 msgid "_Pause"
 msgstr "_Pause"
 
+msgid "_Mute"
+msgstr ""
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -14856,6 +14870,25 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "You do not have permission to uninstall this application."
 
+#~ msgid "No Sametime Community Server specified"
+#~ msgstr "No Sametime Community Server specified"
+
+#~ msgid ""
+#~ "No host or IP address has been configured for the Meanwhile account %s. "
+#~ "Please enter one below to continue logging in."
+#~ msgstr ""
+#~ "No host or IP address has been configured for the Meanwhile account %s. "
+#~ "Please enter one below to continue logging in."
+
+#~ msgid "Meanwhile Connection Setup"
+#~ msgstr "Meanwhile Connection Setup"
+
+#~ msgid "No Sametime Community Server Specified"
+#~ msgstr "No Sametime Community Server Specified"
+
+#~ msgid "Connect"
+#~ msgstr "Connect"
+
 #~ msgid "Automatically reject from users not in buddy list"
 #~ msgstr "Automatically reject from users not in buddy list"