--- a/po/en_GB.po Mon Feb 14 20:00:12 2005 -0500
+++ b/po/en_GB.po Mon Feb 14 20:34:58 2005 -0500
@@ -1,14 +1,14 @@
# Gaim British English (en_GB) translations
-# Copyright (C) 2003 Luke Ross <lukeross@sys3175.co.uk>
+# Copyright (C) 2003-2005 Luke Ross <lukeross@sys3175.co.uk> # This file is distributed under the same license as the Gaim package.
-"Project-Id-Version: Gaim 0.73\n"
+"Project-Id-Version: Gaim 1.1.3\n" "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-17 11:40+0000\n"
-"PO-Revision-Date: 2004-01-14 12:26+0000\n"
+"POT-Creation-Date: 2005-02-14 13:36+0000\n" +"PO-Revision-Date: 2005-02-14 13:35+0000\n" "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
"Language-Team: <en_GB@li.org>\n"
@@ -149,7 +149,7 @@
-#: plugins/docklet/docklet.c:136 src/gtkaccount.c:738 src/gtkaccount.c:2160
+#: plugins/docklet/docklet.c:136 src/gtkaccount.c:751 src/gtkaccount.c:2176 @@ -170,8 +170,8 @@
#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
-#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:5670
-#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6862
+#: src/protocols/oscar/oscar.c:679 src/protocols/oscar/oscar.c:5700 +#: src/protocols/oscar/oscar.c:6691 src/protocols/oscar/oscar.c:6891 #: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
#: src/protocols/silc/silc.c:81
@@ -179,7 +179,7 @@
#: plugins/docklet/docklet.c:190 src/away.c:584
-#: src/protocols/oscar/oscar.c:5588 src/protocols/oscar/oscar.c:6870
+#: src/protocols/oscar/oscar.c:5618 src/protocols/oscar/oscar.c:6899 @@ -191,7 +191,7 @@
-#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2341
+#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2357 @@ -445,7 +445,7 @@
#: plugins/gevolution/add_buddy_dialog.c:132
#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2167
#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
-#: src/protocols/msn/msn.c:1433 src/protocols/trepia/trepia.c:399
+#: src/protocols/msn/msn.c:1441 src/protocols/trepia/trepia.c:399 @@ -460,13 +460,13 @@
#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7146
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7175 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4144
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4145 @@ -505,13 +505,13 @@
msgstr "_Associate Buddy"
#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
-#: src/gtkblist.c:3084 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkblist.c:3085 src/gtkprefs.c:962 src/gtkprefs.c:1014 #: src/gtkprefs.c:1826 src/protocols/jabber/jabber.c:937
#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:774 src/blist.c:981 src/blist.c:1928 src/gtkblist.c:3963
+#: src/blist.c:774 src/blist.c:981 src/blist.c:1928 src/gtkblist.c:3964 #: src/protocols/jabber/roster.c:66
@@ -574,8 +574,8 @@
msgstr "Optional information"
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:575
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379 +#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:585 @@ -1073,11 +1073,11 @@
"Notifies in a conversation window when a buddy goes or returns from away or "
-#: plugins/tcl/tcl.c:364
+#: plugins/tcl/tcl.c:363 msgid "Tcl Plugin Loader"
msgstr "Tcl Plugin Loader"
-#: plugins/tcl/tcl.c:366 plugins/tcl/tcl.c:367
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366 msgid "Provides support for loading Tcl plugins"
msgstr "Provides support for loading Tcl plugins"
@@ -1205,7 +1205,7 @@
msgstr "_Start Gaim on Windows startup"
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3129
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3130 @@ -1226,7 +1226,7 @@
#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
-#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1770
+#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1778 @@ -1274,30 +1274,30 @@
#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2456
-#: src/gtkdialogs.c:484 src/gtkdialogs.c:626 src/gtkdialogs.c:680
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2457 +#: src/gtkdialogs.c:485 src/gtkdialogs.c:627 src/gtkdialogs.c:681 #: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1061
#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
-#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2323
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3659
-#: src/protocols/oscar/oscar.c:6933 src/protocols/oscar/oscar.c:7025
-#: src/protocols/oscar/oscar.c:7077 src/protocols/oscar/oscar.c:7163
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2333 +#: src/protocols/oscar/oscar.c:3595 src/protocols/oscar/oscar.c:3689 +#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:7054 +#: src/protocols/oscar/oscar.c:7106 src/protocols/oscar/oscar.c:7192 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
#: src/protocols/silc/ops.c:1691 src/protocols/silc/silc.c:703
-#: src/protocols/yahoo/yahoo.c:2821 src/protocols/yahoo/yahoo.c:2830
+#: src/protocols/yahoo/yahoo.c:2826 src/protocols/yahoo/yahoo.c:2835 #: src/account.c:343 src/account.c:381 src/away.c:367 src/connection.c:199
-#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2457
-#: src/gtkblist.c:4529 src/gtkconn.c:169 src/gtkdialogs.c:485
-#: src/gtkdialogs.c:627 src/gtkdialogs.c:681 src/gtkdialogs.c:779
-#: src/gtkdialogs.c:801 src/gtkdialogs.c:821 src/gtkdialogs.c:858
-#: src/gtkdialogs.c:918 src/gtkdialogs.c:961 src/gtkdialogs.c:999
+#: src/gtkaccount.c:2026 src/gtkaccount.c:2522 src/gtkblist.c:2458 +#: src/gtkblist.c:4531 src/gtkconn.c:169 src/gtkdialogs.c:486 +#: src/gtkdialogs.c:628 src/gtkdialogs.c:682 src/gtkdialogs.c:780 +#: src/gtkdialogs.c:802 src/gtkdialogs.c:822 src/gtkdialogs.c:859 +#: src/gtkdialogs.c:919 src/gtkdialogs.c:962 src/gtkdialogs.c:1000 #: src/gtkimhtmltoolbar.c:423 src/gtkprivacy.c:586 src/gtkprivacy.c:599
#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
#: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
@@ -1305,17 +1305,17 @@
#: src/protocols/jabber/jabber.c:1062 src/protocols/jabber/xdata.c:338
#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
-#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1519
-#: src/protocols/oscar/oscar.c:2324 src/protocols/oscar/oscar.c:3523
-#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3603
-#: src/protocols/oscar/oscar.c:3660 src/protocols/oscar/oscar.c:6934
-#: src/protocols/oscar/oscar.c:7026 src/protocols/oscar/oscar.c:7078
-#: src/protocols/oscar/oscar.c:7147 src/protocols/oscar/oscar.c:7164
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1529 +#: src/protocols/oscar/oscar.c:2334 src/protocols/oscar/oscar.c:3553 +#: src/protocols/oscar/oscar.c:3596 src/protocols/oscar/oscar.c:3633 +#: src/protocols/oscar/oscar.c:3690 src/protocols/oscar/oscar.c:6963 +#: src/protocols/oscar/oscar.c:7055 src/protocols/oscar/oscar.c:7107 +#: src/protocols/oscar/oscar.c:7176 src/protocols/oscar/oscar.c:7193 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1692
#: src/protocols/silc/silc.c:704 src/protocols/trepia/trepia.c:348
-#: src/protocols/yahoo/yahoo.c:2822 src/protocols/yahoo/yahoo.c:2831
+#: src/protocols/yahoo/yahoo.c:2827 src/protocols/yahoo/yahoo.c:2836 #: src/request.h:1245 src/request.h:1255
@@ -1462,7 +1462,7 @@
msgstr "Unable to send message. The message is too large."
#: src/conversation.c:237 src/conversation.c:251
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4156 msgid "Unable to send message to %s:"
msgstr "Unable to send message to %s:"
@@ -1758,7 +1758,7 @@
"Set all accounts as not away.\n"
@@ -1770,164 +1770,164 @@
"<b>Image size:</b> %dx%d"
#. Build the login options frame.
-#: src/gtkaccount.c:642 src/gtkft.c:555
+#: src/gtkaccount.c:655 src/gtkft.c:555 -#: src/gtkaccount.c:647 src/gtkblist.c:4116
+#: src/gtkaccount.c:660 src/gtkblist.c:4117
-#: src/gtkaccount.c:725 src/gtkblist.c:4130 src/gtkblist.c:4477
+#: src/gtkaccount.c:738 src/gtkblist.c:4131 src/gtkblist.c:4478
msgid "Remember password"
msgstr "Remember password"
#. Build the user options frame.
msgid "New mail notifications"
msgstr "New mail notifications"
#. Build the protocol options frame.
#. Use Global Proxy Settings
-#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1092 msgid "Use Global Proxy Settings"
msgstr "Use Global Proxy Settings"
-#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1099 -#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
+#: src/gtkaccount.c:1057 src/gtkaccount.c:1106 -#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
+#: src/gtkaccount.c:1063 src/gtkaccount.c:1113 -#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
+#: src/gtkaccount.c:1069 src/gtkaccount.c:1120 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1190
+#: src/gtkaccount.c:1075 src/gtkaccount.c:1127 src/gtkprefs.c:1190 msgid "Use Environmental Settings"
msgstr "Use Environmental Settings"
-#: src/gtkaccount.c:1153
+#: src/gtkaccount.c:1166 msgid "you can see the butterflies mating"
msgstr "you can see the butterflies mating"
-#: src/gtkaccount.c:1157
+#: src/gtkaccount.c:1170 msgid "If you look real closely"
msgstr "If you look real closely"
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1186 -#: src/gtkaccount.c:1191 src/gtkprefs.c:1184
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1184 -#: src/gtkaccount.c:1200 src/gtkprefs.c:1211
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1211 -#: src/gtkaccount.c:1204 src/gtkprefs.c:1229
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1229 -#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1225 -#: src/gtkaccount.c:1217 src/gtkprefs.c:1266
+#: src/gtkaccount.c:1230 src/gtkprefs.c:1266 -#: src/gtkaccount.c:1585
+#: src/gtkaccount.c:1601 -#: src/gtkaccount.c:1587
+#: src/gtkaccount.c:1603 -#: src/gtkaccount.c:1611
+#: src/gtkaccount.c:1627 msgid "Show more options"
msgstr "Show more options"
-#: src/gtkaccount.c:1612
+#: src/gtkaccount.c:1628 msgid "Show fewer options"
msgstr "Show fewer options"
-#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:675
+#: src/gtkaccount.c:1655 src/protocols/jabber/jabber.c:675 -#: src/gtkaccount.c:2004
+#: src/gtkaccount.c:2020 msgid "Are you sure you want to delete %s?"
msgstr "Are you sure you want to delete %s?"
-#: src/gtkaccount.c:2009 src/gtkrequest.c:246
+#: src/gtkaccount.c:2025 src/gtkrequest.c:246 -#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4210
+#: src/gtkaccount.c:2139 src/protocols/oscar/oscar.c:4240 -#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:971
-#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:5668
-#: src/protocols/oscar/oscar.c:6861 src/protocols/silc/silc.c:45
-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/zephyr/zephyr.c:2122
+#: src/gtkaccount.c:2163 src/protocols/jabber/jabber.c:971 +#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:5698 +#: src/protocols/oscar/oscar.c:6890 src/protocols/silc/silc.c:45 +#: src/protocols/yahoo/yahoo.c:2589 src/protocols/zephyr/zephyr.c:2122 #: src/protocols/zephyr/zephyr.c:2141
-#: src/gtkaccount.c:2168
+#: src/gtkaccount.c:2184 -#: src/gtkaccount.c:2481
+#: src/gtkaccount.c:2497 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
msgstr "%s%s%s%s has made %s his or her buddy%s%s%s"
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2511 @@ -1937,18 +1937,18 @@
"Do you wish to add him or her to your buddy list?"
-#: src/gtkaccount.c:2499
+#: src/gtkaccount.c:2515 -#: src/gtkaccount.c:2503
+#: src/gtkaccount.c:2519 msgid "Add buddy to your list?"
msgstr "Add buddy to your list?"
-#: src/gtkaccount.c:2505 src/gtkblist.c:4528 src/gtkconv.c:1503
+#: src/gtkaccount.c:2521 src/gtkblist.c:4530 src/gtkconv.c:1503 #: src/gtkconv.c:3862 src/gtkconv.c:3933 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3837
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3867 #: src/protocols/silc/chat.c:593
@@ -1969,11 +1969,11 @@
-#: src/gtkblist.c:1166 src/gtkblist.c:3282
+#: src/gtkblist.c:1166 src/gtkblist.c:3283 -#: src/gtkblist.c:1169 src/gtkblist.c:3272
+#: src/gtkblist.c:1169 src/gtkblist.c:3273 @@ -2001,7 +2001,7 @@
msgstr "Alias Contact..."
-#: src/gtkblist.c:1200 src/gtkdialogs.c:855 src/gtkdialogs.c:857
+#: src/gtkblist.c:1200 src/gtkdialogs.c:856 src/gtkdialogs.c:858 @@ -2055,129 +2055,129 @@
"You are not currently signed on with an account that can add that buddy."
msgid "/Buddies/New Instant _Message..."
msgstr "/Buddies/New Instant _Message..."
msgid "/Buddies/Join a _Chat..."
msgstr "/Buddies/Join a _Chat..."
msgid "/Buddies/Get User _Info..."
msgstr "/Buddies/Get User _Info..."
msgid "/Buddies/View User _Log..."
msgstr "/Buddies/View User _Log..."
msgid "/Buddies/Show _Offline Buddies"
msgstr "/Buddies/Show _Offline Buddies"
msgid "/Buddies/Show _Empty Groups"
msgstr "/Buddies/Show _Empty Groups"
msgid "/Buddies/_Add Buddy..."
msgstr "/Buddies/_Add Buddy..."
msgid "/Buddies/Add C_hat..."
msgstr "/Buddies/Add C_hat..."
msgid "/Buddies/Add _Group..."
msgstr "/Buddies/Add _Group..."
msgid "/Buddies/_Signoff"
msgstr "/Buddies/_Signoff"
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Tools/Buddy _Pounce"
+msgid "/Tools/Buddy _Pounce" +msgstr "/Tools/Buddy _Pounce" msgid "/Tools/Account Ac_tions"
msgstr "/Tools/Account Ac_tions"
msgid "/Tools/Pl_ugin Actions"
msgstr "/Tools/Pl_ugin Actions"
msgstr "/Tools/A_ccounts"
msgid "/Tools/_File Transfers"
msgstr "/Tools/_File Transfers"
msgid "/Tools/R_oom List"
msgstr "/Tools/R_oom List"
msgid "/Tools/Pr_eferences"
msgstr "/Tools/Pr_eferences"
msgid "/Tools/View System _Log"
msgstr "/Tools/View System _Log"
msgid "/Help/Online _Help"
msgstr "/Help/Online _Help"
msgid "/Help/_Debug Window"
msgstr "/Help/_Debug Window"
msgid "Please enter a new name for the selected group."
msgstr "Please enter a new name for the selected group."
@@ -2186,7 +2186,7 @@
@@ -2194,12 +2194,12 @@
@@ -2207,7 +2207,7 @@
@@ -2215,7 +2215,7 @@
@@ -2223,7 +2223,7 @@
@@ -2231,7 +2231,7 @@
@@ -2239,7 +2239,7 @@
@@ -2247,7 +2247,7 @@
@@ -2255,7 +2255,7 @@
"<b>Description:</b> Spooky"
@@ -2263,7 +2263,7 @@
"<b>Description:</b> Spooky"
@@ -2271,7 +2271,7 @@
@@ -2279,108 +2279,108 @@
msgstr "Idle (%dh%02dm) "
#. Make menu items sensitive/insensitive where appropriate
msgid "/Buddies/Join a Chat..."
msgstr "/Buddies/Join a Chat..."
msgstr "/Tools/Room List"
msgid "/Tools/Buddy Pounce"
msgstr "/Tools/Buddy Pounce"
msgid "/Tools/Account Actions"
msgstr "/Tools/Account Actions"
msgid "/Tools/Plugin Actions"
msgstr "/Tools/Plugin Actions"
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
msgid "/Buddies/Show Offline Buddies"
msgstr "/Buddies/Show Offline Buddies"
msgid "/Buddies/Show Empty Groups"
msgstr "/Buddies/Show Empty Groups"
msgid "Send a message to the selected buddy"
msgstr "Send a message to the selected buddy"
msgid "Get information on the selected buddy"
msgstr "Get information on the selected buddy"
msgstr "Join a chat room"
msgid "Set an away message"
msgstr "Set an away message"
-#: src/gtkblist.c:4070 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4071 src/protocols/silc/buddy.c:731 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2751
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2756
"Please enter the screen name of the person you would like to add to your "
"buddy list. You may optionally enter an alias, or nickname, for the buddy. "
@@ -2391,15 +2391,15 @@
"The alias will be displayed in place of the screen name whenever possible.\n"
#. Set up stuff for the account box
-#: src/gtkblist.c:4154 src/gtkblist.c:4457
+#: src/gtkblist.c:4155 src/gtkblist.c:4458
msgid "This protocol does not support chat rooms."
msgstr "This protocol does not support chat rooms."
"You are not currently signed on with any protocols that have the ability to "
@@ -2407,11 +2407,11 @@
"You are not currently signed on with any protocols that have the ability to "
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
@@ -2419,15 +2419,15 @@
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
msgid "Please enter the name of the group to be added."
msgstr "Please enter the name of the group to be added."
-#: src/gtkblist.c:5095 src/gtkblist.c:5192
+#: src/gtkblist.c:5097 src/gtkblist.c:5194 msgid "No actions available"
msgstr "No actions available"
@@ -2579,7 +2579,7 @@
-#: src/gtkconv.c:1460 src/gtkconv.c:3855 src/protocols/oscar/oscar.c:590
+#: src/gtkconv.c:1460 src/gtkconv.c:3855 src/protocols/oscar/oscar.c:600 @@ -3144,7 +3144,7 @@
msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3154,71 +3154,71 @@
"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
"at once. It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
msgid "Active Developers"
msgstr "Active Developers"
msgid "Crazy Patch Writers"
msgstr "Crazy Patch Writers"
msgid "Retired Developers"
msgstr "Retired Developers"
msgid "Current Translators"
msgstr "Current Translators"
msgstr "Past Translators"
-#: src/gtkdialogs.c:466 src/gtkdialogs.c:608 src/gtkdialogs.c:661
+#: src/gtkdialogs.c:467 src/gtkdialogs.c:609 src/gtkdialogs.c:662 -#: src/gtkdialogs.c:472 src/gtkdialogs.c:614 src/gtkdialogs.c:667
+#: src/gtkdialogs.c:473 src/gtkdialogs.c:615 src/gtkdialogs.c:668
msgid "New Instant Message"
msgstr "New Instant Message"
msgid "Please enter the screen name of the person you would like to IM."
msgstr "Please enter the screen name of the person you would like to IM."
"Please enter the screen name of the person whose info you would like to view."
"Please enter the screen name of the person whose info you would like to view."
"Please enter the screen name of the person whose log you would like to view."
"Please enter the screen name of the person whose log you would like to view."
"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3231,45 +3231,45 @@
"This will increase %s's warning level and he or she will be subject to "
"harsher rate limiting.\n"
msgid "Warn _anonymously?"
msgstr "Warn _anonymously?"
msgid "<b>Anonymous warnings are less severe.</b>"
msgstr "<b>Anonymous warnings are less severe.</b>"
msgid "Enter an alias for this contact."
msgstr "Enter an alias for this contact."
-#: src/gtkdialogs.c:778 src/gtkdialogs.c:800 src/gtkdialogs.c:820
+#: src/gtkdialogs.c:779 src/gtkdialogs.c:801 src/gtkdialogs.c:821 #: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
msgid "Enter an alias for %s."
msgstr "Enter an alias for %s."
msgid "Enter an alias for this chat."
msgstr "Enter an alias for this chat."
"You are about to remove the contact containing %s and %d other buddies from "
@@ -3278,7 +3278,7 @@
"You are about to remove the contact containing %s and %d other buddies from "
"your buddy list. Do you want to continue?"
"You are about to remove the group %s and all its members from your buddy "
@@ -3287,22 +3287,22 @@
"You are about to remove the group %s and all its members from your buddy "
"list. Do you want to continue?"
-#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
+#: src/gtkdialogs.c:917 src/gtkdialogs.c:918
"You are about to remove %s from your buddy list. Do you want to continue?"
"You are about to remove %s from your buddy list. Do you want to continue?"
-#: src/gtkdialogs.c:958 src/gtkdialogs.c:960
+#: src/gtkdialogs.c:959 src/gtkdialogs.c:961
"You are about to remove the chat %s from your buddy list. Do you want to "
@@ -3311,7 +3311,7 @@
"You are about to remove the chat %s from your buddy list. Do you want to "
-#: src/gtkdialogs.c:997 src/gtkdialogs.c:998
+#: src/gtkdialogs.c:998 src/gtkdialogs.c:999 @@ -3427,27 +3427,27 @@
msgstr "Hyperlink colour"
msgid "Color to draw hyperlinks."
msgstr "Colour to draw hyperlinks."
msgid "_Copy E-Mail Address"
msgstr "_Copy E-Mail Address"
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
"Unable to guess the image type based on the file extension supplied. "
@@ -3455,16 +3455,16 @@
"Unable to guess the image type based on the file extension supplied. "
msgid "Error saving image: %s"
msgstr "Error saving image: %s"
-#: src/gtkimhtml.c:2937 src/gtkimhtml.c:2949
+#: src/gtkimhtml.c:2939 src/gtkimhtml.c:2951
@@ -3570,13 +3570,13 @@
msgid "Conversations with %s"
msgstr "Conversations with %s"
-#: src/gtklog.c:395 src/gtklog.c:411
+#: src/gtklog.c:400 src/gtklog.c:416 @@ -4020,8 +4020,8 @@
msgid "New conversation _placement:"
msgstr "New conversation _placement:"
-#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:733
-#: src/protocols/oscar/oscar.c:5072
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:743 +#: src/protocols/oscar/oscar.c:5102 @@ -4263,9 +4263,9 @@
msgid "When away and idle"
msgstr "When away and idle"
-#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1286
+#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1294 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
-#: src/protocols/oscar/oscar.c:4225 src/protocols/yahoo/yahoo.c:2580
+#: src/protocols/oscar/oscar.c:4255 src/protocols/yahoo/yahoo.c:2585 #: src/protocols/yahoo/yahoo_profile.c:664
@@ -4592,11 +4592,11 @@
msgid "<b><font color=\"red\">The logger has no read function</font></b>"
msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
@@ -4605,7 +4605,7 @@
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
"REPLY>:</b></font> %s<br/>\n"
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
@@ -4614,25 +4614,25 @@
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
"REPLY>:</b></font> %s<br/>\n"
-#: src/log.c:643 src/log.c:773
+#: src/log.c:661 src/log.c:791 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
-#: src/log.c:653 src/log.c:785
+#: src/log.c:671 src/log.c:803 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgid "(%s) %s <AUTO-REPLY>: %s\n"
msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -4746,8 +4746,8 @@
#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2797
#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
-#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2925
-#: src/protocols/yahoo/yahoo.c:3041
+#: src/protocols/oscar/oscar.c:765 src/protocols/yahoo/yahoo.c:2930 +#: src/protocols/yahoo/yahoo.c:3046 @@ -4760,11 +4760,11 @@
msgstr "Away for friends only"
#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977
-#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:673
-#: src/protocols/oscar/oscar.c:5583 src/protocols/oscar/oscar.c:5661
-#: src/protocols/oscar/oscar.c:5685 src/protocols/oscar/oscar.c:6867
-#: src/protocols/oscar/oscar.c:6872 src/protocols/yahoo/yahoo.c:2578
-#: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:3053
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:683 +#: src/protocols/oscar/oscar.c:5613 src/protocols/oscar/oscar.c:5691 +#: src/protocols/oscar/oscar.c:5715 src/protocols/oscar/oscar.c:6896 +#: src/protocols/oscar/oscar.c:6901 src/protocols/yahoo/yahoo.c:2583 +#: src/protocols/yahoo/yahoo.c:2950 src/protocols/yahoo/yahoo.c:3058 @@ -4807,7 +4807,7 @@
msgid "Unknown Error Code."
msgstr "Unknown Error Code."
-#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4026
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4056 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
@@ -4815,8 +4815,8 @@
#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1012
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4030
-#: src/protocols/oscar/oscar.c:4254 src/protocols/silc/ops.c:1086
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4060 +#: src/protocols/oscar/oscar.c:4284 src/protocols/silc/ops.c:1086 #: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
msgid "Buddy Information"
@@ -4838,10 +4838,10 @@
#. we didn't successfully connect. tdt->toc_fd is valid here
#: src/protocols/gg/gg.c:675 src/protocols/icq/gaim_icq.c:343
#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2216
-#: src/protocols/yahoo/yahoo.c:2245 src/protocols/yahoo/yahoo.c:2308
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2221 +#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2313 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482 msgid "Unable to connect."
msgstr "Unable to connect."
@@ -4903,25 +4903,25 @@
-#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5064
+#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5094 #: src/protocols/gg/gg.c:958 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:5075 src/protocols/silc/ops.c:808
+#: src/protocols/oscar/oscar.c:5105 src/protocols/silc/ops.c:808 #: src/protocols/trepia/trepia.c:268
#: src/protocols/gg/gg.c:963 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:5076 src/protocols/trepia/trepia.c:275
+#: src/protocols/oscar/oscar.c:5106 src/protocols/trepia/trepia.c:275 #: src/protocols/gg/gg.c:967 src/protocols/gg/gg.c:1711
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5065
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5095 #: src/protocols/silc/ops.c:1204
@@ -4937,7 +4937,7 @@
#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:637
-#: src/protocols/oscar/oscar.c:5119 src/protocols/oscar/oscar.c:5127
+#: src/protocols/oscar/oscar.c:5149 src/protocols/oscar/oscar.c:5157 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
@@ -5094,14 +5094,14 @@
msgstr "The user %s (%s%s%s%s%s) wants you to authorise them."
#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:248
-#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3765
-#: src/protocols/oscar/oscar.c:6315
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3795 +#: src/protocols/oscar/oscar.c:6344 #: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249
-#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3767
-#: src/protocols/oscar/oscar.c:6316
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3797 +#: src/protocols/oscar/oscar.c:6345 @@ -5126,20 +5126,20 @@
msgid "Unknown command: %s"
msgstr "Unknown command: %s"
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:576
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:576 #: src/protocols/silc/silc.c:1007
msgid "current topic is: %s"
msgstr "current topic is: %s"
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:580
+#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:580 #: src/protocols/silc/silc.c:1011
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:174 +#: src/protocols/yahoo/yahoo_filexfer.c:183 +#: src/protocols/yahoo/yahoo_filexfer.c:192 msgid "File Transfer Aborted"
msgstr "File Transfer Aborted"
@@ -5186,9 +5186,9 @@
#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:796
-#: src/protocols/msn/session.c:334 src/protocols/napster/napster.c:510
-#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1744
-#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/msn/session.c:340 src/protocols/napster/napster.c:510 +#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1754 +#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2444 #: src/protocols/zephyr/zephyr.c:1452
@@ -5198,7 +5198,7 @@
msgstr "Couldn't create socket"
#: src/protocols/irc/irc.c:258 src/protocols/jabber/jabber.c:302
-#: src/protocols/oscar/oscar.c:1675 src/protocols/oscar/oscar.c:1740
+#: src/protocols/oscar/oscar.c:1685 src/protocols/oscar/oscar.c:1750 msgid "Couldn't connect to host"
msgstr "Couldn't connect to host"
@@ -5207,12 +5207,12 @@
#: src/protocols/irc/irc.c:552 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1399
+#: src/protocols/yahoo/yahoochat.c:1400 #: src/protocols/irc/irc.c:555 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1408
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1409 @@ -5240,7 +5240,7 @@
#: src/protocols/irc/irc.c:685 src/protocols/jabber/jabber.c:1613
-#: src/protocols/msn/msn.c:1893 src/protocols/napster/napster.c:675
+#: src/protocols/msn/msn.c:1901 src/protocols/napster/napster.c:675 #: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1301
@@ -5289,7 +5289,7 @@
#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1286 src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/msn/msn.c:1294 src/protocols/yahoo/yahoo_profile.c:664 msgid "<b>%s:</b> %s<br>"
msgstr "<b>%s:</b> %s<br>"
@@ -5349,92 +5349,100 @@
-#: src/protocols/irc/msgs.c:427
+#: src/protocols/irc/msgs.c:428 +#: src/protocols/irc/msgs.c:429 +msgid "The IRC server's local time is:" +msgstr "The IRC server's local time is:" +#: src/protocols/irc/msgs.c:440 -#: src/protocols/irc/msgs.c:438
+#: src/protocols/irc/msgs.c:451 -#: src/protocols/irc/msgs.c:441
+#: src/protocols/irc/msgs.c:454 msgid "User is not logged in"
msgstr "User is not logged in"
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:459 msgid "No such nick or channel"
msgstr "No such nick or channel"
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:479 -#: src/protocols/irc/msgs.c:522
+#: src/protocols/irc/msgs.c:535 msgid "Joining %s requires an invitation."
msgstr "Joining %s requires an invitation."
-#: src/protocols/irc/msgs.c:523
+#: src/protocols/irc/msgs.c:536 -#: src/protocols/irc/msgs.c:626
+#: src/protocols/irc/msgs.c:639 msgid "You have been kicked by %s: (%s)"
msgstr "You have been kicked by %s: (%s)"
-#: src/protocols/irc/msgs.c:631
+#: src/protocols/irc/msgs.c:644 msgid "Kicked by %s (%s)"
msgstr "Kicked by %s (%s)"
-#: src/protocols/irc/msgs.c:652
+#: src/protocols/irc/msgs.c:665 msgid "mode (%s %s) by %s"
msgstr "mode (%s %s) by %s"
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:775 msgid "Could not change nick"
msgstr "Could not change nick"
-#: src/protocols/irc/msgs.c:763
+#: src/protocols/irc/msgs.c:776 msgid "Cannot change nick"
msgstr "Cannot change nick"
-#: src/protocols/irc/msgs.c:784
+#: src/protocols/irc/msgs.c:797 msgid "You have parted the channel%s%s"
msgstr "You have parted the channel%s%s"
-#: src/protocols/irc/msgs.c:824
+#: src/protocols/irc/msgs.c:838 msgid "Error: invalid PONG from server"
msgstr "Error: invalid PONG from server"
-#: src/protocols/irc/msgs.c:826
+#: src/protocols/irc/msgs.c:840 msgid "PING reply -- Lag: %lu seconds"
msgstr "PING reply -- Lag: %lu seconds"
-#: src/protocols/irc/msgs.c:901
+#: src/protocols/irc/msgs.c:915 -#: src/protocols/irc/msgs.c:902 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:916 src/protocols/silc/ops.c:912 msgid "Cannot join channel"
msgstr "Cannot join channel"
-#: src/protocols/irc/msgs.c:938
+#: src/protocols/irc/msgs.c:952 -#: src/protocols/irc/parse.c:110
+#: src/protocols/irc/parse.c:111 msgid "action <action to perform>: Perform an action."
msgstr "action <action to perform>: Perform an action."
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:112 "away [message]: Set an away message, or use no message to return from being "
@@ -5442,7 +5450,7 @@
"away [message]: Set an away message, or use no message to return from being "
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:113 "deop <nick1> [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
@@ -5450,7 +5458,7 @@
"deop <nick1> [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114 "devoice <nick1> [nick2] ...: Remove channel voice status from "
"someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5460,7 +5468,7 @@
"someone, preventing them from speaking if the channel is moderated (+m). You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115 "invite <nick> [room]: Invite someone to join you in the specified "
"channel, or the current channel."
@@ -5468,7 +5476,7 @@
"invite <nick> [room]: Invite someone to join you in the specified "
"channel, or the current channel."
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116 "j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -5476,7 +5484,7 @@
"j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117 "join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -5484,7 +5492,7 @@
"join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118 "kick <nick> [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
@@ -5492,7 +5500,7 @@
"kick <nick> [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119 "list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
@@ -5500,11 +5508,11 @@
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120 msgid "me <action to perform>: Perform an action."
msgstr "me <action to perform>: Perform an action."
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121 "mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel "
@@ -5512,7 +5520,7 @@
"mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel "
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122 "msg <nick> <message>: Send a private message to a user (as "
@@ -5520,15 +5528,15 @@
"msg <nick> <message>: Send a private message to a user (as "
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123 msgid "names [channel]: List the users currently in a channel."
msgstr "names [channel]: List the users currently in a channel."
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1423
+#: src/protocols/irc/parse.c:124 src/protocols/jabber/jabber.c:1423 msgid "nick <new nickname>: Change your nickname."
msgstr "nick <new nickname>: Change your nickname."
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125 "op <nick1> [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
@@ -5536,7 +5544,7 @@
"op <nick1> [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:126 "operwall <message>: If you don't know what this is, you probably "
@@ -5544,7 +5552,7 @@
"operwall <message>: If you don't know what this is, you probably "
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:127 "part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
@@ -5552,7 +5560,7 @@
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128 "ping [nick]: Asks how much lag a user (or the server if no user specified) "
@@ -5560,7 +5568,7 @@
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:129 "query <nick> <message>: Send a private message to a user (as "
@@ -5568,15 +5576,15 @@
"query <nick> <message>: Send a private message to a user (as "
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:130 msgid "quit [message]: Disconnect from the server, with an optional message."
msgstr "quit [message]: Disconnect from the server, with an optional message."
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131 msgid "quote [...]: Send a raw command to the server."
msgstr "quote [...]: Send a raw command to the server."
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132 "remove <nick> [message]: Remove someone from a room. You must be a "
"channel operator to do this."
@@ -5584,15 +5592,19 @@
"remove <nick> [message]: Remove someone from a room. You must be a "
"channel operator to do this."
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:133 +msgid "time: Displays the current local time at the IRC server." +msgstr "time: Displays the current local time at the IRC server." +#: src/protocols/irc/parse.c:134 msgid "topic [new topic]: View or change the channel topic."
msgstr "topic [new topic]: View or change the channel topic."
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:135 msgid "umode <+|-><A-Za-z>: Set or unset a user mode."
msgstr "umode <+|-><A-Za-z>: Set or unset a user mode."
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:136 "voice <nick1> [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
@@ -5600,7 +5612,7 @@
"voice <nick1> [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:137 "wallops <message>: If you don't know what this is, you probably can't "
@@ -5608,25 +5620,25 @@
"wallops <message>: If you don't know what this is, you probably can't "
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:138 msgid "whois <nick>: Get information on a user."
msgstr "whois <nick>: Get information on a user."
-#: src/protocols/irc/parse.c:417
+#: src/protocols/irc/parse.c:419 msgid "Reply time from %s: %lu seconds"
msgstr "Reply time from %s: %lu seconds"
-#: src/protocols/irc/parse.c:418
+#: src/protocols/irc/parse.c:420 -#: src/protocols/irc/parse.c:418
+#: src/protocols/irc/parse.c:420 -#: src/protocols/irc/parse.c:521 src/protocols/irc/parse.c:525
-#: src/protocols/oscar/oscar.c:1572 src/protocols/toc/toc.c:188
+#: src/protocols/irc/parse.c:523 src/protocols/irc/parse.c:527 +#: src/protocols/oscar/oscar.c:1582 src/protocols/toc/toc.c:188 #: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
#: src/protocols/toc/toc.c:689
@@ -5684,7 +5696,7 @@
#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1276
+#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1284 #: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
#: src/protocols/yahoo/yahoo_profile.c:1000
@@ -5751,7 +5763,7 @@
#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5130 @@ -5774,9 +5786,9 @@
#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:951
#: src/protocols/msn/msn.c:488 src/protocols/novell/novell.c:2819
-#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:715
-#: src/protocols/oscar/oscar.c:721 src/protocols/oscar/oscar.c:723
-#: src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:725 +#: src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:733 +#: src/protocols/yahoo/yahoo.c:2708 @@ -5789,7 +5801,7 @@
#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:632
-#: src/protocols/oscar/oscar.c:5118 src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5148 src/protocols/oscar/oscar.c:5156 #: src/protocols/silc/ops.c:848
@@ -5834,7 +5846,7 @@
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6386
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6415 #: src/protocols/yahoo/yahoochat.c:1003
@@ -5988,8 +6000,8 @@
-#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5120
-#: src/protocols/oscar/oscar.c:5128 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5150 +#: src/protocols/oscar/oscar.c:5158 src/protocols/trepia/trepia.c:336 #: src/protocols/trepia/trepia.c:414
@@ -6019,7 +6031,7 @@
msgid "Initializing Stream"
msgstr "Initialising Stream"
-#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:340
+#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:346 @@ -6029,7 +6041,7 @@
#: src/protocols/jabber/jabber.c:895 src/protocols/jabber/jabber.c:1172
#: src/protocols/jabber/jabber.c:1213 src/protocols/jabber/jabber.c:1246
-#: src/protocols/oscar/oscar.c:721 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:731 src/protocols/oscar/oscar.c:6699 @@ -6073,8 +6085,8 @@
#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41
#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
-#: src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:5673
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:5703 +#: src/protocols/oscar/oscar.c:6892 @@ -6589,7 +6601,7 @@
msgid "Too many hits to a FND"
msgstr "Too many hits to a FND"
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188 @@ -6682,7 +6694,7 @@
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2182
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2192 #: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:630
msgid "Authentication failed"
msgstr "Authentication failed"
@@ -6770,7 +6782,7 @@
#: src/protocols/msn/msn.c:488 src/protocols/msn/msn.c:496
-#: src/protocols/msn/msn.c:499 src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/msn/msn.c:499 src/protocols/yahoo/yahoo.c:2708 @@ -6787,39 +6799,39 @@
-#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:797 #: src/protocols/msn/state.c:34
msgid "Away From Computer"
msgstr "Away From Computer"
-#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:797
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2560
-#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3043
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:799 +#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2565 +#: src/protocols/yahoo/yahoo.c:2932 src/protocols/yahoo/yahoo.c:3048 -#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:799
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:801 #: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
-#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2562
-#: src/protocols/yahoo/yahoo.c:2929 src/protocols/yahoo/yahoo.c:3044
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2567 +#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:3049 -#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:801
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2570
-#: src/protocols/yahoo/yahoo.c:2937 src/protocols/yahoo/yahoo.c:3048
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:803 +#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2575 +#: src/protocols/yahoo/yahoo.c:2942 src/protocols/yahoo/yahoo.c:3053 -#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:803
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2574
-#: src/protocols/yahoo/yahoo.c:2941 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:805 +#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2579 +#: src/protocols/yahoo/yahoo.c:2946 src/protocols/yahoo/yahoo.c:3055 -#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:807 #: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
@@ -6864,91 +6876,95 @@
"SSL support is needed for MSN. Please install a supported SSL library. See "
"http://gaim.sf.net/faq-ssl.php for more information."
-#: src/protocols/msn/msn.c:1268 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/msn/msn.c:649 +msgid "Failed to connect to server." +msgstr "Failed to connect to server." +#: src/protocols/msn/msn.c:1276 src/protocols/yahoo/yahoo_profile.c:659 #: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
msgid "<b>Alias:</b> %s<br>"
msgstr "<b>Alias:</b> %s<br>"
#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1276 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1284 src/protocols/msn/msn.c:1642 #: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
-#: src/protocols/msn/msn.c:1364
+#: src/protocols/msn/msn.c:1372 -#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1377 src/protocols/msn/msn.c:1629 #: src/protocols/yahoo/yahoo_profile.c:761
msgid "Error retrieving profile"
msgstr "Error retreiving profile"
-#: src/protocols/msn/msn.c:1440 src/protocols/oscar/oscar.c:5105
+#: src/protocols/msn/msn.c:1448 src/protocols/oscar/oscar.c:5135 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
#: src/protocols/yahoo/yahoo_profile.c:1015
-#: src/protocols/msn/msn.c:1447 src/protocols/oscar/oscar.c:5091
+#: src/protocols/msn/msn.c:1455 src/protocols/oscar/oscar.c:5121 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
#: src/protocols/yahoo/yahoo_profile.c:1025
-#: src/protocols/msn/msn.c:1456 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1464 src/protocols/yahoo/yahoo_profile.c:1020 -#: src/protocols/msn/msn.c:1463 src/protocols/novell/novell.c:1445
+#: src/protocols/msn/msn.c:1471 src/protocols/novell/novell.c:1445 #: src/protocols/yahoo/yahoo_profile.c:1010
-#: src/protocols/msn/msn.c:1471 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1479 src/protocols/yahoo/yahoo_profile.c:1030 -#: src/protocols/msn/msn.c:1488 src/protocols/msn/msn.c:1494
-#: src/protocols/msn/msn.c:1501 src/protocols/msn/msn.c:1509
-#: src/protocols/msn/msn.c:1516
+#: src/protocols/msn/msn.c:1496 src/protocols/msn/msn.c:1502 +#: src/protocols/msn/msn.c:1509 src/protocols/msn/msn.c:1517 +#: src/protocols/msn/msn.c:1524 msgid "A Little About Me"
msgstr "A Little About Me"
-#: src/protocols/msn/msn.c:1525 src/protocols/msn/msn.c:1531
-#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1545
+#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1539 +#: src/protocols/msn/msn.c:1546 src/protocols/msn/msn.c:1553 msgstr "Favourite Things"
-#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1560
-#: src/protocols/msn/msn.c:1567
+#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1568 +#: src/protocols/msn/msn.c:1575 msgid "Hobbies and Interests"
msgstr "Hobbies and Interests"
-#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582
+#: src/protocols/msn/msn.c:1584 src/protocols/msn/msn.c:1590 #: src/protocols/yahoo/yahoo_profile.c:1072
-#: src/protocols/msn/msn.c:1590 src/protocols/yahoo/yahoo_profile.c:1123
+#: src/protocols/msn/msn.c:1598 src/protocols/yahoo/yahoo_profile.c:1123 -#: src/protocols/msn/msn.c:1601 src/protocols/silc/ops.c:844
+#: src/protocols/msn/msn.c:1609 src/protocols/silc/ops.c:844 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1631 msgid "The user has not created a public profile."
msgstr "The user has not created a public profile."
-#: src/protocols/msn/msn.c:1624
+#: src/protocols/msn/msn.c:1632 "MSN reported not being able to find the user's profile. This either means "
"that the user does not exist, or that the user exists but has not created a "
@@ -6958,7 +6974,7 @@
"that the user does not exist, or that the user exists but has not created a "
-#: src/protocols/msn/msn.c:1628
+#: src/protocols/msn/msn.c:1636 "Gaim could not find any information in the user's profile. The user most "
@@ -6966,15 +6982,15 @@
"Gaim could not find any information in the user's profile. The user most "
-#: src/protocols/msn/msn.c:1634 src/protocols/yahoo/yahoo_profile.c:1168
+#: src/protocols/msn/msn.c:1642 src/protocols/yahoo/yahoo_profile.c:1168 -#: src/protocols/msn/msn.c:1775
+#: src/protocols/msn/msn.c:1783 msgid "Display conversation closed notices"
msgstr "Display conversation closed notices"
-#: src/protocols/msn/msn.c:1780
+#: src/protocols/msn/msn.c:1788 msgid "Display timeout notices"
msgstr "Display timeout notices"
@@ -6988,72 +7004,72 @@
-#: src/protocols/msn/msn.c:1867 src/protocols/msn/msn.c:1869
+#: src/protocols/msn/msn.c:1875 src/protocols/msn/msn.c:1877 msgid "MSN Protocol Plugin"
msgstr "MSN Protocol Plugin"
-#: src/protocols/msn/msn.c:1888 src/protocols/trepia/trepia.c:1296
+#: src/protocols/msn/msn.c:1896 src/protocols/trepia/trepia.c:1296 -#: src/protocols/msn/msn.c:1897
+#: src/protocols/msn/msn.c:1905 -#: src/protocols/msn/nexus.c:111 src/protocols/msn/servconn.c:127
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127 #: src/protocols/yahoo/yahoochat.c:1357
msgid "Unable to connect"
msgstr "Unable to connect"
-#: src/protocols/msn/notification.c:181
+#: src/protocols/msn/notification.c:178 msgid "%s is not a valid group."
msgstr "%s is not a valid group."
-#: src/protocols/msn/notification.c:187 src/protocols/msn/notification.c:501
-#: src/protocols/msn/session.c:320
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:522 +#: src/protocols/msn/session.c:325 -#: src/protocols/msn/notification.c:190
+#: src/protocols/msn/notification.c:187 -#: src/protocols/msn/notification.c:471
+#: src/protocols/msn/notification.c:492 msgid "Unable to add user on %s (%s)"
msgstr "Unable to add user on %s (%s)"
-#: src/protocols/msn/notification.c:475
+#: src/protocols/msn/notification.c:496 msgid "Unable to block user on %s (%s)"
msgstr "Unable to block user on %s (%s)"
-#: src/protocols/msn/notification.c:479
+#: src/protocols/msn/notification.c:500 msgid "Unable to permit user on %s (%s)"
msgstr "Unable to permit user on %s (%s)"
-#: src/protocols/msn/notification.c:487
+#: src/protocols/msn/notification.c:508 msgid "%s could not be added because your buddy list is full."
msgstr "%s could not be added because your buddy list is full."
-#: src/protocols/msn/notification.c:496
+#: src/protocols/msn/notification.c:517 msgid "%s is not a valid passport account."
msgstr "%s is not a valid passport account."
-#: src/protocols/msn/notification.c:752
+#: src/protocols/msn/notification.c:773 msgid "Unable to rename group"
msgstr "Unable to rename group"
-#: src/protocols/msn/notification.c:807
+#: src/protocols/msn/notification.c:828 msgid "Unable to delete group"
msgstr "Unable to delete group"
-#: src/protocols/msn/notification.c:1210
+#: src/protocols/msn/notification.c:1231 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7092,8 +7108,8 @@
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:312
-#: src/protocols/oscar/oscar.c:4088
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:317 +#: src/protocols/oscar/oscar.c:4118 @@ -7119,75 +7135,80 @@
msgstr "You have signed on from another location."
#: src/protocols/msn/session.c:306
+msgid "The MSN servers are temporarily unavailable. Please wait and try again." +"The MSN servers are temporarily unavailable. Please wait and try again." +#: src/protocols/msn/session.c:311 msgid "The MSN servers are going down temporarily."
msgstr "The MSN servers are going down temporarily."
-#: src/protocols/msn/session.c:310
+#: src/protocols/msn/session.c:315 msgid "Unable to authenticate: %s"
msgstr "Unable to authenticate: %s"
-#: src/protocols/msn/session.c:315
+#: src/protocols/msn/session.c:320 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-#: src/protocols/msn/session.c:335 src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:341 src/protocols/msn/session.c:343 -#: src/protocols/msn/session.c:336
+#: src/protocols/msn/session.c:342 -#: src/protocols/msn/session.c:338
+#: src/protocols/msn/session.c:344 msgid "Starting authentication"
msgstr "Starting authentication"
-#: src/protocols/msn/session.c:339
+#: src/protocols/msn/session.c:345 -#: src/protocols/msn/session.c:341
+#: src/protocols/msn/session.c:347 -#: src/protocols/msn/session.c:342 src/protocols/trepia/trepia.c:636
+#: src/protocols/msn/session.c:348 src/protocols/trepia/trepia.c:636 msgid "Retrieving buddy list"
msgstr "Retrieving buddy list"
-#: src/protocols/msn/switchboard.c:368
+#: src/protocols/msn/switchboard.c:373 msgid "Message may have not been sent because a timeout occurred:"
msgstr "Message may have not been sent because a timeout occurred:"
-#: src/protocols/msn/switchboard.c:376
+#: src/protocols/msn/switchboard.c:381 msgid "Message could not be sent, not allowed while invisible:"
msgstr "Message could not be sent; not allowed while invisible:"
-#: src/protocols/msn/switchboard.c:380
+#: src/protocols/msn/switchboard.c:385 msgid "Message could not be sent because the user is offline:"
msgstr "Message could not be sent because the user is offline:"
-#: src/protocols/msn/switchboard.c:384
+#: src/protocols/msn/switchboard.c:389 msgid "Message could not be sent because a connection error occurred:"
msgstr "Message could not be sent because a connection error occured:"
-#: src/protocols/msn/switchboard.c:388
+#: src/protocols/msn/switchboard.c:393 "Message could not be sent because an error with the switchboard occurred:"
"Message could not be sent because an error with the switchboard occurred:"
-#: src/protocols/msn/switchboard.c:396
+#: src/protocols/msn/switchboard.c:401 msgid "Message may have not been sent because an unknown error occurred:"
msgstr "Message may have not been sent because an unknown error occurred:"
-#: src/protocols/msn/switchboard.c:626
+#: src/protocols/msn/switchboard.c:636 msgid "The conversation has become inactive and timed out."
msgstr "The conversation has become inactive and timed out."
-#: src/protocols/msn/switchboard.c:645
+#: src/protocols/msn/switchboard.c:655 msgid "%s has closed the conversation window."
msgstr "%s has closed the conversation window."
@@ -7503,8 +7524,8 @@
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5078
-#: src/protocols/oscar/oscar.c:5085
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5108 +#: src/protocols/oscar/oscar.c:5115 @@ -7605,8 +7626,8 @@
msgid "This conference has been closed. No more messages can be sent."
msgstr "This conference has been closed. No more messages can be sent."
-#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:723
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:733 +#: src/protocols/oscar/oscar.c:6701 src/protocols/yahoo/yahoo.c:2587 @@ -7640,103 +7661,103 @@
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:184 -#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:185 -#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:186 -#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:187 -#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:189 msgid "Service unavailable"
msgstr "Service unavailable"
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:190 msgid "Service not defined"
msgstr "Service not defined"
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:191 -#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:192 msgid "Not supported by host"
msgstr "Not supported by host"
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:193 msgid "Not supported by client"
msgstr "Not supported by client"
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:194 msgid "Refused by client"
msgstr "Refused by client"
+#: src/protocols/oscar/oscar.c:195 +#: src/protocols/oscar/oscar.c:196 #: src/protocols/oscar/oscar.c:197
#: src/protocols/oscar/oscar.c:198
+msgid "Busted SNAC payload" +msgstr "Busted SNAC payload" #: src/protocols/oscar/oscar.c:199
-#: src/protocols/oscar/oscar.c:200
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
-#: src/protocols/oscar/oscar.c:201
msgid "Insufficient rights"
msgstr "Insufficient rights"
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:200 msgid "In local permit/deny"
msgstr "In local permit/deny"
+#: src/protocols/oscar/oscar.c:201 +msgid "Too evil (sender)" +msgstr "Too evil (sender)" +#: src/protocols/oscar/oscar.c:202 +msgid "Too evil (receiver)" +msgstr "Too evil (receiver)" #: src/protocols/oscar/oscar.c:203
-msgid "Too evil (sender)"
-msgstr "Too evil (sender)"
+msgid "User temporarily unavailable" +msgstr "User temporarily unavailable" #: src/protocols/oscar/oscar.c:204
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
#: src/protocols/oscar/oscar.c:205
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
#: src/protocols/oscar/oscar.c:206
+msgid "Request ambiguous" +msgstr "Request ambiguous" #: src/protocols/oscar/oscar.c:207
#: src/protocols/oscar/oscar.c:208
-msgid "Request ambiguous"
-msgstr "Request ambiguous"
-#: src/protocols/oscar/oscar.c:209
-#: src/protocols/oscar/oscar.c:210
msgstr "Not while on AOL"
-#: src/protocols/oscar/oscar.c:402 src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:403 src/protocols/oscar/oscar.c:486 "(There was an error receiving this message. The buddy you are speaking to "
"most likely has a buggy client.)"
@@ -7744,157 +7765,157 @@
"(There was an error receiving this message. The buddy you are speaking to "
"most likely has a buggy client.)"
-#: src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:588 -#: src/protocols/oscar/oscar.c:581
+#: src/protocols/oscar/oscar.c:591 -#: src/protocols/oscar/oscar.c:584 src/protocols/silc/silc.c:646
+#: src/protocols/oscar/oscar.c:594 src/protocols/silc/silc.c:646 #: src/protocols/silc/util.c:506
-#: src/protocols/oscar/oscar.c:587 src/protocols/oscar/oscar.c:6974
+#: src/protocols/oscar/oscar.c:597 src/protocols/oscar/oscar.c:7003 -#: src/protocols/oscar/oscar.c:594
+#: src/protocols/oscar/oscar.c:604 -#: src/protocols/oscar/oscar.c:597
+#: src/protocols/oscar/oscar.c:607 -#: src/protocols/oscar/oscar.c:600
+#: src/protocols/oscar/oscar.c:610 -#: src/protocols/oscar/oscar.c:603
+#: src/protocols/oscar/oscar.c:613 msgid "ICQ Direct Connect"
msgstr "ICQ Direct Connect"
-#: src/protocols/oscar/oscar.c:606
+#: src/protocols/oscar/oscar.c:616 -#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:619 -#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:622 -#: src/protocols/oscar/oscar.c:615
+#: src/protocols/oscar/oscar.c:625 msgstr "ICQ Server Relay"
-#: src/protocols/oscar/oscar.c:618
+#: src/protocols/oscar/oscar.c:628 -#: src/protocols/oscar/oscar.c:621
+#: src/protocols/oscar/oscar.c:631 msgid "Trillian Encryption"
msgstr "Trillian Encryption"
-#: src/protocols/oscar/oscar.c:624
+#: src/protocols/oscar/oscar.c:634 -#: src/protocols/oscar/oscar.c:627
+#: src/protocols/oscar/oscar.c:637 -#: src/protocols/oscar/oscar.c:630
+#: src/protocols/oscar/oscar.c:640 msgstr "Security Enabled"
-#: src/protocols/oscar/oscar.c:633
+#: src/protocols/oscar/oscar.c:643 -#: src/protocols/oscar/oscar.c:637
+#: src/protocols/oscar/oscar.c:647 -#: src/protocols/oscar/oscar.c:640
+#: src/protocols/oscar/oscar.c:650 -#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:653 -#: src/protocols/oscar/oscar.c:661 src/protocols/oscar/oscar.c:5682
-#: src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:5712 +#: src/protocols/oscar/oscar.c:6895 -#: src/protocols/oscar/oscar.c:665 src/protocols/oscar/oscar.c:5676
-#: src/protocols/oscar/oscar.c:6864
+#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:5706 +#: src/protocols/oscar/oscar.c:6893 -#: src/protocols/oscar/oscar.c:667 src/protocols/oscar/oscar.c:5679
-#: src/protocols/oscar/oscar.c:6865
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5709 +#: src/protocols/oscar/oscar.c:6894 -#: src/protocols/oscar/oscar.c:671
+#: src/protocols/oscar/oscar.c:681 -#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:749 -#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:758 -#: src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:893 msgid "Direct IM with %s closed"
msgstr "Direct IM with %s closed"
-#: src/protocols/oscar/oscar.c:885
+#: src/protocols/oscar/oscar.c:895 msgid "Direct IM with %s failed"
msgstr "Direct IM with %s failed"
-#: src/protocols/oscar/oscar.c:892
+#: src/protocols/oscar/oscar.c:902 msgid "Direct Connect failed"
msgstr "Direct Connect failed"
-#: src/protocols/oscar/oscar.c:969 src/protocols/oscar/oscar.c:1100
+#: src/protocols/oscar/oscar.c:979 src/protocols/oscar/oscar.c:1110 msgid "Direct IM with %s established"
msgstr "Direct IM with %s established"
-#: src/protocols/oscar/oscar.c:1050
+#: src/protocols/oscar/oscar.c:1060 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
-#: src/protocols/oscar/oscar.c:1470
+#: src/protocols/oscar/oscar.c:1480 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
-#: src/protocols/oscar/oscar.c:1475
+#: src/protocols/oscar/oscar.c:1485 msgid "Unable to open Direct IM"
msgstr "Unable to open Direct IM"
-#: src/protocols/oscar/oscar.c:1510
+#: src/protocols/oscar/oscar.c:1520 msgid "You have selected to open a Direct IM connection with %s."
msgstr "You have selected to open a Direct IM connection with %s."
-#: src/protocols/oscar/oscar.c:1514
+#: src/protocols/oscar/oscar.c:1524 "Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
@@ -7902,24 +7923,24 @@
"Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
-#: src/protocols/oscar/oscar.c:1518 src/protocols/oscar/oscar.c:3522
+#: src/protocols/oscar/oscar.c:1528 src/protocols/oscar/oscar.c:3552 -#: src/protocols/oscar/oscar.c:1585 src/protocols/toc/toc.c:874
+#: src/protocols/oscar/oscar.c:1595 src/protocols/toc/toc.c:874 msgid "You have been disconnected from chat room %s."
msgstr "You have been disconnected from chat room %s."
-#: src/protocols/oscar/oscar.c:1604
+#: src/protocols/oscar/oscar.c:1614 msgid "Chat is currently unavailable"
msgstr "Chat is currently unavailable"
-#: src/protocols/oscar/oscar.c:1685
+#: src/protocols/oscar/oscar.c:1695 msgstr "Screen name sent"
-#: src/protocols/oscar/oscar.c:1699
+#: src/protocols/oscar/oscar.c:1709 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7930,46 +7951,46 @@
"invalid. Screen names must either start with a letter and contain only "
"letters, numbers and spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:1727
+#: src/protocols/oscar/oscar.c:1737 msgid "Unable to login to AIM"
msgstr "Unable to login to AIM"
-#: src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:2275
+#: src/protocols/oscar/oscar.c:1839 src/protocols/oscar/oscar.c:2285 msgid "Could Not Connect"
msgstr "Could Not Connect"
-#: src/protocols/oscar/oscar.c:1837
+#: src/protocols/oscar/oscar.c:1847 msgid "Connection established, cookie sent"
msgstr "Connection established, cookie sent"
-#: src/protocols/oscar/oscar.c:1957 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+#: src/protocols/oscar/oscar.c:1967 src/protocols/yahoo/yahoo_filexfer.c:175 +#: src/protocols/yahoo/yahoo_filexfer.c:184 +#: src/protocols/yahoo/yahoo_filexfer.c:193 msgid "Unable to establish file descriptor."
msgstr "Unable to establish file descriptor."
-#: src/protocols/oscar/oscar.c:1962
+#: src/protocols/oscar/oscar.c:1972 msgid "Unable to create new connection."
msgstr "Unable to create new connection."
-#: src/protocols/oscar/oscar.c:2034
+#: src/protocols/oscar/oscar.c:2044 msgid "Unable to establish listener socket."
msgstr "Unable to establish listener socket."
-#: src/protocols/oscar/oscar.c:2159 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2169 src/protocols/toc/toc.c:541 msgid "Incorrect nickname or password."
msgstr "Incorrect nickname or password."
-#: src/protocols/oscar/oscar.c:2164
+#: src/protocols/oscar/oscar.c:2174 msgid "Your account is currently suspended."
msgstr "Your account is currently suspended."
#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2168
+#: src/protocols/oscar/oscar.c:2178 msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "The AOL Instant Messenger service is temporarily unavailable."
-#: src/protocols/oscar/oscar.c:2173
+#: src/protocols/oscar/oscar.c:2183 "You have been connecting and disconnecting too frequently. Wait ten minutes "
"and try again. If you continue to try, you will need to wait even longer."
@@ -7977,33 +7998,33 @@
"You have been connecting and disconnecting too frequently. Wait ten minutes "
"and try again. If you continue to try, you will need to wait even longer."
-#: src/protocols/oscar/oscar.c:2178
+#: src/protocols/oscar/oscar.c:2188 msgid "The client version you are using is too old. Please upgrade at %s"
msgstr "The client version you are using is too old. Please upgrade at %s"
-#: src/protocols/oscar/oscar.c:2210
+#: src/protocols/oscar/oscar.c:2220 -#: src/protocols/oscar/oscar.c:2282
+#: src/protocols/oscar/oscar.c:2292 msgid "Received authorization"
msgstr "Received authorisation"
-#: src/protocols/oscar/oscar.c:2306
+#: src/protocols/oscar/oscar.c:2316 msgid "The SecurID key entered is invalid."
msgstr "The SecurID key entered is invalid."
-#: src/protocols/oscar/oscar.c:2320
+#: src/protocols/oscar/oscar.c:2330 -#: src/protocols/oscar/oscar.c:2321
+#: src/protocols/oscar/oscar.c:2331 msgid "Enter the 6 digit number from the digital display."
msgstr "Enter the 6 digit number from the digital display."
-#: src/protocols/oscar/oscar.c:2361 src/protocols/oscar/oscar.c:2391
-#: src/protocols/oscar/oscar.c:2480
+#: src/protocols/oscar/oscar.c:2371 src/protocols/oscar/oscar.c:2401 +#: src/protocols/oscar/oscar.c:2490 "You may be disconnected shortly. You may want to use TOC until this is "
@@ -8012,24 +8033,24 @@
"You may be disconnected shortly. You may want to use TOC until this is "
"fixed. Check %s for updates."
-#: src/protocols/oscar/oscar.c:2364 src/protocols/oscar/oscar.c:2394
+#: src/protocols/oscar/oscar.c:2374 src/protocols/oscar/oscar.c:2404 msgid "Gaim was unable to get a valid AIM login hash."
msgstr "Gaim was unable to get a valid AIM login hash."
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2493 msgid "Gaim was unable to get a valid login hash."
msgstr "Gaim was unable to get a valid login hash."
-#: src/protocols/oscar/oscar.c:2515
+#: src/protocols/oscar/oscar.c:2525 -#: src/protocols/oscar/oscar.c:3514
+#: src/protocols/oscar/oscar.c:3544 msgid "%s has just asked to directly connect to %s"
msgstr "%s has just asked to directly connect to %s"
-#: src/protocols/oscar/oscar.c:3517
+#: src/protocols/oscar/oscar.c:3547 "This requires a direct connection between the two computers and is necessary "
"for IM Images. Because your IP address will be revealed, this may be "
@@ -8039,19 +8060,19 @@
"for IM Images. Because your IP address will be revealed, this may be "
"considered a privacy risk."
-#: src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:3585 msgid "Please authorize me so I can add you to my buddy list."
msgstr "Please authorise me so I can add you to my buddy list."
-#: src/protocols/oscar/oscar.c:3563
+#: src/protocols/oscar/oscar.c:3593 msgid "Authorization Request Message:"
msgstr "Authorisation Request Message:"
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3594 msgid "Please authorize me!"
msgstr "Please authorise me!"
-#: src/protocols/oscar/oscar.c:3594
+#: src/protocols/oscar/oscar.c:3624 "The user %s requires authorization before being added to a buddy list. Do "
@@ -8060,22 +8081,22 @@
"The user %s requires authorisation before being added to a buddy list. Do "
"you want to send an authorisation request?"
-#: src/protocols/oscar/oscar.c:3599 src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3629 src/protocols/oscar/oscar.c:3631 msgid "Request Authorization"
msgstr "Request Authorisation"
-#: src/protocols/oscar/oscar.c:3649 src/protocols/oscar/oscar.c:3651
-#: src/protocols/oscar/oscar.c:3658 src/protocols/oscar/oscar.c:3755
-#: src/protocols/oscar/oscar.c:3775 src/protocols/oscar/oscar.c:6307
-#: src/protocols/oscar/oscar.c:6353
+#: src/protocols/oscar/oscar.c:3679 src/protocols/oscar/oscar.c:3681 +#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3785 +#: src/protocols/oscar/oscar.c:3805 src/protocols/oscar/oscar.c:6336 +#: src/protocols/oscar/oscar.c:6382 msgstr "No reason given."
-#: src/protocols/oscar/oscar.c:3657
+#: src/protocols/oscar/oscar.c:3687 msgid "Authorization Denied Message:"
msgstr "Authorisation Denied Message:"
-#: src/protocols/oscar/oscar.c:3755
+#: src/protocols/oscar/oscar.c:3785 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -8084,11 +8105,11 @@
"The user %u wants to add you to their buddy list for the following reason:\n"
-#: src/protocols/oscar/oscar.c:3763 src/protocols/oscar/oscar.c:6313
+#: src/protocols/oscar/oscar.c:3793 src/protocols/oscar/oscar.c:6342 msgid "Authorization Request"
msgstr "Authorisation Request"
-#: src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:3805 "The user %u has denied your request to add them to your buddy list for the "
@@ -8099,17 +8120,17 @@
-#: src/protocols/oscar/oscar.c:3776
+#: src/protocols/oscar/oscar.c:3806 msgid "ICQ authorization denied."
msgstr "ICQ authorisation denied."
#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3783
+#: src/protocols/oscar/oscar.c:3813 msgid "The user %u has granted your request to add them to your buddy list."
msgstr "The user %u has granted your request to add them to your buddy list."
-#: src/protocols/oscar/oscar.c:3791
+#: src/protocols/oscar/oscar.c:3821 "You have received a special message\n"
@@ -8122,7 +8143,7 @@
-#: src/protocols/oscar/oscar.c:3799
+#: src/protocols/oscar/oscar.c:3829 "You have received an ICQ page\n"
@@ -8135,7 +8156,7 @@
-#: src/protocols/oscar/oscar.c:3807
+#: src/protocols/oscar/oscar.c:3837 "You have received an ICQ email from %s [%s]\n"
@@ -8148,34 +8169,34 @@
-#: src/protocols/oscar/oscar.c:3828
+#: src/protocols/oscar/oscar.c:3858 msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "ICQ user %u has sent you a buddy: %s (%s)"
-#: src/protocols/oscar/oscar.c:3834
+#: src/protocols/oscar/oscar.c:3864 msgid "Do you want to add this buddy to your buddy list?"
msgstr "Do you want to add this buddy to your buddy list?"
-#: src/protocols/oscar/oscar.c:3838
+#: src/protocols/oscar/oscar.c:3868 -#: src/protocols/oscar/oscar.c:3922
+#: src/protocols/oscar/oscar.c:3952 msgid "You missed %hu message from %s because it was invalid."
msgid_plural "You missed %hu messages from %s because they were invalid."
msgstr[0] "You missed %hu message from %s because it was invalid."
msgstr[1] "You missed %hu messages from %s because they were invalid."
-#: src/protocols/oscar/oscar.c:3931
+#: src/protocols/oscar/oscar.c:3961 msgid "You missed %hu message from %s because it was too large."
msgid_plural "You missed %hu messages from %s because they were too large."
msgstr[0] "You missed %hu message from %s because it was too large."
msgstr[1] "You missed %hu messages from %s because they were too large."
-#: src/protocols/oscar/oscar.c:3940
+#: src/protocols/oscar/oscar.c:3970 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8186,76 +8207,76 @@
"You missed %hu messages from %s because the rate limit has been exceeded."
-#: src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3979 msgid "You missed %hu message from %s because he/she was too evil."
msgid_plural "You missed %hu messages from %s because he/she was too evil."
msgstr[0] "You missed %hu message from %s because he/she was too evil."
msgstr[1] "You missed %hu messages from %s because he/she was too evil."
-#: src/protocols/oscar/oscar.c:3958
+#: src/protocols/oscar/oscar.c:3988 msgid "You missed %hu message from %s because you are too evil."
msgid_plural "You missed %hu messages from %s because you are too evil."
msgstr[0] "You missed %hu message from %s because you are too evil."
msgstr[1] "You missed %hu messages from %s because you are too evil."
-#: src/protocols/oscar/oscar.c:3967
+#: src/protocols/oscar/oscar.c:3997 msgid "You missed %hu message from %s for an unknown reason."
msgid_plural "You missed %hu messages from %s for an unknown reason."
msgstr[0] "You missed %hu message from %s for an unknown reason."
msgstr[1] "You missed %hu messages from %s for an unknown reason."
-#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4253
+#: src/protocols/oscar/oscar.c:4051 src/protocols/oscar/oscar.c:4283 -#: src/protocols/oscar/oscar.c:4087
+#: src/protocols/oscar/oscar.c:4117 msgid "SNAC threw error: %s\n"
msgstr "SNAC threw error: %s\n"
#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4153 msgid "Unable to send message: %s"
msgstr "Unable to send message: %s"
-#: src/protocols/oscar/oscar.c:4123 src/protocols/oscar/oscar.c:4128
-#: src/protocols/oscar/oscar.c:4186 src/protocols/oscar/oscar.c:4190
+#: src/protocols/oscar/oscar.c:4153 src/protocols/oscar/oscar.c:4158 +#: src/protocols/oscar/oscar.c:4216 src/protocols/oscar/oscar.c:4220 -#: src/protocols/oscar/oscar.c:4186
+#: src/protocols/oscar/oscar.c:4216 msgid "User information not available: %s"
msgstr "User information not available: %s"
-#: src/protocols/oscar/oscar.c:4189
+#: src/protocols/oscar/oscar.c:4219 msgid "User information for %s unavailable:"
msgstr "User information for %s unavailable:"
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4241 -#: src/protocols/oscar/oscar.c:4215
+#: src/protocols/oscar/oscar.c:4245 -#: src/protocols/oscar/oscar.c:4220 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4250 src/protocols/yahoo/yahoo_profile.c:1118 -#: src/protocols/oscar/oscar.c:4304
+#: src/protocols/oscar/oscar.c:4334 msgid "Your AIM connection may be lost."
msgstr "Your AIM connection may be lost."
#. The conversion failed!
-#: src/protocols/oscar/oscar.c:4490
+#: src/protocols/oscar/oscar.c:4520 "[Unable to display a message from this user because it contained invalid "
@@ -8263,11 +8284,11 @@
"[Unable to display a message from this user because it contained invalid "
-#: src/protocols/oscar/oscar.c:4710
+#: src/protocols/oscar/oscar.c:4740 msgid "Rate limiting error."
msgstr "Rate limiting error."
-#: src/protocols/oscar/oscar.c:4711
+#: src/protocols/oscar/oscar.c:4741 "The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -8275,7 +8296,7 @@
"The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4804 "You have been disconnected because you have signed on with this screen name "
@@ -8283,109 +8304,109 @@
"You have been disconnected because you have signed on with this screen name "
-#: src/protocols/oscar/oscar.c:4776
+#: src/protocols/oscar/oscar.c:4806 msgid "You have been signed off for an unknown reason."
msgstr "You have been signed off for an unknown reason."
-#: src/protocols/oscar/oscar.c:4807
+#: src/protocols/oscar/oscar.c:4837 msgid "Finalizing connection"
msgstr "Finalizing connection"
-#: src/protocols/oscar/oscar.c:5090 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5120 src/protocols/silc/util.c:538 -#: src/protocols/oscar/oscar.c:5091
+#: src/protocols/oscar/oscar.c:5121 -#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5122 src/protocols/trepia/trepia.c:282 #: src/protocols/trepia/trepia.c:408
-#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5122 src/protocols/trepia/trepia.c:281 #: src/protocols/trepia/trepia.c:408
-#: src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5138 msgid "Personal Web Page"
msgstr "Personal Web Page"
-#: src/protocols/oscar/oscar.c:5112
+#: src/protocols/oscar/oscar.c:5142 msgid "Additional Information"
msgstr "Additional Information"
-#: src/protocols/oscar/oscar.c:5117
+#: src/protocols/oscar/oscar.c:5147 -#: src/protocols/oscar/oscar.c:5121 src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5151 src/protocols/oscar/oscar.c:5159 -#: src/protocols/oscar/oscar.c:5125
+#: src/protocols/oscar/oscar.c:5155 -#: src/protocols/oscar/oscar.c:5133
+#: src/protocols/oscar/oscar.c:5163 msgstr "Work Information"
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5164 -#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:5165 -#: src/protocols/oscar/oscar.c:5136
+#: src/protocols/oscar/oscar.c:5166 -#: src/protocols/oscar/oscar.c:5138
+#: src/protocols/oscar/oscar.c:5168 -#: src/protocols/oscar/oscar.c:5148
+#: src/protocols/oscar/oscar.c:5178 -#: src/protocols/oscar/oscar.c:5197
+#: src/protocols/oscar/oscar.c:5227 -#: src/protocols/oscar/oscar.c:5218
+#: src/protocols/oscar/oscar.c:5248 msgid "The following screen names are associated with %s"
msgstr "The following screen names are associated with %s"
-#: src/protocols/oscar/oscar.c:5222
+#: src/protocols/oscar/oscar.c:5252 -#: src/protocols/oscar/oscar.c:5239
+#: src/protocols/oscar/oscar.c:5269 msgid "No results found for email address %s"
msgstr "No results found for email address %s"
-#: src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:5290 msgid "You should receive an email asking to confirm %s."
msgstr "You should receive an email asking to confirm %s."
-#: src/protocols/oscar/oscar.c:5262
+#: src/protocols/oscar/oscar.c:5292 msgid "Account Confirmation Requested"
msgstr "Account Confirmation Requested"
-#: src/protocols/oscar/oscar.c:5293
+#: src/protocols/oscar/oscar.c:5323 msgid "Error Changing Account Info"
msgstr "Error Changing Account Info"
-#: src/protocols/oscar/oscar.c:5296
+#: src/protocols/oscar/oscar.c:5326 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8394,7 +8415,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
-#: src/protocols/oscar/oscar.c:5299
+#: src/protocols/oscar/oscar.c:5329 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8403,7 +8424,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
-#: src/protocols/oscar/oscar.c:5302
+#: src/protocols/oscar/oscar.c:5332 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8412,7 +8433,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
-#: src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5335 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8421,7 +8442,7 @@
"Error 0x%04x: Unable to change email address because there is already a "
"request pending for this screen name."
-#: src/protocols/oscar/oscar.c:5308
+#: src/protocols/oscar/oscar.c:5338 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8430,7 +8451,7 @@
"Error 0x%04x: Unable to change email address because the given address has "
"too many screen names associated with it."
-#: src/protocols/oscar/oscar.c:5311
+#: src/protocols/oscar/oscar.c:5341 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8439,12 +8460,12 @@
"Error 0x%04x: Unable to change email address because the given address is "
-#: src/protocols/oscar/oscar.c:5314
+#: src/protocols/oscar/oscar.c:5344 msgid "Error 0x%04x: Unknown error."
msgstr "Error 0x%04x: Unknown error."
-#: src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5354 "Your screen name is currently formatted as follows:\n"
@@ -8453,26 +8474,26 @@
"Your screen name is currently formatted as follows:\n"
-#: src/protocols/oscar/oscar.c:5325 src/protocols/oscar/oscar.c:5332
+#: src/protocols/oscar/oscar.c:5355 src/protocols/oscar/oscar.c:5362 -#: src/protocols/oscar/oscar.c:5330
+#: src/protocols/oscar/oscar.c:5360 msgid "The email address for %s is %s"
msgstr "The email address for %s is %s"
-#: src/protocols/oscar/oscar.c:5395
+#: src/protocols/oscar/oscar.c:5425 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-#: src/protocols/oscar/oscar.c:5531
+#: src/protocols/oscar/oscar.c:5561 msgid "Unable to set AIM profile."
msgstr "Unable to set AIM profile."
-#: src/protocols/oscar/oscar.c:5532
+#: src/protocols/oscar/oscar.c:5562 "You have probably requested to set your profile before the login procedure "
"completed. Your profile remains unset; try setting it again when you are "
@@ -8482,7 +8503,7 @@
"completed. Your profile remains unset; try setting it again when you are "
-#: src/protocols/oscar/oscar.c:5559
+#: src/protocols/oscar/oscar.c:5589 "The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -8497,19 +8518,19 @@
"The maximum profile length of %d bytes has been exceeded. Gaim has "
-#: src/protocols/oscar/oscar.c:5564
+#: src/protocols/oscar/oscar.c:5594 msgid "Profile too long."
msgstr "Profile too long."
-#: src/protocols/oscar/oscar.c:5580 src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:5610 src/protocols/oscar/oscar.c:6900 -#: src/protocols/oscar/oscar.c:5598
+#: src/protocols/oscar/oscar.c:5628 msgid "Unable to set AIM away message."
msgstr "Unable to set AIM away message."
-#: src/protocols/oscar/oscar.c:5599
+#: src/protocols/oscar/oscar.c:5629 "You have probably requested to set your away message before the login "
"procedure completed. You remain in a \"present\" state; try setting it "
@@ -8519,7 +8540,7 @@
"procedure completed. You remain in a \"present\" state; try setting it "
"again when you are fully connected."
-#: src/protocols/oscar/oscar.c:5639
+#: src/protocols/oscar/oscar.c:5669 "The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -8534,11 +8555,11 @@
"The maximum away message length of %d bytes has been exceeded. Gaim has "
-#: src/protocols/oscar/oscar.c:5644
+#: src/protocols/oscar/oscar.c:5674 msgid "Away message too long."
msgstr "Away message too long."
-#: src/protocols/oscar/oscar.c:5722
+#: src/protocols/oscar/oscar.c:5751 "Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -8549,16 +8570,16 @@
"must either start with a letter and contain only letters, numbers and "
"spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:5724 src/protocols/oscar/oscar.c:6173
-#: src/protocols/oscar/oscar.c:6187
+#: src/protocols/oscar/oscar.c:5753 src/protocols/oscar/oscar.c:6202 +#: src/protocols/oscar/oscar.c:6216 -#: src/protocols/oscar/oscar.c:5885
+#: src/protocols/oscar/oscar.c:5914 msgid "Unable To Retrieve Buddy List"
msgstr "Unable To Retrieve Buddy List"
-#: src/protocols/oscar/oscar.c:5886
+#: src/protocols/oscar/oscar.c:5915 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
"servers. Your buddy list is not lost, and will probably become available in "
@@ -8568,13 +8589,13 @@
"servers. Your buddy list is not lost, and will probably become available in "
-#: src/protocols/oscar/oscar.c:6068 src/protocols/oscar/oscar.c:6069
-#: src/protocols/oscar/oscar.c:6074 src/protocols/oscar/oscar.c:6231
-#: src/protocols/oscar/oscar.c:6232 src/protocols/oscar/oscar.c:6237
+#: src/protocols/oscar/oscar.c:6097 src/protocols/oscar/oscar.c:6098 +#: src/protocols/oscar/oscar.c:6103 src/protocols/oscar/oscar.c:6260 +#: src/protocols/oscar/oscar.c:6261 src/protocols/oscar/oscar.c:6266 -#: src/protocols/oscar/oscar.c:6171
+#: src/protocols/oscar/oscar.c:6200 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8583,11 +8604,11 @@
"Could not add the buddy %s because you have too many buddies in your buddy "
"list. Please remove one and try again."
-#: src/protocols/oscar/oscar.c:6171 src/protocols/oscar/oscar.c:6185
+#: src/protocols/oscar/oscar.c:6200 src/protocols/oscar/oscar.c:6214 -#: src/protocols/oscar/oscar.c:6185
+#: src/protocols/oscar/oscar.c:6214 "Could not add the buddy %s for an unknown reason. The most common reason "
@@ -8598,7 +8619,7 @@
"for this is that you have the maximum number of allowed buddies in your "
-#: src/protocols/oscar/oscar.c:6268
+#: src/protocols/oscar/oscar.c:6297 "The user %s has given you permission to add you to their buddy list. Do you "
@@ -8607,11 +8628,11 @@
"The user %s has given you permission to add you to their buddy list. Do you "
-#: src/protocols/oscar/oscar.c:6274
+#: src/protocols/oscar/oscar.c:6303 msgid "Authorization Given"
msgstr "Authorisation Given"
-#: src/protocols/oscar/oscar.c:6307
+#: src/protocols/oscar/oscar.c:6336 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8621,17 +8642,17 @@
-#: src/protocols/oscar/oscar.c:6349
+#: src/protocols/oscar/oscar.c:6378 msgid "The user %s has granted your request to add them to your buddy list."
msgstr "The user %s has granted your request to add them to your buddy list."
-#: src/protocols/oscar/oscar.c:6350
+#: src/protocols/oscar/oscar.c:6379 msgid "Authorization Granted"
msgstr "Authorisation Granted"
-#: src/protocols/oscar/oscar.c:6353
+#: src/protocols/oscar/oscar.c:6382 "The user %s has denied your request to add them to your buddy list for the "
@@ -8642,76 +8663,76 @@
-#: src/protocols/oscar/oscar.c:6354
+#: src/protocols/oscar/oscar.c:6383 msgid "Authorization Denied"
msgstr "Authorisation Denied"
-#: src/protocols/oscar/oscar.c:6391 src/protocols/toc/toc.c:1273
+#: src/protocols/oscar/oscar.c:6420 src/protocols/toc/toc.c:1273 -#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:6458 msgid "Invalid chat name specified."
msgstr "Invalid chat name specified."
-#: src/protocols/oscar/oscar.c:6518
+#: src/protocols/oscar/oscar.c:6547 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-#: src/protocols/oscar/oscar.c:6644
+#: src/protocols/oscar/oscar.c:6673 -#: src/protocols/oscar/oscar.c:6930
+#: src/protocols/oscar/oscar.c:6959 msgid "Buddy Comment for %s"
msgstr "Buddy Comment for %s"
-#: src/protocols/oscar/oscar.c:6931
+#: src/protocols/oscar/oscar.c:6960 -#: src/protocols/oscar/oscar.c:6950
+#: src/protocols/oscar/oscar.c:6979 msgid "Edit Buddy Comment"
msgstr "Edit Buddy Comment"
-#: src/protocols/oscar/oscar.c:6956
+#: src/protocols/oscar/oscar.c:6985 -#: src/protocols/oscar/oscar.c:6968
+#: src/protocols/oscar/oscar.c:6997 -#: src/protocols/oscar/oscar.c:6985
+#: src/protocols/oscar/oscar.c:7014 msgid "Re-request Authorization"
msgstr "Re-request Authorisation"
-#: src/protocols/oscar/oscar.c:7015
+#: src/protocols/oscar/oscar.c:7044 msgid "The new formatting is invalid."
msgstr "The new formatting is invalid."
-#: src/protocols/oscar/oscar.c:7016
+#: src/protocols/oscar/oscar.c:7045 msgid "Screen name formatting can change only capitalization and whitespace."
msgstr "Screen name formatting can change only capitalisation and whitespace."
-#: src/protocols/oscar/oscar.c:7023
+#: src/protocols/oscar/oscar.c:7052 msgid "New screen name formatting:"
msgstr "New screen name formatting:"
-#: src/protocols/oscar/oscar.c:7075
+#: src/protocols/oscar/oscar.c:7104 msgid "Change Address To:"
msgstr "Change Address To:"
-#: src/protocols/oscar/oscar.c:7120
+#: src/protocols/oscar/oscar.c:7149 msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>you are not waiting for authorisation</i>"
-#: src/protocols/oscar/oscar.c:7123
+#: src/protocols/oscar/oscar.c:7152 msgid "You are awaiting authorization from the following buddies"
msgstr "You are awaiting authorisation from the following buddies"
-#: src/protocols/oscar/oscar.c:7124
+#: src/protocols/oscar/oscar.c:7153 "You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -8719,75 +8740,75 @@
"You can re-request authorisation from these buddies by right-clicking on "
"them and selecting \"Re-request Authorisation.\""
-#: src/protocols/oscar/oscar.c:7141
+#: src/protocols/oscar/oscar.c:7170 msgid "Find Buddy by E-mail"
msgstr "Find Buddy by E-mail"
-#: src/protocols/oscar/oscar.c:7142
+#: src/protocols/oscar/oscar.c:7171 msgid "Search for a buddy by e-mail address"
msgstr "Search for a buddy by e-mail address"
-#: src/protocols/oscar/oscar.c:7143
+#: src/protocols/oscar/oscar.c:7172 msgid "Type the e-mail address of the buddy you are searching for."
msgstr "Type the e-mail address of the buddy you are searching for."
-#: src/protocols/oscar/oscar.c:7160
+#: src/protocols/oscar/oscar.c:7189 msgid "Available Message:"
msgstr "Available Message:"
-#: src/protocols/oscar/oscar.c:7161
+#: src/protocols/oscar/oscar.c:7190 msgid "I'm doing work and hoping for a distraction--IM me!"
msgstr "I'm doing work and hoping for a distraction--IM me!"
-#: src/protocols/oscar/oscar.c:7242 src/protocols/silc/silc.c:800
+#: src/protocols/oscar/oscar.c:7271 src/protocols/silc/silc.c:800 msgstr "Set User Info..."
-#: src/protocols/oscar/oscar.c:7247
+#: src/protocols/oscar/oscar.c:7276 msgid "Set User Info (URL)..."
msgstr "Set User Info (URL)..."
-#: src/protocols/oscar/oscar.c:7253
+#: src/protocols/oscar/oscar.c:7282 msgid "Set Available Message..."
msgstr "Set Available Message..."
-#: src/protocols/oscar/oscar.c:7258 src/protocols/silc/silc.c:796
+#: src/protocols/oscar/oscar.c:7287 src/protocols/silc/silc.c:796 msgid "Change Password..."
msgstr "Change Password..."
-#: src/protocols/oscar/oscar.c:7263
+#: src/protocols/oscar/oscar.c:7292 msgid "Change Password (URL)"
msgstr "Change Password (URL)"
-#: src/protocols/oscar/oscar.c:7267
+#: src/protocols/oscar/oscar.c:7296 msgid "Configure IM Forwarding (URL)"
msgstr "Configure IM Forwarding (URL)"
-#: src/protocols/oscar/oscar.c:7276
+#: src/protocols/oscar/oscar.c:7305 msgid "Format Screen Name..."
msgstr "Format Screen Name..."
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7309 -#: src/protocols/oscar/oscar.c:7284
+#: src/protocols/oscar/oscar.c:7313 msgid "Display Currently Registered Address"
msgstr "Display Currently Registered Address"
-#: src/protocols/oscar/oscar.c:7288
+#: src/protocols/oscar/oscar.c:7317 msgid "Change Currently Registered Address..."
msgstr "Change Currently Registered Address"
-#: src/protocols/oscar/oscar.c:7295
+#: src/protocols/oscar/oscar.c:7324 msgid "Show Buddies Awaiting Authorization"
msgstr "Show Buddies Awaiting Authorisation"
-#: src/protocols/oscar/oscar.c:7301
+#: src/protocols/oscar/oscar.c:7330 msgid "Search for Buddy by Email..."
msgstr "Search for Buddy by Email..."
-#: src/protocols/oscar/oscar.c:7306
+#: src/protocols/oscar/oscar.c:7335 msgid "Search for Buddy by Information"
msgstr "Search for Buddy by Information"
@@ -8801,19 +8822,19 @@
-#: src/protocols/oscar/oscar.c:7427 src/protocols/oscar/oscar.c:7429
+#: src/protocols/oscar/oscar.c:7456 src/protocols/oscar/oscar.c:7458 msgid "AIM/ICQ Protocol Plugin"
msgstr "AIM/ICQ Protocol Plugin"
-#: src/protocols/oscar/oscar.c:7448
+#: src/protocols/oscar/oscar.c:7477 -#: src/protocols/oscar/oscar.c:7451
+#: src/protocols/oscar/oscar.c:7480 -#: src/protocols/oscar/oscar.c:7454 src/protocols/zephyr/zephyr.c:2760
+#: src/protocols/oscar/oscar.c:7483 src/protocols/zephyr/zephyr.c:2760 @@ -10442,25 +10463,25 @@
"You have been logged off as you have logged in on a different machine or "
-#: src/protocols/yahoo/yahoo.c:821
+#: src/protocols/yahoo/yahoo.c:826 msgid "Your Yahoo! message did not get sent."
msgstr "Your Yahoo! message did not get sent."
-#: src/protocols/yahoo/yahoo.c:840
+#: src/protocols/yahoo/yahoo.c:845 -#: src/protocols/yahoo/yahoo.c:885
+#: src/protocols/yahoo/yahoo.c:890 msgid "Yahoo! system message for %s:"
msgstr "Yahoo! system message for %s:"
-#: src/protocols/yahoo/yahoo.c:952
+#: src/protocols/yahoo/yahoo.c:957 msgid "%s has (retroactively) denied your request to add them to your list."
msgstr "%s has (retroactively) denied your request to add them to your list."
-#: src/protocols/yahoo/yahoo.c:955
+#: src/protocols/yahoo/yahoo.c:960 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10469,11 +10490,11 @@
"%s has (retroactively) denied your request to add them to your list for the "
-#: src/protocols/yahoo/yahoo.c:958
+#: src/protocols/yahoo/yahoo.c:963 msgid "Add buddy rejected"
msgstr "Add buddy rejected"
-#: src/protocols/yahoo/yahoo.c:1719
+#: src/protocols/yahoo/yahoo.c:1724 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10484,11 +10505,11 @@
"method. This version of Gaim will likely not be able to successfully sign "
"on to Yahoo. Check %s for updates."
-#: src/protocols/yahoo/yahoo.c:1722
+#: src/protocols/yahoo/yahoo.c:1727 msgid "Failed Yahoo! Authentication"
msgstr "Failed Yahoo! Authentication"
-#: src/protocols/yahoo/yahoo.c:1794
+#: src/protocols/yahoo/yahoo.c:1799 "You have tried to ignore %s, but the user is on your buddy list. Clicking "
@@ -10497,19 +10518,19 @@
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
"\"Yes\" will remove and ignore the buddy."
-#: src/protocols/yahoo/yahoo.c:1797
+#: src/protocols/yahoo/yahoo.c:1802 -#: src/protocols/yahoo/yahoo.c:1831
+#: src/protocols/yahoo/yahoo.c:1836 msgid "Invalid username."
msgstr "Invalid username."
-#: src/protocols/yahoo/yahoo.c:1842
+#: src/protocols/yahoo/yahoo.c:1847 msgid "Normal authentication failed!"
msgstr "Normal authentication failed!"
-#: src/protocols/yahoo/yahoo.c:1843
+#: src/protocols/yahoo/yahoo.c:1848 "The normal authentication method has failed. This means either your password "
"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10521,90 +10542,90 @@
"attempt to log in using Web Messenger authentication, will which result in "
"reduced functionality and features."
-#: src/protocols/yahoo/yahoo.c:1851
+#: src/protocols/yahoo/yahoo.c:1856 msgid "Incorrect password."
msgstr "Incorrect password."
-#: src/protocols/yahoo/yahoo.c:1854
+#: src/protocols/yahoo/yahoo.c:1859 msgid "Your account is locked, please log in to the Yahoo! website."
msgstr "Your account is locked, please log in to the Yahoo! website."
-#: src/protocols/yahoo/yahoo.c:1857
+#: src/protocols/yahoo/yahoo.c:1862 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
-#: src/protocols/yahoo/yahoo.c:1911
+#: src/protocols/yahoo/yahoo.c:1916 msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr "Could not add buddy %s to group %s to the server list on account %s."
-#: src/protocols/yahoo/yahoo.c:1914
+#: src/protocols/yahoo/yahoo.c:1919 msgid "Could not add buddy to server list"
msgstr "Could not add buddy to server list"
-#: src/protocols/yahoo/yahoo.c:2148 src/protocols/yahoo/yahoo.c:2276
+#: src/protocols/yahoo/yahoo.c:2153 src/protocols/yahoo/yahoo.c:2281 #: src/protocols/yahoo/ycht.c:414
-#: src/protocols/yahoo/yahoo.c:2298 src/protocols/yahoo/yahoo.c:2408
-#: src/protocols/yahoo/yahoo.c:2458 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477
+#: src/protocols/yahoo/yahoo.c:2303 src/protocols/yahoo/yahoo.c:2413 +#: src/protocols/yahoo/yahoo.c:2463 src/protocols/yahoo/yahoo.c:2473 +#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1478 #: src/protocols/yahoo/ycht.c:518
msgid "Connection problem"
msgstr "Connection problem"
-#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2931
-#: src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/yahoo/yahoo.c:2569 src/protocols/yahoo/yahoo.c:2936 +#: src/protocols/yahoo/yahoo.c:3050 -#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2933
-#: src/protocols/yahoo/yahoo.c:3046
+#: src/protocols/yahoo/yahoo.c:2571 src/protocols/yahoo/yahoo.c:2938 +#: src/protocols/yahoo/yahoo.c:3051 -#: src/protocols/yahoo/yahoo.c:2568 src/protocols/yahoo/yahoo.c:2935
-#: src/protocols/yahoo/yahoo.c:3047
+#: src/protocols/yahoo/yahoo.c:2573 src/protocols/yahoo/yahoo.c:2940 +#: src/protocols/yahoo/yahoo.c:3052 -#: src/protocols/yahoo/yahoo.c:2572 src/protocols/yahoo/yahoo.c:2939
-#: src/protocols/yahoo/yahoo.c:3049
+#: src/protocols/yahoo/yahoo.c:2577 src/protocols/yahoo/yahoo.c:2944 +#: src/protocols/yahoo/yahoo.c:3054 -#: src/protocols/yahoo/yahoo.c:2576 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3051
+#: src/protocols/yahoo/yahoo.c:2581 src/protocols/yahoo/yahoo.c:2948 +#: src/protocols/yahoo/yahoo.c:3056 -#: src/protocols/yahoo/yahoo.c:2657 src/protocols/yahoo/yahoo.c:2683
+#: src/protocols/yahoo/yahoo.c:2662 src/protocols/yahoo/yahoo.c:2688 msgid "Not on server list"
msgstr "Not on server list"
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2767 -#: src/protocols/yahoo/yahoo.c:2767
+#: src/protocols/yahoo/yahoo.c:2772 msgid "Initiate Conference"
msgstr "Initiate Conference"
-#: src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/yahoo/yahoo.c:2824 msgstr "Active which ID?"
-#: src/protocols/yahoo/yahoo.c:2828
+#: src/protocols/yahoo/yahoo.c:2833 msgid "Join who in chat?"
msgstr "Join who in chat?"
-#: src/protocols/yahoo/yahoo.c:2838
+#: src/protocols/yahoo/yahoo.c:2843 -#: src/protocols/yahoo/yahoo.c:2842
+#: src/protocols/yahoo/yahoo.c:2847 msgid "Join user in chat..."
msgstr "Join user in chat..."
@@ -10618,47 +10639,47 @@
-#: src/protocols/yahoo/yahoo.c:3377 src/protocols/yahoo/yahoo.c:3379
+#: src/protocols/yahoo/yahoo.c:3382 src/protocols/yahoo/yahoo.c:3384 msgid "Yahoo Protocol Plugin"
msgstr "Yahoo Protocol Plugin"
-#: src/protocols/yahoo/yahoo.c:3398
+#: src/protocols/yahoo/yahoo.c:3403 -#: src/protocols/yahoo/yahoo.c:3401
+#: src/protocols/yahoo/yahoo.c:3406 -#: src/protocols/yahoo/yahoo.c:3404
+#: src/protocols/yahoo/yahoo.c:3409 msgstr "Japan Pager host"
-#: src/protocols/yahoo/yahoo.c:3407
+#: src/protocols/yahoo/yahoo.c:3412 -#: src/protocols/yahoo/yahoo.c:3410
+#: src/protocols/yahoo/yahoo.c:3415 msgid "File transfer host"
msgstr "File transfer host"
-#: src/protocols/yahoo/yahoo.c:3413
+#: src/protocols/yahoo/yahoo.c:3418 msgid "Japan File transfer host"
msgstr "Japan File transfer host"
-#: src/protocols/yahoo/yahoo.c:3416
+#: src/protocols/yahoo/yahoo.c:3421 msgid "File transfer port"
msgstr "File transfer port"
-#: src/protocols/yahoo/yahoo.c:3419
+#: src/protocols/yahoo/yahoo.c:3424 msgid "Chat Room List Url"
msgstr "Chat Room List Url"
-#: src/protocols/yahoo/yahoo.c:3422
+#: src/protocols/yahoo/yahoo.c:3427 -#: src/protocols/yahoo/yahoo.c:3425
+#: src/protocols/yahoo/yahoo.c:3430 @@ -10791,19 +10812,19 @@
msgid "Fetching the room list failed."
msgstr "Fetching the room list failed."
-#: src/protocols/yahoo/yahoochat.c:1402
+#: src/protocols/yahoo/yahoochat.c:1403 -#: src/protocols/yahoo/yahoochat.c:1405
+#: src/protocols/yahoo/yahoochat.c:1406 -#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1478 msgid "Unable to fetch room list."
msgstr "Unable to fetch room list."
-#: src/protocols/yahoo/yahoochat.c:1470
+#: src/protocols/yahoo/yahoochat.c:1471 @@ -10949,21 +10970,21 @@
#. XXX: why in the hell are we calling gaim_connection_error() here?