--- a/po/en_GB.po Wed Jan 19 19:49:13 2005 -0500
+++ b/po/en_GB.po Wed Jan 19 20:26:19 2005 -0500
@@ -5,15 +5,15 @@
-"Project-Id-Version: Gaim 0.73\n"-"Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2004-11-30 17:30+0000\n"+"Project-Id-Version: Gaim 1.1.2\n" +"POT-Creation-Date: 2005-01-19 20:25-0500\n" "PO-Revision-Date: 2004-01-14 12:26+0000\n"
"Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
"Language-Team: <en_GB@li.org>\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n>1;\n"
#: plugins/autorecon.c:234
@@ -45,7 +45,6 @@
#: plugins/autorecon.c:273 plugins/autorecon.c:275
msgid "When you are kicked offline, this reconnects you."
msgstr "When you are kicked offline, this reconnects you."
@@ -149,7 +148,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 @@ -166,20 +165,20 @@
#: plugins/docklet/docklet.c:184 src/gtkprefs.c:1812 src/protocols/gg/gg.c:52
-#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:961+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:973 #: 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/jabber/presence.c:133 src/protocols/novell/novell.c:2800 #: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
-#: src/protocols/oscar/oscar.c:670 src/protocols/oscar/oscar.c:5617-#: src/protocols/oscar/oscar.c:6609 src/protocols/oscar/oscar.c:6809-#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:47+#: 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/silc/buddy.c:1388 src/protocols/silc/silc.c:47 #: src/protocols/silc/silc.c:81
#: plugins/docklet/docklet.c:190 src/away.c:584
-#: src/protocols/oscar/oscar.c:5535 src/protocols/oscar/oscar.c:6817+#: src/protocols/oscar/oscar.c:5588 src/protocols/oscar/oscar.c:6870 @@ -191,7 +190,7 @@
-#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2341+#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2357 @@ -300,7 +299,6 @@
#: plugins/filectl.c:227 plugins/filectl.c:229
msgid "Allows you to control Gaim by entering commands in a file."
msgstr "Allows you to control Gaim by entering commands in a file."
@@ -321,7 +319,7 @@
-#: plugins/gaim-remote/remote.c:669+#: plugins/gaim-remote/remote.c:670 "Failed to assign %s to a socket:\n"
@@ -330,7 +328,7 @@
"Failed to assign %s to a socket:\n"
-#: plugins/gaim-remote/remote.c:692+#: plugins/gaim-remote/remote.c:694 msgid "Unable to open socket"
msgstr "Unable to open socket"
@@ -340,19 +338,19 @@
-#: plugins/gaim-remote/remote.c:742+#: plugins/gaim-remote/remote.c:744 -#: plugins/gaim-remote/remote.c:745+#: plugins/gaim-remote/remote.c:747 msgid "Provides remote control for gaim applications."
msgstr "Provides remote control for gaim applications."
-#: plugins/gaim-remote/remote.c:747+#: plugins/gaim-remote/remote.c:749 "Gives Gaim the ability to be remote-controlled through third-party "
"applications or through the gaim-remote tool."
@@ -444,8 +442,8 @@
#: 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:599-#: src/protocols/msn/msn.c:1479 src/protocols/trepia/trepia.c:399+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607 +#: src/protocols/msn/msn.c:1433 src/protocols/trepia/trepia.c:399 @@ -460,13 +458,13 @@
#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7093+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7146 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4124+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4144 @@ -505,13 +503,13 @@
msgstr "_Associate Buddy"
#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
-#: src/gtkblist.c:3082 src/gtkprefs.c:962 src/gtkprefs.c:1014-#: src/gtkprefs.c:1826 src/protocols/jabber/jabber.c:925+#: src/gtkblist.c:3084 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:1924 src/gtkblist.c:3943+#: src/blist.c:774 src/blist.c:981 src/blist.c:1928 src/gtkblist.c:3963 #: src/protocols/jabber/roster.c:66
@@ -530,7 +528,7 @@
msgid "Select all accounts that buddies should be auto-added to."
msgstr "Select all accounts that buddies should be auto-added to."
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:620+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:621 @@ -547,7 +545,6 @@
#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
msgid "Provides integration with Ximian Evolution."
msgstr "Provides integration with Ximian Evolution."
@@ -574,8 +571,8 @@
msgstr "Optional information"
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:576+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379 +#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:575 @@ -604,7 +601,6 @@
#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
msgid "Test to see that all ui signals are working properly."
msgstr "Test to see that all UI signals are working properly."
@@ -638,7 +634,6 @@
#: plugins/iconaway.c:107 plugins/iconaway.c:109
msgid "Iconifies the buddy list and your conversations when you go away."
msgstr "Iconifies the buddy list and your conversations when you go away."
@@ -728,68 +723,68 @@
msgstr "Adds a small box to the buddy list that shows if you have new mail."
#. ---------- "Notify For" ----------
msgstr "_Focused windows"
#. ---------- "Notification Methods" ----------
msgid "Notification Methods"
msgstr "Notification Methods"
msgid "Prepend _string into window title:"
msgstr "Prepend _string into window title:"
msgid "Insert c_ount of new messages into window title"
msgstr "Insert c_ount of new messages into window title"
msgid "Set window manager \"_URGENT\" hint"
msgstr "Set window manager \"_URGENT\" hint"
#. ---------- "Notification Removals" ----------
msgid "Notification Removal"
msgstr "Notification Removal"
#. Remove on focus button
msgid "Remove when conversation window _gains focus"
msgstr "Remove when conversation window _gains focus"
#. Remove on click button
msgid "Remove when conversation window _receives click"
msgstr "Remove when conversation window _receives click"
msgid "Remove when _typing in conversation window"
msgstr "Remove when _typing in conversation window"
#. Remove on message send button
msgid "Remove when a _message gets sent"
msgstr "Remove when a _message gets sent"
#. Remove on conversation switch button
msgid "Remove on switch to conversation ta_b"
msgstr "Remove on switch to conversation ta_b"
@@ -799,15 +794,14 @@
msgid "Message Notification"
msgstr "Message Notification"
-#: plugins/notify.c:799 plugins/notify.c:801+#: plugins/notify.c:802 plugins/notify.c:804 msgid "Provides a variety of ways of notifying you of unread messages."
msgstr "Provides a variety of ways of notifying you of unread messages."
@@ -823,7 +817,6 @@
#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
msgid "Provides support for loading perl plugins."
msgstr "Provides support for loading perl plugins."
@@ -910,7 +903,6 @@
#: plugins/signals-test.c:588 plugins/signals-test.c:590
msgid "Test to see that all signals are working properly."
msgstr "Test to see that all signals are working properly."
@@ -928,7 +920,6 @@
#: plugins/simple.c:37 plugins/simple.c:39
msgid "Tests to see that most things are working."
msgstr "Tests to see that most things are working."
@@ -978,7 +969,6 @@
#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
msgid "Provides SSL support through GNUTLS."
msgstr "Provides SSL support through GNUTLS."
@@ -989,15 +979,14 @@
-#: plugins/ssl/ssl-nss.c:318+#: plugins/ssl/ssl-nss.c:327
-#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323+#: plugins/ssl/ssl-nss.c:330 plugins/ssl/ssl-nss.c:332 msgid "Provides SSL support through Mozilla NSS."
msgstr "Provides SSL support through Mozilla NSS."
@@ -1014,7 +1003,6 @@
#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
msgid "Provides a wrapper around SSL support libraries."
msgstr "Provides a wrapper around SSL support libraries."
@@ -1064,7 +1052,6 @@
#: plugins/statenotify.c:122 plugins/statenotify.c:125
"Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1073,11 +1060,11 @@
"Notifies in a conversation window when a buddy goes or returns from away or "
-#: plugins/tcl/tcl.c:363+#: plugins/tcl/tcl.c:364 msgid "Tcl Plugin Loader"
msgstr "Tcl Plugin Loader"
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366+#: plugins/tcl/tcl.c:366 plugins/tcl/tcl.c:367 msgid "Provides support for loading Tcl plugins"
msgstr "Provides support for loading Tcl plugins"
@@ -1094,7 +1081,6 @@
#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
msgid "A horizontal scrolling version of the buddy list."
msgstr "A horizontal scrolling version of the buddy list."
@@ -1128,7 +1114,6 @@
#: plugins/timestamp.c:274 plugins/timestamp.c:276
msgid "Adds iChat-style timestamps to conversations every N minutes."
msgstr "Adds iChat-style timestamps to conversations every N minutes."
@@ -1205,7 +1190,7 @@
msgstr "_Start Gaim on Windows startup"
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3127+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3129 @@ -1226,7 +1211,7 @@
#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
-#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1816+#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1770 @@ -1242,7 +1227,7 @@
msgid "Options specific to Windows Gaim."
msgstr "Options specific to Windows Gaim."
-#: src/account.c:277 src/protocols/jabber/jabber.c:1002+#: src/account.c:277 src/protocols/jabber/jabber.c:1014 msgid "New passwords do not match."
msgstr "New passwords do not match."
@@ -1274,47 +1259,49 @@
#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2454-#: src/gtkdialogs.c:392 src/gtkdialogs.c:534 src/gtkdialogs.c:588-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1049-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228-#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258-#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3512-#: src/protocols/oscar/oscar.c:3606 src/protocols/oscar/oscar.c:6880-#: src/protocols/oscar/oscar.c:6972 src/protocols/oscar/oscar.c:7024-#: src/protocols/oscar/oscar.c:7110 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/request.h:1245+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2456 +#: 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/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/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:2455-#: src/gtkblist.c:4509 src/gtkconn.c:169 src/gtkdialogs.c:393-#: src/gtkdialogs.c:535 src/gtkdialogs.c:589 src/gtkdialogs.c:687-#: src/gtkdialogs.c:709 src/gtkdialogs.c:729 src/gtkdialogs.c:766-#: src/gtkdialogs.c:826 src/gtkdialogs.c:869 src/gtkdialogs.c:907-#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599+#: src/gtkaccount.c:2026 src/gtkaccount.c:2522 src/gtkblist.c:2457 +#: src/gtkblist.c:4530 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
-#: src/protocols/jabber/chat.c:752 src/protocols/jabber/jabber.c:668-#: src/protocols/jabber/jabber.c:1050 src/protocols/jabber/xdata.c:338-#: src/protocols/msn/msn.c:229 src/protocols/msn/msn.c:244-#: src/protocols/msn/msn.c:259 src/protocols/msn/msn.c:274-#: src/protocols/msn/msn.c:291 src/protocols/oscar/oscar.c:1517-#: src/protocols/oscar/oscar.c:3470 src/protocols/oscar/oscar.c:3513-#: src/protocols/oscar/oscar.c:3550 src/protocols/oscar/oscar.c:3607-#: src/protocols/oscar/oscar.c:6881 src/protocols/oscar/oscar.c:6973-#: src/protocols/oscar/oscar.c:7025 src/protocols/oscar/oscar.c:7094-#: src/protocols/oscar/oscar.c:7111 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/request.h:1245 src/request.h:1255+#: src/protocols/jabber/chat.c:754 src/protocols/jabber/jabber.c:676 +#: 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/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/request.h:1245 src/request.h:1255 @@ -1355,7 +1342,7 @@
msgstr "Remove Away Message"
-#: src/away.c:366 src/gtkconv.c:1500 src/gtkconv.c:3863 src/gtkconv.c:3934+#: src/away.c:366 src/gtkconv.c:1501 src/gtkconv.c:3869 src/gtkconv.c:3940 @@ -1406,7 +1393,7 @@
"%d buddy from group %s was not removed because its account was not logged "
@@ -1421,11 +1408,11 @@
"%d buddies from group %s were not removed because their accounts were not "
"logged in. These buddies and the group were not removed.\n"
msgid "Group not removed"
msgstr "Group not removed"
"An error was encountered parsing your buddy list. It has not been loaded, "
"and the old file has moved to blist.xml~."
@@ -1433,7 +1420,7 @@
"An error was encountered parsing your buddy list. It has not been loaded, "
"and the old file has been moved to blist.xml~."
msgstr "Buddy List Error"
@@ -1460,7 +1447,7 @@
msgstr "Unable to send message. The message is too large."
#: src/conversation.c:237 src/conversation.c:251
-#: src/protocols/oscar/oscar.c:4073+#: src/protocols/oscar/oscar.c:4126 msgid "Unable to send message to %s:"
msgstr "Unable to send message to %s:"
@@ -1473,67 +1460,67 @@
msgid "Unable to send message."
msgstr "Unable to send message."
-#: src/conversation.c:1989+#: src/conversation.c:1992 msgid "%s entered the room."
msgstr "%s entered the room."
-#: src/conversation.c:1992+#: src/conversation.c:1995 msgid "%s [<I>%s</I>] entered the room."
msgstr "%s [<I>%s</I>] entered the room."
-#: src/conversation.c:2088+#: src/conversation.c:2091 msgid "You are now known as %s"
msgstr "You are now known as %s"
-#: src/conversation.c:2091+#: src/conversation.c:2094 msgid "%s is now known as %s"
msgstr "%s is now known as %s"
-#: src/conversation.c:2132+#: src/conversation.c:2135 msgid "%s left the room (%s)."
msgstr "%s left the room (%s)."
-#: src/conversation.c:2134+#: src/conversation.c:2137 msgid "%s left the room."
msgstr "%s left the room."
-#: src/conversation.c:2203+#: src/conversation.c:2206 -#: src/conversation.c:2205+#: src/conversation.c:2208 msgid " left the room (%s)."
msgstr " left the room (%s)."
-#: src/conversation.c:2610+#: src/conversation.c:2613 msgid "Last created window"
msgstr "Last created window"
-#: src/conversation.c:2612+#: src/conversation.c:2615 msgid "Separate IM and Chat windows"
msgstr "Separate IM and Chat windows"
-#: src/conversation.c:2614 src/gtkprefs.c:1387+#: src/conversation.c:2617 src/gtkprefs.c:1387 -#: src/conversation.c:2616+#: src/conversation.c:2619 -#: src/conversation.c:2618+#: src/conversation.c:2621 -#: src/ft.c:147 src/protocols/msn/msn.c:370+#: src/ft.c:147 src/protocols/msn/msn.c:368 @@ -1573,17 +1560,22 @@
msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
msgid "%s wants to send you %s (%s)"
msgstr "%s wants to send you %s (%s)"
+msgid "%s wants to send you a file" +msgstr "%s wants to send you a file" msgid "Accept file transfer request from %s?"
msgstr "Accept file transfer request from %s?"
"A file is available for download from:\n"
@@ -1594,37 +1586,50 @@
msgid "%s is not a valid filename.\n"
msgstr "%s is not a valid filename.\n"
msgid "Offering to send %s to %s"
msgstr "Offering to send %s to %s"
-msgid "Transfer of %s complete"-msgstr "Transfer of %s complete"+msgid "Transfer of file %s complete" +msgstr "Transfer of file %s complete" +msgid "File transfer complete" +msgstr "File transfer complete" msgid "You canceled the transfer of %s"
msgstr "You cancelled the transfer of %s"
+msgid "File transfer cancelled" +msgstr "File transfer cancelled" msgid "%s canceled the transfer of %s"
msgstr "%s cancelled the transfer of %s"
+msgid "%s canceled the file transfer" +msgstr "%s cancelled the transfer of" msgid "File transfer to %s aborted.\n"
msgstr "File transfer to %s aborted.\n"
msgid "File transfer from %s aborted.\n"
msgstr "File transfer from %s aborted.\n"
@@ -1738,7 +1743,7 @@
"Set all accounts as not away.\n"
@@ -1750,164 +1755,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:4096+#: src/gtkaccount.c:660 src/gtkblist.c:4116
-#: src/gtkaccount.c:725 src/gtkblist.c:4110 src/gtkblist.c:4457+#: src/gtkaccount.c:738 src/gtkblist.c:4130 src/gtkblist.c:4477
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:667+#: 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:4157+#: src/gtkaccount.c:2139 src/protocols/oscar/oscar.c:4210 -#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:959-#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:5615-#: src/protocols/oscar/oscar.c:6808 src/protocols/silc/silc.c:45-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/zephyr/zephyr.c:2123-#: src/protocols/zephyr/zephyr.c:2142+#: src/gtkaccount.c:2163 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/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 @@ -1917,18 +1922,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:4508 src/gtkconv.c:1502-#: src/gtkconv.c:3856 src/gtkconv.c:3927 src/gtkrequest.c:247-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3784+#: src/gtkaccount.c:2521 src/gtkblist.c:4529 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/silc/chat.c:593
@@ -1949,11 +1954,11 @@
-#: src/gtkblist.c:1166 src/gtkblist.c:3280+#: src/gtkblist.c:1166 src/gtkblist.c:3282 -#: src/gtkblist.c:1169 src/gtkblist.c:3270+#: src/gtkblist.c:1169 src/gtkblist.c:3272 @@ -1981,7 +1986,7 @@
msgstr "Alias Contact..."
-#: src/gtkblist.c:1200 src/gtkdialogs.c:763 src/gtkdialogs.c:765+#: src/gtkblist.c:1200 src/gtkdialogs.c:856 src/gtkdialogs.c:858 @@ -2028,136 +2033,136 @@
-#: src/gtkblist.c:1981 src/gtkconv.c:4499 src/gtkpounce.c:316+#: src/gtkblist.c:1981 src/gtkconv.c:4505 src/gtkpounce.c:316 "You are not currently signed on with an account that can add that buddy."
"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/Account Ac_tions"
msgstr "/Tools/Account Ac_tions"
-msgid "/Tools/Pl_ugin Actions"-msgstr "/Tools/Pl_ugin Actions"+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."
@@ -2166,7 +2171,7 @@
@@ -2174,12 +2179,12 @@
@@ -2187,7 +2192,7 @@
@@ -2195,7 +2200,7 @@
@@ -2203,7 +2208,7 @@
@@ -2211,7 +2216,7 @@
@@ -2219,7 +2224,7 @@
@@ -2227,7 +2232,7 @@
@@ -2235,7 +2240,7 @@
"<b>Description:</b> Spooky"
@@ -2243,7 +2248,7 @@
"<b>Description:</b> Spooky"
@@ -2251,7 +2256,7 @@
@@ -2259,108 +2264,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:4050 src/protocols/silc/buddy.c:731+#: src/gtkblist.c:4070 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
"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. "
@@ -2371,15 +2376,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:4134 src/gtkblist.c:4437+#: src/gtkblist.c:4154 src/gtkblist.c:4457
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 "
@@ -2387,11 +2392,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"
@@ -2399,15 +2404,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:5075 src/gtkblist.c:5172+#: src/gtkblist.c:5096 src/gtkblist.c:5193 msgid "No actions available"
msgstr "No actions available"
@@ -2427,11 +2432,11 @@
-#: src/gtkconn.c:361 src/gtkconn.c:593+#: src/gtkconn.c:361 src/gtkconn.c:594
"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2444,15 +2449,15 @@
@@ -2533,7 +2538,7 @@
-#: src/gtkconv.c:905 src/gtkconv.c:2615 src/gtkdebug.c:182+#: src/gtkconv.c:905 src/gtkconv.c:2620 src/gtkdebug.c:182 msgid "Unable to open file."
msgstr "Unable to read file."
@@ -2554,318 +2559,318 @@
-#: src/gtkconv.c:1459 src/gtkconv.c:3849 src/protocols/oscar/oscar.c:591+#: src/gtkconv.c:1460 src/gtkconv.c:3855 src/protocols/oscar/oscar.c:590
-#: src/gtkconv.c:1470 src/gtkprefs.c:831+#: src/gtkconv.c:1471 src/gtkprefs.c:831 -#: src/gtkconv.c:1479 src/gtkconv.c:3870+#: src/gtkconv.c:1480 src/gtkconv.c:3876
msgid "Unable to save icon file to disk."
msgstr "Unable to save icon file to disk."
msgid "User is typing..."
msgstr "User is typing..."
msgid "User has typed something and paused"
msgstr "User has typed something and paused"
#. Build the Send As menu
msgid "/Conversation/New Instant _Message..."
msgstr "/Conversation/New Instant _Message..."
msgid "/Conversation/_Find..."
msgstr "/Conversation/_Find..."
msgid "/Conversation/View _Log"
msgstr "/Conversation/View _Log"
msgid "/Conversation/_Save As..."
msgstr "/Conversation/_Save As..."
msgid "/Conversation/Clear"
msgstr "/Conversation/Clear"
msgid "/Conversation/Se_nd File..."
msgstr "/Conversation/Se_nd File..."
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/Conversation/Add Buddy _Pounce..."
msgid "/Conversation/_Get Info"
msgstr "/Conversation/_Get Info"
msgid "/Conversation/_Warn..."
msgstr "/Conversation/_Warn..."
msgid "/Conversation/In_vite..."
msgstr "/Conversation/In_vite..."
msgid "/Conversation/A_lias..."
msgstr "/Conversation/A_lias..."
msgid "/Conversation/_Block..."
msgstr "/Conversation/_Block..."
msgid "/Conversation/_Add..."
msgstr "/Conversation/_Add..."
msgid "/Conversation/_Remove..."
msgstr "/Conversation/_Remove..."
msgid "/Conversation/Insert Lin_k..."
msgstr "/Conversation/Insert Lin_k..."
msgid "/Conversation/Insert Imag_e..."
msgstr "/Conversation/Insert Imag_e..."
msgid "/Conversation/_Close"
msgstr "/Conversation/_Close"
msgid "/Options/Enable _Logging"
msgstr "/Options/Enable _Logging"
msgid "/Options/Enable _Sounds"
msgstr "/Options/Enable _Sounds"
msgid "/Options/Show Formatting _Toolbar"
msgstr "/Options/Show Formatting _Toolbar"
msgid "/Options/Show T_imestamps"
msgstr "/Options/Show T_imestamps"
msgid "/Conversation/View Log"
msgstr "/Conversation/View Log"
msgid "/Conversation/Send File..."
msgstr "/Conversation/Send File..."
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/Conversation/Add Buddy Pounce..."
msgid "/Conversation/Get Info"
msgstr "/Conversation/Get Info"
msgid "/Conversation/Warn..."
msgstr "/Conversation/Warn..."
msgid "/Conversation/Invite..."
msgstr "/Conversation/Invite..."
msgid "/Conversation/Alias..."
msgstr "/Conversation/Alias..."
msgid "/Conversation/Block..."
msgstr "/Conversation/Block..."
msgid "/Conversation/Add..."
msgstr "/Conversation/Add..."
-msgid "/Conversation/Remove..."-msgstr "/Conversation/Remove..."+msgid "/Conversation/Remove..." +msgstr "/Conversation/Remove..." msgid "/Conversation/Insert Link..."
msgstr "/Conversation/Insert Link..."
msgid "/Conversation/Insert Image..."
msgstr "/Conversation/Insert Image..."
msgid "/Options/Enable Logging"
msgstr "/Options/Enable Logging"
msgid "/Options/Enable Sounds"
msgstr "/Options/Enable Sounds"
msgid "/Options/Show Formatting Toolbar"
msgstr "/Options/Show Formatting Toolbar"
msgid "/Options/Show Timestamps"
msgstr "/Options/Show Timestamps"
#. The buttons, from left to right
-#: src/gtkconv.c:3842 src/gtkprivacy.c:623 src/gtkprivacy.c:634+#: src/gtkconv.c:3848 src/gtkprivacy.c:623 src/gtkprivacy.c:634
msgid "Send a file to the user"
msgstr "Send a file to the user"
msgid "Add the user to your buddy list"
msgstr "Add the user to your buddy list"
msgid "Remove the user from your buddy list"
msgstr "Remove the user from your buddy list"
-#: src/gtkconv.c:3871 src/gtkconv.c:4206+#: src/gtkconv.c:3877 src/gtkconv.c:4212 msgid "Get the user's information"
msgstr "Get the user's information"
-#: src/gtkconv.c:3877 src/gtkconv.c:3941+#: src/gtkconv.c:3883 src/gtkconv.c:3947 -#: src/gtkconv.c:3878 src/gtkconv.c:3942+#: src/gtkconv.c:3884 src/gtkconv.c:3948 #. The buttons, from left to right
msgid "Add the chat to your buddy list"
msgstr "Add the chat to your buddy list"
msgid "Remove the chat from your buddy list"
msgstr "Remove the chat from your buddy list"
#. Setup the label telling how many people are in the room.
msgstr "0 people in room"
msgid "Close conversation"
msgstr "Close conversation"
-#: src/gtkconv.c:5323 src/gtkconv.c:5352 src/gtkconv.c:5448 src/gtkconv.c:5506+#: src/gtkconv.c:5329 src/gtkconv.c:5358 src/gtkconv.c:5454 src/gtkconv.c:5512 msgid "%d person in room"
msgid_plural "%d people in room"
msgstr[0] "%d person in room"
msgstr[1] "%d people in room"
-#: src/gtkconv.c:6079 src/gtkconv.c:6082+#: src/gtkconv.c:6085 src/gtkconv.c:6088 msgid "<main>/Conversation/Close"
msgstr "<main>/Conversation/Close"
"say <message>: Send a message normally as if you weren't using a "
@@ -2873,11 +2878,11 @@
"say <message>: Send a message normally as if you weren't using a "
msgid "me <action>: Send an IRC style action to a buddy or chat."
msgstr "me <action>: Send an IRC style action to a buddy or chat."
"debug <option>: Send various debug information to the current "
@@ -2885,7 +2890,7 @@
"debug <option>: Send various debug information to the current "
msgid "help <command>: Help on a specific command."
msgstr "help <command>: Help on a specific command."
@@ -2913,205 +2918,218 @@
-msgid "developer & webmaster"-msgstr "developer & webmaster"+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:68 +#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:73 -#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69-#: src/gtkdialogs.c:70 src/gtkdialogs.c:72+msgid "developer & webmaster" +msgstr "developer & webmaster"
msgid "former libfaim maintainer"
msgstr "former libfaim maintainer"
msgid "former lead developer"
msgstr "former lead developer"
msgid "former maintainer"
msgstr "former maintainer"
msgid "former Jabber developer"
msgstr "former Jabber developer"
msgid "hacker and designated driver [lazy bum]"
msgstr "hacker and designated driver [lazy bum]"
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:126+#: src/gtkdialogs.c:101 src/gtkdialogs.c:142 -#: src/gtkdialogs.c:88 src/gtkdialogs.c:127 src/gtkdialogs.c:128+#: src/gtkdialogs.c:102 src/gtkdialogs.c:143 src/gtkdialogs.c:144 -#: src/gtkdialogs.c:89 src/gtkdialogs.c:129+#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
msgid "Australian English"
msgstr "Australian English"
msgstr "Canadian English"
-#: src/gtkdialogs.c:94 src/gtkdialogs.c:130+#: src/gtkdialogs.c:108 src/gtkdialogs.c:146 -#: src/gtkdialogs.c:95 src/gtkdialogs.c:131+#: src/gtkdialogs.c:109 src/gtkdialogs.c:147 -#: src/gtkdialogs.c:96 src/gtkdialogs.c:132+#: src/gtkdialogs.c:110 src/gtkdialogs.c:148 -#: src/gtkdialogs.c:97 src/gtkdialogs.c:133+#: src/gtkdialogs.c:111 src/gtkdialogs.c:149
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:134+#: src/gtkdialogs.c:115 src/gtkdialogs.c:150 -#: src/gtkdialogs.c:102 src/gtkdialogs.c:135+#: src/gtkdialogs.c:116 src/gtkdialogs.c:151
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:136+#: src/gtkdialogs.c:118 src/gtkdialogs.c:152
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:137+#: src/gtkdialogs.c:123 src/gtkdialogs.c:153
msgid "Portuguese-Brazil"
msgstr "Portuguese-Brazil"
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:138 src/gtkdialogs.c:139+#: src/gtkdialogs.c:127 src/gtkdialogs.c:154 src/gtkdialogs.c:155
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:141+#: src/gtkdialogs.c:130 src/gtkdialogs.c:157 src/gtkdialogs.c:158
msgid "T.M.Thanh and the Gnome-Vi Team"
msgstr "T.M.Thanh and the Gnome-Vi Team"
msgid "Simplified Chinese"
msgstr "Simplified Chinese"
msgid "Traditional Chinese"
msgstr "Traditional Chinese"
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 "
@@ -3121,71 +3139,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:374 src/gtkdialogs.c:516 src/gtkdialogs.c:569+#: src/gtkdialogs.c:467 src/gtkdialogs.c:609 src/gtkdialogs.c:662 -#: src/gtkdialogs.c:380 src/gtkdialogs.c:522 src/gtkdialogs.c:575+#: 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"
@@ -3198,45 +3216,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:686 src/gtkdialogs.c:708 src/gtkdialogs.c:728+#: 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 "
@@ -3245,7 +3263,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 "
@@ -3254,22 +3272,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:824 src/gtkdialogs.c:825+#: 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:866 src/gtkdialogs.c:868+#: src/gtkdialogs.c:959 src/gtkdialogs.c:961
"You are about to remove the chat %s from your buddy list. Do you want to "
@@ -3278,7 +3296,7 @@
"You are about to remove the chat %s from your buddy list. Do you want to "
-#: src/gtkdialogs.c:905 src/gtkdialogs.c:906+#: src/gtkdialogs.c:998 src/gtkdialogs.c:999 @@ -3414,7 +3432,7 @@
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
"Unable to guess the image type based on the file extension supplied. "
@@ -3422,16 +3440,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:2931 src/gtkimhtml.c:2943+#: src/gtkimhtml.c:2937 src/gtkimhtml.c:2949
@@ -3439,23 +3457,23 @@
-#: src/gtkimhtmltoolbar.c:239+#: src/gtkimhtmltoolbar.c:240 msgid "Select Text Color"
msgstr "Select Text Colour"
-#: src/gtkimhtmltoolbar.c:312+#: src/gtkimhtmltoolbar.c:314 msgid "Select Background Color"
msgstr "Select Background Colour"
-#: src/gtkimhtmltoolbar.c:395+#: src/gtkimhtmltoolbar.c:398 -#: src/gtkimhtmltoolbar.c:403+#: src/gtkimhtmltoolbar.c:406 -#: src/gtkimhtmltoolbar.c:406+#: src/gtkimhtmltoolbar.c:409 "Please enter the URL and description of the link that you want to insert. "
"The description is optional."
@@ -3463,77 +3481,77 @@
"Please enter the URL and description of the link that you want to insert. "
"The description is optional."
-#: src/gtkimhtmltoolbar.c:410+#: src/gtkimhtmltoolbar.c:413 msgid "Please enter the URL of the link that you want to insert."
msgstr "Please enter the URL of the link that you want to insert."
-#: src/gtkimhtmltoolbar.c:415+#: src/gtkimhtmltoolbar.c:418 -#: src/gtkimhtmltoolbar.c:419+#: src/gtkimhtmltoolbar.c:422 -#: src/gtkimhtmltoolbar.c:488+#: src/gtkimhtmltoolbar.c:491 msgid "Failed to store image: %s\n"
msgstr "Failed to store image: %s\n"
-#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524+#: src/gtkimhtmltoolbar.c:517 src/gtkimhtmltoolbar.c:527 -#: src/gtkimhtmltoolbar.c:662+#: src/gtkimhtmltoolbar.c:665 msgid "This theme has no available smileys."
msgstr "This theme has no available smileys."
-#: src/gtkimhtmltoolbar.c:677+#: src/gtkimhtmltoolbar.c:680 -#: src/gtkimhtmltoolbar.c:895+#: src/gtkimhtmltoolbar.c:898 -#: src/gtkimhtmltoolbar.c:906+#: src/gtkimhtmltoolbar.c:909 -#: src/gtkimhtmltoolbar.c:917+#: src/gtkimhtmltoolbar.c:920 -#: src/gtkimhtmltoolbar.c:933+#: src/gtkimhtmltoolbar.c:936 msgstr "Larger font size"
-#: src/gtkimhtmltoolbar.c:945+#: src/gtkimhtmltoolbar.c:948 msgid "Smaller font size"
msgstr "Smaller font size"
-#: src/gtkimhtmltoolbar.c:962+#: src/gtkimhtmltoolbar.c:965 -#: src/gtkimhtmltoolbar.c:974+#: src/gtkimhtmltoolbar.c:977 msgid "Foreground font color"
msgstr "Foreground font colour"
-#: src/gtkimhtmltoolbar.c:986+#: src/gtkimhtmltoolbar.c:989 msgstr "Background colour"
-#: src/gtkimhtmltoolbar.c:1001+#: src/gtkimhtmltoolbar.c:1004 -#: src/gtkimhtmltoolbar.c:1011+#: src/gtkimhtmltoolbar.c:1014 -#: src/gtkimhtmltoolbar.c:1022+#: src/gtkimhtmltoolbar.c:1025 @@ -3617,7 +3635,7 @@
msgstr "Please enter a buddy to pounce."
-#: src/gtkpounce.c:391 src/gtkpounce.c:893+#: src/gtkpounce.c:391 src/gtkpounce.c:895 msgstr "New Buddy Pounce"
@@ -3713,51 +3731,51 @@
msgstr "Sav_e this pounce after activation"
msgid "Remove Buddy Pounce"
msgstr "Remove Buddy Pounce"
msgid "%s has started typing to you (%s)"
msgstr "%s has started typing to you (%s)"
msgid "%s has signed on (%s)"
msgstr "%s has signed on (%s)"
msgid "%s has returned from being idle (%s)"
msgstr "%s has returned from being idle (%s)"
msgid "%s has returned from being away (%s)"
msgstr "%s has returned from being away (%s)"
msgid "%s has stopped typing to you (%s)"
msgstr "%s has stopped typing to you (%s)"
msgid "%s has signed off (%s)"
msgstr "%s has signed off (%s)"
msgid "%s has become idle (%s)"
msgstr "%s has become idle (%s)"
msgid "%s has gone away. (%s)"
msgstr "%s has gone away. (%s)"
msgid "Unknown pounce event. Please report this!"
msgstr "Unknown pounce event. Please report this!"
@@ -3782,7 +3800,7 @@
#: src/gtkprefs.c:728 src/gtkprefs.c:2204 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:741+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:743 @@ -3987,8 +4005,8 @@
msgid "New conversation _placement:"
msgstr "New conversation _placement:"
-#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:734-#: src/protocols/oscar/oscar.c:5019+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:733 +#: src/protocols/oscar/oscar.c:5072 @@ -4230,9 +4248,9 @@
msgid "When away and idle"
msgstr "When away and idle"
-#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1332+#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1286 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
-#: src/protocols/oscar/oscar.c:4172 src/protocols/yahoo/yahoo.c:2580+#: src/protocols/oscar/oscar.c:4225 src/protocols/yahoo/yahoo.c:2580 #: src/protocols/yahoo/yahoo_profile.c:664
@@ -4379,7 +4397,7 @@
msgid "Block only the users below"
msgstr "Block only the users below"
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1467+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1479 @@ -4444,16 +4462,16 @@
#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
#: src/gtkrequest.c:240 src/protocols/gg/gg.c:950
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:500-#: src/protocols/msn/msn.c:503 src/protocols/novell/novell.c:1892+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:498 +#: src/protocols/msn/msn.c:501 src/protocols/novell/novell.c:1892 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
#: src/gtkrequest.c:241 src/protocols/gg/gg.c:950
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:500-#: src/protocols/msn/msn.c:503 src/protocols/novell/novell.c:1893+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:498 +#: src/protocols/msn/msn.c:501 src/protocols/novell/novell.c:1893 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
@@ -4463,24 +4481,24 @@
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:316+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314 #: src/protocols/silc/util.c:332
-#: src/gtkrequest.c:1398+#: src/gtkrequest.c:1402 msgid "That file already exists"
msgstr "That file already exists"
-#: src/gtkrequest.c:1399+#: src/gtkrequest.c:1403 msgid "Would you like to overwrite it?"
msgstr "Would you like to overwrite it?"
-#: src/gtkrequest.c:1437 src/gtkrequest.c:1458+#: src/gtkrequest.c:1441 src/gtkrequest.c:1462 -#: src/gtkrequest.c:1438 src/gtkrequest.c:1459+#: src/gtkrequest.c:1442 src/gtkrequest.c:1463 @@ -4633,7 +4651,7 @@
@@ -4667,16 +4685,16 @@
" -h, --help display this help and exit\n"
msgid "Gaim %s. Try `%s -h' for more information.\n"
msgstr "Gaim %s. Try `%s -h' for more information.\n"
msgid "Unable to load preferences"
msgstr "Unable to load preferences"
"Gaim was not able to load your preferences because they are stored in an old "
"format that is no longer used. Please reconfigure your settings using the "
@@ -4709,12 +4727,12 @@
msgstr "Slightly less boring default"
#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:514 src/protocols/msn/state.c:29+#: src/protocols/msn/msn.c:512 src/protocols/msn/state.c:29 #: 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:756 src/protocols/yahoo/yahoo.c:2925-#: src/protocols/yahoo/yahoo.c:3041+#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2923 +#: src/protocols/yahoo/yahoo.c:3039 @@ -4726,12 +4744,12 @@
msgid "Away for friends only"
msgstr "Away for friends only"
-#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:965-#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:674-#: src/protocols/oscar/oscar.c:5530 src/protocols/oscar/oscar.c:5608-#: src/protocols/oscar/oscar.c:5632 src/protocols/oscar/oscar.c:6814-#: src/protocols/oscar/oscar.c:6819 src/protocols/yahoo/yahoo.c:2578-#: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:3053+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977 +#: src/protocols/jabber/presence.c:140 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:2943 src/protocols/yahoo/yahoo.c:3051 @@ -4751,10 +4769,10 @@
msgid "Unable to connect to server."
msgstr "Unable to connect to server."
-#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365-#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475-#: src/protocols/jabber/jabber.c:107+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134 +#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369 +#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479 +#: src/protocols/jabber/jabber.c:108 msgid "Invalid response from server."
msgstr "Invalid response from server."
@@ -4774,18 +4792,17 @@
msgid "Unknown Error Code."
msgstr "Unknown Error Code."
-#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:3973+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4026 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#. 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:3977-#: src/protocols/oscar/oscar.c:4201 src/protocols/silc/ops.c:1086+#: 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/silc/ops.c:1148 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1131+#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130 msgid "Buddy Information"
msgstr "Buddy Information"
@@ -4870,25 +4887,25 @@
-#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5011+#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5064 -#: src/protocols/gg/gg.c:958 src/protocols/jabber/jabber.c:614-#: src/protocols/oscar/oscar.c:5022 src/protocols/silc/ops.c:808+#: 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/trepia/trepia.c:268
-#: src/protocols/gg/gg.c:963 src/protocols/jabber/jabber.c:619-#: src/protocols/oscar/oscar.c:5023 src/protocols/trepia/trepia.c:275+#: 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/gg/gg.c:967 src/protocols/gg/gg.c:1711
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5012+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5065 #: src/protocols/silc/ops.c:1204
@@ -4903,8 +4920,8 @@
-#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:629-#: src/protocols/oscar/oscar.c:5066 src/protocols/oscar/oscar.c:5074+#: 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/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
@@ -5008,7 +5025,7 @@
msgstr "Directory Search"
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1063+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1075 #: src/protocols/toc/toc.c:1564
@@ -5046,7 +5063,6 @@
#: src/protocols/gg/gg.c:1690 src/protocols/gg/gg.c:1692
msgid "Gadu-Gadu Protocol Plugin"
msgstr "Gadu-Gadu Protocol Plugin"
@@ -5060,15 +5076,15 @@
msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
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:3712-#: src/protocols/oscar/oscar.c:6262+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249 +#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3765 +#: src/protocols/oscar/oscar.c:6315 -#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249-#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3714-#: src/protocols/oscar/oscar.c:6263+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:250 +#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3767 +#: src/protocols/oscar/oscar.c:6316 @@ -5093,21 +5109,20 @@
msgid "Unknown command: %s"
msgstr "Unknown command: %s"
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:574+#: src/protocols/irc/cmds.c:450 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:578+#: src/protocols/irc/cmds.c:454 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:171-#: src/protocols/yahoo/yahoo_filexfer.c:180-#: src/protocols/yahoo/yahoo_filexfer.c:189-#: src/protocols/yahoo/yahoo_filexfer.c:199+#: 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 msgid "File Transfer Aborted"
msgstr "File Transfer Aborted"
@@ -5132,7 +5147,7 @@
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:401+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:400 msgid "Server has disconnected"
msgstr "Server has disconnected"
@@ -5152,31 +5167,35 @@
msgid "IRC nicks may not contain whitespace"
msgstr "IRC nicks may not contain whitespace"
-#: src/protocols/irc/irc.c:236 src/protocols/toc/toc.c:198-#: src/protocols/irc/irc.c:245+#. connect to the server +#: 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/zephyr/zephyr.c:1452 +#: src/protocols/irc/irc.c:243 msgid "Couldn't create socket"
msgstr "Couldn't create socket"
-#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:298-#: src/protocols/oscar/oscar.c:1673 src/protocols/oscar/oscar.c:1737+#: src/protocols/irc/irc.c:258 src/protocols/jabber/jabber.c:302 +#: src/protocols/oscar/oscar.c:1675 src/protocols/oscar/oscar.c:1740 msgid "Couldn't connect to host"
msgstr "Couldn't connect to host"
-#: src/protocols/irc/irc.c:398 src/protocols/trepia/trepia.c:927+#: src/protocols/irc/irc.c:397 src/protocols/trepia/trepia.c:927 -#: src/protocols/irc/irc.c:553 src/protocols/silc/chat.c:1373-#: src/protocols/yahoo/yahoochat.c:1398+#: src/protocols/irc/irc.c:552 src/protocols/silc/chat.c:1373 +#: src/protocols/yahoo/yahoochat.c:1399 -#: src/protocols/irc/irc.c:556 src/protocols/silc/chat.c:1376-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1407+#: src/protocols/irc/irc.c:555 src/protocols/silc/chat.c:1376 +#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1408 @@ -5188,39 +5207,39 @@
-#: src/protocols/irc/irc.c:663+#: src/protocols/irc/irc.c:662 msgid "IRC Protocol Plugin"
msgstr "IRC Protocol Plugin"
-#: src/protocols/irc/irc.c:664+#: src/protocols/irc/irc.c:663 msgid "The IRC Protocol Plugin that Sucks Less"
msgstr "The IRC Protocol Plugin that Sucks Less"
-#: src/protocols/irc/irc.c:683 src/protocols/irc/msgs.c:201-#: src/protocols/jabber/jabber.c:1580 src/protocols/napster/napster.c:670+#: src/protocols/irc/irc.c:682 src/protocols/irc/msgs.c:201 +#: src/protocols/jabber/jabber.c:1592 src/protocols/napster/napster.c:670 #: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
-#: src/protocols/irc/irc.c:686 src/protocols/jabber/jabber.c:1601-#: src/protocols/msn/msn.c:1939 src/protocols/napster/napster.c:675+#: 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/silc/silc.c:1593 src/protocols/trepia/trepia.c:1301
-#: src/protocols/irc/irc.c:689+#: src/protocols/irc/irc.c:688 -#: src/protocols/irc/irc.c:692 src/protocols/irc/msgs.c:195-#: src/protocols/jabber/jabber.c:589 src/protocols/silc/buddy.c:1445+#: src/protocols/irc/irc.c:691 src/protocols/irc/msgs.c:195 +#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1454 #: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
-#: src/protocols/irc/irc.c:695+#: src/protocols/irc/irc.c:694 @@ -5253,7 +5272,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:1332 src/protocols/yahoo/yahoo_profile.c:664+#: src/protocols/msn/msn.c:1286 src/protocols/yahoo/yahoo_profile.c:664 msgid "<b>%s:</b> %s<br>"
msgstr "<b>%s:</b> %s<br>"
@@ -5285,111 +5304,111 @@
msgid "Buddy Information for %s"
msgstr "Buddy Information for %s"
-#: src/protocols/irc/msgs.c:286+#: src/protocols/irc/msgs.c:287 msgid "%s has changed the topic to: %s"
msgstr "%s has changed the topic to: %s"
-#: src/protocols/irc/msgs.c:291+#: src/protocols/irc/msgs.c:292 msgid "The topic for %s is: %s"
msgstr "The topic for %s is: %s"
-#: src/protocols/irc/msgs.c:308+#: src/protocols/irc/msgs.c:309 msgid "Unknown message '%s'"
msgstr "Unknown message '%s'"
-#: src/protocols/irc/msgs.c:309+#: src/protocols/irc/msgs.c:310 -#: src/protocols/irc/msgs.c:309+#: src/protocols/irc/msgs.c:310 msgid "Gaim has sent a message the IRC server did not understand."
msgstr "Gaim has sent a message the IRC server did not understand."
-#: src/protocols/irc/msgs.c:332+#: src/protocols/irc/msgs.c:333 -#: src/protocols/irc/msgs.c:426+#: src/protocols/irc/msgs.c:427 -#: src/protocols/irc/msgs.c:437+#: src/protocols/irc/msgs.c:438 -#: src/protocols/irc/msgs.c:440+#: src/protocols/irc/msgs.c:441 msgid "User is not logged in"
msgstr "User is not logged in"
-#: src/protocols/irc/msgs.c:445+#: src/protocols/irc/msgs.c:446 msgid "No such nick or channel"
msgstr "No such nick or channel"
-#: src/protocols/irc/msgs.c:465+#: src/protocols/irc/msgs.c:466 -#: src/protocols/irc/msgs.c:521+#: src/protocols/irc/msgs.c:522 msgid "Joining %s requires an invitation."
msgstr "Joining %s requires an invitation."
-#: src/protocols/irc/msgs.c:522+#: src/protocols/irc/msgs.c:523 -#: src/protocols/irc/msgs.c:625+#: src/protocols/irc/msgs.c:626 msgid "You have been kicked by %s: (%s)"
msgstr "You have been kicked by %s: (%s)"
-#: src/protocols/irc/msgs.c:630+#: src/protocols/irc/msgs.c:631 msgid "Kicked by %s (%s)"
msgstr "Kicked by %s (%s)"
-#: src/protocols/irc/msgs.c:651+#: src/protocols/irc/msgs.c:652 msgid "mode (%s %s) by %s"
msgstr "mode (%s %s) by %s"
-#: src/protocols/irc/msgs.c:760+#: src/protocols/irc/msgs.c:762 msgid "Could not change nick"
msgstr "Could not change nick"
-#: src/protocols/irc/msgs.c:761+#: src/protocols/irc/msgs.c:763 msgid "Cannot change nick"
msgstr "Cannot change nick"
-#: src/protocols/irc/msgs.c:782+#: src/protocols/irc/msgs.c:784 msgid "You have parted the channel%s%s"
msgstr "You have parted the channel%s%s"
-#: src/protocols/irc/msgs.c:822+#: src/protocols/irc/msgs.c:824 msgid "Error: invalid PONG from server"
msgstr "Error: invalid PONG from server"
-#: src/protocols/irc/msgs.c:824+#: src/protocols/irc/msgs.c:826 msgid "PING reply -- Lag: %lu seconds"
msgstr "PING reply -- Lag: %lu seconds"
-#: src/protocols/irc/msgs.c:899+#: src/protocols/irc/msgs.c:901 -#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912+#: src/protocols/irc/msgs.c:902 src/protocols/silc/ops.c:912 msgid "Cannot join channel"
msgstr "Cannot join channel"
-#: src/protocols/irc/msgs.c:936+#: src/protocols/irc/msgs.c:938 @@ -5488,7 +5507,7 @@
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:1411+#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1423 msgid "nick <new nickname>: Change your nickname."
msgstr "nick <new nickname>: Change your nickname."
@@ -5576,40 +5595,48 @@
msgid "whois <nick>: Get information on a user."
msgstr "whois <nick>: Get information on a user."
-#: src/protocols/irc/parse.c:414+#: src/protocols/irc/parse.c:417 msgid "Reply time from %s: %lu seconds"
msgstr "Reply time from %s: %lu seconds"
-#: src/protocols/irc/parse.c:415+#: src/protocols/irc/parse.c:418 -#: src/protocols/irc/parse.c:415+#: src/protocols/irc/parse.c:418 -#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522-#: src/protocols/oscar/oscar.c:1570 src/protocols/toc/toc.c:188+#: 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/toc/toc.c:596 src/protocols/toc/toc.c:612
#: src/protocols/toc/toc.c:689
-#: src/protocols/jabber/auth.c:51-msgid "Server requires SSL for login"-msgstr "Server requires SSL for login"-#: src/protocols/jabber/auth.c:111+#: src/protocols/jabber/auth.c:52 +"Server requires TLS/SSL for login. Select \"Use TLS if available\" in " +"Server requires TLS/SSL for login. Select \"Use TLS if available\" in " +#: src/protocols/jabber/auth.c:54 +msgid "Server requires TLS/SSL for login. No TLS/SSL support found." +msgstr "Server requires TLS/SSL for login. No TLS/SSL support found." +#: src/protocols/jabber/auth.c:115 msgid "Server requires plaintext authentication over an unencrypted stream"
msgstr "Server requires plaintext authentication over an unencrypted stream"
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165 +#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243 msgid "Plaintext Authentication"
msgstr "Plaintext Authentication"
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244 "This server requires plaintext authentication over an unencrypted "
"connection. Allow this and continue authentication?"
@@ -5617,11 +5644,11 @@
"This server requires plaintext authentication over an unencrypted "
"connection. Allow this and continue authentication?"
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252 msgid "Server does not use any supported authentication method"
msgstr "Server does not use any supported authentication method"
-#: src/protocols/jabber/auth.c:386+#: src/protocols/jabber/auth.c:390 msgid "Invalid challenge from server"
msgstr "Invalid challenge from server"
@@ -5640,14 +5667,14 @@
#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1322-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:820+#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1276 +#: 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
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:649+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:657 @@ -5668,7 +5695,7 @@
#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:639+#: src/protocols/jabber/jabber.c:647 @@ -5707,7 +5734,7 @@
#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5047+#: src/protocols/oscar/oscar.c:5100 @@ -5728,15 +5755,15 @@
#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:939-#: src/protocols/msn/msn.c:490 src/protocols/novell/novell.c:2819-#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:716-#: src/protocols/oscar/oscar.c:722 src/protocols/oscar/oscar.c:724+#: 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/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1583+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1595 @@ -5744,8 +5771,8 @@
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:624-#: src/protocols/oscar/oscar.c:5065 src/protocols/oscar/oscar.c:5073+#: 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/silc/ops.c:848
@@ -5790,7 +5817,7 @@
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6333+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6386 #: src/protocols/yahoo/yahoochat.c:1003
@@ -5830,51 +5857,51 @@
msgid "Invalid Room Handle"
msgstr "Invalid Room Handle"
-#: src/protocols/jabber/chat.c:377+#: src/protocols/jabber/chat.c:379 msgid "Configuration error"
msgstr "Configuration error"
-#: src/protocols/jabber/chat.c:386 src/protocols/jabber/chat.c:531+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533 msgid "Unable to configure"
msgstr "Unable to configure"
-#: src/protocols/jabber/chat.c:402+#: src/protocols/jabber/chat.c:404 msgid "Room Configuration Error"
msgstr "Room Configuration Error"
-#: src/protocols/jabber/chat.c:403+#: src/protocols/jabber/chat.c:405 msgid "This room is not capable of being configured"
msgstr "This room is not capable of being configured"
-#: src/protocols/jabber/chat.c:453 src/protocols/jabber/chat.c:522+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524 msgid "Registration error"
msgstr "Registration error"
-#: src/protocols/jabber/chat.c:605+#: src/protocols/jabber/chat.c:607 msgid "Nick changing not supported in non-MUC chatrooms"
msgstr "Nick changing not supported in non-MUC chatrooms"
-#: src/protocols/jabber/chat.c:649 src/protocols/jabber/chat.c:660+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662 -#: src/protocols/jabber/chat.c:650 src/protocols/jabber/chat.c:661+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663 msgid "Error retreiving roomlist"
msgstr "Error retreiving roomlist"
-#: src/protocols/jabber/chat.c:709+#: src/protocols/jabber/chat.c:711 -#: src/protocols/jabber/chat.c:747+#: src/protocols/jabber/chat.c:749 msgid "Enter a Conference Server"
msgstr "Enter a Conference Server"
-#: src/protocols/jabber/chat.c:748+#: src/protocols/jabber/chat.c:750 msgid "Select a conference server to query"
msgstr "Select a conference server to query"
-#: src/protocols/jabber/chat.c:751+#: src/protocols/jabber/chat.c:753 @@ -5882,443 +5909,435 @@
msgid "Error initializing session"
msgstr "Error initializing session"
-#: src/protocols/jabber/jabber.c:207 src/protocols/msn/httpmethod.c:266-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699-#: src/protocols/trepia/trepia.c:988 src/protocols/trepia/trepia.c:1032-#: src/protocols/trepia/trepia.c:1131 src/protocols/trepia/trepia.c:1177+#: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248 +#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988 +#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131 +#: src/protocols/trepia/trepia.c:1177 -#: src/protocols/jabber/jabber.c:245 src/protocols/jabber/jabber.c:265+#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269 -#: src/protocols/jabber/jabber.c:325+#: src/protocols/jabber/jabber.c:329 msgid "Connection Failed"
msgstr "Connection Failed"
-#: src/protocols/jabber/jabber.c:328+#: src/protocols/jabber/jabber.c:332 msgid "SSL Handshake Failed"
msgstr "SSL Handshake Failed"
-#: src/protocols/jabber/jabber.c:371 src/protocols/jabber/jabber.c:700+#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709 msgid "Invalid Jabber ID"
msgstr "Invalid Jabber ID"
-#: src/protocols/jabber/jabber.c:399 src/protocols/jabber/jabber.c:727+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:739 msgid "SSL support unavailable"
msgstr "SSL support unavailable"
-#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:737+#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749 #: src/protocols/trepia/trepia.c:1071
msgid "Unable to create socket"
msgstr "Unable to create socket"
-#: src/protocols/jabber/jabber.c:434+#: src/protocols/jabber/jabber.c:442 msgid "Registration of %s@%s successful"
msgstr "Registration of %s@%s successful"
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445 msgid "Registration Successful"
msgstr "Registration Successful"
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:1182+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1194 -#: src/protocols/jabber/jabber.c:445 src/protocols/jabber/jabber.c:446+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454 msgid "Registration Failed"
msgstr "Registration Failed"
-#: src/protocols/jabber/jabber.c:557 src/protocols/jabber/jabber.c:558+#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566 msgid "Already Registered"
msgstr "Already Registered"
-#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:1037+#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1049 -#: src/protocols/jabber/jabber.c:604+#: src/protocols/jabber/jabber.c:612 -#: src/protocols/jabber/jabber.c:634 src/protocols/oscar/oscar.c:5067-#: src/protocols/oscar/oscar.c:5075 src/protocols/trepia/trepia.c:336+#: 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/trepia/trepia.c:414
-#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:853+#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:853 #: src/protocols/silc/silc.c:650 src/protocols/silc/util.c:510
-#: src/protocols/jabber/jabber.c:654+#: src/protocols/jabber/jabber.c:662 -#: src/protocols/jabber/jabber.c:662+#: src/protocols/jabber/jabber.c:670 msgid "Please fill out the information below to register your new account."
msgstr "Please fill out the information below to register your new account."
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:666+#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674 msgid "Register New Jabber Account"
msgstr "Register New Jabber Account"
-#: src/protocols/jabber/jabber.c:745+#: src/protocols/jabber/jabber.c:757 -#. connect to the server-#: src/protocols/jabber/jabber.c:784 src/protocols/msn/msn.c:654-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2152-#: src/protocols/oscar/oscar.c:1741 src/protocols/trepia/trepia.c:1065-#: src/protocols/yahoo/yahoo.c:2439 src/protocols/zephyr/zephyr.c:1453-#: src/protocols/jabber/jabber.c:788+#: src/protocols/jabber/jabber.c:800 msgid "Initializing Stream"
msgstr "Initialising Stream"
-#: src/protocols/jabber/jabber.c:794+#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:340 -#: src/protocols/jabber/jabber.c:803+#: src/protocols/jabber/jabber.c:815 msgid "Re-initializing Stream"
msgstr "Re-initialising Stream"
-#: src/protocols/jabber/jabber.c:883 src/protocols/jabber/jabber.c:1160-#: src/protocols/jabber/jabber.c:1201 src/protocols/jabber/jabber.c:1234-#: src/protocols/oscar/oscar.c:722 src/protocols/oscar/oscar.c:6617+#: 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/jabber/jabber.c:914+#: src/protocols/jabber/jabber.c:926 -#: src/protocols/jabber/jabber.c:916+#: src/protocols/jabber/jabber.c:928 msgid "From (To pending)"
msgstr "From (To pending)"
-#: src/protocols/jabber/jabber.c:918+#: src/protocols/jabber/jabber.c:930 -#: src/protocols/jabber/jabber.c:921+#: src/protocols/jabber/jabber.c:933 -#: src/protocols/jabber/jabber.c:923+#: src/protocols/jabber/jabber.c:935 msgid "None (To pending)"
msgstr "None (To pending)"
-#: src/protocols/jabber/jabber.c:927+#: src/protocols/jabber/jabber.c:939 -#: src/protocols/jabber/jabber.c:947+#: src/protocols/jabber/jabber.c:959 -#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:35-#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130+#: src/protocols/jabber/jabber.c:972 src/protocols/jabber/jutil.c:35 +#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:131 -#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:38-#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135+#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jutil.c:38 +#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:136 -#: src/protocols/jabber/jabber.c:963 src/protocols/jabber/jutil.c:41-#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137-#: src/protocols/oscar/oscar.c:664 src/protocols/oscar/oscar.c:5620-#: src/protocols/oscar/oscar.c:6810+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41 +#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:138 +#: src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:5673 +#: src/protocols/oscar/oscar.c:6863 -#: src/protocols/jabber/jabber.c:980+#: src/protocols/jabber/jabber.c:992 msgstr "Password Changed"
-#: src/protocols/jabber/jabber.c:981+#: src/protocols/jabber/jabber.c:993 msgid "Your password has been changed."
msgstr "Your password has been changed."
-#: src/protocols/jabber/jabber.c:985 src/protocols/jabber/jabber.c:986+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jabber.c:998 msgid "Error changing password"
msgstr "Error changing password"
-#: src/protocols/jabber/jabber.c:1042+#: src/protocols/jabber/jabber.c:1054 msgstr "Password (again)"
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/jabber.c:1048+#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/jabber.c:1060 msgid "Change Jabber Password"
msgstr "Change Jabber Password"
-#: src/protocols/jabber/jabber.c:1048+#: src/protocols/jabber/jabber.c:1060 msgid "Please enter your new password"
msgstr "Please enter your new password"
-#: src/protocols/jabber/jabber.c:1058 src/protocols/toc/toc.c:1554+#: src/protocols/jabber/jabber.c:1070 src/protocols/toc/toc.c:1554 -#: src/protocols/jabber/jabber.c:1140+#: src/protocols/jabber/jabber.c:1152 -#: src/protocols/jabber/jabber.c:1142+#: src/protocols/jabber/jabber.c:1154 -#: src/protocols/jabber/jabber.c:1144+#: src/protocols/jabber/jabber.c:1156 msgid "Feature Not Implemented"
msgstr "Feature Not Implemented"
-#: src/protocols/jabber/jabber.c:1146+#: src/protocols/jabber/jabber.c:1158 -#: src/protocols/jabber/jabber.c:1148+#: src/protocols/jabber/jabber.c:1160 -#: src/protocols/jabber/jabber.c:1150 src/protocols/jabber/jabber.c:1224+#: src/protocols/jabber/jabber.c:1162 src/protocols/jabber/jabber.c:1236 msgid "Internal Server Error"
msgstr "Internal Server Error"
-#: src/protocols/jabber/jabber.c:1152+#: src/protocols/jabber/jabber.c:1164 -#: src/protocols/jabber/jabber.c:1154+#: src/protocols/jabber/jabber.c:1166 msgid "Malformed Jabber ID"
msgstr "Malformed Jabber ID"
-#: src/protocols/jabber/jabber.c:1156+#: src/protocols/jabber/jabber.c:1168 -#: src/protocols/jabber/jabber.c:1158+#: src/protocols/jabber/jabber.c:1170 -#: src/protocols/jabber/jabber.c:1162+#: src/protocols/jabber/jabber.c:1174 msgstr "Payment Required"
-#: src/protocols/jabber/jabber.c:1164+#: src/protocols/jabber/jabber.c:1176 msgid "Recipient Unavailable"
msgstr "Recipient unavailable"
-#: src/protocols/jabber/jabber.c:1168+#: src/protocols/jabber/jabber.c:1180 msgid "Registration Required"
msgstr "Registration Required"
-#: src/protocols/jabber/jabber.c:1170+#: src/protocols/jabber/jabber.c:1182 msgid "Remote Server Not Found"
msgstr "Remote Server Not Found"
-#: src/protocols/jabber/jabber.c:1172+#: src/protocols/jabber/jabber.c:1184 msgid "Remote Server Timeout"
msgstr "Remote Server Timeout"
-#: src/protocols/jabber/jabber.c:1174+#: src/protocols/jabber/jabber.c:1186 msgid "Server Overloaded"
msgstr "Server Overloaded"
-#: src/protocols/jabber/jabber.c:1176+#: src/protocols/jabber/jabber.c:1188 msgid "Service Unavailable"
msgstr "Service Unavailable"
-#: src/protocols/jabber/jabber.c:1178+#: src/protocols/jabber/jabber.c:1190 msgid "Subscription Required"
msgstr "Subscription Required"
-#: src/protocols/jabber/jabber.c:1180+#: src/protocols/jabber/jabber.c:1192 msgid "Unexpected Request"
msgstr "Unexpected Request"
-#: src/protocols/jabber/jabber.c:1187+#: src/protocols/jabber/jabber.c:1199 msgid "Authorization Aborted"
msgstr "Authorisation Aborted"
-#: src/protocols/jabber/jabber.c:1189+#: src/protocols/jabber/jabber.c:1201 msgid "Incorrect encoding in authorization"
msgstr "Incorrect encoding in authorisation"
-#: src/protocols/jabber/jabber.c:1192+#: src/protocols/jabber/jabber.c:1204 -#: src/protocols/jabber/jabber.c:1195+#: src/protocols/jabber/jabber.c:1207 msgid "Invalid Authorization Mechanism"
msgstr "Invalid Authorisation Mechanism"
-#: src/protocols/jabber/jabber.c:1198+#: src/protocols/jabber/jabber.c:1210 msgid "Authorization mechanism too weak"
msgstr "Authorisation mechanism too weak"
-#: src/protocols/jabber/jabber.c:1203+#: src/protocols/jabber/jabber.c:1215 msgid "Temporary Authentication Failure"
msgstr "Temporary Authentication Failure"
-#: src/protocols/jabber/jabber.c:1205+#: src/protocols/jabber/jabber.c:1217 msgid "Authentication Failure"
msgstr "Authentication Failure"
-#: src/protocols/jabber/jabber.c:1209+#: src/protocols/jabber/jabber.c:1221 -#: src/protocols/jabber/jabber.c:1211+#: src/protocols/jabber/jabber.c:1223 msgid "Bad Namespace Prefix"
msgstr "Bad Namespace Prefix"
-#: src/protocols/jabber/jabber.c:1214+#: src/protocols/jabber/jabber.c:1226 msgid "Resource Conflict"
msgstr "Resource Conflict"
-#: src/protocols/jabber/jabber.c:1216 src/protocols/silc/ops.c:1511+#: src/protocols/jabber/jabber.c:1228 src/protocols/silc/ops.c:1511 msgid "Connection Timeout"
msgstr "Connection Timeout"
-#: src/protocols/jabber/jabber.c:1218+#: src/protocols/jabber/jabber.c:1230 -#: src/protocols/jabber/jabber.c:1220+#: src/protocols/jabber/jabber.c:1232 -#: src/protocols/jabber/jabber.c:1222+#: src/protocols/jabber/jabber.c:1234 msgid "Improper Addressing"
msgstr "Improper Addressing"
-#: src/protocols/jabber/jabber.c:1226+#: src/protocols/jabber/jabber.c:1238 -#: src/protocols/jabber/jabber.c:1228+#: src/protocols/jabber/jabber.c:1240 msgid "Invalid Namespace"
msgstr "Invalid Namespace"
-#: src/protocols/jabber/jabber.c:1230+#: src/protocols/jabber/jabber.c:1242 -#: src/protocols/jabber/jabber.c:1232+#: src/protocols/jabber/jabber.c:1244 msgid "Non-matching Hosts"
msgstr "Non-matching Hosts"
-#: src/protocols/jabber/jabber.c:1236+#: src/protocols/jabber/jabber.c:1248 msgstr "Policy Violation"
-#: src/protocols/jabber/jabber.c:1238+#: src/protocols/jabber/jabber.c:1250 msgid "Remote Connection Failed"
msgstr "Remote Connection Failed"
-#: src/protocols/jabber/jabber.c:1240+#: src/protocols/jabber/jabber.c:1252 msgid "Resource Constraint"
msgstr "Resource Constraint"
-#: src/protocols/jabber/jabber.c:1242+#: src/protocols/jabber/jabber.c:1254 -#: src/protocols/jabber/jabber.c:1244+#: src/protocols/jabber/jabber.c:1256 -#: src/protocols/jabber/jabber.c:1246+#: src/protocols/jabber/jabber.c:1258 -#: src/protocols/jabber/jabber.c:1248+#: src/protocols/jabber/jabber.c:1260 msgid "Undefined Condition"
msgstr "Undefined Condition"
-#: src/protocols/jabber/jabber.c:1250+#: src/protocols/jabber/jabber.c:1262 msgid "Unsupported Encoding"
msgstr "Unsupported Encoding"
-#: src/protocols/jabber/jabber.c:1252+#: src/protocols/jabber/jabber.c:1264 msgid "Unsupported Stanza Type"
msgstr "Unsupported Stanza Type"
-#: src/protocols/jabber/jabber.c:1254+#: src/protocols/jabber/jabber.c:1266 msgid "Unsupported Version"
msgstr "Unsupported Version"
-#: src/protocols/jabber/jabber.c:1256+#: src/protocols/jabber/jabber.c:1268 msgid "XML Not Well Formed"
msgstr "XML Not Well Formed"
-#: src/protocols/jabber/jabber.c:1258+#: src/protocols/jabber/jabber.c:1270 -#: src/protocols/jabber/jabber.c:1325+#: src/protocols/jabber/jabber.c:1337 msgid "Unable to ban user %s"
msgstr "Unable to ban user %s"
-#: src/protocols/jabber/jabber.c:1377+#: src/protocols/jabber/jabber.c:1389 msgid "Unable to kick user %s"
msgstr "Unable to kick user %s"
-#: src/protocols/jabber/jabber.c:1403+#: src/protocols/jabber/jabber.c:1415 msgid "config: Configure a chat room."
msgstr "config: Configure a chat room."
-#: src/protocols/jabber/jabber.c:1407+#: src/protocols/jabber/jabber.c:1419 msgid "configure: Configure a chat room."
msgstr "configure: Configure a chat room."
-#: src/protocols/jabber/jabber.c:1416+#: src/protocols/jabber/jabber.c:1428 msgid "part [room]: Leave the room."
msgstr "part [room]: Leave the room."
-#: src/protocols/jabber/jabber.c:1421+#: src/protocols/jabber/jabber.c:1433 msgid "register: Register with a chat room."
msgstr "register: Register with a chat room."
-#: src/protocols/jabber/jabber.c:1427+#: src/protocols/jabber/jabber.c:1439 msgid "topic [new topic]: View or change the topic."
msgstr "topic [new topic]: View or change the topic."
-#: src/protocols/jabber/jabber.c:1433+#: src/protocols/jabber/jabber.c:1445 msgid "ban <user> [room]: Ban a user from the room."
msgstr "ban <user> [room]: Ban a user from the room."
-#: src/protocols/jabber/jabber.c:1439+#: src/protocols/jabber/jabber.c:1451 msgid "invite <user> [room]: Invite a user to the room."
msgstr "invite <user> [room]: Invite a user to the room."
-#: src/protocols/jabber/jabber.c:1445+#: src/protocols/jabber/jabber.c:1457 msgid "join: <room> [server]: Join a chat on this server."
msgstr "join: <room> [server]: Join a chat on this server."
-#: src/protocols/jabber/jabber.c:1451+#: src/protocols/jabber/jabber.c:1463 msgid "kick <user> [room]: Kick a user from the room."
msgstr "kick <user> [room]: Kick a user from the room."
-#: src/protocols/jabber/jabber.c:1456+#: src/protocols/jabber/jabber.c:1468 "msg <user> <message>: Send a private message to another user."
"msg <user> <message>: Send a private message to another user."
-#: src/protocols/jabber/jabber.c:1471+#: src/protocols/jabber/jabber.c:1483 msgid "Hide Operating System"
msgstr "Hide Operating System"
@@ -6331,25 +6350,24 @@
-#: src/protocols/jabber/jabber.c:1558 src/protocols/jabber/jabber.c:1560+#: src/protocols/jabber/jabber.c:1570 src/protocols/jabber/jabber.c:1572 msgid "Jabber Protocol Plugin"
msgstr "Jabber Protocol Plugin"
-#: src/protocols/jabber/jabber.c:1586+#: src/protocols/jabber/jabber.c:1598 msgid "Use TLS if available"
msgstr "Use TLS if available"
-#: src/protocols/jabber/jabber.c:1591+#: src/protocols/jabber/jabber.c:1603 -#: src/protocols/jabber/jabber.c:1596+#: src/protocols/jabber/jabber.c:1608 msgid "Allow plaintext auth over unencrypted streams"
msgstr "Allow plaintext auth over unencrypted streams"
-#: src/protocols/jabber/jabber.c:1605 src/protocols/silc/silc.c:1589+#: src/protocols/jabber/jabber.c:1617 src/protocols/silc/silc.c:1589 @@ -6386,20 +6404,20 @@
-#: src/protocols/jabber/presence.c:239+#: src/protocols/jabber/presence.c:240 msgid "Unknown Error in presence"
msgstr "Unknown Error in presence"
-#: src/protocols/jabber/presence.c:242+#: src/protocols/jabber/presence.c:243 msgid "The user %s wants to add you to their buddy list."
msgstr "The user %s wants to add you to their buddy list."
-#: src/protocols/jabber/presence.c:296 src/protocols/jabber/presence.c:297+#: src/protocols/jabber/presence.c:297 src/protocols/jabber/presence.c:298 -#: src/protocols/jabber/presence.c:298+#: src/protocols/jabber/presence.c:299 "You are creating a new room. Would you like to configure it, or accept the "
@@ -6407,20 +6425,20 @@
"You are creating a new room. Would you like to configure it, or accept the "
-#: src/protocols/jabber/presence.c:300+#: src/protocols/jabber/presence.c:301 -#: src/protocols/jabber/presence.c:302+#: src/protocols/jabber/presence.c:303 -#: src/protocols/jabber/presence.c:332+#: src/protocols/jabber/presence.c:333 msgstr "Error in chat %s"
-#: src/protocols/jabber/presence.c:335+#: src/protocols/jabber/presence.c:336 msgid "Error joining chat %s"
msgstr "Error joining chat %s"
@@ -6434,18 +6452,6 @@
msgstr "File Send Failed"
-#: src/protocols/msn/cmdproc.c:355-msgid "Miscellaneous error"-msgstr "Miscellaneous error"-#: src/protocols/msn/cmdproc.c:358-msgid "You have signed on from another location."-msgstr "You have signed on from another location."-#: src/protocols/msn/cmdproc.c:360-msgid "The MSN servers are going down temporarily."-msgstr "The MSN servers are going down temporarily." #: src/protocols/msn/dialog.c:91
msgid "Buddy list synchronization issue in %s (%s)"
@@ -6658,7 +6664,7 @@
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2172+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2182 #: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:630
msgid "Authentication failed"
msgstr "Authentication failed"
@@ -6693,35 +6699,35 @@
-#: src/protocols/msn/msn.c:116+#: src/protocols/msn/msn.c:114 msgid "Your new MSN friendly name is too long."
msgstr "Your new MSN friendly name is too long."
-#: src/protocols/msn/msn.c:224+#: src/protocols/msn/msn.c:222 msgid "Set your friendly name."
msgstr "Set your friendly name."
-#: src/protocols/msn/msn.c:225+#: src/protocols/msn/msn.c:223 msgid "This is the name that other MSN buddies will see you as."
msgstr "This is the name that other MSN buddies will see you as."
-#: src/protocols/msn/msn.c:241+#: src/protocols/msn/msn.c:239 msgid "Set your home phone number."
msgstr "Set your home phone number."
-#: src/protocols/msn/msn.c:256+#: src/protocols/msn/msn.c:254 msgid "Set your work phone number."
msgstr "Set your work phone number."
-#: src/protocols/msn/msn.c:271+#: src/protocols/msn/msn.c:269 msgid "Set your mobile phone number."
msgstr "Set your mobile phone number."
-#: src/protocols/msn/msn.c:284+#: src/protocols/msn/msn.c:282 msgid "Allow MSN Mobile pages?"
msgstr "Allow MSN Mobile pages?"
-#: src/protocols/msn/msn.c:285+#: src/protocols/msn/msn.c:283 "Do you want to allow or disallow people on your buddy list to send you MSN "
"Mobile pages to your cell phone or other mobile device?"
@@ -6729,24 +6735,24 @@
"Do you want to allow or disallow people on your buddy list to send you MSN "
"Mobile pages to your mobile phone or other mobile device?"
-#: src/protocols/msn/msn.c:289+#: src/protocols/msn/msn.c:287 -#: src/protocols/msn/msn.c:290+#: src/protocols/msn/msn.c:288 +#: src/protocols/msn/msn.c:311 +msgid "Send a mobile message." +msgstr "Send a mobile message." #: src/protocols/msn/msn.c:313
-msgid "Send a mobile message."-msgstr "Send a mobile message."-#: src/protocols/msn/msn.c:315-#: src/protocols/msn/msn.c:490 src/protocols/msn/msn.c:498-#: src/protocols/msn/msn.c:501 src/protocols/yahoo/yahoo.c:2703+#: src/protocols/msn/msn.c:488 src/protocols/msn/msn.c:496 +#: src/protocols/msn/msn.c:499 src/protocols/yahoo/yahoo.c:2703 @@ -6755,84 +6761,84 @@
-#: src/protocols/msn/msn.c:498+#: src/protocols/msn/msn.c:496 -#: src/protocols/msn/msn.c:501+#: src/protocols/msn/msn.c:499 -#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:824+#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:795 #: src/protocols/msn/state.c:34
msgid "Away From Computer"
msgstr "Away From Computer"
-#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:826+#: 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/yahoo/yahoo.c:2925 src/protocols/yahoo/yahoo.c:3041 -#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:828+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:799 #: 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:1383 src/protocols/silc/silc.c:48+#: 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/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3042 -#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:830+#: 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/yahoo/yahoo.c:2935 src/protocols/yahoo/yahoo.c:3046 -#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:832+#: 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/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:3048 -#: src/protocols/msn/msn.c:520 src/protocols/msn/msn.c:834-#: src/protocols/zephyr/zephyr.c:2112 src/protocols/zephyr/zephyr.c:2144+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:805 +#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143 -#: src/protocols/msn/msn.c:531+#: src/protocols/msn/msn.c:529 msgid "Set Friendly Name"
msgstr "Set Friendly Name"
-#: src/protocols/msn/msn.c:536+#: src/protocols/msn/msn.c:534 msgid "Set Home Phone Number"
msgstr "Set Home Phone Number"
-#: src/protocols/msn/msn.c:540+#: src/protocols/msn/msn.c:538 msgid "Set Work Phone Number"
msgstr "Set Work Phone Number"
-#: src/protocols/msn/msn.c:544+#: src/protocols/msn/msn.c:542 msgid "Set Mobile Phone Number"
msgstr "Set Mobile Phone Number"
-#: src/protocols/msn/msn.c:550+#: src/protocols/msn/msn.c:548 msgid "Enable/Disable Mobile Devices"
msgstr "Enable/Disable Mobile Devices"
-#: src/protocols/msn/msn.c:555+#: src/protocols/msn/msn.c:553 msgid "Allow/Disallow Mobile Pages"
msgstr "Allow/Disallow Mobile Pages"
-#: src/protocols/msn/msn.c:578+#: src/protocols/msn/msn.c:576 -#: src/protocols/msn/msn.c:588-#: src/protocols/msn/msn.c:624+#: src/protocols/msn/msn.c:585 src/protocols/novell/novell.c:3369 +#: src/protocols/msn/msn.c:621 "SSL support is needed for MSN. Please install a supported SSL library. See "
"http://gaim.sf.net/faq-ssl.php for more information."
@@ -6840,91 +6846,91 @@
"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:1314 src/protocols/yahoo/yahoo_profile.c:659-#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1121+#: src/protocols/msn/msn.c:1268 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:1322 src/protocols/msn/msn.c:1680+#: src/protocols/msn/msn.c:1276 src/protocols/msn/msn.c:1634 #: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
-#: src/protocols/msn/msn.c:1410+#: src/protocols/msn/msn.c:1364 -#: src/protocols/msn/msn.c:1415 src/protocols/msn/msn.c:1667+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1621 #: src/protocols/yahoo/yahoo_profile.c:761
msgid "Error retrieving profile"
msgstr "Error retreiving profile"
-#: src/protocols/msn/msn.c:1486 src/protocols/oscar/oscar.c:5052+#: src/protocols/msn/msn.c:1440 src/protocols/oscar/oscar.c:5105 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
#: src/protocols/yahoo/yahoo_profile.c:1015
-#: src/protocols/msn/msn.c:1493 src/protocols/oscar/oscar.c:5038+#: src/protocols/msn/msn.c:1447 src/protocols/oscar/oscar.c:5091 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
#: src/protocols/yahoo/yahoo_profile.c:1025
-#: src/protocols/msn/msn.c:1502 src/protocols/yahoo/yahoo_profile.c:1020+#: src/protocols/msn/msn.c:1456 src/protocols/yahoo/yahoo_profile.c:1020 -#: src/protocols/msn/msn.c:1509 src/protocols/novell/novell.c:1445+#: src/protocols/msn/msn.c:1463 src/protocols/novell/novell.c:1445 #: src/protocols/yahoo/yahoo_profile.c:1010
-#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1030+#: src/protocols/msn/msn.c:1471 src/protocols/yahoo/yahoo_profile.c:1030 -#: src/protocols/msn/msn.c:1534 src/protocols/msn/msn.c:1540-#: src/protocols/msn/msn.c:1547 src/protocols/msn/msn.c:1555-#: src/protocols/msn/msn.c:1562+#: 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 msgid "A Little About Me"
msgstr "A Little About Me"
-#: src/protocols/msn/msn.c:1571 src/protocols/msn/msn.c:1577-#: src/protocols/msn/msn.c:1584 src/protocols/msn/msn.c:1591+#: src/protocols/msn/msn.c:1525 src/protocols/msn/msn.c:1531 +#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1545 msgstr "Favourite Things"
-#: src/protocols/msn/msn.c:1600 src/protocols/msn/msn.c:1606-#: src/protocols/msn/msn.c:1613+#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1560 +#: src/protocols/msn/msn.c:1567 msgid "Hobbies and Interests"
msgstr "Hobbies and Interests"
-#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628+#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582 #: src/protocols/yahoo/yahoo_profile.c:1072
-#: src/protocols/msn/msn.c:1636 src/protocols/yahoo/yahoo_profile.c:1123+#: src/protocols/msn/msn.c:1590 src/protocols/yahoo/yahoo_profile.c:1123 -#: src/protocols/msn/msn.c:1647 src/protocols/silc/ops.c:844+#: src/protocols/msn/msn.c:1601 src/protocols/silc/ops.c:844 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
-#: src/protocols/msn/msn.c:1669+#: src/protocols/msn/msn.c:1623 msgid "The user has not created a public profile."
msgstr "The user has not created a public profile."
-#: src/protocols/msn/msn.c:1670+#: src/protocols/msn/msn.c:1624 "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 "
@@ -6934,7 +6940,8 @@
"that the user does not exist, or that the user exists but has not created a "
-#: src/protocols/msn/msn.c:1674+#. This should never happen +#: src/protocols/msn/msn.c:1628 "Gaim could not find any information in the user's profile. The user most "
@@ -6942,15 +6949,15 @@
"Gaim could not find any information in the user's profile. The user most "
-#: src/protocols/msn/msn.c:1680 src/protocols/yahoo/yahoo_profile.c:1168+#: src/protocols/msn/msn.c:1634 src/protocols/yahoo/yahoo_profile.c:1168 -#: src/protocols/msn/msn.c:1821+#: src/protocols/msn/msn.c:1775 msgid "Display conversation closed notices"
msgstr "Display conversation closed notices"
-#: src/protocols/msn/msn.c:1826+#: src/protocols/msn/msn.c:1780 msgid "Display timeout notices"
msgstr "Display timeout notices"
@@ -6963,50 +6970,72 @@
-#: src/protocols/msn/msn.c:1913 src/protocols/msn/msn.c:1915+#: src/protocols/msn/msn.c:1867 src/protocols/msn/msn.c:1869 msgid "MSN Protocol Plugin"
msgstr "MSN Protocol Plugin"
-#: src/protocols/msn/msn.c:1934 src/protocols/trepia/trepia.c:1296+#: src/protocols/msn/msn.c:1888 src/protocols/trepia/trepia.c:1296 -#: src/protocols/msn/msn.c:1943+#: src/protocols/msn/msn.c:1897 -#: src/protocols/msn/nexus.c:79-msgid "Unable to connect to server"-msgstr "Unable to connect to server"-#: src/protocols/msn/nexus.c:218-msgid "Unknown error when attempting to authorize with MSN login server."-msgstr "Unknown error when attempting to authorise with MSN login server."-#: src/protocols/msn/notification.c:84-msgid "Requesting to send password"-msgstr "Requesting to send password"-#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:636-msgid "Retrieving buddy list"-msgstr "Retrieving buddy list"-#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173-#: src/protocols/oscar/oscar.c:2462-#: src/protocols/msn/notification.c:714-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "-#: src/protocols/msn/notification.c:1090+#: 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:178 +msgid "%s is not a valid group." +msgstr "%s is not a valid group." +#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:495 +#: src/protocols/msn/session.c:320 +#: src/protocols/msn/notification.c:187 +#: src/protocols/msn/notification.c:465 +msgid "Unable to add user on %s (%s)" +msgstr "Unable to add user on %s (%s)" +#: src/protocols/msn/notification.c:469 +msgid "Unable to block user on %s (%s)" +msgstr "Unable to block user on %s (%s)" +#: src/protocols/msn/notification.c:473 +msgid "Unable to permit user on %s (%s)" +msgstr "Unable to permit user on %s (%s)" +#: src/protocols/msn/notification.c:481 +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:490 +msgid "%s is not a valid passport account." +msgstr "%s is not a valid passport account." +#: src/protocols/msn/notification.c:746 +msgid "Unable to rename group" +msgstr "Unable to rename group" +#: src/protocols/msn/notification.c:801 +msgid "Unable to delete group" +msgstr "Unable to delete group" +#: src/protocols/msn/notification.c:1203 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7037,68 +7066,114 @@
"After the maintenance has been completed, you will be able to successfully "
-#: src/protocols/msn/notification.c:1155-msgid "Syncing with server"-msgstr "Syncing with server"-#: src/protocols/msn/servconn.c:46-msgid "Unable to connect to %s server"-msgstr "Unable to connect to %s server"-#: src/protocols/msn/servconn.c:50-msgid "Error writing to %s server"-msgstr "Error writing to %s server"-#: src/protocols/msn/servconn.c:54-msgid "Error reading from %s server"-msgstr "Error reading from %s server"-#: src/protocols/msn/servconn.c:58-msgid "Unknown error from %s server"-msgstr "Unknown error from %s server"-#: src/protocols/msn/servconn.c:351-msgid "Received HTTP error. Please report this."-msgstr "Received HTTP error. Please report this."-#: src/protocols/msn/switchboard.c:193+#: src/protocols/msn/servconn.c:129 +#: src/protocols/msn/servconn.c:131 +#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:312 +#: src/protocols/oscar/oscar.c:4088 +#: src/protocols/msn/servconn.c:136 +"Connection error from %s server (%s):\n" +"Connection error from %s server (%s):\n" +#: src/protocols/msn/session.c:295 +msgid "Our protocol is not supported by the server." +msgstr "Our protocol is not supported by the server." +#: src/protocols/msn/session.c:299 +msgid "Error parsing HTTP." +msgstr "Error parsing HTTP." +#: src/protocols/msn/session.c:303 +msgid "You have signed on from another location." +msgstr "You have signed on from another location." +#: src/protocols/msn/session.c:306 +msgid "The MSN servers are going down temporarily." +msgstr "The MSN servers are going down temporarily." +#: src/protocols/msn/session.c:310 +msgid "Unable to authenticate: %s" +msgstr "Unable to authenticate: %s" +#: src/protocols/msn/session.c:315 +"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:336 +#: src/protocols/msn/session.c:338 +msgid "Starting authentication" +msgstr "Starting authentication" +#: src/protocols/msn/session.c:339 +#: src/protocols/msn/session.c:341 +#: src/protocols/msn/session.c:342 src/protocols/trepia/trepia.c:636 +msgid "Retrieving buddy list" +msgstr "Retrieving buddy list" +#: src/protocols/msn/switchboard.c:368 +msgid "Message may have not been sent because a timeout occurred:" +msgstr "Message may not have been sent because a timeout occurred:" +#: src/protocols/msn/switchboard.c:376 +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 +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 +msgid "Message could not be sent because a connection error occurred:" +msgstr "Message could not be sent because a connection error occurred:" +#: src/protocols/msn/switchboard.c:388 +"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 +msgid "Message may have not been sent because an unknown error occurred:" +msgstr "Message may not have been sent because an unknown error occurred:" +#: src/protocols/msn/switchboard.c:626 msgid "The conversation has become inactive and timed out."
msgstr "The conversation has become inactive and timed out."
-#: src/protocols/msn/switchboard.c:212+#: src/protocols/msn/switchboard.c:645 msgid "%s has closed the conversation window."
msgstr "%s has closed the conversation window."
-#: src/protocols/msn/switchboard.c:478-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:481-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:484-msgid "Message could not be sent because a connection error occured"-msgstr "Message could not be sent because a connection error occured"-#: src/protocols/msn/switchboard.c:487-msgid "Message could not be sent for an unknown reason"-msgstr "Message could not be sent for an unknown reason"-#: src/protocols/msn/switchboard.c:492 #: src/protocols/msn/userlist.c:87
msgid "The user %s (%s) wants to add %s to his or her buddy list."
@@ -7167,7 +7242,6 @@
#: src/protocols/napster/napster.c:650 src/protocols/napster/napster.c:652
msgid "NAPSTER Protocol Plugin"
msgstr "NAPSTER Protocol Plugin"
@@ -7410,8 +7484,8 @@
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5025-#: src/protocols/oscar/oscar.c:5032+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5078 +#: src/protocols/oscar/oscar.c:5085 @@ -7512,8 +7586,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:724-#: src/protocols/oscar/oscar.c:6619 src/protocols/yahoo/yahoo.c:2582+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:723 +#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2582 @@ -7525,10 +7599,6 @@
-#: src/protocols/novell/novell.c:3369@@ -7538,7 +7608,6 @@
#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
msgid "Novell GroupWise Messenger Protocol Plugin"
msgstr "Novell GroupWise Messenger Protocol Plugin"
@@ -7647,7 +7716,7 @@
msgstr "Not while on AOL"
-#: src/protocols/oscar/oscar.c:403 src/protocols/oscar/oscar.c:486+#: src/protocols/oscar/oscar.c:402 src/protocols/oscar/oscar.c:485 "(There was an error receiving this message. The buddy you are speaking to "
"most likely has a buggy client.)"
@@ -7655,157 +7724,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:579+#: src/protocols/oscar/oscar.c:578 -#: src/protocols/oscar/oscar.c:582+#: src/protocols/oscar/oscar.c:581 -#: src/protocols/oscar/oscar.c:585 src/protocols/silc/silc.c:646+#: src/protocols/oscar/oscar.c:584 src/protocols/silc/silc.c:646 #: src/protocols/silc/util.c:506
-#: src/protocols/oscar/oscar.c:588 src/protocols/oscar/oscar.c:6921+#: src/protocols/oscar/oscar.c:587 src/protocols/oscar/oscar.c:6974 -#: src/protocols/oscar/oscar.c:595+#: src/protocols/oscar/oscar.c:594 -#: src/protocols/oscar/oscar.c:598+#: src/protocols/oscar/oscar.c:597 -#: src/protocols/oscar/oscar.c:601+#: src/protocols/oscar/oscar.c:600 -#: src/protocols/oscar/oscar.c:604+#: src/protocols/oscar/oscar.c:603 msgid "ICQ Direct Connect"
msgstr "ICQ Direct Connect"
-#: src/protocols/oscar/oscar.c:607+#: src/protocols/oscar/oscar.c:606 -#: src/protocols/oscar/oscar.c:610+#: src/protocols/oscar/oscar.c:609 -#: src/protocols/oscar/oscar.c:613+#: src/protocols/oscar/oscar.c:612 -#: src/protocols/oscar/oscar.c:616+#: src/protocols/oscar/oscar.c:615 msgstr "ICQ Server Relay"
-#: src/protocols/oscar/oscar.c:619+#: src/protocols/oscar/oscar.c:618 -#: src/protocols/oscar/oscar.c:622+#: src/protocols/oscar/oscar.c:621 msgid "Trillian Encryption"
msgstr "Trillian Encryption"
-#: src/protocols/oscar/oscar.c:625+#: src/protocols/oscar/oscar.c:624 -#: src/protocols/oscar/oscar.c:628+#: src/protocols/oscar/oscar.c:627 -#: src/protocols/oscar/oscar.c:631+#: src/protocols/oscar/oscar.c:630 msgstr "Security Enabled"
-#: src/protocols/oscar/oscar.c:634+#: src/protocols/oscar/oscar.c:633 -#: src/protocols/oscar/oscar.c:638+#: src/protocols/oscar/oscar.c:637 -#: src/protocols/oscar/oscar.c:641+#: src/protocols/oscar/oscar.c:640 -#: src/protocols/oscar/oscar.c:644+#: src/protocols/oscar/oscar.c:643 -#: src/protocols/oscar/oscar.c:662 src/protocols/oscar/oscar.c:5629-#: src/protocols/oscar/oscar.c:6813+#: src/protocols/oscar/oscar.c:661 src/protocols/oscar/oscar.c:5682 +#: src/protocols/oscar/oscar.c:6866 -#: src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:5623-#: src/protocols/oscar/oscar.c:6811+#: src/protocols/oscar/oscar.c:665 src/protocols/oscar/oscar.c:5676 +#: src/protocols/oscar/oscar.c:6864 -#: src/protocols/oscar/oscar.c:668 src/protocols/oscar/oscar.c:5626-#: src/protocols/oscar/oscar.c:6812+#: src/protocols/oscar/oscar.c:667 src/protocols/oscar/oscar.c:5679 +#: src/protocols/oscar/oscar.c:6865 -#: src/protocols/oscar/oscar.c:672+#: src/protocols/oscar/oscar.c:671 -#: src/protocols/oscar/oscar.c:740+#: src/protocols/oscar/oscar.c:739 -#: src/protocols/oscar/oscar.c:749+#: src/protocols/oscar/oscar.c:748 -#: src/protocols/oscar/oscar.c:884+#: src/protocols/oscar/oscar.c:883 msgid "Direct IM with %s closed"
msgstr "Direct IM with %s closed"
-#: src/protocols/oscar/oscar.c:886+#: src/protocols/oscar/oscar.c:885 msgid "Direct IM with %s failed"
msgstr "Direct IM with %s failed"
-#: src/protocols/oscar/oscar.c:893+#: src/protocols/oscar/oscar.c:892 msgid "Direct Connect failed"
msgstr "Direct Connect failed"
-#: src/protocols/oscar/oscar.c:970 src/protocols/oscar/oscar.c:1101+#: src/protocols/oscar/oscar.c:969 src/protocols/oscar/oscar.c:1100 msgid "Direct IM with %s established"
msgstr "Direct IM with %s established"
-#: src/protocols/oscar/oscar.c:1051+#: src/protocols/oscar/oscar.c:1050 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:1468+#: src/protocols/oscar/oscar.c:1470 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:1473+#: src/protocols/oscar/oscar.c:1475 msgid "Unable to open Direct IM"
msgstr "Unable to open Direct IM"
-#: src/protocols/oscar/oscar.c:1508+#: src/protocols/oscar/oscar.c:1510 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:1512+#: src/protocols/oscar/oscar.c:1514 "Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
@@ -7813,24 +7882,24 @@
"Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
-#: src/protocols/oscar/oscar.c:1516 src/protocols/oscar/oscar.c:3469+#: src/protocols/oscar/oscar.c:1518 src/protocols/oscar/oscar.c:3522 -#: src/protocols/oscar/oscar.c:1583 src/protocols/toc/toc.c:874+#: src/protocols/oscar/oscar.c:1585 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:1602+#: src/protocols/oscar/oscar.c:1604 msgid "Chat is currently unavailable"
msgstr "Chat is currently unavailable"
-#: src/protocols/oscar/oscar.c:1683+#: src/protocols/oscar/oscar.c:1685 msgstr "Screen name sent"
-#: src/protocols/oscar/oscar.c:1697+#: src/protocols/oscar/oscar.c:1699 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7841,46 +7910,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:1725+#: src/protocols/oscar/oscar.c:1727 msgid "Unable to login to AIM"
msgstr "Unable to login to AIM"
-#: src/protocols/oscar/oscar.c:1826 src/protocols/oscar/oscar.c:2265+#: src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:2275 msgid "Could Not Connect"
msgstr "Could Not Connect"
-#: src/protocols/oscar/oscar.c:1834+#: src/protocols/oscar/oscar.c:1837 msgid "Connection established, cookie sent"
msgstr "Connection established, cookie sent"
-#: src/protocols/oscar/oscar.c:1947 src/protocols/yahoo/yahoo_filexfer.c:181-#: src/protocols/yahoo/yahoo_filexfer.c:190-#: src/protocols/yahoo/yahoo_filexfer.c:200+#: 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 msgid "Unable to establish file descriptor."
msgstr "Unable to establish file descriptor."
-#: src/protocols/oscar/oscar.c:1952+#: src/protocols/oscar/oscar.c:1962 msgid "Unable to create new connection."
msgstr "Unable to create new connection."
-#: src/protocols/oscar/oscar.c:2024+#: src/protocols/oscar/oscar.c:2034 msgid "Unable to establish listener socket."
msgstr "Unable to establish listener socket."
-#: src/protocols/oscar/oscar.c:2149 src/protocols/toc/toc.c:541+#: src/protocols/oscar/oscar.c:2159 src/protocols/toc/toc.c:541 msgid "Incorrect nickname or password."
msgstr "Incorrect nickname or password."
-#: src/protocols/oscar/oscar.c:2154+#: src/protocols/oscar/oscar.c:2164 msgid "Your account is currently suspended."
msgstr "Your account is currently suspended."
#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2158+#: src/protocols/oscar/oscar.c:2168 msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "The AOL Instant Messenger service is temporarily unavailable."
-#: src/protocols/oscar/oscar.c:2163+#: src/protocols/oscar/oscar.c:2173 "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."
@@ -7888,21 +7957,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:2168+#: src/protocols/oscar/oscar.c:2178 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:2200+#: src/protocols/oscar/oscar.c:2210 -#: src/protocols/oscar/oscar.c:2272+#: src/protocols/oscar/oscar.c:2282 msgid "Received authorization"
msgstr "Received authorisation"
-#: src/protocols/oscar/oscar.c:2308 src/protocols/oscar/oscar.c:2338-#: src/protocols/oscar/oscar.c:2427+#: src/protocols/oscar/oscar.c:2306 +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:2321 +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 "You may be disconnected shortly. You may want to use TOC until this is "
@@ -7911,20 +7992,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:2311 src/protocols/oscar/oscar.c:2341+#: src/protocols/oscar/oscar.c:2364 src/protocols/oscar/oscar.c:2394 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:2430+#: src/protocols/oscar/oscar.c:2483 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:3461+#: src/protocols/oscar/oscar.c:2515 +#: src/protocols/oscar/oscar.c:3514 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:3464+#: src/protocols/oscar/oscar.c:3517 "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 "
@@ -7934,19 +8019,19 @@
"for IM Images. Because your IP address will be revealed, this may be "
"considered a privacy risk."
-#: src/protocols/oscar/oscar.c:3502+#: src/protocols/oscar/oscar.c:3555 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:3510+#: src/protocols/oscar/oscar.c:3563 msgid "Authorization Request Message:"
msgstr "Authorisation Request Message:"
-#: src/protocols/oscar/oscar.c:3511+#: src/protocols/oscar/oscar.c:3564 msgid "Please authorize me!"
msgstr "Please authorise me!"
-#: src/protocols/oscar/oscar.c:3541+#: src/protocols/oscar/oscar.c:3594 "The user %s requires authorization before being added to a buddy list. Do "
@@ -7955,22 +8040,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:3546 src/protocols/oscar/oscar.c:3548+#: src/protocols/oscar/oscar.c:3599 src/protocols/oscar/oscar.c:3601 msgid "Request Authorization"
msgstr "Request Authorisation"
-#: src/protocols/oscar/oscar.c:3596 src/protocols/oscar/oscar.c:3598-#: src/protocols/oscar/oscar.c:3605 src/protocols/oscar/oscar.c:3702-#: src/protocols/oscar/oscar.c:3722 src/protocols/oscar/oscar.c:6254-#: src/protocols/oscar/oscar.c:6300+#: 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 msgstr "No reason given."
-#: src/protocols/oscar/oscar.c:3604+#: src/protocols/oscar/oscar.c:3657 msgid "Authorization Denied Message:"
msgstr "Authorisation Denied Message:"
-#: src/protocols/oscar/oscar.c:3702+#: src/protocols/oscar/oscar.c:3755 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7979,11 +8064,11 @@
"The user %u wants to add you to their buddy list for the following reason:\n"
-#: src/protocols/oscar/oscar.c:3710 src/protocols/oscar/oscar.c:6260+#: src/protocols/oscar/oscar.c:3763 src/protocols/oscar/oscar.c:6313 msgid "Authorization Request"
msgstr "Authorisation Request"
-#: src/protocols/oscar/oscar.c:3722+#: src/protocols/oscar/oscar.c:3775 "The user %u has denied your request to add them to your buddy list for the "
@@ -7994,17 +8079,17 @@
-#: src/protocols/oscar/oscar.c:3723+#: src/protocols/oscar/oscar.c:3776 msgid "ICQ authorization denied."
msgstr "ICQ authorisation denied."
#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3730+#: src/protocols/oscar/oscar.c:3783 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:3738+#: src/protocols/oscar/oscar.c:3791 "You have received a special message\n"
@@ -8017,7 +8102,7 @@
-#: src/protocols/oscar/oscar.c:3746+#: src/protocols/oscar/oscar.c:3799 "You have received an ICQ page\n"
@@ -8030,7 +8115,7 @@
-#: src/protocols/oscar/oscar.c:3754+#: src/protocols/oscar/oscar.c:3807 "You have received an ICQ email from %s [%s]\n"
@@ -8043,34 +8128,34 @@
-#: src/protocols/oscar/oscar.c:3775+#: src/protocols/oscar/oscar.c:3828 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:3781+#: src/protocols/oscar/oscar.c:3834 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:3785+#: src/protocols/oscar/oscar.c:3838 -#: src/protocols/oscar/oscar.c:3869+#: src/protocols/oscar/oscar.c:3922 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:3878+#: src/protocols/oscar/oscar.c:3931 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:3887+#: src/protocols/oscar/oscar.c:3940 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8081,80 +8166,76 @@
"You missed %hu messages from %s because the rate limit has been exceeded."
-#: src/protocols/oscar/oscar.c:3896+#: src/protocols/oscar/oscar.c:3949 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:3905+#: src/protocols/oscar/oscar.c:3958 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:3914+#: src/protocols/oscar/oscar.c:3967 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:3968 src/protocols/oscar/oscar.c:4200+#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4253 -#: src/protocols/oscar/oscar.c:4034+#: src/protocols/oscar/oscar.c:4087 msgid "SNAC threw error: %s\n"
msgstr "SNAC threw error: %s\n"
-#: src/protocols/oscar/oscar.c:4035 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4070+#: src/protocols/oscar/oscar.c:4123 msgid "Unable to send message: %s"
msgstr "Unable to send message: %s"
-#: src/protocols/oscar/oscar.c:4070 src/protocols/oscar/oscar.c:4075-#: src/protocols/oscar/oscar.c:4133 src/protocols/oscar/oscar.c:4137+#: 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:4133+#: src/protocols/oscar/oscar.c:4186 msgid "User information not available: %s"
msgstr "User information not available: %s"
-#: src/protocols/oscar/oscar.c:4136+#: src/protocols/oscar/oscar.c:4189 msgid "User information for %s unavailable:"
msgstr "User information for %s unavailable:"
-#: src/protocols/oscar/oscar.c:4158+#: src/protocols/oscar/oscar.c:4211 -#: src/protocols/oscar/oscar.c:4162+#: src/protocols/oscar/oscar.c:4215 -#: src/protocols/oscar/oscar.c:4167 src/protocols/yahoo/yahoo_profile.c:1118+#: src/protocols/oscar/oscar.c:4220 src/protocols/yahoo/yahoo_profile.c:1118 -#: src/protocols/oscar/oscar.c:4251+#: src/protocols/oscar/oscar.c:4304 msgid "Your AIM connection may be lost."
msgstr "Your AIM connection may be lost."
#. The conversion failed!
-#: src/protocols/oscar/oscar.c:4437+#: src/protocols/oscar/oscar.c:4490 "[Unable to display a message from this user because it contained invalid "
@@ -8162,11 +8243,11 @@
"[Unable to display a message from this user because it contained invalid "
-#: src/protocols/oscar/oscar.c:4657+#: src/protocols/oscar/oscar.c:4710 msgid "Rate limiting error."
msgstr "Rate limiting error."
-#: src/protocols/oscar/oscar.c:4658+#: src/protocols/oscar/oscar.c:4711 "The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -8174,7 +8255,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:4721+#: src/protocols/oscar/oscar.c:4774 "You have been disconnected because you have signed on with this screen name "
@@ -8182,109 +8263,109 @@
"You have been disconnected because you have signed on with this screen name "
-#: src/protocols/oscar/oscar.c:4723+#: src/protocols/oscar/oscar.c:4776 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:4754+#: src/protocols/oscar/oscar.c:4807 msgid "Finalizing connection"
msgstr "Finalizing connection"
-#: src/protocols/oscar/oscar.c:5037 src/protocols/silc/util.c:538+#: src/protocols/oscar/oscar.c:5090 src/protocols/silc/util.c:538 -#: src/protocols/oscar/oscar.c:5038+#: src/protocols/oscar/oscar.c:5091 -#: src/protocols/oscar/oscar.c:5039 src/protocols/trepia/trepia.c:282+#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:282 #: src/protocols/trepia/trepia.c:408
-#: src/protocols/oscar/oscar.c:5039 src/protocols/trepia/trepia.c:281+#: src/protocols/oscar/oscar.c:5092 src/protocols/trepia/trepia.c:281 #: src/protocols/trepia/trepia.c:408
-#: src/protocols/oscar/oscar.c:5055+#: src/protocols/oscar/oscar.c:5108 msgid "Personal Web Page"
msgstr "Personal Web Page"
-#: src/protocols/oscar/oscar.c:5059+#: src/protocols/oscar/oscar.c:5112 msgid "Additional Information"
msgstr "Additional Information"
-#: src/protocols/oscar/oscar.c:5064+#: src/protocols/oscar/oscar.c:5117 -#: src/protocols/oscar/oscar.c:5068 src/protocols/oscar/oscar.c:5076+#: src/protocols/oscar/oscar.c:5121 src/protocols/oscar/oscar.c:5129 -#: src/protocols/oscar/oscar.c:5072+#: src/protocols/oscar/oscar.c:5125 -#: src/protocols/oscar/oscar.c:5080+#: src/protocols/oscar/oscar.c:5133 msgstr "Work Information"
-#: src/protocols/oscar/oscar.c:5081+#: src/protocols/oscar/oscar.c:5134 -#: src/protocols/oscar/oscar.c:5082+#: src/protocols/oscar/oscar.c:5135 -#: src/protocols/oscar/oscar.c:5083+#: src/protocols/oscar/oscar.c:5136 -#: src/protocols/oscar/oscar.c:5085+#: src/protocols/oscar/oscar.c:5138 -#: src/protocols/oscar/oscar.c:5095+#: src/protocols/oscar/oscar.c:5148 -#: src/protocols/oscar/oscar.c:5144+#: src/protocols/oscar/oscar.c:5197 -#: src/protocols/oscar/oscar.c:5165+#: src/protocols/oscar/oscar.c:5218 msgid "The following screen names are associated with %s"
msgstr "The following screen names are associated with %s"
-#: src/protocols/oscar/oscar.c:5169+#: src/protocols/oscar/oscar.c:5222 -#: src/protocols/oscar/oscar.c:5186+#: src/protocols/oscar/oscar.c:5239 msgid "No results found for email address %s"
msgstr "No results found for email address %s"
-#: src/protocols/oscar/oscar.c:5207+#: src/protocols/oscar/oscar.c:5260 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:5209+#: src/protocols/oscar/oscar.c:5262 msgid "Account Confirmation Requested"
msgstr "Account Confirmation Requested"
-#: src/protocols/oscar/oscar.c:5240+#: src/protocols/oscar/oscar.c:5293 msgid "Error Changing Account Info"
msgstr "Error Changing Account Info"
-#: src/protocols/oscar/oscar.c:5243+#: src/protocols/oscar/oscar.c:5296 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8293,7 +8374,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
-#: src/protocols/oscar/oscar.c:5246+#: src/protocols/oscar/oscar.c:5299 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8302,7 +8383,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
-#: src/protocols/oscar/oscar.c:5249+#: src/protocols/oscar/oscar.c:5302 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8311,7 +8392,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
-#: src/protocols/oscar/oscar.c:5252+#: src/protocols/oscar/oscar.c:5305 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8320,7 +8401,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:5255+#: src/protocols/oscar/oscar.c:5308 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8329,7 +8410,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:5258+#: src/protocols/oscar/oscar.c:5311 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8338,12 +8419,12 @@
"Error 0x%04x: Unable to change email address because the given address is "
-#: src/protocols/oscar/oscar.c:5261+#: src/protocols/oscar/oscar.c:5314 msgid "Error 0x%04x: Unknown error."
msgstr "Error 0x%04x: Unknown error."
-#: src/protocols/oscar/oscar.c:5271+#: src/protocols/oscar/oscar.c:5324 "Your screen name is currently formatted as follows:\n"
@@ -8352,26 +8433,26 @@
"Your screen name is currently formatted as follows:\n"
-#: src/protocols/oscar/oscar.c:5272 src/protocols/oscar/oscar.c:5279+#: src/protocols/oscar/oscar.c:5325 src/protocols/oscar/oscar.c:5332 -#: src/protocols/oscar/oscar.c:5277+#: src/protocols/oscar/oscar.c:5330 msgid "The email address for %s is %s"
msgstr "The email address for %s is %s"
-#: src/protocols/oscar/oscar.c:5342+#: src/protocols/oscar/oscar.c:5395 "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:5478+#: src/protocols/oscar/oscar.c:5531 msgid "Unable to set AIM profile."
msgstr "Unable to set AIM profile."
-#: src/protocols/oscar/oscar.c:5479+#: src/protocols/oscar/oscar.c:5532 "You have probably requested to set your profile before the login procedure "
"completed. Your profile remains unset; try setting it again when you are "
@@ -8381,7 +8462,7 @@
"completed. Your profile remains unset; try setting it again when you are "
-#: src/protocols/oscar/oscar.c:5506+#: src/protocols/oscar/oscar.c:5559 "The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -8396,19 +8477,19 @@
"The maximum profile length of %d bytes has been exceeded. Gaim has "
-#: src/protocols/oscar/oscar.c:5511+#: src/protocols/oscar/oscar.c:5564 msgid "Profile too long."
msgstr "Profile too long."
-#: src/protocols/oscar/oscar.c:5527 src/protocols/oscar/oscar.c:6818+#: src/protocols/oscar/oscar.c:5580 src/protocols/oscar/oscar.c:6871 -#: src/protocols/oscar/oscar.c:5545+#: src/protocols/oscar/oscar.c:5598 msgid "Unable to set AIM away message."
msgstr "Unable to set AIM away message."
-#: src/protocols/oscar/oscar.c:5546+#: src/protocols/oscar/oscar.c:5599 "You have probably requested to set your away message before the login "
"procedure completed. You remain in a \"present\" state; try setting it "
@@ -8418,7 +8499,7 @@
"procedure completed. You remain in a \"present\" state; try setting it "
"again when you are fully connected."
-#: src/protocols/oscar/oscar.c:5586+#: src/protocols/oscar/oscar.c:5639 "The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -8433,11 +8514,11 @@
"The maximum away message length of %d bytes has been exceeded. Gaim has "
-#: src/protocols/oscar/oscar.c:5591+#: src/protocols/oscar/oscar.c:5644 msgid "Away message too long."
msgstr "Away message too long."
-#: src/protocols/oscar/oscar.c:5669+#: src/protocols/oscar/oscar.c:5722 "Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -8448,16 +8529,16 @@
"must either start with a letter and contain only letters, numbers and "
"spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:5671 src/protocols/oscar/oscar.c:6120-#: src/protocols/oscar/oscar.c:6134+#: src/protocols/oscar/oscar.c:5724 src/protocols/oscar/oscar.c:6173 +#: src/protocols/oscar/oscar.c:6187 -#: src/protocols/oscar/oscar.c:5832+#: src/protocols/oscar/oscar.c:5885 msgid "Unable To Retrieve Buddy List"
msgstr "Unable To Retrieve Buddy List"
-#: src/protocols/oscar/oscar.c:5833+#: src/protocols/oscar/oscar.c:5886 "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 "
@@ -8467,13 +8548,13 @@
"servers. Your buddy list is not lost, and will probably become available in "
-#: src/protocols/oscar/oscar.c:6015 src/protocols/oscar/oscar.c:6016-#: src/protocols/oscar/oscar.c:6021 src/protocols/oscar/oscar.c:6178-#: src/protocols/oscar/oscar.c:6179 src/protocols/oscar/oscar.c:6184+#: 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:6118+#: src/protocols/oscar/oscar.c:6171 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8482,11 +8563,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:6118 src/protocols/oscar/oscar.c:6132+#: src/protocols/oscar/oscar.c:6171 src/protocols/oscar/oscar.c:6185 -#: src/protocols/oscar/oscar.c:6132+#: src/protocols/oscar/oscar.c:6185 "Could not add the buddy %s for an unknown reason. The most common reason "
@@ -8497,7 +8578,7 @@
"for this is that you have the maximum number of allowed buddies in your "
-#: src/protocols/oscar/oscar.c:6215+#: src/protocols/oscar/oscar.c:6268 "The user %s has given you permission to add you to their buddy list. Do you "
@@ -8506,11 +8587,11 @@
"The user %s has given you permission to add you to their buddy list. Do you "
-#: src/protocols/oscar/oscar.c:6221+#: src/protocols/oscar/oscar.c:6274 msgid "Authorization Given"
msgstr "Authorisation Given"
-#: src/protocols/oscar/oscar.c:6254+#: src/protocols/oscar/oscar.c:6307 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8520,17 +8601,17 @@
-#: src/protocols/oscar/oscar.c:6296+#: src/protocols/oscar/oscar.c:6349 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:6297+#: src/protocols/oscar/oscar.c:6350 msgid "Authorization Granted"
msgstr "Authorisation Granted"
-#: src/protocols/oscar/oscar.c:6300+#: src/protocols/oscar/oscar.c:6353 "The user %s has denied your request to add them to your buddy list for the "
@@ -8541,76 +8622,76 @@
-#: src/protocols/oscar/oscar.c:6301+#: src/protocols/oscar/oscar.c:6354 msgid "Authorization Denied"
msgstr "Authorisation Denied"
-#: src/protocols/oscar/oscar.c:6338 src/protocols/toc/toc.c:1273+#: src/protocols/oscar/oscar.c:6391 src/protocols/toc/toc.c:1273 -#: src/protocols/oscar/oscar.c:6376+#: src/protocols/oscar/oscar.c:6429 msgid "Invalid chat name specified."
msgstr "Invalid chat name specified."
-#: src/protocols/oscar/oscar.c:6465+#: src/protocols/oscar/oscar.c:6518 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:6591+#: src/protocols/oscar/oscar.c:6644 -#: src/protocols/oscar/oscar.c:6877+#: src/protocols/oscar/oscar.c:6930 msgid "Buddy Comment for %s"
msgstr "Buddy Comment for %s"
-#: src/protocols/oscar/oscar.c:6878+#: src/protocols/oscar/oscar.c:6931 -#: src/protocols/oscar/oscar.c:6897+#: src/protocols/oscar/oscar.c:6950 msgid "Edit Buddy Comment"
msgstr "Edit Buddy Comment"
-#: src/protocols/oscar/oscar.c:6903+#: src/protocols/oscar/oscar.c:6956 -#: src/protocols/oscar/oscar.c:6915+#: src/protocols/oscar/oscar.c:6968 -#: src/protocols/oscar/oscar.c:6932+#: src/protocols/oscar/oscar.c:6985 msgid "Re-request Authorization"
msgstr "Re-request Authorisation"
-#: src/protocols/oscar/oscar.c:6962+#: src/protocols/oscar/oscar.c:7015 msgid "The new formatting is invalid."
msgstr "The new formatting is invalid."
-#: src/protocols/oscar/oscar.c:6963+#: src/protocols/oscar/oscar.c:7016 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:6970+#: src/protocols/oscar/oscar.c:7023 msgid "New screen name formatting:"
msgstr "New screen name formatting:"
-#: src/protocols/oscar/oscar.c:7022+#: src/protocols/oscar/oscar.c:7075 msgid "Change Address To:"
msgstr "Change Address To:"
-#: src/protocols/oscar/oscar.c:7067+#: src/protocols/oscar/oscar.c:7120 msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>you are not waiting for authorisation</i>"
-#: src/protocols/oscar/oscar.c:7070+#: src/protocols/oscar/oscar.c:7123 msgid "You are awaiting authorization from the following buddies"
msgstr "You are awaiting authorisation from the following buddies"
-#: src/protocols/oscar/oscar.c:7071+#: src/protocols/oscar/oscar.c:7124 "You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -8618,75 +8699,75 @@
"You can re-request authorisation from these buddies by right-clicking on "
"them and selecting \"Re-request Authorisation.\""
-#: src/protocols/oscar/oscar.c:7088+#: src/protocols/oscar/oscar.c:7141 msgid "Find Buddy by E-mail"
msgstr "Find Buddy by E-mail"
-#: src/protocols/oscar/oscar.c:7089+#: src/protocols/oscar/oscar.c:7142 msgid "Search for a buddy by e-mail address"
msgstr "Search for a buddy by e-mail address"
-#: src/protocols/oscar/oscar.c:7090+#: src/protocols/oscar/oscar.c:7143 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:7107+#: src/protocols/oscar/oscar.c:7160 msgid "Available Message:"
msgstr "Available Message:"
-#: src/protocols/oscar/oscar.c:7108+#: src/protocols/oscar/oscar.c:7161 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:7189 src/protocols/silc/silc.c:800+#: src/protocols/oscar/oscar.c:7242 src/protocols/silc/silc.c:800 msgstr "Set User Info..."
-#: src/protocols/oscar/oscar.c:7194+#: src/protocols/oscar/oscar.c:7247 msgid "Set User Info (URL)..."
msgstr "Set User Info (URL)..."
-#: src/protocols/oscar/oscar.c:7200+#: src/protocols/oscar/oscar.c:7253 msgid "Set Available Message..."
msgstr "Set Available Message..."
-#: src/protocols/oscar/oscar.c:7205 src/protocols/silc/silc.c:796+#: src/protocols/oscar/oscar.c:7258 src/protocols/silc/silc.c:796 msgid "Change Password..."
msgstr "Change Password..."
-#: src/protocols/oscar/oscar.c:7210+#: src/protocols/oscar/oscar.c:7263 msgid "Change Password (URL)"
msgstr "Change Password (URL)"
-#: src/protocols/oscar/oscar.c:7214+#: src/protocols/oscar/oscar.c:7267 msgid "Configure IM Forwarding (URL)"
msgstr "Configure IM Forwarding (URL)"
-#: src/protocols/oscar/oscar.c:7223+#: src/protocols/oscar/oscar.c:7276 msgid "Format Screen Name..."
msgstr "Format Screen Name..."
-#: src/protocols/oscar/oscar.c:7227+#: src/protocols/oscar/oscar.c:7280 -#: src/protocols/oscar/oscar.c:7231+#: src/protocols/oscar/oscar.c:7284 msgid "Display Currently Registered Address"
msgstr "Display Currently Registered Address"
-#: src/protocols/oscar/oscar.c:7235+#: src/protocols/oscar/oscar.c:7288 msgid "Change Currently Registered Address..."
msgstr "Change Currently Registered Address"
-#: src/protocols/oscar/oscar.c:7242+#: src/protocols/oscar/oscar.c:7295 msgid "Show Buddies Awaiting Authorization"
msgstr "Show Buddies Awaiting Authorisation"
-#: src/protocols/oscar/oscar.c:7248+#: src/protocols/oscar/oscar.c:7301 msgid "Search for Buddy by Email..."
msgstr "Search for Buddy by Email..."
-#: src/protocols/oscar/oscar.c:7253+#: src/protocols/oscar/oscar.c:7306 msgid "Search for Buddy by Information"
msgstr "Search for Buddy by Information"
@@ -8699,20 +8780,19 @@
-#: src/protocols/oscar/oscar.c:7374 src/protocols/oscar/oscar.c:7376+#: src/protocols/oscar/oscar.c:7427 src/protocols/oscar/oscar.c:7429 msgid "AIM/ICQ Protocol Plugin"
msgstr "AIM/ICQ Protocol Plugin"
-#: src/protocols/oscar/oscar.c:7395+#: src/protocols/oscar/oscar.c:7448 -#: src/protocols/oscar/oscar.c:7398+#: src/protocols/oscar/oscar.c:7451 -#: src/protocols/oscar/oscar.c:7401 src/protocols/zephyr/zephyr.c:2761+#: src/protocols/oscar/oscar.c:7454 src/protocols/zephyr/zephyr.c:2760 @@ -8810,7 +8890,7 @@
msgid "Cannot fetch the public key"
msgstr "Cannot fetch the public key"
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553 @@ -8885,134 +8965,134 @@
"More than one user was found with the same name. Select the correct user "
"from the list to add to the buddy list."
-#: src/protocols/silc/buddy.c:1377+#: src/protocols/silc/buddy.c:1386 -#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:49+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49 #: src/protocols/silc/silc.c:85
-#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:50+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50 #: src/protocols/silc/silc.c:87
-#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:46+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46 #: src/protocols/silc/silc.c:79
-#: src/protocols/silc/buddy.c:1389+#: src/protocols/silc/buddy.c:1398 -#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:621+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:621 #: src/protocols/silc/util.c:469
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:623+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:623 #: src/protocols/silc/util.c:471
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:625+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:625 #: src/protocols/silc/util.c:473
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:627+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:627 #: src/protocols/silc/util.c:475
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:629+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:629 #: src/protocols/silc/util.c:477
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:631+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:631 #: src/protocols/silc/util.c:479
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:633+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:633 #: src/protocols/silc/util.c:481
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:635+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:635 #: src/protocols/silc/util.c:483
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:637+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:637 #: src/protocols/silc/util.c:485
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:639+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:639 #: src/protocols/silc/util.c:487
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:641+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:641 #: src/protocols/silc/util.c:489
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980 -#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989 -#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995 -#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001 msgid "Preferred Contact"
msgstr "Preferred Contact"
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006 msgid "Preferred Language"
msgstr "Preferred Language"
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011 -#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016 #: src/protocols/silc/silc.c:689 src/protocols/silc/silc.c:691
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021 -#: src/protocols/silc/buddy.c:1529+#: src/protocols/silc/buddy.c:1538 -#: src/protocols/silc/buddy.c:1534+#: src/protocols/silc/buddy.c:1543 msgid "IM with Key Exchange"
msgstr "IM with Key Exchange"
-#: src/protocols/silc/buddy.c:1538+#: src/protocols/silc/buddy.c:1547 msgstr "IM with Password"
-#: src/protocols/silc/buddy.c:1549+#: src/protocols/silc/buddy.c:1558 msgid "Get Public Key..."
msgstr "Get Public Key..."
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1409 @@ -9756,7 +9836,7 @@
msgid "whois <nick>: View nick's information"
msgstr "whois <nick>: View nick's information"
-#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2479+#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2478 msgid "msg <nick> <message>: Send a private message to a user"
msgstr "msg <nick> <message>: Send a private message to a user"
@@ -10035,6 +10115,11 @@
+#: src/protocols/toc/toc.c:198 #: src/protocols/toc/toc.c:480
msgid "Unable to write file %s."
@@ -10232,7 +10317,6 @@
#: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
msgid "TOC Protocol Plugin"
msgstr "TOC Protocol Plugin"
@@ -10323,7 +10407,6 @@
#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
msgid "Trepia Protocol Plugin"
msgstr "Trepia Protocol Plugin"
@@ -10444,33 +10527,33 @@
#: 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:1415 src/protocols/yahoo/yahoochat.c:1476+#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477 #: 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:2564 src/protocols/yahoo/yahoo.c:2929 +#: src/protocols/yahoo/yahoo.c:3043 -#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2933-#: src/protocols/yahoo/yahoo.c:3046+#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2931 +#: src/protocols/yahoo/yahoo.c:3044 -#: src/protocols/yahoo/yahoo.c:2568 src/protocols/yahoo/yahoo.c:2935-#: src/protocols/yahoo/yahoo.c:3047+#: src/protocols/yahoo/yahoo.c:2568 src/protocols/yahoo/yahoo.c:2933 +#: src/protocols/yahoo/yahoo.c:3045 -#: src/protocols/yahoo/yahoo.c:2572 src/protocols/yahoo/yahoo.c:2939-#: src/protocols/yahoo/yahoo.c:3049+#: src/protocols/yahoo/yahoo.c:2572 src/protocols/yahoo/yahoo.c:2937 +#: src/protocols/yahoo/yahoo.c:3047 -#: src/protocols/yahoo/yahoo.c:2576 src/protocols/yahoo/yahoo.c:2943-#: src/protocols/yahoo/yahoo.c:3051+#: src/protocols/yahoo/yahoo.c:2576 src/protocols/yahoo/yahoo.c:2941 +#: src/protocols/yahoo/yahoo.c:3049 @@ -10511,60 +10594,50 @@
-#: src/protocols/yahoo/yahoo.c:3377 src/protocols/yahoo/yahoo.c:3379+#: src/protocols/yahoo/yahoo.c:3375 src/protocols/yahoo/yahoo.c:3377 msgid "Yahoo Protocol Plugin"
msgstr "Yahoo Protocol Plugin"
-#: src/protocols/yahoo/yahoo.c:3398+#: src/protocols/yahoo/yahoo.c:3396 -#: src/protocols/yahoo/yahoo.c:3401+#: src/protocols/yahoo/yahoo.c:3399 -#: src/protocols/yahoo/yahoo.c:3404+#: src/protocols/yahoo/yahoo.c:3402 msgstr "Japan Pager host"
-#: src/protocols/yahoo/yahoo.c:3407+#: src/protocols/yahoo/yahoo.c:3405 -#: src/protocols/yahoo/yahoo.c:3410+#: src/protocols/yahoo/yahoo.c:3408 msgid "File transfer host"
msgstr "File transfer host"
-#: src/protocols/yahoo/yahoo.c:3413+#: src/protocols/yahoo/yahoo.c:3411 msgid "Japan File transfer host"
msgstr "Japan File transfer host"
-#: src/protocols/yahoo/yahoo.c:3416+#: src/protocols/yahoo/yahoo.c:3414 msgid "File transfer port"
msgstr "File transfer port"
-#: src/protocols/yahoo/yahoo.c:3419+#: src/protocols/yahoo/yahoo.c:3417 msgid "Chat Room List Url"
msgstr "Chat Room List Url"
-#: src/protocols/yahoo/yahoo.c:3422+#: src/protocols/yahoo/yahoo.c:3420 -#: src/protocols/yahoo/yahoo.c:3425+#: src/protocols/yahoo/yahoo.c:3423 -#: src/protocols/yahoo/yahoo_filexfer.c:169-"Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "-"Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d " #: src/protocols/yahoo/yahoo_profile.c:675
msgid "<b>IP Address:</b> %s<br>"
@@ -10690,27 +10763,23 @@
msgid "Maybe they're not in a chat?"
msgstr "Perhaps they're not in a chat?"
-#: src/protocols/yahoo/yahoochat.c:1356-msgid "Unable to connect"-msgstr "Unable to connect"-#: src/protocols/yahoo/yahoochat.c:1356+#: src/protocols/yahoo/yahoochat.c:1357 msgid "Fetching the room list failed."
msgstr "Fetching the room list failed."
-#: src/protocols/yahoo/yahoochat.c:1401+#: src/protocols/yahoo/yahoochat.c:1402 -#: src/protocols/yahoo/yahoochat.c:1404+#: src/protocols/yahoo/yahoochat.c:1405 -#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476+#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477 msgid "Unable to fetch room list."
msgstr "Unable to fetch room list."
-#: src/protocols/yahoo/yahoochat.c:1469+#: src/protocols/yahoo/yahoochat.c:1470 @@ -10731,68 +10800,68 @@
msgid "Unable send to chat %s,%s,%s"
msgstr "Unable send to chat %s,%s,%s"
-#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1119+#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118 msgid "<b>User:</b> %s<br>"
msgstr "<b>User:</b> %s<br>"
-#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1124+#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123 msgid "<br>Hidden or not logged-in"
msgstr "<br>Hidden or not logged-in"
-#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1126+#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125 msgid "<br>At %s since %s"
msgstr "<br>At %s since %s"
-#: src/protocols/zephyr/zephyr.c:1409 src/protocols/zephyr/zephyr.c:1410+#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409 -#: src/protocols/zephyr/zephyr.c:2156+#: src/protocols/zephyr/zephyr.c:2155 -#: src/protocols/zephyr/zephyr.c:2162+#: src/protocols/zephyr/zephyr.c:2161 -#: src/protocols/zephyr/zephyr.c:2168+#: src/protocols/zephyr/zephyr.c:2167 -#: src/protocols/zephyr/zephyr.c:2179+#: src/protocols/zephyr/zephyr.c:2178 msgid "Attempt to subscribe to %s,%s,%s failed"
msgstr "Attempt to subscribe to %s,%s,%s failed"
-#: src/protocols/zephyr/zephyr.c:2484+#: src/protocols/zephyr/zephyr.c:2483 msgid "zlocate <nick>: Locate user"
msgstr "zlocate <nick>: Locate user"
-#: src/protocols/zephyr/zephyr.c:2489+#: src/protocols/zephyr/zephyr.c:2488 msgid "zl <nick>: Locate user"
msgstr "zl <nick>: Locate user"
-#: src/protocols/zephyr/zephyr.c:2494+#: src/protocols/zephyr/zephyr.c:2493 msgid "instance <instance>: Set the instance to be used on this class"
msgstr "instance <instance>: Set the instance to be used on this class"
-#: src/protocols/zephyr/zephyr.c:2499+#: src/protocols/zephyr/zephyr.c:2498 msgid "inst <instance>: Set the instance to be used on this class"
msgstr "inst <instance>: Set the instance to be used on this class"
-#: src/protocols/zephyr/zephyr.c:2505+#: src/protocols/zephyr/zephyr.c:2504 msgid "sub <class> <instance> <recipient>: Join a new chat"
msgstr "sub <class> <instance> <recipient>: Join a new chat"
-#: src/protocols/zephyr/zephyr.c:2510+#: src/protocols/zephyr/zephyr.c:2509 "zi <instance>: Send a message to <message,<i>instance</i>,*>"
"zi <instance>: Send a message to <message,<i>instance</i>,*>"
-#: src/protocols/zephyr/zephyr.c:2516+#: src/protocols/zephyr/zephyr.c:2515 "zci <class> <instance>: Send a message to <<i>class</i>,"
@@ -10800,7 +10869,7 @@
"zci <class> <instance>: Send a message to <<i>class</i>,"
-#: src/protocols/zephyr/zephyr.c:2522+#: src/protocols/zephyr/zephyr.c:2521 "zcir <class> <instance> <recipient>: Send a message to <"
"<i>class</i>,<i>instance</i>,<i>recipient</i>>"
@@ -10808,7 +10877,7 @@
"zcir <class> <instance> <recipient>: Send a message to <"
"<i>class</i>,<i>instance</i>,<i>recipient</i>>"
-#: src/protocols/zephyr/zephyr.c:2528+#: src/protocols/zephyr/zephyr.c:2527 "zir <instance> <recipient>: Send a message to <MESSAGE,"
"<i>instance</i>,<i>recipient</i>>"
@@ -10816,15 +10885,15 @@
"zir <instance> <recipient>: Send a message to <MESSAGE,"
"<i>instance</i>,<i>recipient</i>>"
-#: src/protocols/zephyr/zephyr.c:2533+#: src/protocols/zephyr/zephyr.c:2532 msgid "zc <class>: Send a message to <<i>class</i>,PERSONAL,*>"
msgstr "zc <class>: Send a message to <<i>class</i>,PERSONAL,*>"
-#: src/protocols/zephyr/zephyr.c:2639+#: src/protocols/zephyr/zephyr.c:2638 -#: src/protocols/zephyr/zephyr.c:2642+#: src/protocols/zephyr/zephyr.c:2641 msgid "Retrieve subscriptions from server"
msgstr "Retrieve subscriptions from server"
@@ -10837,20 +10906,19 @@
-#: src/protocols/zephyr/zephyr.c:2725 src/protocols/zephyr/zephyr.c:2727+#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726 msgid "Zephyr Protocol Plugin"
msgstr "Zephyr Protocol Plugin"
-#: src/protocols/zephyr/zephyr.c:2752+#: src/protocols/zephyr/zephyr.c:2751 msgid "Export to .anyone"
msgstr "Export to .anyone"
-#: src/protocols/zephyr/zephyr.c:2755+#: src/protocols/zephyr/zephyr.c:2754 msgid "Export to .zephyr.subs"
msgstr "Export to .zephyr.subs"
-#: src/protocols/zephyr/zephyr.c:2758+#: src/protocols/zephyr/zephyr.c:2757 @@ -10899,58 +10967,58 @@
msgid "%s is now known as %s.\n"
msgstr "%s is now known as %s.\n"
msgid_plural "(%d messages)"
msgstr[1] "(%d messages)"
-#: src/server.c:1187 src/server.c:1196+#: src/server.c:1203 src/server.c:1212
msgstr "%s is no longer idle"
-#: src/server.c:1260 src/server.c:1267+#: src/server.c:1276 src/server.c:1283
"%s has just been warned by %s.\n"
@@ -10959,11 +11027,11 @@
"%s has just been warned by %s.\n"
"Your new warning level is %d%%"
msgid "an anonymous person"
msgstr "an anonymous person"
"%s has invited %s to the chat room %s:\n"
@@ -10972,12 +11040,12 @@
"%s has invited %s to the chat room %s:\n"
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s has invited %s to the chat room %s\n"
msgid "Accept chat invitation?"
msgstr "Accept chat invitation?"
@@ -11008,38 +11076,85 @@
msgid "g003: Error opening connection.\n"
msgstr "g003: Error opening connection.\n"
+#~ msgid "Miscellaneous error" +#~ msgstr "Miscellaneous error" +#~ msgid "Initiate Chat" +#~ msgstr "Initiate Chat" +#~ msgid "Unable to connect to server" +#~ msgstr "Unable to connect to server" +#~ msgid "Unknown error when attempting to authorize with MSN login server." +#~ msgstr "Unknown error when attempting to authorise with MSN login server." +#~ msgid "Requesting to send password" +#~ msgstr "Requesting to send password" +#~ msgid "Syncing with server" +#~ msgstr "Syncing with server" +#~ msgid "Unable to connect to %s server" +#~ msgstr "Unable to connect to %s server" +#~ msgid "Error writing to %s server" +#~ msgstr "Error writing to %s server" +#~ msgid "Error reading from %s server" +#~ msgstr "Error reading from %s server" +#~ msgid "Received HTTP error. Please report this." +#~ msgstr "Received HTTP error. Please report this." +#~ msgid "Message could not be sent for an unknown reason" +#~ msgstr "Message could not be sent for an unknown reason" +#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d " +#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d " 