--- a/po/en_CA.po Tue Jan 18 14:13:49 2005 -0500
+++ b/po/en_CA.po Tue Jan 18 14:31:13 2005 -0500
@@ -1,15 +1,15 @@
# Canadian English translation of gaim
-# Copyright (C) 2004 Adam Weinberger and the gaim project+# Copyright (C) 2004-2005 Adam Weinberger and the gaim project # This file is distributed under the same licence as the gaim package.
-# Adam Weinberger <adamw@gnome.org>, 2004.+# Adam Weinberger <adamw@gnome.org>, 2004, 2005. "Project-Id-Version: gaim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-13 11:11-0400\n"-"PO-Revision-Date: 2004-09-23 19:45-0400\n"+"POT-Creation-Date: 2005-01-16 16:54-0500\n" +"PO-Revision-Date: 2005-01-16 19:45-0400\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: en_CA <adamw@FreeBSD.org>\n"
@@ -150,69 +150,69 @@
-#: plugins/docklet/docklet.c:134 src/gtkaccount.c:738 src/gtkaccount.c:2160+#: plugins/docklet/docklet.c:136 src/gtkaccount.c:738 src/gtkaccount.c:2160 -#: plugins/docklet/docklet.c:137+#: plugins/docklet/docklet.c:139 -#: plugins/docklet/docklet.c:138+#: plugins/docklet/docklet.c:140 -#: plugins/docklet/docklet.c:173+#: plugins/docklet/docklet.c:176 -#: plugins/docklet/docklet.c:181 src/gtkprefs.c:1809 src/protocols/gg/gg.c:52-#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:961-#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63-#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2799-#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2968-#: src/protocols/oscar/oscar.c:670 src/protocols/oscar/oscar.c:5613-#: src/protocols/oscar/oscar.c:6605 src/protocols/oscar/oscar.c:6805-#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:47-#: src/protocols/silc/silc.c:77+#: 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: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/novell/novell.c:2917 src/protocols/novell/novell.c:2969 +#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:5670 +#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6862 +#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47 +#: src/protocols/silc/silc.c:81 -#: plugins/docklet/docklet.c:187 src/away.c:584-#: src/protocols/oscar/oscar.c:5531 src/protocols/oscar/oscar.c:6813+#: plugins/docklet/docklet.c:190 src/away.c:584 +#: src/protocols/oscar/oscar.c:5588 src/protocols/oscar/oscar.c:6870 -#: plugins/docklet/docklet.c:195+#: plugins/docklet/docklet.c:198 -#: plugins/docklet/docklet.c:200 src/gtkft.c:628+#: plugins/docklet/docklet.c:203 src/gtkft.c:628 -#: plugins/docklet/docklet.c:201 src/gtkaccount.c:2341+#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2341 -#: plugins/docklet/docklet.c:202 src/gtkprefs.c:2506+#: plugins/docklet/docklet.c:205 src/gtkprefs.c:2512 -#: plugins/docklet/docklet.c:211+#: plugins/docklet/docklet.c:214 -#: plugins/docklet/docklet.c:215+#: plugins/docklet/docklet.c:218 -#: plugins/docklet/docklet.c:517+#: plugins/docklet/docklet.c:533 msgid "Tray Icon Configuration"
msgstr "Tray Icon Configuration"
-#: plugins/docklet/docklet.c:521+#: plugins/docklet/docklet.c:537 msgid "_Hide new messages until tray icon is clicked"
msgstr "_Hide new messages until tray icon is clicked"
@@ -222,18 +222,19 @@
-#: plugins/docklet/docklet.c:547+#: plugins/docklet/docklet.c:563 msgstr "System Tray Icon"
-#: plugins/docklet/docklet.c:550+#: plugins/docklet/docklet.c:566 msgid "Displays an icon for Gaim in the system tray."
msgstr "Displays an icon for Gaim in the system tray."
-#: plugins/docklet/docklet.c:552+#: plugins/docklet/docklet.c:568 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
"the current status of Gaim, allow fast access to commonly used functions, "
@@ -277,6 +278,8 @@
msgid "Extra conversation placement options."
msgstr "Extra conversation placement options."
#: plugins/extplacement.c:134
"Restrict the number of conversations per windows, optionally separating IMs "
@@ -319,7 +322,7 @@
-#: plugins/gaim-remote/remote.c:669+#: plugins/gaim-remote/remote.c:670 "Failed to assign %s to a socket:\n"
@@ -328,7 +331,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"
@@ -338,18 +341,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."
@@ -374,6 +378,7 @@
msgid "An example plugin that does stuff - see the description."
msgstr "An example plugin that does stuff - see the description."
"This is a really cool plugin that does a lot of stuff:\n"
@@ -421,6 +426,7 @@
msgid "Provides support for mouse gestures"
msgstr "Provides support for mouse gestures"
#: plugins/gestures/gestures.c:279
"Allows support for mouse gestures in conversation windows.\n"
@@ -437,58 +443,47 @@
"Drag up and then to the left to switch to the previous conversation.\n"
"Drag up and then to the right to switch to the next conversation."
-#: plugins/gevolution/add_buddy_dialog.c:134-#: plugins/gevolution/assoc-buddy.c:72-msgid "Local Addressbook"-msgstr "Local Addressbook"-#: plugins/gevolution/add_buddy_dialog.c:144-#: plugins/gevolution/add_buddy_dialog.c:155-#: plugins/gevolution/assoc-buddy.c:82 plugins/gevolution/assoc-buddy.c:93-#: src/gtkblist.c:3080 src/gtkprefs.c:959 src/gtkprefs.c:1011-#: src/gtkprefs.c:1823 src/protocols/jabber/jabber.c:925-#: plugins/gevolution/add_buddy_dialog.c:188-#: plugins/gevolution/assoc-buddy.c:176 src/gtkprefs.c:2164-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:599-#: src/protocols/msn/msn.c:1394 src/protocols/trepia/trepia.c:399+#: plugins/gevolution/add_buddy_dialog.c:132 +#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2167 +#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607 +#: src/protocols/msn/msn.c:1433 src/protocols/trepia/trepia.c:399 -#: plugins/gevolution/add_buddy_dialog.c:199+#: plugins/gevolution/add_buddy_dialog.c:143 msgid "Instant Messaging"
msgstr "Instant Messaging"
-#: plugins/gevolution/add_buddy_dialog.c:480+#: plugins/gevolution/add_buddy_dialog.c:455 msgid "Select a person from your address book below, or add a new person."
msgstr "Select a person from your address book below, or add a new person."
-#: plugins/gevolution/add_buddy_dialog.c:493-#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7089+#: plugins/gevolution/add_buddy_dialog.c:468 +#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7146 -#: plugins/gevolution/add_buddy_dialog.c:564-#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4120+#: plugins/gevolution/add_buddy_dialog.c:549 +#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4144 -#: plugins/gevolution/add_buddy_dialog.c:590-#: plugins/gevolution/assoc-buddy.c:484+#: plugins/gevolution/add_buddy_dialog.c:575 +#: plugins/gevolution/assoc-buddy.c:466 -#: plugins/gevolution/add_buddy_dialog.c:607+#: plugins/gevolution/add_buddy_dialog.c:592 -#: plugins/gevolution/assoc-buddy.c:368+#: plugins/gevolution/assoc-buddy.c:341 "Select a person from your address book to add this buddy to, or create a new "
@@ -497,21 +492,27 @@
-#: plugins/gevolution/assoc-buddy.c:447+#: plugins/gevolution/assoc-buddy.c:429 msgid "Show user details"
msgstr "Show user details"
-#: plugins/gevolution/assoc-buddy.c:448+#: plugins/gevolution/assoc-buddy.c:430 msgid "Hide user details"
msgstr "Hide user details"
#. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:501+#: plugins/gevolution/assoc-buddy.c:483 msgstr "_Associate Buddy"
-#: plugins/gevolution/gevo-util.c:65 plugins/gevolution/gevolution.c:90-#: src/blist.c:774 src/blist.c:981 src/blist.c:1917 src/gtkblist.c:3939+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87 +#: src/gtkblist.c:3084 src/gtkprefs.c:962 src/gtkprefs.c:1014 +#: src/gtkprefs.c:1826 src/protocols/jabber/jabber.c:937 +#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90 +#: src/blist.c:774 src/blist.c:981 src/blist.c:1928 src/gtkblist.c:3963 #: src/protocols/jabber/roster.c:66
@@ -521,15 +522,16 @@
msgstr "Add to Address Book"
-#: plugins/gevolution/gevolution.c:352+#: plugins/gevolution/gevolution.c:344 msgid "Evolution Integration Configuration"
msgstr "Evolution Integration Configuration"
-#: plugins/gevolution/gevolution.c:355+#: plugins/gevolution/gevolution.c:347 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:385 plugins/idle.c:52 src/gtkconn.c:620+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:621 @@ -539,7 +541,7 @@
-#: plugins/gevolution/gevolution.c:468+#: plugins/gevolution/gevolution.c:460 msgid "Evolution Integration"
msgstr "Evolution Integration"
@@ -547,46 +549,46 @@
-#: plugins/gevolution/gevolution.c:471 plugins/gevolution/gevolution.c:473+#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465 msgid "Provides integration with Ximian Evolution."
msgstr "Provides integration with Ximian Evolution."
-#: plugins/gevolution/new_person_dialog.c:268+#: plugins/gevolution/new_person_dialog.c:264 msgid "Please enter the person's information below."
msgstr "Please enter the person's information below."
-#: plugins/gevolution/new_person_dialog.c:272+#: plugins/gevolution/new_person_dialog.c:268 msgid "Please enter the buddy's screen name and account type below."
msgstr "Please enter the buddy's screen name and account type below."
+#: plugins/gevolution/new_person_dialog.c:288 #: plugins/gevolution/new_person_dialog.c:292
-#: plugins/gevolution/new_person_dialog.c:296 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:316+#: plugins/gevolution/new_person_dialog.c:312 msgid "Optional information:"
msgstr "Optional information:"
-#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:576+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372 +#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:575 -#: plugins/gevolution/new_person_dialog.c:351+#: plugins/gevolution/new_person_dialog.c:347 -#: plugins/gevolution/new_person_dialog.c:363+#: plugins/gevolution/new_person_dialog.c:359 -#: plugins/gevolution/new_person_dialog.c:383+#: plugins/gevolution/new_person_dialog.c:379 @@ -683,6 +685,7 @@
msgid "Test plugin IPC support, as a client."
msgstr "Test plugin IPC support, as a client."
#: plugins/ipc-test-client.c:92
"Test plugin IPC support, as a client. This locates the server plugin and "
@@ -708,6 +711,7 @@
msgid "Test plugin IPC support, as a server."
msgstr "Test plugin IPC support, as a server."
#: plugins/ipc-test-server.c:79
msgid "Test plugin IPC support, as a server. This registers the IPC commands."
msgstr "Test plugin IPC support, as a server. This registers the IPC commands."
@@ -725,68 +729,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"
@@ -796,7 +800,7 @@
msgid "Message Notification"
msgstr "Message Notification"
@@ -804,7 +808,7 @@
-#: 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."
@@ -885,6 +889,7 @@
msgid "Checks periodically for new releases."
msgstr "Checks periodically for new releases."
"Checks periodically for new releases and notifies the user with the "
@@ -985,7 +990,7 @@
-#: plugins/ssl/ssl-nss.c:317+#: plugins/ssl/ssl-nss.c:318 @@ -993,7 +998,7 @@
-#: plugins/ssl/ssl-nss.c:320 plugins/ssl/ssl-nss.c:322+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323 msgid "Provides SSL support through Mozilla NSS."
msgstr "Provides SSL support through Mozilla NSS."
@@ -1015,35 +1020,35 @@
msgid "Provides a wrapper around SSL support libraries."
msgstr "Provides a wrapper around SSL support libraries."
-#: plugins/statenotify.c:38+#: plugins/statenotify.c:41 msgid "%s has gone away."
msgstr "%s has gone away."
-#: plugins/statenotify.c:45+#: plugins/statenotify.c:48 msgid "%s is no longer away."
msgstr "%s is no longer away."
-#: plugins/statenotify.c:52+#: plugins/statenotify.c:55 msgid "%s has become idle."
msgstr "%s has become idle."
-#: plugins/statenotify.c:59+#: plugins/statenotify.c:62 msgid "%s is no longer idle."
msgstr "%s is no longer idle."
-#: plugins/statenotify.c:70+#: plugins/statenotify.c:73 -#: plugins/statenotify.c:73+#: plugins/statenotify.c:76 msgstr "Buddy Goes _Away"
-#: plugins/statenotify.c:76+#: plugins/statenotify.c:79 msgstr "Buddy Goes _Idle"
@@ -1053,11 +1058,15 @@
-#: plugins/statenotify.c:116+#: plugins/statenotify.c:119 msgid "Buddy State Notification"
msgstr "Buddy State Notification"
-#: plugins/statenotify.c:119 plugins/statenotify.c:122+#: plugins/statenotify.c:122 plugins/statenotify.c:125 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1065,11 +1074,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"
@@ -1145,7 +1154,7 @@
msgstr "_Show slider bar in IM window"
#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:421 src/gtkprefs.c:953+#: plugins/win32/transparency/win2ktrans.c:421 src/gtkprefs.c:956 msgid "Buddy List Window"
msgstr "Buddy List Window"
@@ -1170,6 +1179,7 @@
msgid "Variable Transparency for the buddy list and conversations."
msgstr "Variable Transparency for the buddy list and conversations."
#: plugins/win32/transparency/win2ktrans.c:485
"This plugin enables variable alpha transparency on conversation windows and "
@@ -1196,8 +1206,8 @@
msgstr "_Start Gaim on Windows startup"
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3125+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3129 @@ -1216,8 +1226,8 @@
msgstr "_Keep Buddy List window on top"
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1004-#: src/gtkprefs.c:2417 src/protocols/msn/msn.c:1731+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007 +#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1770 @@ -1233,7 +1243,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."
@@ -1265,47 +1275,49 @@
#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2452-#: src/gtkdialogs.c:385 src/gtkdialogs.c:527 src/gtkdialogs.c:581-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1049-#: src/protocols/jabber/xdata.c:337 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/oscar/oscar.c:3512-#: src/protocols/oscar/oscar.c:3606 src/protocols/oscar/oscar.c:6876-#: src/protocols/oscar/oscar.c:6968 src/protocols/oscar/oscar.c:7020-#: src/protocols/oscar/oscar.c:7106 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:699 src/protocols/yahoo/yahoo.c:2811-#: src/protocols/yahoo/yahoo.c:2820 src/request.h:1245+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2456 +#: src/gtkdialogs.c:484 src/gtkdialogs.c:626 src/gtkdialogs.c:680 +#: src/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:2453-#: src/gtkblist.c:4503 src/gtkconn.c:169 src/gtkdialogs.c:386-#: src/gtkdialogs.c:528 src/gtkdialogs.c:582 src/gtkdialogs.c:680-#: src/gtkdialogs.c:702 src/gtkdialogs.c:722 src/gtkdialogs.c:759-#: src/gtkdialogs.c:819 src/gtkdialogs.c:862 src/gtkdialogs.c:897-#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599+#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2457 +#: src/gtkblist.c:4529 src/gtkconn.c:169 src/gtkdialogs.c:485 +#: src/gtkdialogs.c:627 src/gtkdialogs.c:681 src/gtkdialogs.c:779 +#: src/gtkdialogs.c:801 src/gtkdialogs.c:821 src/gtkdialogs.c:858 +#: src/gtkdialogs.c:918 src/gtkdialogs.c:961 src/gtkdialogs.c:999 +#: src/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:739 src/protocols/jabber/jabber.c:668-#: src/protocols/jabber/jabber.c:1050 src/protocols/jabber/xdata.c:338-#: 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/msn/msn.c:290 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:6877 src/protocols/oscar/oscar.c:6969-#: src/protocols/oscar/oscar.c:7021 src/protocols/oscar/oscar.c:7090-#: src/protocols/oscar/oscar.c:7107 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:700-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2812-#: src/protocols/yahoo/yahoo.c:2821 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 @@ -1320,7 +1332,7 @@
#: src/account.c:739 src/gtkft.c:158 src/protocols/jabber/buddy.c:570
-#: src/protocols/novell/novell.c:2811+#: src/protocols/novell/novell.c:2812 @@ -1346,7 +1358,7 @@
msgstr "Remove Away Message"
-#: src/away.c:366 src/gtkconv.c:1503 src/gtkconv.c:3847 src/gtkconv.c:3918+#: src/away.c:366 src/gtkconv.c:1501 src/gtkconv.c:3869 src/gtkconv.c:3940 @@ -1397,7 +1409,7 @@
"%d buddy from group %s was not removed because its account was not logged "
@@ -1412,11 +1424,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~."
@@ -1424,7 +1436,7 @@
"An error was encountered parsing your buddy list. It has not been loaded, "
"and the old file has moved to blist.xml~."
msgstr "Buddy List Error"
@@ -1446,75 +1458,85 @@
msgid "Enter password for %s (%s)"
msgstr "Enter password for %s (%s)"
-#: src/conversation.c:229+#: src/conversation.c:233 msgid "Unable to send message. The message is too large."
msgstr "Unable to send message. The message is too large."
-#: src/conversation.c:237+#: src/conversation.c:237 src/conversation.c:251 +#: src/protocols/oscar/oscar.c:4126 +msgid "Unable to send message to %s:" +msgstr "Unable to send message to %s:" +#: src/conversation.c:239 +msgid "The message is too large." +msgstr "The message is too large." +#: src/conversation.c:248 msgid "Unable to send message."
msgstr "Unable to send message."
-#: src/conversation.c:1953+#: src/conversation.c:1992 msgid "%s entered the room."
msgstr "%s entered the room."
-#: src/conversation.c:1956+#: src/conversation.c:1995 msgid "%s [<I>%s</I>] entered the room."
msgstr "%s [<I>%s</I>] entered the room."
-#: src/conversation.c:2052+#: src/conversation.c:2091 msgid "You are now known as %s"
msgstr "You are now known as %s"
-#: src/conversation.c:2055+#: src/conversation.c:2094 msgid "%s is now known as %s"
msgstr "%s is now known as %s"
-#: src/conversation.c:2096+#: src/conversation.c:2135 msgid "%s left the room (%s)."
msgstr "%s left the room (%s)."
-#: src/conversation.c:2098+#: src/conversation.c:2137 msgid "%s left the room."
msgstr "%s left the room."
-#: src/conversation.c:2167+#: src/conversation.c:2206 -#: src/conversation.c:2169+#: src/conversation.c:2208 msgid " left the room (%s)."
msgstr " left the room (%s)."
-#: src/conversation.c:2574+#: src/conversation.c:2613 msgid "Last created window"
msgstr "Last created window"
-#: src/conversation.c:2576+#: src/conversation.c:2615 msgid "Separate IM and Chat windows"
msgstr "Separate IM and Chat windows"
-#: src/conversation.c:2578 src/gtkprefs.c:1384+#: src/conversation.c:2617 src/gtkprefs.c:1387 -#: src/conversation.c:2580+#: src/conversation.c:2619 -#: src/conversation.c:2582+#: src/conversation.c:2621
+#: src/ft.c:147 src/protocols/msn/msn.c:368 @@ -1554,17 +1576,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"
@@ -1575,37 +1602,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 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 canceled the transfer of %s"+msgstr "%s cancelled the transfer of %s" +msgid "%s canceled the file transfer" +msgstr "%s cancelled the file transfer" 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"
@@ -1637,9 +1677,9 @@
-" away Pop up the away dialog with the default "+" away Pop up the away dialogue with the default " -" back Remove the away dialog\n"+" back Remove the away dialogue\n" " quit Close running copy of Gaim\n"
@@ -1683,7 +1723,7 @@
"is the message to be sent. '+' must be used in place of spaces.\n"
"Please note the quoting used above - if you run this from a shell the '&'\n"
"needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screen name,\n"+"Also, the following will just open a conversation window to a screen name,\n" "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
@@ -1739,7 +1779,7 @@
-#: src/gtkaccount.c:647 src/gtkblist.c:4092+#: src/gtkaccount.c:647 src/gtkblist.c:4116 @@ -1747,7 +1787,7 @@
-#: src/gtkaccount.c:725 src/gtkblist.c:4106 src/gtkblist.c:4451+#: src/gtkaccount.c:725 src/gtkblist.c:4130 src/gtkblist.c:4477 @@ -1800,7 +1840,7 @@
#. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1187+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1190 msgid "Use Environmental Settings"
msgstr "Use Environmental Settings"
@@ -1816,15 +1856,15 @@
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1181+#: src/gtkaccount.c:1191 src/gtkprefs.c:1184 -#: src/gtkaccount.c:1200 src/gtkprefs.c:1208+#: src/gtkaccount.c:1200 src/gtkprefs.c:1211 -#: src/gtkaccount.c:1204 src/gtkprefs.c:1226+#: src/gtkaccount.c:1204 src/gtkprefs.c:1229 @@ -1832,7 +1872,7 @@
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1263+#: src/gtkaccount.c:1217 src/gtkprefs.c:1266 @@ -1854,7 +1894,7 @@
msgstr "Show fewer options"
-#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:667+#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:675 @@ -1867,15 +1907,15 @@
-#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4157+#: src/gtkaccount.c:2123 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:5611-#: src/protocols/oscar/oscar.c:6804 src/protocols/silc/silc.c:45-#: src/protocols/yahoo/yahoo.c:2574 src/protocols/zephyr/zephyr.c:2123-#: src/protocols/zephyr/zephyr.c:2142+#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:971 +#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:5668 +#: src/protocols/oscar/oscar.c:6861 src/protocols/silc/silc.c:45 +#: src/protocols/yahoo/yahoo.c:2584 src/protocols/zephyr/zephyr.c:2122 +#: src/protocols/zephyr/zephyr.c:2141 @@ -1907,18 +1947,18 @@
msgstr "Add buddy to your list?"
-#: src/gtkaccount.c:2505 src/gtkblist.c:4502 src/gtkconv.c:1505-#: src/gtkconv.c:3840 src/gtkconv.c:3911 src/gtkrequest.c:247-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3784+#: src/gtkaccount.c:2505 src/gtkblist.c:4528 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
"Please enter the appropriate information about the chat you would like to "
@@ -1926,219 +1966,219 @@
"Please enter the appropriate information about the chat you would like to "
-#: src/gtkblist.c:869 src/gtkpounce.c:415 src/gtkroomlist.c:354+#: src/gtkblist.c:871 src/gtkpounce.c:415 src/gtkroomlist.c:354 -#: src/gtkblist.c:1164 src/gtkblist.c:3278+#: src/gtkblist.c:1166 src/gtkblist.c:3282 -#: src/gtkblist.c:1167 src/gtkblist.c:3268+#: src/gtkblist.c:1169 src/gtkblist.c:3272
msgid "Add Buddy _Pounce"
msgstr "Add Buddy _Pounce"
-#: src/gtkblist.c:1181 src/gtkblist.c:1278+#: src/gtkblist.c:1183 src/gtkblist.c:1280
msgstr "Alias Contact..."
-#: src/gtkblist.c:1198 src/gtkdialogs.c:756 src/gtkdialogs.c:758+#: src/gtkblist.c:1200 src/gtkdialogs.c:855 src/gtkdialogs.c:857 -#: src/gtkblist.c:1202 src/gtkblist.c:1286 src/gtkblist.c:1300+#: src/gtkblist.c:1204 src/gtkblist.c:1288 src/gtkblist.c:1302 -#: src/gtkblist.c:1204 src/gtkblist.c:1288 src/gtkblist.c:1305+#: src/gtkblist.c:1206 src/gtkblist.c:1290 src/gtkblist.c:1307
-#: src/gtkblist.c:1274 src/gtkroomlist.c:264 src/gtkroomlist.c:409+#: src/gtkblist.c:1276 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkblist.c:1302 src/gtkblist.c:1327+#: src/gtkblist.c:1304 src/gtkblist.c:1329
-#: src/gtkblist.c:1979 src/gtkconv.c:4483 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/A_ccounts"-msgstr "/Tools/A_ccounts"+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/A_ccounts" +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."
@@ -2147,7 +2187,7 @@
@@ -2155,12 +2195,12 @@
@@ -2168,7 +2208,7 @@
@@ -2176,7 +2216,7 @@
@@ -2184,7 +2224,7 @@
@@ -2192,7 +2232,7 @@
@@ -2200,7 +2240,7 @@
@@ -2208,7 +2248,7 @@
@@ -2216,7 +2256,7 @@
"<b>Description:</b> Spooky"
@@ -2224,7 +2264,7 @@
"<b>Description:</b> Spooky"
@@ -2232,7 +2272,7 @@
@@ -2240,108 +2280,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:4046 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:2741+#: 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. "
@@ -2352,15 +2392,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:4130 src/gtkblist.c:4431+#: 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 "
@@ -2368,11 +2408,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"
@@ -2380,15 +2420,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:5067 src/gtkblist.c:5164+#: src/gtkblist.c:5095 src/gtkblist.c:5192 msgid "No actions available"
msgstr "No actions available"
@@ -2408,11 +2448,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"
@@ -2425,15 +2465,15 @@
@@ -2483,21 +2523,22 @@
msgid "That command doesn't work on this protocol."
msgstr "That command doesn't work on this protocol."
-#: src/gtkconv.c:707 src/gtkconv.c:733+#: src/gtkconv.c:704 src/gtkconv.c:730 msgid "That buddy is not on the same protocol as this chat"
msgstr "That buddy is not on the same protocol as this chat"
"You are not currently signed on with an account that can invite that buddy."
"You are not currently signed on with an account that can invite that buddy."
msgid "Invite Buddy Into Chat Room"
msgstr "Invite Buddy Into Chat Room"
+#. Put our happy label in it. "Please enter the name of the user you wish to invite, along with an optional "
@@ -2505,347 +2546,347 @@
"Please enter the name of the user you wish to invite, along with an optional "
-#: src/gtkconv.c:908 src/gtkconv.c:2601 src/gtkdebug.c:182+#: src/gtkconv.c:905 src/gtkconv.c:2620 src/gtkdebug.c:182 msgid "Unable to open file."
msgstr "Unable to open file."
msgid "<h1>Conversation with %s</h1>\n"
msgstr "<h1>Conversation with %s</h1>\n"
msgid "Save Conversation"
msgstr "Save Conversation"
-#: src/gtkconv.c:1012 src/gtkdebug.c:131+#: src/gtkconv.c:1009 src/gtkdebug.c:131 -#: src/gtkconv.c:1038 src/gtkdebug.c:159+#: src/gtkconv.c:1035 src/gtkdebug.c:159
-#: src/gtkconv.c:1462 src/gtkconv.c:3833 src/protocols/oscar/oscar.c:591+#: src/gtkconv.c:1460 src/gtkconv.c:3855 src/protocols/oscar/oscar.c:590
-#: src/gtkconv.c:1473 src/gtkprefs.c:828+#: src/gtkconv.c:1471 src/gtkprefs.c:831 -#: src/gtkconv.c:1482 src/gtkconv.c:3854+#: 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/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:3826 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:3855 src/gtkconv.c:4190+#: src/gtkconv.c:3877 src/gtkconv.c:4212 msgid "Get the user's information"
msgstr "Get the user's information"
-#: src/gtkconv.c:3861 src/gtkconv.c:3925+#: src/gtkconv.c:3883 src/gtkconv.c:3947 -#: src/gtkconv.c:3862 src/gtkconv.c:3926+#: 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:5306 src/gtkconv.c:5335 src/gtkconv.c:5431 src/gtkconv.c:5489+#: 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:6058 src/gtkconv.c:6061+#: 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 "
@@ -2853,11 +2894,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 "
@@ -2865,7 +2906,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."
@@ -2893,197 +2934,218 @@
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:68 src/gtkdialogs.c:69 +#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72 msgid "developer & webmaster"
msgstr "developer & webmaster"
-#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69 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:86 src/gtkdialogs.c:123+#: src/gtkdialogs.c:101 src/gtkdialogs.c:142 -#: src/gtkdialogs.c:87 src/gtkdialogs.c:124+#: src/gtkdialogs.c:102 src/gtkdialogs.c:143 src/gtkdialogs.c:144 -#: src/gtkdialogs.c:88 src/gtkdialogs.c:125+#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
+msgid "Australian English" +msgstr "Australian English"
msgstr "Canadian English"
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:126+#: src/gtkdialogs.c:108 src/gtkdialogs.c:146 -#: src/gtkdialogs.c:93 src/gtkdialogs.c:127+#: src/gtkdialogs.c:109 src/gtkdialogs.c:147 -#: src/gtkdialogs.c:94 src/gtkdialogs.c:128+#: src/gtkdialogs.c:110 src/gtkdialogs.c:148 -#: src/gtkdialogs.c:95 src/gtkdialogs.c:129+#: src/gtkdialogs.c:111 src/gtkdialogs.c:149
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:130+#: src/gtkdialogs.c:115 src/gtkdialogs.c:150 -#: src/gtkdialogs.c:100 src/gtkdialogs.c:131+#: src/gtkdialogs.c:116 src/gtkdialogs.c:151
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:132+#: src/gtkdialogs.c:118 src/gtkdialogs.c:152
-#: src/gtkdialogs.c:106 src/gtkdialogs.c:133+#: src/gtkdialogs.c:123 src/gtkdialogs.c:153
msgid "Portuguese-Brazil"
msgstr "Portuguese-Brazil"
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135+#: src/gtkdialogs.c:127 src/gtkdialogs.c:154 src/gtkdialogs.c:155
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:137+#: 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 "
@@ -3093,71 +3155,71 @@
"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
"at once. It is written using Gtk+ and is licenced 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:367 src/gtkdialogs.c:509 src/gtkdialogs.c:562+#: src/gtkdialogs.c:466 src/gtkdialogs.c:608 src/gtkdialogs.c:661 -#: src/gtkdialogs.c:373 src/gtkdialogs.c:515 src/gtkdialogs.c:568+#: src/gtkdialogs.c:472 src/gtkdialogs.c:614 src/gtkdialogs.c:667
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"
@@ -3170,45 +3232,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:679 src/gtkdialogs.c:701 src/gtkdialogs.c:721+#: src/gtkdialogs.c:778 src/gtkdialogs.c:800 src/gtkdialogs.c:820 #: 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 "
@@ -3217,7 +3279,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 "
@@ -3226,22 +3288,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:817 src/gtkdialogs.c:818+#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
"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:859 src/gtkdialogs.c:861+#: src/gtkdialogs.c:958 src/gtkdialogs.c:960
"You are about to remove the chat %s from your buddy list. Do you want to "
@@ -3250,7 +3312,7 @@
"You are about to remove the chat %s from your buddy list. Do you want to "
-#: src/gtkdialogs.c:895 src/gtkdialogs.c:896+#: src/gtkdialogs.c:997 src/gtkdialogs.c:998 @@ -3265,7 +3327,7 @@
#: src/gtkft.c:164 src/gtkft.c:929
#: src/gtkft.c:167 src/gtkft.c:848
msgid "Waiting for transfer to begin"
@@ -3333,7 +3395,7 @@
msgid "_Keep the dialog open"
-msgstr "_Keep the dialog open"+msgstr "_Keep the dialogue open" msgid "_Clear finished transfers"
@@ -3362,31 +3424,31 @@
msgstr "Hyperlink colour"
msgid "Color to draw hyperlinks."
msgstr "Colour to draw hyperlinks."
msgid "_Copy E-Mail Address"
msgstr "_Copy E-Mail Address"
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
"Unable to guess the image type based on the file extension supplied. "
@@ -3394,16 +3456,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:2925 src/gtkimhtml.c:2937+#: src/gtkimhtml.c:2937 src/gtkimhtml.c:2949
@@ -3411,23 +3473,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."
@@ -3435,77 +3497,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 @@ -3565,7 +3627,7 @@
msgstr "The browser command <b>%s</b> is invalid."
#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
msgid "Unable to open URL"
msgstr "Unable to open URL"
@@ -3574,7 +3636,7 @@
msgid "Error launching <b>%s</b>: %s"
msgstr "Error launching <b>%s</b>: %s"
"The 'Manual' browser command has been chosen, but no command has been set."
@@ -3589,7 +3651,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"
@@ -3685,51 +3747,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!"
@@ -3741,7 +3803,7 @@
msgid "D_isplay remote nicknames if no alias is set"
msgstr "D_isplay remote nicknames if no alias is set"
"Select a smiley theme that you would like to use from the list below. New "
"themes can be installed by dragging and dropping them onto the theme list."
@@ -3749,48 +3811,48 @@
"Select a smiley theme that you would like to use from the list below. New "
"themes can be installed by dragging and dropping them onto the theme list."
-#: src/gtkprefs.c:725 src/gtkprefs.c:2201 src/protocols/jabber/buddy.c:264-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:715+#: 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:743
msgid "Show _timestamp on messages"
msgstr "Show _timestamp on messages"
msgid "_Highlight misspelled words"
msgstr "_Highlight misspelled words"
msgid "Ignore font _faces"
msgstr "Ignore font _faces"
msgid "Ignore font si_zes"
msgstr "Ignore font si_zes"
msgid "Default Formatting"
msgstr "Default Formatting"
msgid "_Send default formatting with outgoing messages"
msgstr "_Send default formatting with outgoing messages"
"This is how your outgoing message text will appear when you use protocols "
"that support formatting. :)"
@@ -3798,273 +3860,273 @@
"This is how your outgoing message text will appear when you use protocols "
"that support formatting. :)"
msgid "_Clear Formatting"
msgstr "_Clear Formatting"
-msgid "Enter _sends message"-msgstr "Enter _sends message"+msgid "Enter _sends message" +msgstr "Enter _sends message" msgid "C_ontrol-Enter sends message"
msgstr "C_ontrol-Enter sends message"
msgid "_Escape closes window"
msgstr "_Escape closes window"
msgid "Control-{B/I/U} changes _formatting"
msgstr "Control-{B/I/U} changes _formatting"
msgid "Control-(number) _inserts smileys"
msgstr "Control-(number) _inserts smileys"
msgid "Buddy List Sorting"
msgstr "Buddy List Sorting"
-#: src/gtkprefs.c:954 src/gtkprefs.c:1006+#: src/gtkprefs.c:957 src/gtkprefs.c:1009 msgid "Show _buttons as:"
msgstr "Show _buttons as:"
-#: src/gtkprefs.c:956 src/gtkprefs.c:1008+#: src/gtkprefs.c:959 src/gtkprefs.c:1011 -#: src/gtkprefs.c:957 src/gtkprefs.c:1009+#: src/gtkprefs.c:960 src/gtkprefs.c:1012 -#: src/gtkprefs.c:958 src/gtkprefs.c:1010+#: src/gtkprefs.c:961 src/gtkprefs.c:1013 msgid "Pictures and text"
msgstr "Pictures and text"
msgid "_Raise window on events"
msgstr "_Raise window on events"
-#: src/gtkprefs.c:965 src/gtkprefs.c:1027+#: src/gtkprefs.c:968 src/gtkprefs.c:1030 msgid "Show buddy _icons"
msgstr "Show buddy _icons"
msgid "Show _warning levels"
msgstr "Show _warning levels"
msgstr "Show idle _times"
msgid "Dim i_dle buddies"
msgstr "Dim i_dle buddies"
msgid "_Automatically expand contacts"
msgstr "_Automatically expand contacts"
msgid "Enable \"_slash\" commands"
msgstr "Enable \"_slash\" commands"
msgid "Send unknown \"_slash\" commands as messages"
msgstr "Send unknown \"_slash\" commands as messages"
msgid "Show _formatting toolbar"
msgstr "Show _formatting toolbar"
msgid "Show _aliases in tabs/titles"
msgstr "Show _aliases in tabs/titles"
msgid "Enable buddy ic_on animation"
msgstr "Enable buddy ic_on animation"
msgid "_Notify buddies that you are typing to them"
msgstr "_Notify buddies that you are typing to them"
msgid "_Raise IM window on events"
msgstr "_Raise IM window on events"
msgid "Raise chat _window on events"
msgstr "Raise chat _window on events"
msgid "Use _multi-colored screen names in chats"
msgstr "Use _multi-coloured screen names in chats"
msgid "Show IMs and chats in _tabbed windows"
msgstr "Show IMs and chats in _tabbed windows"
msgid "Show close b_utton on tabs"
msgstr "Show close b_utton on tabs"
msgid "New conversation _placement:"
msgstr "New conversation _placement:"
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:734-#: src/protocols/oscar/oscar.c:5017+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:733 +#: src/protocols/oscar/oscar.c:5072
msgid "_Autodetect IP Address"
msgstr "_Autodetect IP Address"
-msgid "_Manually specify range of ports to listen on"-msgstr "_Manually specify range of ports to listen on"+msgid "_Manually specify range of ports to listen on" +msgstr "_Manually specify range of ports to listen on"
msgid "Browser Selection"
msgstr "Browser Selection"
@@ -4073,83 +4135,83 @@
msgid "_Log all instant messages"
msgstr "_Log all instant messages"
msgid "_Enable system log"
msgstr "_Enable system log"
msgid "Log when buddies _sign on/sign off"
msgstr "Log when buddies _sign on/sign off"
msgid "Log when buddies become _idle/un-idle"
msgstr "Log when buddies become _idle/un-idle"
msgid "Log when buddies go away/come _back"
msgstr "Log when buddies go away/come _back"
msgid "Log your _own signons/idleness/awayness"
msgstr "Log your _own signons/idleness/awayness"
msgid "Sounds when conversation has _focus"
msgstr "Sounds when conversation has _focus"
msgid "_Sounds while away"
msgstr "_Sounds while away"
@@ -4158,90 +4220,90 @@
msgid "_Queue new messages when away"
msgstr "_Queue new messages when away"
msgid "When away and idle"
msgstr "When away and idle"
-#: src/gtkprefs.c:1820 src/protocols/msn/msn.c:1247-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2805-#: src/protocols/oscar/oscar.c:4170 src/protocols/yahoo/yahoo.c:2570+#: 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:4225 src/protocols/yahoo/yahoo.c:2580 #: src/protocols/yahoo/yahoo_profile.c:664
msgid "Idle _time reporting:"
msgstr "Idle _time reporting:"
msgid "Set away _when idle"
msgstr "Set away _when idle"
msgid "_Minutes before setting away:"
msgstr "_Minutes before setting away:"
"<span size=\"larger\">%s %s</span>\n"
@@ -4256,7 +4318,7 @@
"<span weight=\"bold\">Web site:</span>\t\t%s\n"
"<span weight=\"bold\">File name:</span>\t%s"
"<span size=\"larger\">%s %s</span>\n"
@@ -4271,64 +4333,63 @@
"<span weight=\"bold\">URL:</span> %s\n"
"<span weight=\"bold\">File name:</span> %s"
-#. We use the registered default browser in windows@@ -4352,7 +4413,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 @@ -4417,15 +4478,17 @@
#. * 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:112 src/protocols/novell/novell.c:1891-#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:116+#: 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:113 src/protocols/novell/novell.c:1892-#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:117+#: 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 @@ -4434,24 +4497,24 @@
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:315+#: 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 @@ -4526,15 +4589,15 @@
"Unable to play sound because the configured sound command could not be "
msgid "<b><font color=\"red\">The logger has no read function</font></b>"
msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
@@ -4543,7 +4606,7 @@
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
"REPLY>:</b></font> %s<br/>\n"
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
@@ -4552,25 +4615,25 @@
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
"REPLY>:</b></font> %s<br/>\n"
-#: src/log.c:648 src/log.c:778+#: src/log.c:643 src/log.c:773 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
-#: src/log.c:658 src/log.c:790+#: src/log.c:653 src/log.c:785 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgid "(%s) %s <AUTO-REPLY>: %s\n"
msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -4603,7 +4666,8 @@
@@ -4637,16 +4701,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 "
@@ -4679,12 +4743,12 @@
msgstr "Slightly less boring default"
#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:458 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:2796-#: src/protocols/novell/novell.c:2915 src/protocols/novell/novell.c:2966-#: src/protocols/oscar/oscar.c:756 src/protocols/yahoo/yahoo.c:2915-#: src/protocols/yahoo/yahoo.c:3031+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2797 +#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967 +#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2925 +#: src/protocols/yahoo/yahoo.c:3041 @@ -4696,12 +4760,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:133 src/protocols/oscar/oscar.c:674-#: src/protocols/oscar/oscar.c:5526 src/protocols/oscar/oscar.c:5604-#: src/protocols/oscar/oscar.c:5628 src/protocols/oscar/oscar.c:6810-#: src/protocols/oscar/oscar.c:6815 src/protocols/yahoo/yahoo.c:2568-#: src/protocols/yahoo/yahoo.c:2935 src/protocols/yahoo/yahoo.c:3043+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977 +#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:673 +#: src/protocols/oscar/oscar.c:5583 src/protocols/oscar/oscar.c:5661 +#: src/protocols/oscar/oscar.c:5685 src/protocols/oscar/oscar.c:6867 +#: src/protocols/oscar/oscar.c:6872 src/protocols/yahoo/yahoo.c:2578 +#: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:3053 @@ -4721,10 +4785,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:354-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464-#: 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."
@@ -4744,7 +4808,7 @@
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"
@@ -4752,10 +4816,10 @@
#. 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:4199 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"
@@ -4775,8 +4839,8 @@
#. we didn't successfully connect. tdt->toc_fd is valid here
#: src/protocols/gg/gg.c:675 src/protocols/icq/gaim_icq.c:343
#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2206-#: src/protocols/yahoo/yahoo.c:2235 src/protocols/yahoo/yahoo.c:2298+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2216 +#: src/protocols/yahoo/yahoo.c:2245 src/protocols/yahoo/yahoo.c:2308 #: src/protocols/yahoo/yahoo_filexfer.c:68
#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
msgid "Unable to connect."
@@ -4840,25 +4904,25 @@
-#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5009+#: 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:5020 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:5021 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:5010+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5065 #: src/protocols/silc/ops.c:1204
@@ -4873,8 +4937,8 @@
-#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:629-#: src/protocols/oscar/oscar.c:5064 src/protocols/oscar/oscar.c:5072+#: 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
@@ -4978,7 +5042,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
@@ -5030,15 +5094,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 authorize them."
-#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3712-#: src/protocols/oscar/oscar.c:6258+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:248 +#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3765 +#: src/protocols/oscar/oscar.c:6315 -#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:242-#: src/protocols/msn/userlist.c:102 src/protocols/oscar/oscar.c:3714-#: src/protocols/oscar/oscar.c:6259+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:249 +#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3767 +#: src/protocols/oscar/oscar.c:6316 @@ -5058,26 +5122,25 @@
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1295+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1299 msgid "Unknown command: %s"
msgstr "Unknown command: %s"
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:574-#: src/protocols/silc/silc.c:1003+#: 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/silc/silc.c:1007+#: 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:169-#: src/protocols/yahoo/yahoo_filexfer.c:179-#: src/protocols/yahoo/yahoo_filexfer.c:188-#: src/protocols/yahoo/yahoo_filexfer.c:198+#: 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"
@@ -5102,7 +5165,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"
@@ -5122,31 +5185,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 @@ -5158,40 +5225,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:1854 src/protocols/napster/napster.c:675-#: src/protocols/silc/silc.c:1589 src/protocols/trepia/trepia.c:1301+#: 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/oscar/oscar.c:7397-#: src/protocols/zephyr/zephyr.c:2760-#: 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:688 +#: 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 @@ -5224,8 +5290,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:1247 src/protocols/msn/msn.c:1260-#: 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>"
@@ -5257,120 +5322,120 @@
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 -#: src/protocols/irc/parse.c:109+#: src/protocols/irc/parse.c:110 msgid "action <action to perform>: Perform an action."
msgstr "action <action to perform>: Perform an action."
-#: src/protocols/irc/parse.c:110+#: src/protocols/irc/parse.c:111 "away [message]: Set an away message, or use no message to return from being "
@@ -5378,7 +5443,7 @@
"away [message]: Set an away message, or use no message to return from being "
-#: src/protocols/irc/parse.c:111+#: src/protocols/irc/parse.c:112 "deop <nick1> [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
@@ -5386,7 +5451,7 @@
"deop <nick1> [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
-#: src/protocols/irc/parse.c:112+#: src/protocols/irc/parse.c:113 "devoice <nick1> [nick2] ...: Remove channel voice status from "
"someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5396,7 +5461,7 @@
"someone, preventing them from speaking if the channel is moderated (+m). You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:113+#: src/protocols/irc/parse.c:114 "invite <nick> [room]: Invite someone to join you in the specified "
"channel, or the current channel."
@@ -5404,7 +5469,7 @@
"invite <nick> [room]: Invite someone to join you in the specified "
"channel, or the current channel."
-#: src/protocols/irc/parse.c:114+#: src/protocols/irc/parse.c:115 "j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -5412,7 +5477,7 @@
"j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
-#: src/protocols/irc/parse.c:115+#: src/protocols/irc/parse.c:116 "join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -5420,7 +5485,7 @@
"join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
-#: src/protocols/irc/parse.c:116+#: src/protocols/irc/parse.c:117 "kick <nick> [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
@@ -5428,7 +5493,7 @@
"kick <nick> [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
-#: src/protocols/irc/parse.c:117+#: src/protocols/irc/parse.c:118 "list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
@@ -5436,11 +5501,11 @@
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
-#: src/protocols/irc/parse.c:118+#: src/protocols/irc/parse.c:119 msgid "me <action to perform>: Perform an action."
msgstr "me <action to perform>: Perform an action."
-#: src/protocols/irc/parse.c:119+#: src/protocols/irc/parse.c:120 "mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel "
@@ -5448,7 +5513,7 @@
"mode <nick|channel> <+|-><A-Za-z>: Set or unset a channel "
-#: src/protocols/irc/parse.c:120+#: src/protocols/irc/parse.c:121 "msg <nick> <message>: Send a private message to a user (as "
@@ -5456,15 +5521,15 @@
"msg <nick> <message>: Send a private message to a user (as "
-#: src/protocols/irc/parse.c:121+#: src/protocols/irc/parse.c:122 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:122 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."
-#: src/protocols/irc/parse.c:123+#: src/protocols/irc/parse.c:124 "op <nick1> [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
@@ -5472,7 +5537,7 @@
"op <nick1> [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:124+#: src/protocols/irc/parse.c:125 "operwall <message>: If you don't know what this is, you probably "
@@ -5480,7 +5545,7 @@
"operwall <message>: If you don't know what this is, you probably "
-#: src/protocols/irc/parse.c:125+#: src/protocols/irc/parse.c:126 "part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
@@ -5488,7 +5553,7 @@
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
-#: src/protocols/irc/parse.c:126+#: src/protocols/irc/parse.c:127 "ping [nick]: Asks how much lag a user (or the server if no user specified) "
@@ -5496,7 +5561,7 @@
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
-#: src/protocols/irc/parse.c:127+#: src/protocols/irc/parse.c:128 "query <nick> <message>: Send a private message to a user (as "
@@ -5504,15 +5569,15 @@
"query <nick> <message>: Send a private message to a user (as "
-#: src/protocols/irc/parse.c:128+#: src/protocols/irc/parse.c:129 msgid "quit [message]: Disconnect from the server, with an optional message."
msgstr "quit [message]: Disconnect from the server, with an optional message."
-#: src/protocols/irc/parse.c:129+#: src/protocols/irc/parse.c:130 msgid "quote [...]: Send a raw command to the server."
msgstr "quote [...]: Send a raw command to the server."
-#: src/protocols/irc/parse.c:130+#: src/protocols/irc/parse.c:131 "remove <nick> [message]: Remove someone from a room. You must be a "
"channel operator to do this."
@@ -5520,15 +5585,15 @@
"remove <nick> [message]: Remove someone from a room. You must be a "
"channel operator to do this."
-#: src/protocols/irc/parse.c:131+#: src/protocols/irc/parse.c:132 msgid "topic [new topic]: View or change the channel topic."
msgstr "topic [new topic]: View or change the channel topic."
-#: src/protocols/irc/parse.c:132+#: src/protocols/irc/parse.c:133 msgid "umode <+|-><A-Za-z>: Set or unset a user mode."
msgstr "umode <+|-><A-Za-z>: Set or unset a user mode."
-#: src/protocols/irc/parse.c:133+#: src/protocols/irc/parse.c:134 "voice <nick1> [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
@@ -5536,7 +5601,7 @@
"voice <nick1> [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
-#: src/protocols/irc/parse.c:134+#: src/protocols/irc/parse.c:135 "wallops <message>: If you don't know what this is, you probably can't "
@@ -5544,51 +5609,52 @@
"wallops <message>: If you don't know what this is, you probably can't "
-#: src/protocols/irc/parse.c:135+#: src/protocols/irc/parse.c:136 msgid "whois <nick>: Get information on a user."
msgstr "whois <nick>: Get information on a user."
-#: src/protocols/irc/parse.c:242-"(There was an error converting this message. Check the 'Encoding' option in "-"(There was an error converting this message. Check the 'Encoding' option in "-#: src/protocols/irc/parse.c:394+#: 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:395+#: src/protocols/irc/parse.c:418 -#: src/protocols/irc/parse.c:395+#: src/protocols/irc/parse.c:418 -#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1570-#: 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/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?"
@@ -5596,11 +5662,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:375+#: src/protocols/jabber/auth.c:390 msgid "Invalid challenge from server"
msgstr "Invalid challenge from server"
@@ -5619,14 +5685,14 @@
#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1237-#: 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 @@ -5647,7 +5713,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 @@ -5663,7 +5729,7 @@
#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:644+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:648 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
@@ -5686,7 +5752,7 @@
#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5045+#: src/protocols/oscar/oscar.c:5100 @@ -5707,15 +5773,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:440 src/protocols/novell/novell.c:2818-#: src/protocols/novell/novell.c:2822 src/protocols/oscar/oscar.c:716-#: src/protocols/oscar/oscar.c:722 src/protocols/oscar/oscar.c:724-#: src/protocols/yahoo/yahoo.c:2693+#: 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 @@ -5723,8 +5789,8 @@
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:624-#: src/protocols/oscar/oscar.c:5063 src/protocols/oscar/oscar.c:5071+#: 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
@@ -5769,7 +5835,7 @@
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6329+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6386 #: src/protocols/yahoo/yahoochat.c:1003
@@ -5809,51 +5875,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:700+#: src/protocols/jabber/chat.c:711 -#: src/protocols/jabber/chat.c:735+#: src/protocols/jabber/chat.c:749 msgid "Enter a Conference Server"
msgstr "Enter a Conference Server"
-#: src/protocols/jabber/chat.c:736+#: 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:739+#: src/protocols/jabber/chat.c:753 @@ -5861,443 +5927,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:5065-#: src/protocols/oscar/oscar.c:5073 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
msgstr "Province/Territory"
-#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:853-#: src/protocols/silc/silc.c:646 src/protocols/silc/util.c:510+#: 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:599-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2151-#: src/protocols/oscar/oscar.c:1741 src/protocols/trepia/trepia.c:1065-#: src/protocols/yahoo/yahoo.c:2429 src/protocols/zephyr/zephyr.c:1453-#: src/protocols/jabber/jabber.c:788+#: src/protocols/jabber/jabber.c:800 msgid "Initializing Stream"
msgstr "Initializing 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-initializing 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:6613+#: 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:66 src/protocols/jabber/presence.c:124+#: src/protocols/jabber/jabber.c:972 src/protocols/jabber/jutil.c:35 +#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130 -#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:38-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:129+#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jutil.c:38 +#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135 -#: src/protocols/jabber/jabber.c:963 src/protocols/jabber/jutil.c:41-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131-#: src/protocols/oscar/oscar.c:664 src/protocols/oscar/oscar.c:5616-#: src/protocols/oscar/oscar.c:6806+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41 +#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137 +#: src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:5673 +#: src/protocols/oscar/oscar.c:6863 -#: src/protocols/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 "Authorization Aborted"
-#: src/protocols/jabber/jabber.c:1189+#: src/protocols/jabber/jabber.c:1201 msgid "Incorrect encoding in authorization"
msgstr "Incorrect encoding in authorization"
-#: 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 Authorization Mechanism"
-#: src/protocols/jabber/jabber.c:1198+#: src/protocols/jabber/jabber.c:1210 msgid "Authorization mechanism too weak"
msgstr "Authorization 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"
@@ -6311,24 +6369,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:1585+#: src/protocols/jabber/jabber.c:1617 src/protocols/silc/silc.c:1589 @@ -6365,20 +6423,20 @@
-#: src/protocols/jabber/presence.c:233+#: src/protocols/jabber/presence.c:239 msgid "Unknown Error in presence"
msgstr "Unknown Error in presence"
-#: src/protocols/jabber/presence.c:236+#: src/protocols/jabber/presence.c:242 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:289 src/protocols/jabber/presence.c:290+#: src/protocols/jabber/presence.c:296 src/protocols/jabber/presence.c:297 -#: src/protocols/jabber/presence.c:291+#: src/protocols/jabber/presence.c:298 "You are creating a new room. Would you like to configure it, or accept the "
@@ -6386,20 +6444,20 @@
"You are creating a new room. Would you like to configure it, or accept the "
-#: src/protocols/jabber/presence.c:293+#: src/protocols/jabber/presence.c:300 -#: src/protocols/jabber/presence.c:295+#: src/protocols/jabber/presence.c:302 -#: src/protocols/jabber/presence.c:325+#: src/protocols/jabber/presence.c:332 msgstr "Error in chat %s"
-#: src/protocols/jabber/presence.c:328+#: src/protocols/jabber/presence.c:335 msgid "Error joining chat %s"
msgstr "Error joining chat %s"
@@ -6413,22 +6471,10 @@
msgstr "File Send Failed"
-#: src/protocols/msn/cmdproc.c:342-msgid "Miscellaneous error"-msgstr "Miscellaneous error"-#: src/protocols/msn/cmdproc.c:345-msgid "You have signed on from another location."-msgstr "You have signed on from another location."-#: src/protocols/msn/cmdproc.c:347-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 syncronization issue in %s (%s)"-msgstr "Buddy list syncronization issue in %s (%s)"+msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Buddy list synchronization issue in %s (%s)" #: src/protocols/msn/dialog.c:97
@@ -6637,7 +6683,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"
@@ -6672,35 +6718,35 @@
-#: src/protocols/msn/msn.c:115+#: 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:223+#: src/protocols/msn/msn.c:222 msgid "Set your friendly name."
msgstr "Set your friendly name."
-#: src/protocols/msn/msn.c:224+#: 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:240+#: src/protocols/msn/msn.c:239 msgid "Set your home phone number."
msgstr "Set your home phone number."
-#: src/protocols/msn/msn.c:255+#: src/protocols/msn/msn.c:254 msgid "Set your work phone number."
msgstr "Set your work phone number."
-#: src/protocols/msn/msn.c:270+#: src/protocols/msn/msn.c:269 msgid "Set your mobile phone number."
msgstr "Set your mobile phone number."
-#: src/protocols/msn/msn.c:283+#: src/protocols/msn/msn.c:282 msgid "Allow MSN Mobile pages?"
msgstr "Allow MSN Mobile pages?"
-#: src/protocols/msn/msn.c:284+#: 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?"
@@ -6708,24 +6754,24 @@
"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?"
-#: src/protocols/msn/msn.c:288+#: src/protocols/msn/msn.c:287 -#: src/protocols/msn/msn.c:289+#: src/protocols/msn/msn.c:288 -#: src/protocols/msn/msn.c:312+#: src/protocols/msn/msn.c:311 msgid "Send a mobile message."
msgstr "Send a mobile message."
-#: src/protocols/msn/msn.c:314+#: src/protocols/msn/msn.c:313 -#: src/protocols/msn/msn.c:440 src/protocols/msn/msn.c:446-#: src/protocols/yahoo/yahoo.c:2693+#: src/protocols/msn/msn.c:488 src/protocols/msn/msn.c:496 +#: src/protocols/msn/msn.c:499 src/protocols/yahoo/yahoo.c:2703 @@ -6734,80 +6780,84 @@
-#: src/protocols/msn/msn.c:446 src/protocols/msn/msn.c:1260+#: src/protocols/msn/msn.c:496 -#: src/protocols/msn/msn.c:459 src/protocols/msn/msn.c:747+#: src/protocols/msn/msn.c:499 +#: 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:460 src/protocols/msn/msn.c:749-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2550-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:3033+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:797 +#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2560 +#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3043 -#: src/protocols/msn/msn.c:461 src/protocols/msn/msn.c:751-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2802-#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2971-#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:48-#: src/protocols/silc/silc.c:79 src/protocols/yahoo/yahoo.c:2552-#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:3034+#: 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: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/msn/msn.c:462 src/protocols/msn/msn.c:753-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2560-#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3038+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:801 +#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2570 +#: src/protocols/yahoo/yahoo.c:2937 src/protocols/yahoo/yahoo.c:3048 -#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:755-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2564-#: src/protocols/yahoo/yahoo.c:2931 src/protocols/yahoo/yahoo.c:3040+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:803 +#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2574 +#: src/protocols/yahoo/yahoo.c:2941 src/protocols/yahoo/yahoo.c:3050 -#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:757-#: 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:475+#: src/protocols/msn/msn.c:529 msgid "Set Friendly Name"
msgstr "Set Friendly Name"
-#: src/protocols/msn/msn.c:480+#: src/protocols/msn/msn.c:534 msgid "Set Home Phone Number"
msgstr "Set Home Phone Number"
-#: src/protocols/msn/msn.c:484+#: src/protocols/msn/msn.c:538 msgid "Set Work Phone Number"
msgstr "Set Work Phone Number"
-#: src/protocols/msn/msn.c:488+#: src/protocols/msn/msn.c:542 msgid "Set Mobile Phone Number"
msgstr "Set Mobile Phone Number"
-#: src/protocols/msn/msn.c:494+#: src/protocols/msn/msn.c:548 msgid "Enable/Disable Mobile Devices"
msgstr "Enable/Disable Mobile Devices"
-#: src/protocols/msn/msn.c:499+#: src/protocols/msn/msn.c:553 msgid "Allow/Disallow Mobile Pages"
msgstr "Allow/Disallow Mobile Pages"
-#: src/protocols/msn/msn.c:522+#: src/protocols/msn/msn.c:576 -#: src/protocols/msn/msn.c:532-#: src/protocols/msn/msn.c:568+#: 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."
@@ -6815,91 +6865,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:1229 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:1237 src/protocols/msn/msn.c:1595+#: 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:1325+#: src/protocols/msn/msn.c:1364 -#: src/protocols/msn/msn.c:1330 src/protocols/msn/msn.c:1582+#: 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 retrieving profile"
-#: src/protocols/msn/msn.c:1401 src/protocols/oscar/oscar.c:5050+#: 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:1408 src/protocols/oscar/oscar.c:5036+#: 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:1417 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:1424 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:1432 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:1449 src/protocols/msn/msn.c:1455-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1470-#: src/protocols/msn/msn.c:1477+#: 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:1486 src/protocols/msn/msn.c:1492-#: src/protocols/msn/msn.c:1499 src/protocols/msn/msn.c:1506+#: 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:1515 src/protocols/msn/msn.c:1521-#: src/protocols/msn/msn.c:1528+#: 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:1537 src/protocols/msn/msn.c:1543+#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582 #: src/protocols/yahoo/yahoo_profile.c:1072
-#: src/protocols/msn/msn.c:1551 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:1562 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:1584+#: 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:1585+#: 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 "
@@ -6909,8 +6959,7 @@
"that the user does not exist, or that the user exists but has not created a "
-#. This should never happen-#: src/protocols/msn/msn.c:1589+#: src/protocols/msn/msn.c:1628 "Gaim could not find any information in the user's profile. The user most "
@@ -6918,15 +6967,15 @@
"Gaim could not find any information in the user's profile. The user most "
-#: src/protocols/msn/msn.c:1595 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:1736+#: src/protocols/msn/msn.c:1775 msgid "Display conversation closed notices"
msgstr "Display conversation closed notices"
-#: src/protocols/msn/msn.c:1741+#: src/protocols/msn/msn.c:1780 msgid "Display timeout notices"
msgstr "Display timeout notices"
@@ -6940,40 +6989,72 @@
-#: src/protocols/msn/msn.c:1828 src/protocols/msn/msn.c:1830+#: 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:1849 src/protocols/trepia/trepia.c:1296+#: src/protocols/msn/msn.c:1888 src/protocols/trepia/trepia.c:1296 -#: src/protocols/msn/msn.c:1858+#: 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 authorize 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:1085+#: src/protocols/msn/nexus.c:111 src/protocols/msn/servconn.c:127 +#: src/protocols/yahoo/yahoochat.c:1357 +msgid "Unable to connect" +msgstr "Unable to connect" +#: src/protocols/msn/notification.c:181 +msgid "%s is not a valid group." +msgstr "%s is not a valid group." +#: src/protocols/msn/notification.c:187 src/protocols/msn/notification.c:501 +#: src/protocols/msn/session.c:320 +#: src/protocols/msn/notification.c:190 +#: src/protocols/msn/notification.c:471 +msgid "Unable to add user on %s (%s)" +msgstr "Unable to add user on %s (%s)" +#: src/protocols/msn/notification.c:475 +msgid "Unable to block user on %s (%s)" +msgstr "Unable to block user on %s (%s)" +#: src/protocols/msn/notification.c:479 +msgid "Unable to permit user on %s (%s)" +msgstr "Unable to permit user on %s (%s)" +#: src/protocols/msn/notification.c:487 +msgid "%s could not be added because your buddy list is full." +msgstr "%s could not be added because your buddy list is full." +#: src/protocols/msn/notification.c:496 +msgid "%s is not a valid passport account." +msgstr "%s is not a valid passport account." +#: src/protocols/msn/notification.c:752 +msgid "Unable to rename group" +msgstr "Unable to rename group" +#: src/protocols/msn/notification.c:807 +msgid "Unable to delete group" +msgstr "Unable to delete group" +#: src/protocols/msn/notification.c:1210 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7004,54 +7085,120 @@
"After the maintenance has been completed, you will be able to successfully "
-#: src/protocols/msn/notification.c:1150-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:72-msgid "MSN error for account %s"-msgstr "MSN error for account %s"-#: src/protocols/msn/servconn.c:346-msgid "Received HTTP error. Please report this."-msgstr "Received HTTP error. Please report this."-#: src/protocols/msn/switchboard.c:172+#: 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 have not 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 have not 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:180+#: src/protocols/msn/switchboard.c:645 msgid "%s has closed the conversation window."
msgstr "%s has closed the conversation window."
-#: src/protocols/msn/userlist.c:86+#: src/protocols/msn/userlist.c:87 msgid "The user %s (%s) wants to add %s to his or her buddy list."
msgstr "The user %s (%s) wants to add %s to his or her buddy list."
-#: src/protocols/msn/userlist.c:94+#: src/protocols/msn/userlist.c:96 msgid "The user %s wants to add %s to his or her buddy list."
msgstr "The user %s wants to add %s to his or her buddy list."
@@ -7357,8 +7504,8 @@
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5023-#: src/protocols/oscar/oscar.c:5030+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5078 +#: src/protocols/oscar/oscar.c:5085 @@ -7427,18 +7574,22 @@
msgid "Would you like to join the conversation?"
msgstr "Would you like to join the conversation?"
-#: src/protocols/novell/novell.c:1984+#: src/protocols/novell/novell.c:1985 msgid "You have been logged out because you logged in at another workstation."
msgstr "You have been logged out because you logged in at another workstation."
-#: src/protocols/novell/novell.c:2038+#: src/protocols/novell/novell.c:2039 "%s appears to be offline and did not receive the message that you just sent."
"%s appears to be offline and did not receive the message that you just sent."
-#: src/protocols/novell/novell.c:2136+#. TODO: Would be nice to prompt if not set! +#. * gaim_request_fields(gc, _("Server Address"),...); +#. ...but for now just error out with a nice message. +#: src/protocols/novell/novell.c:2137 "Unable to connect to server. Please enter the address of the server you wish "
@@ -7446,31 +7597,27 @@
"Unable to connect to server. Please enter the address of the server you wish "
-#: src/protocols/novell/novell.c:2158+#: src/protocols/novell/novell.c:2159 msgid "Error. SSL support is not installed."
msgstr "Error. SSL support is not installed."
-#: src/protocols/novell/novell.c:2462+#: src/protocols/novell/novell.c:2463 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:2808 src/protocols/oscar/oscar.c:724-#: src/protocols/oscar/oscar.c:6615 src/protocols/yahoo/yahoo.c:2572+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:723 +#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2582 -#: src/protocols/novell/novell.c:2819+#: src/protocols/novell/novell.c:2820 -#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2974+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975 -#: src/protocols/novell/novell.c:3368@@ -7481,15 +7628,15 @@
-#: src/protocols/novell/novell.c:3467 src/protocols/novell/novell.c:3469+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470 msgid "Novell GroupWise Messenger Protocol Plugin"
msgstr "Novell GroupWise Messenger Protocol Plugin"
-#: src/protocols/novell/novell.c:3488+#: src/protocols/novell/novell.c:3489 -#: src/protocols/novell/novell.c:3492+#: src/protocols/novell/novell.c:3493 @@ -7589,7 +7736,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.)"
@@ -7597,157 +7744,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:642+#: 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:6917+#: 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:5625-#: src/protocols/oscar/oscar.c:6809+#: 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:5619-#: src/protocols/oscar/oscar.c:6807+#: 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:5622-#: src/protocols/oscar/oscar.c:6808+#: 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?"
@@ -7755,24 +7902,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 "
@@ -7783,46 +7930,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:180-#: src/protocols/yahoo/yahoo_filexfer.c:189-#: src/protocols/yahoo/yahoo_filexfer.c:199+#: 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."
@@ -7830,21 +7977,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 authorization"
-#: 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 "
@@ -7853,20 +8012,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 "
@@ -7876,19 +8039,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 authorize 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 "Authorization Request Message:"
-#: src/protocols/oscar/oscar.c:3511+#: src/protocols/oscar/oscar.c:3564 msgid "Please authorize me!"
msgstr "Please authorize 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 "
@@ -7897,22 +8060,22 @@
"The user %s requires authorization before being added to a buddy list. Do "
"you want to send an authorization 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 Authorization"
-#: 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:6250-#: src/protocols/oscar/oscar.c:6296+#: 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 "Authorization 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"
@@ -7921,11 +8084,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:6256+#: src/protocols/oscar/oscar.c:3763 src/protocols/oscar/oscar.c:6313 msgid "Authorization Request"
msgstr "Authorization 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 "
@@ -7936,17 +8099,17 @@
-#: src/protocols/oscar/oscar.c:3723+#: src/protocols/oscar/oscar.c:3776 msgid "ICQ authorization denied."
msgstr "ICQ authorization 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"
@@ -7959,7 +8122,7 @@
-#: src/protocols/oscar/oscar.c:3746+#: src/protocols/oscar/oscar.c:3799 "You have received an ICQ page\n"
@@ -7972,7 +8135,7 @@
-#: src/protocols/oscar/oscar.c:3754+#: src/protocols/oscar/oscar.c:3807 "You have received an ICQ email from %s [%s]\n"
@@ -7985,34 +8148,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."
@@ -8023,85 +8186,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:4198+#: 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:4073-msgid "Unable to send message to %s:"-msgstr "Unable to send message to %s:"-#: 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:4161+#: src/protocols/oscar/oscar.c:4215 -#: src/protocols/oscar/oscar.c:4165 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:4249+#: 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:4435+#: src/protocols/oscar/oscar.c:4490 "[Unable to display a message from this user because it contained invalid "
@@ -8109,11 +8263,11 @@
"[Unable to display a message from this user because it contained invalid "
-#: src/protocols/oscar/oscar.c:4655+#: src/protocols/oscar/oscar.c:4710 msgid "Rate limiting error."
msgstr "Rate limiting error."
-#: src/protocols/oscar/oscar.c:4656+#: 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."
@@ -8121,7 +8275,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:4719+#: src/protocols/oscar/oscar.c:4774 "You have been disconnected because you have signed on with this screen name "
@@ -8129,109 +8283,109 @@
"You have been disconnected because you have signed on with this screen name "
-#: src/protocols/oscar/oscar.c:4721+#: 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:4752+#: src/protocols/oscar/oscar.c:4807 msgid "Finalizing connection"
msgstr "Finalizing connection"
-#: src/protocols/oscar/oscar.c:5035 src/protocols/silc/util.c:538+#: src/protocols/oscar/oscar.c:5090 src/protocols/silc/util.c:538 -#: src/protocols/oscar/oscar.c:5036+#: src/protocols/oscar/oscar.c:5091 -#: src/protocols/oscar/oscar.c:5037 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:5037 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:5053+#: src/protocols/oscar/oscar.c:5108 msgid "Personal Web Page"
msgstr "Personal Web Page"
-#: src/protocols/oscar/oscar.c:5057+#: src/protocols/oscar/oscar.c:5112 msgid "Additional Information"
msgstr "Additional Information"
-#: src/protocols/oscar/oscar.c:5062+#: src/protocols/oscar/oscar.c:5117 -#: src/protocols/oscar/oscar.c:5066 src/protocols/oscar/oscar.c:5074+#: src/protocols/oscar/oscar.c:5121 src/protocols/oscar/oscar.c:5129 -#: src/protocols/oscar/oscar.c:5070+#: src/protocols/oscar/oscar.c:5125 -#: src/protocols/oscar/oscar.c:5078+#: src/protocols/oscar/oscar.c:5133 msgstr "Work Information"
-#: src/protocols/oscar/oscar.c:5079+#: src/protocols/oscar/oscar.c:5134 -#: src/protocols/oscar/oscar.c:5080+#: src/protocols/oscar/oscar.c:5135 -#: src/protocols/oscar/oscar.c:5081+#: src/protocols/oscar/oscar.c:5136 -#: src/protocols/oscar/oscar.c:5083+#: src/protocols/oscar/oscar.c:5138 -#: src/protocols/oscar/oscar.c:5093+#: src/protocols/oscar/oscar.c:5148 -#: src/protocols/oscar/oscar.c:5142+#: src/protocols/oscar/oscar.c:5197 -#: src/protocols/oscar/oscar.c:5163+#: 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:5167+#: src/protocols/oscar/oscar.c:5222 -#: src/protocols/oscar/oscar.c:5184+#: 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:5205+#: 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:5207+#: src/protocols/oscar/oscar.c:5262 msgid "Account Confirmation Requested"
msgstr "Account Confirmation Requested"
-#: src/protocols/oscar/oscar.c:5238+#: src/protocols/oscar/oscar.c:5293 msgid "Error Changing Account Info"
msgstr "Error Changing Account Info"
-#: src/protocols/oscar/oscar.c:5241+#: src/protocols/oscar/oscar.c:5296 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8240,7 +8394,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
-#: src/protocols/oscar/oscar.c:5244+#: src/protocols/oscar/oscar.c:5299 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8249,7 +8403,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
-#: src/protocols/oscar/oscar.c:5247+#: src/protocols/oscar/oscar.c:5302 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8258,7 +8412,7 @@
"Error 0x%04x: Unable to format screen name because the requested screen name "
-#: src/protocols/oscar/oscar.c:5250+#: src/protocols/oscar/oscar.c:5305 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8267,7 +8421,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:5253+#: src/protocols/oscar/oscar.c:5308 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8276,7 +8430,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:5256+#: src/protocols/oscar/oscar.c:5311 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8285,12 +8439,12 @@
"Error 0x%04x: Unable to change email address because the given address is "
-#: src/protocols/oscar/oscar.c:5259+#: src/protocols/oscar/oscar.c:5314 msgid "Error 0x%04x: Unknown error."
msgstr "Error 0x%04x: Unknown error."
-#: src/protocols/oscar/oscar.c:5269+#: src/protocols/oscar/oscar.c:5324 "Your screen name is currently formatted as follows:\n"
@@ -8299,26 +8453,26 @@
"Your screen name is currently formatted as follows:\n"
-#: src/protocols/oscar/oscar.c:5270 src/protocols/oscar/oscar.c:5277+#: src/protocols/oscar/oscar.c:5325 src/protocols/oscar/oscar.c:5332 -#: src/protocols/oscar/oscar.c:5275+#: 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:5339+#: 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:5474+#: src/protocols/oscar/oscar.c:5531 msgid "Unable to set AIM profile."
msgstr "Unable to set AIM profile."
-#: src/protocols/oscar/oscar.c:5475+#: 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 "
@@ -8328,7 +8482,7 @@
"completed. Your profile remains unset; try setting it again when you are "
-#: src/protocols/oscar/oscar.c:5502+#: src/protocols/oscar/oscar.c:5559 "The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -8343,19 +8497,19 @@
"The maximum profile length of %d bytes has been exceeded. Gaim has "
-#: src/protocols/oscar/oscar.c:5507+#: src/protocols/oscar/oscar.c:5564 msgid "Profile too long."
msgstr "Profile too long."
-#: src/protocols/oscar/oscar.c:5523 src/protocols/oscar/oscar.c:6814+#: src/protocols/oscar/oscar.c:5580 src/protocols/oscar/oscar.c:6871 -#: src/protocols/oscar/oscar.c:5541+#: 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:5542+#: 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 "
@@ -8365,7 +8519,7 @@
"procedure completed. You remain in a \"present\" state; try setting it "
"again when you are fully connected."
-#: src/protocols/oscar/oscar.c:5582+#: src/protocols/oscar/oscar.c:5639 "The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -8380,11 +8534,11 @@
"The maximum away message length of %d bytes has been exceeded. Gaim has "
-#: src/protocols/oscar/oscar.c:5587+#: src/protocols/oscar/oscar.c:5644 msgid "Away message too long."
msgstr "Away message too long."
-#: src/protocols/oscar/oscar.c:5665+#: src/protocols/oscar/oscar.c:5722 "Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -8395,16 +8549,16 @@
"must either start with a letter and contain only letters, numbers and "
"spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:5667 src/protocols/oscar/oscar.c:6116-#: src/protocols/oscar/oscar.c:6130+#: src/protocols/oscar/oscar.c:5724 src/protocols/oscar/oscar.c:6173 +#: src/protocols/oscar/oscar.c:6187 -#: src/protocols/oscar/oscar.c:5828+#: src/protocols/oscar/oscar.c:5885 msgid "Unable To Retrieve Buddy List"
msgstr "Unable To Retrieve Buddy List"
-#: src/protocols/oscar/oscar.c:5829+#: 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 "
@@ -8414,13 +8568,13 @@
"servers. Your buddy list is not lost, and will probably become available in "
-#: src/protocols/oscar/oscar.c:6011 src/protocols/oscar/oscar.c:6012-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6174-#: src/protocols/oscar/oscar.c:6175 src/protocols/oscar/oscar.c:6180+#: 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:6114+#: src/protocols/oscar/oscar.c:6171 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8429,11 +8583,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:6114 src/protocols/oscar/oscar.c:6128+#: src/protocols/oscar/oscar.c:6171 src/protocols/oscar/oscar.c:6185 -#: src/protocols/oscar/oscar.c:6128+#: src/protocols/oscar/oscar.c:6185 "Could not add the buddy %s for an unknown reason. The most common reason "
@@ -8444,7 +8598,7 @@
"for this is that you have the maximum number of allowed buddies in your "
-#: src/protocols/oscar/oscar.c:6211+#: src/protocols/oscar/oscar.c:6268 "The user %s has given you permission to add you to their buddy list. Do you "
@@ -8453,11 +8607,11 @@
"The user %s has given you permission to add you to their buddy list. Do you "
-#: src/protocols/oscar/oscar.c:6217+#: src/protocols/oscar/oscar.c:6274 msgid "Authorization Given"
msgstr "Authorization Given"
-#: src/protocols/oscar/oscar.c:6250+#: src/protocols/oscar/oscar.c:6307 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8467,17 +8621,17 @@
-#: src/protocols/oscar/oscar.c:6292+#: 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:6293+#: src/protocols/oscar/oscar.c:6350 msgid "Authorization Granted"
msgstr "Authorization Granted"
-#: src/protocols/oscar/oscar.c:6296+#: src/protocols/oscar/oscar.c:6353 "The user %s has denied your request to add them to your buddy list for the "
@@ -8488,76 +8642,76 @@
-#: src/protocols/oscar/oscar.c:6297+#: src/protocols/oscar/oscar.c:6354 msgid "Authorization Denied"
msgstr "Authorization Denied"
-#: src/protocols/oscar/oscar.c:6334 src/protocols/toc/toc.c:1273+#: src/protocols/oscar/oscar.c:6391 src/protocols/toc/toc.c:1273 -#: src/protocols/oscar/oscar.c:6372+#: src/protocols/oscar/oscar.c:6429 msgid "Invalid chat name specified."
msgstr "Invalid chat name specified."
-#: src/protocols/oscar/oscar.c:6461+#: 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:6587+#: src/protocols/oscar/oscar.c:6644 -#: src/protocols/oscar/oscar.c:6873+#: src/protocols/oscar/oscar.c:6930 msgid "Buddy Comment for %s"
msgstr "Buddy Comment for %s"
-#: src/protocols/oscar/oscar.c:6874+#: src/protocols/oscar/oscar.c:6931 -#: src/protocols/oscar/oscar.c:6893+#: src/protocols/oscar/oscar.c:6950 msgid "Edit Buddy Comment"
msgstr "Edit Buddy Comment"
-#: src/protocols/oscar/oscar.c:6899+#: src/protocols/oscar/oscar.c:6956 -#: src/protocols/oscar/oscar.c:6911+#: src/protocols/oscar/oscar.c:6968 -#: src/protocols/oscar/oscar.c:6928+#: src/protocols/oscar/oscar.c:6985 msgid "Re-request Authorization"
msgstr "Re-request Authorization"
-#: src/protocols/oscar/oscar.c:6958+#: src/protocols/oscar/oscar.c:7015 msgid "The new formatting is invalid."
msgstr "The new formatting is invalid."
-#: src/protocols/oscar/oscar.c:6959+#: src/protocols/oscar/oscar.c:7016 msgid "Screen name formatting can change only capitalization and whitespace."
msgstr "Screen name formatting can change only capitalization and whitespace."
-#: src/protocols/oscar/oscar.c:6966+#: src/protocols/oscar/oscar.c:7023 msgid "New screen name formatting:"
msgstr "New screen name formatting:"
-#: src/protocols/oscar/oscar.c:7018+#: src/protocols/oscar/oscar.c:7075 msgid "Change Address To:"
msgstr "Change Address To:"
-#: src/protocols/oscar/oscar.c:7063+#: src/protocols/oscar/oscar.c:7120 msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>you are not waiting for authorization</i>"
-#: src/protocols/oscar/oscar.c:7066+#: src/protocols/oscar/oscar.c:7123 msgid "You are awaiting authorization from the following buddies"
msgstr "You are awaiting authorization from the following buddies"
-#: src/protocols/oscar/oscar.c:7067+#: src/protocols/oscar/oscar.c:7124 "You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -8565,75 +8719,75 @@
"You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
-#: src/protocols/oscar/oscar.c:7084+#: src/protocols/oscar/oscar.c:7141 msgid "Find Buddy by E-mail"
msgstr "Find Buddy by E-mail"
-#: src/protocols/oscar/oscar.c:7085+#: 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:7086+#: 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:7103+#: src/protocols/oscar/oscar.c:7160 msgid "Available Message:"
msgstr "Available Message:"
-#: src/protocols/oscar/oscar.c:7104+#: 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:7185 src/protocols/silc/silc.c:796+#: src/protocols/oscar/oscar.c:7242 src/protocols/silc/silc.c:800 msgstr "Set User Info..."
-#: src/protocols/oscar/oscar.c:7190+#: src/protocols/oscar/oscar.c:7247 msgid "Set User Info (URL)..."
msgstr "Set User Info (URL)..."
-#: src/protocols/oscar/oscar.c:7196+#: src/protocols/oscar/oscar.c:7253 msgid "Set Available Message..."
msgstr "Set Available Message..."
-#: src/protocols/oscar/oscar.c:7201 src/protocols/silc/silc.c:792+#: src/protocols/oscar/oscar.c:7258 src/protocols/silc/silc.c:796 msgid "Change Password..."
msgstr "Change Password..."
-#: src/protocols/oscar/oscar.c:7206+#: src/protocols/oscar/oscar.c:7263 msgid "Change Password (URL)"
msgstr "Change Password (URL)"
-#: src/protocols/oscar/oscar.c:7210+#: src/protocols/oscar/oscar.c:7267 msgid "Configure IM Forwarding (URL)"
msgstr "Configure IM Forwarding (URL)"
-#: src/protocols/oscar/oscar.c:7219+#: src/protocols/oscar/oscar.c:7276 msgid "Format Screen Name..."
msgstr "Format Screen Name..."
-#: src/protocols/oscar/oscar.c:7223+#: src/protocols/oscar/oscar.c:7280 -#: src/protocols/oscar/oscar.c:7227+#: src/protocols/oscar/oscar.c:7284 msgid "Display Currently Registered Address"
msgstr "Display Currently Registered Address"
-#: src/protocols/oscar/oscar.c:7231+#: src/protocols/oscar/oscar.c:7288 msgid "Change Currently Registered Address..."
msgstr "Change Currently Registered Address..."
-#: src/protocols/oscar/oscar.c:7238+#: src/protocols/oscar/oscar.c:7295 msgid "Show Buddies Awaiting Authorization"
msgstr "Show Buddies Awaiting Authorization"
-#: src/protocols/oscar/oscar.c:7244+#: src/protocols/oscar/oscar.c:7301 msgid "Search for Buddy by Email..."
msgstr "Search for Buddy by Email..."
-#: src/protocols/oscar/oscar.c:7249+#: src/protocols/oscar/oscar.c:7306 msgid "Search for Buddy by Information"
msgstr "Search for Buddy by Information"
@@ -8647,18 +8801,22 @@
-#: src/protocols/oscar/oscar.c:7370 src/protocols/oscar/oscar.c:7372+#: 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:7391+#: src/protocols/oscar/oscar.c:7448 -#: src/protocols/oscar/oscar.c:7394+#: src/protocols/oscar/oscar.c:7451 +#: src/protocols/oscar/oscar.c:7454 src/protocols/zephyr/zephyr.c:2760 #: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
#: src/protocols/silc/ft.c:338
@@ -8753,7 +8911,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 @@ -8828,134 +8986,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/silc.c:81+#: 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/silc.c:83+#: 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/silc.c:75+#: 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:617+#: 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:619+#: 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:621+#: 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:623+#: 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:625+#: 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:627+#: 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:629+#: 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:631+#: 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:633+#: 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:635+#: 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:637+#: 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/silc.c:685 src/protocols/silc/silc.c:687+#: 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 @@ -9163,11 +9321,11 @@
msgid "Cannot join private group"
msgstr "Cannot join private group"
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:895+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:899 msgid "Cannot call command"
msgstr "Cannot call command"
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:896+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:900 @@ -9312,7 +9470,7 @@
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:784+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:788 msgid "Detach From Server"
msgstr "Detach From Server"
@@ -9434,7 +9592,7 @@
msgstr "Disconnected by server"
#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
-#: src/protocols/silc/silc.c:174+#: src/protocols/silc/silc.c:178 msgstr "Resuming session"
@@ -9517,48 +9675,48 @@
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140 msgid "Verify Public Key"
msgstr "Verify Public Key"
-#: src/protocols/silc/pk.c:118+#: src/protocols/silc/pk.c:119 -#: src/protocols/silc/pk.c:140+#: src/protocols/silc/pk.c:141 msgid "Unsupported public key type"
msgstr "Unsupported public key type"
-#: src/protocols/silc/silc.c:134+#: src/protocols/silc/silc.c:138 msgid "Connection failed"
msgstr "Connection failed"
-#: src/protocols/silc/silc.c:166+#: src/protocols/silc/silc.c:170 msgid "Cannot initialize SILC Client connection"
msgstr "Cannot initialize SILC Client connection"
-#: src/protocols/silc/silc.c:177+#: src/protocols/silc/silc.c:181 msgid "Performing key exchange"
msgstr "Performing key exchange"
-#: src/protocols/silc/silc.c:249+#: src/protocols/silc/silc.c:253 -#: src/protocols/silc/silc.c:283+#: src/protocols/silc/silc.c:287 msgid "Connecting to SILC Server"
msgstr "Connecting to SILC Server"
-#: src/protocols/silc/silc.c:613+#: src/protocols/silc/silc.c:617 msgid "Your Current Mood"
msgstr "Your Current Mood"
-#: src/protocols/silc/silc.c:615+#: src/protocols/silc/silc.c:619 -#: src/protocols/silc/silc.c:640+#: src/protocols/silc/silc.c:644 "Your Preferred Contact Methods"
@@ -9566,43 +9724,43 @@
"Your Preferred Contact Methods"
-#: src/protocols/silc/silc.c:648 src/protocols/silc/util.c:514+#: src/protocols/silc/silc.c:652 src/protocols/silc/util.c:514 -#: src/protocols/silc/silc.c:650 src/protocols/silc/util.c:516+#: src/protocols/silc/silc.c:654 src/protocols/silc/util.c:516 -#: src/protocols/silc/silc.c:652 src/protocols/silc/util.c:518+#: src/protocols/silc/silc.c:656 src/protocols/silc/util.c:518 msgid "Video Conferencing"
msgstr "Video Conferencing"
-#: src/protocols/silc/silc.c:657+#: src/protocols/silc/silc.c:661 msgid "Your Current Status"
msgstr "Your Current Status"
-#: src/protocols/silc/silc.c:664+#: src/protocols/silc/silc.c:668 -#: src/protocols/silc/silc.c:667+#: src/protocols/silc/silc.c:671 msgid "Let others see what services you are using"
msgstr "Let others see what services you are using"
-#: src/protocols/silc/silc.c:673+#: src/protocols/silc/silc.c:677 msgid "Let others see what computer you are using"
msgstr "Let others see what computer you are using"
-#: src/protocols/silc/silc.c:680+#: src/protocols/silc/silc.c:684 -#: src/protocols/silc/silc.c:693 src/protocols/silc/silc.c:694+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:698 msgid "User Online Status Attributes"
msgstr "User Online Status Attributes"
-#: src/protocols/silc/silc.c:695+#: src/protocols/silc/silc.c:699 "You can let other users see your online status information and your personal "
"information. Please fill the information you would like other users to see "
@@ -9612,131 +9770,131 @@
"information. Please fill the information you would like other users to see "
-#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:741-#: src/protocols/silc/silc.c:1144+#: src/protocols/silc/silc.c:739 src/protocols/silc/silc.c:745 +#: src/protocols/silc/silc.c:1148 msgid "Message of the Day"
msgstr "Message of the Day"
-#: src/protocols/silc/silc.c:735+#: src/protocols/silc/silc.c:739 msgid "No Message of the Day available"
msgstr "No Message of the Day available"
-#: src/protocols/silc/silc.c:736 src/protocols/silc/silc.c:1139+#: src/protocols/silc/silc.c:740 src/protocols/silc/silc.c:1143 msgid "There is no Message of the Day associated with this connection"
msgstr "There is no Message of the Day associated with this connection"
-#: src/protocols/silc/silc.c:779+#: src/protocols/silc/silc.c:783 -#: src/protocols/silc/silc.c:788+#: src/protocols/silc/silc.c:792 msgid "View Message of the Day"
msgstr "View Message of the Day"
-#: src/protocols/silc/silc.c:860+#: src/protocols/silc/silc.c:864 msgid "User <I>%s</I> is not present in the network"
msgstr "User <I>%s</I> is not present in the network"
-#: src/protocols/silc/silc.c:969+#: src/protocols/silc/silc.c:973 msgid "Failed to leave channel"
msgstr "Failed to leave channel"
-#: src/protocols/silc/silc.c:1015+#: src/protocols/silc/silc.c:1019 -#: src/protocols/silc/silc.c:1096+#: src/protocols/silc/silc.c:1100 msgid "You must specify a nick"
msgstr "You must specify a nick"
-#: src/protocols/silc/silc.c:1198+#: src/protocols/silc/silc.c:1202 msgid "channel %s not found"
msgstr "channel %s not found"
-#: src/protocols/silc/silc.c:1203+#: src/protocols/silc/silc.c:1207 msgid "channel modes for %s: %s"
msgstr "channel modes for %s: %s"
-#: src/protocols/silc/silc.c:1205+#: src/protocols/silc/silc.c:1209 msgid "no channel modes are set on %s"
msgstr "no channel modes are set on %s"
-#: src/protocols/silc/silc.c:1218+#: src/protocols/silc/silc.c:1222 msgid "Failed to set cmodes for %s"
msgstr "Failed to set cmodes for %s"
-#: src/protocols/silc/silc.c:1248+#: src/protocols/silc/silc.c:1252 msgid "Unknown command: %s, (may be a Gaim bug)"
msgstr "Unknown command: %s, (may be a Gaim bug)"
-#: src/protocols/silc/silc.c:1311+#: src/protocols/silc/silc.c:1315 msgid "part [channel]: Leave the chat"
msgstr "part [channel]: Leave the chat"
-#: src/protocols/silc/silc.c:1315+#: src/protocols/silc/silc.c:1319 msgid "leave [channel]: Leave the chat"
msgstr "leave [channel]: Leave the chat"
-#: src/protocols/silc/silc.c:1319+#: src/protocols/silc/silc.c:1323 msgid "topic [<new topic>]: View or change the topic"
msgstr "topic [<new topic>]: View or change the topic"
-#: src/protocols/silc/silc.c:1324+#: src/protocols/silc/silc.c:1328 msgid "join <channel> [<password>]: Join a chat on this network"
msgstr "join <channel> [<password>]: Join a chat on this network"
-#: src/protocols/silc/silc.c:1328+#: src/protocols/silc/silc.c:1332 msgid "list: List channels on this network"
msgstr "list: List channels on this network"
-#: src/protocols/silc/silc.c:1332+#: src/protocols/silc/silc.c:1336 msgid "whois <nick>: View nick's information"
msgstr "whois <nick>: View nick's information"
-#: src/protocols/silc/silc.c:1336 src/protocols/zephyr/zephyr.c:2478+#: 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"
-#: src/protocols/silc/silc.c:1340+#: src/protocols/silc/silc.c:1344 msgid "query <nick> [<message>]: Send a private message to a user"
"query <nick> [<message>]: Send a private message to a user"
-#: src/protocols/silc/silc.c:1344+#: src/protocols/silc/silc.c:1348 msgid "motd: View the server's Message Of The Day"
msgstr "motd: View the server's Message Of The Day"
-#: src/protocols/silc/silc.c:1348+#: src/protocols/silc/silc.c:1352 msgid "detach: Detach this session"
msgstr "detach: Detach this session"
-#: src/protocols/silc/silc.c:1352+#: src/protocols/silc/silc.c:1356 msgid "quit [message]: Disconnect from the server, with an optional message"
msgstr "quit [message]: Disconnect from the server, with an optional message"
-#: src/protocols/silc/silc.c:1356+#: src/protocols/silc/silc.c:1360 msgid "call <command>: Call any silc client command"
msgstr "call <command>: Call any silc client command"
-#: src/protocols/silc/silc.c:1362+#: src/protocols/silc/silc.c:1366 msgid "kill <nick> [-pubkey|<reason>]: Kill nick"
msgstr "kill <nick> [-pubkey|<reason>]: Kill nick"
-#: src/protocols/silc/silc.c:1366+#: src/protocols/silc/silc.c:1370 msgid "nick <newnick>: Change your nickname"
msgstr "nick <newnick>: Change your nickname"
-#: src/protocols/silc/silc.c:1370+#: src/protocols/silc/silc.c:1374 msgid "whowas <nick>: View nick's information"
msgstr "whowas <nick>: View nick's information"
-#: src/protocols/silc/silc.c:1374+#: src/protocols/silc/silc.c:1378 "cmode <channel> [+|-<modes>] [arguments]: Change or display "
@@ -9744,7 +9902,7 @@
"cmode <channel> [+|-<modes>] [arguments]: Change or display "
-#: src/protocols/silc/silc.c:1378+#: src/protocols/silc/silc.c:1382 "cumode <channel> +|-<modes> <nick>: Change nick's modes "
@@ -9752,15 +9910,15 @@
"cumode <channel> +|-<modes> <nick>: Change nick's modes "
-#: src/protocols/silc/silc.c:1382+#: src/protocols/silc/silc.c:1386 msgid "umode <usermodes>: Set your modes in the network"
msgstr "umode <usermodes>: Set your modes in the network"
-#: src/protocols/silc/silc.c:1386+#: src/protocols/silc/silc.c:1390 msgid "oper <nick> [-pubkey]: Get server operator privileges"
msgstr "oper <nick> [-pubkey]: Get server operator privileges"
-#: src/protocols/silc/silc.c:1390+#: src/protocols/silc/silc.c:1394 "invite <channel> [-|+]<nick>: invite nick or add/remove from "
@@ -9768,35 +9926,35 @@
"invite <channel> [-|+]<nick>: invite nick or add/remove from "
-#: src/protocols/silc/silc.c:1394+#: src/protocols/silc/silc.c:1398 msgid "kick <channel> <nick> [comment]: Kick client from channel"
msgstr "kick <channel> <nick> [comment]: Kick client from channel"
-#: src/protocols/silc/silc.c:1398+#: src/protocols/silc/silc.c:1402 msgid "info [server]: View server administrative details"
msgstr "info [server]: View server administrative details"
-#: src/protocols/silc/silc.c:1402+#: src/protocols/silc/silc.c:1406 msgid "ban [<channel> +|-<nick>]: Ban client from channel"
msgstr "ban [<channel> +|-<nick>]: Ban client from channel"
-#: src/protocols/silc/silc.c:1406+#: src/protocols/silc/silc.c:1410 msgid "getkey <nick|server>: Retrieve client's or server's public key"
msgstr "getkey <nick|server>: Retrieve client's or server's public key"
-#: src/protocols/silc/silc.c:1410+#: src/protocols/silc/silc.c:1414 msgid "stats: View server and network statistics"
msgstr "stats: View server and network statistics"
-#: src/protocols/silc/silc.c:1414+#: src/protocols/silc/silc.c:1418 msgid "ping: Send PING to the connected server"
msgstr "ping: Send PING to the connected server"
-#: src/protocols/silc/silc.c:1419+#: src/protocols/silc/silc.c:1423 msgid "users <channel>: List users in channel"
msgstr "users <channel>: List users in channel"
-#: src/protocols/silc/silc.c:1423+#: src/protocols/silc/silc.c:1427 "names [-count|-ops|-halfops|-voices|-normal] <channel(s)>: List "
"specific users in channel(s)"
@@ -9804,39 +9962,39 @@
"names [-count|-ops|-halfops|-voices|-normal] <channel(s)>: List "
"specific users in channel(s)"
-#: src/protocols/silc/silc.c:1435+#: src/protocols/silc/silc.c:1439 msgstr "Instant Messages"
-#: src/protocols/silc/silc.c:1440+#: src/protocols/silc/silc.c:1444 msgid "Digitally sign all IM messages"
msgstr "Digitally sign all IM messages"
-#: src/protocols/silc/silc.c:1445+#: src/protocols/silc/silc.c:1449 msgid "Verify all IM message signatures"
msgstr "Verify all IM message signatures"
-#: src/protocols/silc/silc.c:1448+#: src/protocols/silc/silc.c:1452 msgstr "Channel Messages"
-#: src/protocols/silc/silc.c:1453+#: src/protocols/silc/silc.c:1457 msgid "Digitally sign all channel messages"
msgstr "Digitally sign all channel messages"
-#: src/protocols/silc/silc.c:1458+#: src/protocols/silc/silc.c:1462 msgid "Verify all channel message signatures"
msgstr "Verify all channel message signatures"
-#: src/protocols/silc/silc.c:1461+#: src/protocols/silc/silc.c:1465 msgid "Default SILC Key Pair"
msgstr "Default SILC Key Pair"
-#: src/protocols/silc/silc.c:1466+#: src/protocols/silc/silc.c:1470 -#: src/protocols/silc/silc.c:1471+#: src/protocols/silc/silc.c:1475 msgstr "SILC Private Key"
@@ -9849,40 +10007,40 @@
-#: src/protocols/silc/silc.c:1560+#: src/protocols/silc/silc.c:1564 msgid "SILC Protocol Plugin"
msgstr "SILC Protocol Plugin"
-#: src/protocols/silc/silc.c:1562+#: src/protocols/silc/silc.c:1566 msgid "Secure Internet Live Conferencing (SILC) Protocol"
msgstr "Secure Internet Live Conferencing (SILC) Protocol"
-#: src/protocols/silc/silc.c:1592+#: src/protocols/silc/silc.c:1596 msgid "Public key authentication"
msgstr "Public key authentication"
-#: src/protocols/silc/silc.c:1598+#: src/protocols/silc/silc.c:1602 -#: src/protocols/silc/silc.c:1602+#: src/protocols/silc/silc.c:1606 msgstr "Private Key File"
-#: src/protocols/silc/silc.c:1607+#: src/protocols/silc/silc.c:1611 msgid "Reject watching by other users"
msgstr "Reject watching by other users"
-#: src/protocols/silc/silc.c:1610+#: src/protocols/silc/silc.c:1614 -#: src/protocols/silc/silc.c:1613+#: src/protocols/silc/silc.c:1617 msgid "Block IMs without Key Exchange"
msgstr "Block IMs without Key Exchange"
-#: src/protocols/silc/silc.c:1616+#: src/protocols/silc/silc.c:1620 msgid "Reject online status attribute requests"
msgstr "Reject online status attribute requests"
@@ -9978,6 +10136,11 @@
+#: src/protocols/toc/toc.c:198 #: src/protocols/toc/toc.c:480
msgid "Unable to write file %s."
@@ -10139,7 +10302,7 @@
#: src/protocols/toc/toc.c:1717
msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably canceled."+msgstr "File transfer failed; other side probably cancelled." #: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
@@ -10279,25 +10442,25 @@
"You have been logged off as you have logged in on a different machine or "
-#: src/protocols/yahoo/yahoo.c:814+#: src/protocols/yahoo/yahoo.c:821 msgid "Your Yahoo! message did not get sent."
msgstr "Your Yahoo! message did not get sent."
-#: src/protocols/yahoo/yahoo.c:833+#: src/protocols/yahoo/yahoo.c:840 -#: src/protocols/yahoo/yahoo.c:876+#: src/protocols/yahoo/yahoo.c:885 msgid "Yahoo! system message for %s:"
msgstr "Yahoo! system message for %s:"
-#: src/protocols/yahoo/yahoo.c:942+#: src/protocols/yahoo/yahoo.c:952 msgid "%s has (retroactively) denied your request to add them to your list."
msgstr "%s has (retroactively) denied your request to add them to your list."
-#: src/protocols/yahoo/yahoo.c:945+#: src/protocols/yahoo/yahoo.c:955 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10306,11 +10469,11 @@
"%s has (retroactively) denied your request to add them to your list for the "
-#: src/protocols/yahoo/yahoo.c:948+#: src/protocols/yahoo/yahoo.c:958 msgid "Add buddy rejected"
msgstr "Add buddy rejected"
-#: src/protocols/yahoo/yahoo.c:1709+#: src/protocols/yahoo/yahoo.c:1719 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10321,11 +10484,11 @@
"method. This version of Gaim will likely not be able to successfully sign "
"on to Yahoo. Check %s for updates."
-#: src/protocols/yahoo/yahoo.c:1712+#: src/protocols/yahoo/yahoo.c:1722 msgid "Failed Yahoo! Authentication"
msgstr "Failed Yahoo! Authentication"
-#: src/protocols/yahoo/yahoo.c:1784+#: src/protocols/yahoo/yahoo.c:1794 "You have tried to ignore %s, but the user is on your buddy list. Clicking "
@@ -10334,19 +10497,19 @@
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
"\"Yes\" will remove and ignore the buddy."
-#: src/protocols/yahoo/yahoo.c:1787+#: src/protocols/yahoo/yahoo.c:1797 -#: src/protocols/yahoo/yahoo.c:1821+#: src/protocols/yahoo/yahoo.c:1831 msgid "Invalid username."
msgstr "Invalid username."
-#: src/protocols/yahoo/yahoo.c:1832+#: src/protocols/yahoo/yahoo.c:1842 msgid "Normal authentication failed!"
msgstr "Normal authentication failed!"
-#: src/protocols/yahoo/yahoo.c:1833+#: src/protocols/yahoo/yahoo.c:1843 "The normal authentication method has failed. This means either your password "
"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10358,90 +10521,90 @@
"attempt to log in using Web Messenger authentication, which will result in "
"reduced functionality and features."
-#: src/protocols/yahoo/yahoo.c:1841+#: src/protocols/yahoo/yahoo.c:1851 msgid "Incorrect password."
msgstr "Incorrect password."
-#: src/protocols/yahoo/yahoo.c:1844+#: src/protocols/yahoo/yahoo.c:1854 msgid "Your account is locked, please log in to the Yahoo! website."
msgstr "Your account is locked. Please log in to the Yahoo! website."
-#: src/protocols/yahoo/yahoo.c:1847+#: src/protocols/yahoo/yahoo.c:1857 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
-#: src/protocols/yahoo/yahoo.c:1901+#: src/protocols/yahoo/yahoo.c:1911 msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr "Could not add buddy %s to group %s to the server list on account %s."
-#: src/protocols/yahoo/yahoo.c:1904+#: src/protocols/yahoo/yahoo.c:1914 msgid "Could not add buddy to server list"
msgstr "Could not add buddy to server list"
-#: src/protocols/yahoo/yahoo.c:2138 src/protocols/yahoo/yahoo.c:2266+#: src/protocols/yahoo/yahoo.c:2148 src/protocols/yahoo/yahoo.c:2276 #: src/protocols/yahoo/ycht.c:414
-#: src/protocols/yahoo/yahoo.c:2288 src/protocols/yahoo/yahoo.c:2398-#: src/protocols/yahoo/yahoo.c:2448 src/protocols/yahoo/yahoo.c:2458-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476+#: src/protocols/yahoo/yahoo.c:2298 src/protocols/yahoo/yahoo.c:2408 +#: src/protocols/yahoo/yahoo.c:2458 src/protocols/yahoo/yahoo.c:2468 +#: src/protocols/yahoo/yahoochat.c:1416 src/protocols/yahoo/yahoochat.c:1477 #: src/protocols/yahoo/ycht.c:518
msgid "Connection problem"
msgstr "Connection problem"
-#: src/protocols/yahoo/yahoo.c:2554 src/protocols/yahoo/yahoo.c:2921-#: src/protocols/yahoo/yahoo.c:3035+#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2931 +#: src/protocols/yahoo/yahoo.c:3045 -#: src/protocols/yahoo/yahoo.c:2556 src/protocols/yahoo/yahoo.c:2923-#: src/protocols/yahoo/yahoo.c:3036+#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2933 +#: src/protocols/yahoo/yahoo.c:3046 -#: src/protocols/yahoo/yahoo.c:2558 src/protocols/yahoo/yahoo.c:2925-#: src/protocols/yahoo/yahoo.c:3037+#: src/protocols/yahoo/yahoo.c:2568 src/protocols/yahoo/yahoo.c:2935 +#: src/protocols/yahoo/yahoo.c:3047 -#: src/protocols/yahoo/yahoo.c:2562 src/protocols/yahoo/yahoo.c:2929-#: src/protocols/yahoo/yahoo.c:3039+#: src/protocols/yahoo/yahoo.c:2572 src/protocols/yahoo/yahoo.c:2939 +#: src/protocols/yahoo/yahoo.c:3049 -#: src/protocols/yahoo/yahoo.c:2566 src/protocols/yahoo/yahoo.c:2933-#: src/protocols/yahoo/yahoo.c:3041+#: src/protocols/yahoo/yahoo.c:2576 src/protocols/yahoo/yahoo.c:2943 +#: src/protocols/yahoo/yahoo.c:3051 -#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:2673+#: src/protocols/yahoo/yahoo.c:2657 src/protocols/yahoo/yahoo.c:2683 msgid "Not on server list"
msgstr "Not on server list"
-#: src/protocols/yahoo/yahoo.c:2752+#: src/protocols/yahoo/yahoo.c:2762 -#: src/protocols/yahoo/yahoo.c:2757+#: src/protocols/yahoo/yahoo.c:2767 msgid "Initiate Conference"
msgstr "Initiate Conference"
-#: src/protocols/yahoo/yahoo.c:2809+#: src/protocols/yahoo/yahoo.c:2819 msgstr "Active which ID?"
-#: src/protocols/yahoo/yahoo.c:2818+#: src/protocols/yahoo/yahoo.c:2828 msgid "Join who in chat?"
msgstr "Join who in chat?"
-#: src/protocols/yahoo/yahoo.c:2828+#: src/protocols/yahoo/yahoo.c:2838 -#: src/protocols/yahoo/yahoo.c:2832+#: src/protocols/yahoo/yahoo.c:2842 msgid "Join user in chat..."
msgstr "Join user in chat..."
@@ -10455,58 +10618,50 @@
-#: src/protocols/yahoo/yahoo.c:3359 src/protocols/yahoo/yahoo.c:3361+#: src/protocols/yahoo/yahoo.c:3377 src/protocols/yahoo/yahoo.c:3379 msgid "Yahoo Protocol Plugin"
msgstr "Yahoo Protocol Plugin"
-#: src/protocols/yahoo/yahoo.c:3380+#: src/protocols/yahoo/yahoo.c:3398 -#: src/protocols/yahoo/yahoo.c:3383+#: src/protocols/yahoo/yahoo.c:3401 -#: src/protocols/yahoo/yahoo.c:3386+#: src/protocols/yahoo/yahoo.c:3404 msgstr "Japan Pager host"
-#: src/protocols/yahoo/yahoo.c:3389+#: src/protocols/yahoo/yahoo.c:3407 -#: src/protocols/yahoo/yahoo.c:3392+#: src/protocols/yahoo/yahoo.c:3410 msgid "File transfer host"
msgstr "File transfer host"
-#: src/protocols/yahoo/yahoo.c:3395+#: src/protocols/yahoo/yahoo.c:3413 msgid "Japan File transfer host"
msgstr "Japan File transfer host"
-#: src/protocols/yahoo/yahoo.c:3398+#: src/protocols/yahoo/yahoo.c:3416 msgid "File transfer port"
msgstr "File transfer port"
-#: src/protocols/yahoo/yahoo.c:3401+#: src/protocols/yahoo/yahoo.c:3419 msgid "Chat Room List Url"
msgstr "Chat Room List Url"
-#: src/protocols/yahoo/yahoo.c:3404+#: src/protocols/yahoo/yahoo.c:3422 -#: src/protocols/yahoo/yahoo.c:3407+#: src/protocols/yahoo/yahoo.c:3425 -#: src/protocols/yahoo/yahoo_filexfer.c:170-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte " #: src/protocols/yahoo/yahoo_profile.c:675
msgid "<b>IP Address:</b> %s<br>"
@@ -10632,27 +10787,23 @@
msgid "Maybe they're not in a chat?"
msgstr "Maybe 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 @@ -10673,37 +10824,37 @@
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"
@@ -10798,21 +10949,21 @@
#. XXX: why in the hell are we calling gaim_connection_error() here?
msgid "Access denied: proxy server forbids port %d tunnelling."
msgstr "Access denied: proxy server forbids port %d tunnelling."
msgid "Proxy connection error %d"
msgstr "Proxy connection error %d"
msgid "Invalid proxy settings"
msgstr "Invalid proxy settings"
"Either the host name or port number specified for your given proxy type is "
@@ -10836,63 +10987,63 @@
msgid "Please enter your password"
msgstr "Please enter your password"
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:1190 src/server.c:1199+#: src/server.c:1203 src/server.c:1212
msgstr "%s became unidle"
-#: src/server.c:1263 src/server.c:1270+#: src/server.c:1276 src/server.c:1283
"%s has just been warned by %s.\n"
@@ -10901,11 +11052,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"
@@ -10914,12 +11065,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?"
@@ -10950,50 +11101,38 @@
msgid "g003: Error opening connection.\n"
msgstr "g003: Error opening connection.\n"
-#: src/win32/win32dep.c:273-msgid "Moving Gaim Settings.."-msgstr "Moving Gaim Settings.."-#: src/win32/win32dep.c:276-msgid "Moving Gaim user settings to: "-msgstr "Moving Gaim user settings to: "-#: src/win32/win32dep.c:278--- a/po/ru.po Tue Jan 18 14:13:49 2005 -0500
+++ b/po/ru.po Tue Jan 18 14:31:13 2005 -0500
@@ -2,15 +2,15 @@
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
# Sergey Volozhanin <svo@asplinux.ru>, 2001.
# Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
-# Dmitry Beloglazov <dmaa@lipetsk.ru>, 2004.+# Dmitry Beloglazov <dmaa@lipetsk.ru>, 2004, 2005. "Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-22 20:00+0300\n"-"PO-Revision-Date: 2004-12-22 21:00+0300\n"+"POT-Creation-Date: 2005-01-18 20:00+0300\n" +"PO-Revision-Date: 2005-01-18 21:00+0300\n" "Last-Translator: Dmitry Beloglazov <dmaa@lipetsk.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -143,7 +143,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 msgstr "Входить автоматически"
@@ -160,12 +160,12 @@
#: 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:972+#: 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/novell/novell.c:2917 src/protocols/novell/novell.c:2969
-#: src/protocols/oscar/oscar.c:668 src/protocols/oscar/oscar.c:5615-#: src/protocols/oscar/oscar.c:6607 src/protocols/oscar/oscar.c:6807+#: 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
@@ -173,7 +173,7 @@
#: plugins/docklet/docklet.c:190 src/away.c:584
-#: src/protocols/oscar/oscar.c:5533 src/protocols/oscar/oscar.c:6815+#: src/protocols/oscar/oscar.c:5588 src/protocols/oscar/oscar.c:6870 @@ -185,7 +185,7 @@
-#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2341+#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2357 @@ -242,7 +242,7 @@
#: plugins/extplacement.c:77
msgid "By conversation count"
-msgstr "По количеству диалогов"+msgstr "По количеству бесед" #: plugins/extplacement.c:98
msgid "Conversation Placement"
@@ -316,7 +316,7 @@
msgstr "Неверный AIM URI"
-#: plugins/gaim-remote/remote.c:669+#: plugins/gaim-remote/remote.c:670 "Failed to assign %s to a socket:\n"
@@ -325,7 +325,7 @@
"Не удалось назначить %s сокету:\n"
-#: plugins/gaim-remote/remote.c:692+#: plugins/gaim-remote/remote.c:694 msgid "Unable to open socket"
msgstr "Не удаётся открыть сокет"
@@ -335,19 +335,19 @@
-#: plugins/gaim-remote/remote.c:742+#: plugins/gaim-remote/remote.c:744 msgstr "Дистанционное управление"
-#: plugins/gaim-remote/remote.c:745+#: plugins/gaim-remote/remote.c:747 msgid "Provides remote control for gaim applications."
msgstr "Предоставляет возможность дистанционного управления Gaim."
-#: 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."
@@ -442,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:606-#: src/protocols/msn/msn.c:1470 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 @@ -458,13 +458,13 @@
#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7091+#: 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 @@ -503,13 +503,13 @@
msgstr "Соотнести пользователя"
#: 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:936+#: 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 +530,7 @@
"Выберите все учётные записи, пользователи которых должны быть добавлены "
-#: 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 @@ -575,8 +575,8 @@
msgstr "Необязательная информация:"
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:574+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379 +#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:575 msgstr "Значок пользователя"
@@ -1083,11 +1083,11 @@
"Уведомляет в окне беседы, когда пользователь отходит или возвращается, "
"начинает или перестает бездействовать."
-#: plugins/tcl/tcl.c:363+#: plugins/tcl/tcl.c:364 msgid "Tcl Plugin Loader"
msgstr "Загрузчик модулей Tcl"
-#: 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 "Предоставляет поддержку модулей на языке Tcl"
@@ -1215,7 +1215,7 @@
msgstr "Запускать Gaim при загрузке Windows"
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3127+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3129 msgstr "Список контактов"
@@ -1236,7 +1236,7 @@
#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
-#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1807+#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1770 @@ -1252,7 +1252,7 @@
msgid "Options specific to Windows Gaim."
msgstr "Специфичные для Windows параметры Gaim."
-#: src/account.c:277 src/protocols/jabber/jabber.c:1013+#: src/account.c:277 src/protocols/jabber/jabber.c:1014 msgid "New passwords do not match."
msgstr "Новые пароли не совпадают."
@@ -1284,47 +1284,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:486 src/gtkdialogs.c:628 src/gtkdialogs.c:682-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1060-#: 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:3510-#: src/protocols/oscar/oscar.c:3604 src/protocols/oscar/oscar.c:6878-#: src/protocols/oscar/oscar.c:6970 src/protocols/oscar/oscar.c:7022-#: src/protocols/oscar/oscar.c:7108 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:487-#: src/gtkdialogs.c:629 src/gtkdialogs.c:683 src/gtkdialogs.c:781-#: src/gtkdialogs.c:803 src/gtkdialogs.c:823 src/gtkdialogs.c:860-#: src/gtkdialogs.c:920 src/gtkdialogs.c:963 src/gtkdialogs.c:1001-#: 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:675-#: src/protocols/jabber/jabber.c:1061 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:1515-#: src/protocols/oscar/oscar.c:3468 src/protocols/oscar/oscar.c:3511-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3605-#: src/protocols/oscar/oscar.c:6879 src/protocols/oscar/oscar.c:6971-#: src/protocols/oscar/oscar.c:7023 src/protocols/oscar/oscar.c:7092-#: src/protocols/oscar/oscar.c:7109 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 @@ -1365,7 +1367,7 @@
msgstr "Удалить сообщение об отсутствии"
-#: 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 @@ -1417,7 +1419,7 @@
"%d buddy from group %s was not removed because its account was not logged "
@@ -1434,11 +1436,11 @@
"вход с соответствующей им учётной записью. Эти пользователи и группа не были "
msgid "Group not removed"
msgstr "Группа не удалена"
"An error was encountered parsing your buddy list. It has not been loaded, "
"and the old file has moved to blist.xml~."
@@ -1446,7 +1448,7 @@
"Произошла ошибка при разборе списка контактов. Список не был загружен, а "
"старый файл был переименован в blist.xml~."
msgstr "Ошибка списка контактов"
@@ -1473,7 +1475,7 @@
msgstr "Не удаётся отправить сообщение. Сообщение слишком велико."
#: src/conversation.c:237 src/conversation.c:251
-#: src/protocols/oscar/oscar.c:4071+#: src/protocols/oscar/oscar.c:4126 msgid "Unable to send message to %s:"
msgstr "Не удаётся отправить сообщение для %s:"
@@ -1486,67 +1488,67 @@
msgid "Unable to send message."
msgstr "Не удаётся отправить сообщение."
-#: src/conversation.c:1989+#: src/conversation.c:1992 msgid "%s entered the room."
msgstr "%s вошёл в комнату."
-#: src/conversation.c:1992+#: src/conversation.c:1995 msgid "%s [<I>%s</I>] entered the room."
msgstr "%s [<I>%s</I>] вошёл в комнату."
-#: src/conversation.c:2088+#: src/conversation.c:2091 msgid "You are now known as %s"
msgstr "Вы теперь известны как %s"
-#: src/conversation.c:2091+#: src/conversation.c:2094 msgid "%s is now known as %s"
msgstr "%s теперь известен как %s"
-#: src/conversation.c:2132+#: src/conversation.c:2135 msgid "%s left the room (%s)."
msgstr "%s вышел из комнаты (%s)."
-#: src/conversation.c:2134+#: src/conversation.c:2137 msgid "%s left the room."
msgstr "%s вышел из комнаты."
-#: src/conversation.c:2203+#: src/conversation.c:2206 -#: src/conversation.c:2205+#: src/conversation.c:2208 msgid " left the room (%s)."
msgstr " вышел из комнаты (%s)."
-#: src/conversation.c:2610+#: src/conversation.c:2613 msgid "Last created window"
msgstr "Последнее созданное окно"
-#: src/conversation.c:2612+#: src/conversation.c:2615 msgid "Separate IM and Chat windows"
msgstr "Отдельные окна бесед и чатов"
-#: 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 msgstr "По учётной записи"
-#: src/ft.c:147 src/protocols/msn/msn.c:370+#: src/ft.c:147 src/protocols/msn/msn.c:368 @@ -1586,17 +1588,22 @@
msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
msgid "%s wants to send you %s (%s)"
msgstr "%s хочет отправить вам %s (%s)"
+msgid "%s wants to send you a file" +msgstr "%s хочет отправить вам файл" msgid "Accept file transfer request from %s?"
-msgstr "Удовлетворить запрос передачи файла %s?"+msgstr "Удовлетворить запрос передачи файлов от %s?" "A file is available for download from:\n"
@@ -1607,40 +1614,53 @@
msgid "%s is not a valid filename.\n"
msgstr "%s не является допустимым именем файла.\n"
msgid "Offering to send %s to %s"
msgstr "Попытка отправки %s для %s"
-msgid "Transfer of %s complete"-msgstr "Передача %s завершена"+msgid "Transfer of file %s complete" +msgstr "Передача файла %s завершена" +msgid "File transfer complete" +msgstr "Передача файлов завершена" msgid "You canceled the transfer of %s"
msgstr "Вы отменили передачу %s"
+msgid "File transfer cancelled" +msgstr "Передача файлов отменена" msgid "%s canceled the transfer of %s"
msgstr "%s отменил передачу %s"
+msgid "%s canceled the file transfer" +msgstr "%s отменил передачу файлов" msgid "File transfer to %s aborted.\n"
-msgstr "Передача файла для %s прервана.\n"+msgstr "Передача файлов для %s прервана.\n" msgid "File transfer from %s aborted.\n"
-msgstr "Передача файла от %s прервана.\n"+msgstr "Передача файлов от %s прервана.\n" #: src/gaim-disclosure.c:253
@@ -1728,7 +1748,7 @@
"Set all accounts as not away.\n"
@@ -1740,164 +1760,164 @@
"<b>Размер изображения:</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 msgstr "Идентификатор пользователя:"
-#: 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 "Запомнить пароль"
#. Build the user options frame.
msgstr "Параметры пользователя"
msgid "New mail notifications"
msgstr "Уведомления о новой почте"
msgstr "Значок пользователя:"
#. 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 "Использовать глобальные настройки прокси"
-#: 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 "Использовать настройки окружения"
-#: src/gtkaccount.c:1153+#: src/gtkaccount.c:1166 msgid "you can see the butterflies mating"
msgstr "вы можете увидеть спаривающихся бабочек"
-#: src/gtkaccount.c:1157+#: src/gtkaccount.c:1170 msgid "If you look real closely"
msgstr "Если приглядитесь"
-#: src/gtkaccount.c:1173+#: src/gtkaccount.c:1186 msgstr "Параметры прокси"
-#: 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 msgstr "Имя пользователя:"
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1266+#: src/gtkaccount.c:1230 src/gtkprefs.c:1266 -#: src/gtkaccount.c:1585+#: src/gtkaccount.c:1601 msgstr "Добавить учётную запись"
-#: src/gtkaccount.c:1587+#: src/gtkaccount.c:1603 msgstr "Изменить учётную запись"
-#: src/gtkaccount.c:1611+#: src/gtkaccount.c:1627 msgid "Show more options"
msgstr "Показать больше параметров"
-#: src/gtkaccount.c:1612+#: src/gtkaccount.c:1628 msgid "Show fewer options"
msgstr "Показать меньше параметров"
-#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:674+#: src/gtkaccount.c:1655 src/protocols/jabber/jabber.c:675 msgstr "Зарегистрировать"
-#: src/gtkaccount.c:2004+#: src/gtkaccount.c:2020 msgid "Are you sure you want to delete %s?"
msgstr "Вы действительно хотите удалить %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:4155+#: src/gtkaccount.c:2139 src/protocols/oscar/oscar.c:4210 msgstr "Идентификатор пользователя"
-#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:970-#: src/protocols/oscar/oscar.c:674 src/protocols/oscar/oscar.c:5613-#: src/protocols/oscar/oscar.c:6806 src/protocols/silc/silc.c:45+#: 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 добавил %s в свой список контактов%s%s%s"
-#: src/gtkaccount.c:2495+#: src/gtkaccount.c:2511 @@ -1907,18 +1927,18 @@
"Хотите добавить его в свой список контактов?"
-#: src/gtkaccount.c:2499+#: src/gtkaccount.c:2515 -#: src/gtkaccount.c:2503+#: src/gtkaccount.c:2519 msgid "Add buddy to your list?"
msgstr "Добавить пользователя в список?"
-#: 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:3782+#: 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
@@ -1939,11 +1959,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 @@ -1971,7 +1991,7 @@
msgstr "Псевдоним контакта..."
-#: src/gtkblist.c:1200 src/gtkdialogs.c:857 src/gtkdialogs.c:859+#: src/gtkblist.c:1200 src/gtkdialogs.c:856 src/gtkdialogs.c:858 @@ -2018,136 +2038,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."
"Вы не подключены с учётной записью, позволяющей добавить этого пользователя."
msgid "/Buddies/New Instant _Message..."
msgstr "/Контакты/Новое _сообщение..."
msgid "/Buddies/Join a _Chat..."
msgstr "/Контакты/Присоединиться к _чату..."
msgid "/Buddies/Get User _Info..."
msgstr "/Контакты/Получить _информацию о пользователе..."
msgid "/Buddies/View User _Log..."
msgstr "/Контакты/Просмотреть _журнал пользователя..."
msgid "/Buddies/Show _Offline Buddies"
msgstr "/Контакты/Показывать о_тсутствующих пользователей"
msgid "/Buddies/Show _Empty Groups"
msgstr "/Контакты/Показывать п_устые группы"
msgid "/Buddies/_Add Buddy..."
msgstr "/Контакты/Добавить _пользователя..."
msgid "/Buddies/Add C_hat..."
msgstr "/Контакты/Добавить ч_ат..."
msgid "/Buddies/Add _Group..."
msgstr "/Контакты/Добавить _группу..."
msgid "/Buddies/_Signoff"
msgstr "/Контакты/_Отключиться"
msgstr "/Контакты/_Выйти"
msgid "/Tools/Buddy _Pounce"
msgstr "/Сервис/Слежение за _пользователями"
msgid "/Tools/Account Ac_tions"
msgstr "/Сервис/Действия с _учётными записями"
-msgid "/Tools/Pl_ugin Actions"-msgstr "/Сервис/Действия с _модулями"+msgid "/Tools/Pl_ugin Actions" +msgstr "/Сервис/Действия с _модулями" msgstr "/Сервис/Учётные _записи"
msgid "/Tools/_File Transfers"
msgstr "/Сервис/Передача _файлов"
msgid "/Tools/R_oom List"
msgstr "/Сервис/Список _комнат"
msgid "/Tools/Pr_eferences"
msgstr "/Сервис/_Настройки"
msgstr "/Сервис/К_онфиденциальность"
msgid "/Tools/View System _Log"
msgstr "/Сервис/Просмотреть системный _журнал"
msgid "/Help/Online _Help"
msgstr "/Помощь/Помощь в _сети"
msgid "/Help/_Debug Window"
msgstr "/Помощь/Окно _отладки"
msgstr "/Помощь/О _программе"
msgstr "Переименовать группу"
msgstr "Новое имя группы"
msgid "Please enter a new name for the selected group."
msgstr "Введите новое имя для выбранной группы."
@@ -2156,7 +2176,7 @@
"<b>Учётная запись:</b> %s"
@@ -2164,12 +2184,12 @@
"<b>Статус:</b> Не в сети"
@@ -2177,7 +2197,7 @@
@@ -2185,7 +2205,7 @@
"<b>Псевдоним контакта:</b>"
@@ -2193,7 +2213,7 @@
@@ -2201,7 +2221,7 @@
"<b>Оригинальный псевдоним:</b>"
@@ -2209,7 +2229,7 @@
@@ -2217,7 +2237,7 @@
@@ -2225,126 +2245,126 @@
"<b>Description:</b> Spooky"
msgstr "Бездействует (%dh%02dm) "
msgstr "Бездействует (%dm) "
msgstr "Предупреждён (%d%%) "
#. Make menu items sensitive/insensitive where appropriate
msgid "/Buddies/Join a Chat..."
msgstr "/Контакты/Присоединиться к чату..."
msgstr "/Сервис/Список комнат"
msgstr "/Сервис/Конфиденциальность"
msgstr "По размеру журнала"
msgid "/Tools/Buddy Pounce"
msgstr "/Сервис/Слежение за пользователями"
msgid "/Tools/Account Actions"
msgstr "/Сервис/Действия с учётными записями"
msgid "/Tools/Plugin Actions"
msgstr "/Сервис/Действия с модулями"
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
msgid "/Buddies/Show Offline Buddies"
msgstr "/Контакты/Показывать отсутствующих пользователей"
msgid "/Buddies/Show Empty Groups"
msgstr "/Контакты/Показывать пустые группы"
msgid "Send a message to the selected buddy"
msgstr "Отправить сообщение выбранному пользователю"
msgid "Get information on the selected buddy"
msgstr "Получить информацию о выбранном пользователе"
msgstr "Присоединиться к чату"
msgid "Set an away message"
msgstr "Установить сообщение об отсутствии"
-#: 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
msgstr "Добавить пользователя"
"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. "
@@ -2356,25 +2376,25 @@
"пользователя, когда это возможно.\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 "Этот протокол не поддерживает чаты."
"You are not currently signed on with any protocols that have the ability to "
msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
@@ -2382,15 +2402,15 @@
"Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
"добавить в список контактов.\n"
msgid "Please enter the name of the group to be added."
msgstr "Введите имя добавляемой группы."
-#: src/gtkblist.c:5075 src/gtkblist.c:5172+#: src/gtkblist.c:5096 src/gtkblist.c:5193 msgid "No actions available"
msgstr "Нет доступных действий"
@@ -2410,11 +2430,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"
@@ -2427,15 +2447,15 @@
msgstr "Причина неизвестна."
msgstr "Пересоединить все"
@@ -2518,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 "Не удаётся открыть файл."
@@ -2539,329 +2559,329 @@
-#: src/gtkconv.c:1459 src/gtkconv.c:3849 src/protocols/oscar/oscar.c:589+#: 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
msgstr "Получить сообщение об отсутствии"
msgid "Unable to save icon file to disk."
msgstr "Не удаётся сохранить файл значка на диск."
msgstr "Сохранить значок"
msgstr "Сохранить значок как..."
msgid "User is typing..."
msgstr "Пользователь пишет..."
msgid "User has typed something and paused"
msgstr "Пользователь что-то написал и остановился"
#. Build the Send As menu
msgid "/Conversation/New Instant _Message..."
msgstr "/Беседа/Новое сообщение..."
msgid "/Conversation/_Find..."
msgstr "/Беседа/Найти..."
msgid "/Conversation/View _Log"
msgstr "/Беседа/Просмотреть журнал"
msgid "/Conversation/_Save As..."
msgstr "/Беседа/Сохранить как..."
msgid "/Conversation/Clear"
msgstr "/Беседа/Очистить"
msgid "/Conversation/Se_nd File..."
msgstr "/Беседа/Отправить файл..."
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/Беседа/Добавить правило..."
msgid "/Conversation/_Get Info"
msgstr "/Беседа/Получить информацию"
msgid "/Conversation/_Warn..."
msgstr "/Беседа/Сделать предупреждение..."
msgid "/Conversation/In_vite..."
msgstr "/Беседа/Пригласить..."
msgid "/Conversation/A_lias..."
msgstr "/Беседа/Псевдоним..."
msgid "/Conversation/_Block..."
msgstr "/Беседа/Блокировать..."
msgid "/Conversation/_Add..."
msgstr "/Беседа/Добавить..."
msgid "/Conversation/_Remove..."
msgstr "/Беседа/Удалить..."
msgid "/Conversation/Insert Lin_k..."
msgstr "/Беседа/Вставить ссылку..."
msgid "/Conversation/Insert Imag_e..."
msgstr "/Беседа/Вставить изображение..."
msgid "/Conversation/_Close"
msgid "/Options/Enable _Logging"
msgstr "/Параметры/Вести журнал"
msgid "/Options/Enable _Sounds"
msgstr "/Параметры/Воспроизводить звуки"
msgid "/Options/Show Formatting _Toolbar"
msgstr "/Параметры/Показывать панель инструментов форматирования"
msgid "/Options/Show T_imestamps"
msgstr "/Параметры/Показывать время сообщений"
msgid "/Conversation/View Log"
msgstr "/Беседа/Просмотреть журнал"
msgid "/Conversation/Send File..."
msgstr "/Беседа/Отправить файл..."
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/Беседа/Добавить правило..."
msgid "/Conversation/Get Info"
msgstr "/Беседа/Получить информацию"
msgid "/Conversation/Warn..."
msgstr "/Беседа/Сделать предупреждение..."
msgid "/Conversation/Invite..."
msgstr "/Беседа/Пригласить..."
msgid "/Conversation/Alias..."
msgstr "/Беседа/Псевдоним..."
msgid "/Conversation/Block..."
msgstr "/Беседа/Блокировать..."
msgid "/Conversation/Add..."
msgstr "/Беседа/Добавить..."
-msgid "/Conversation/Remove..."-msgstr "/Беседа/Удалить..."+msgid "/Conversation/Remove..." +msgstr "/Беседа/Удалить..." msgid "/Conversation/Insert Link..."
msgstr "/Беседа/Вставить ссылку..."
msgid "/Conversation/Insert Image..."
msgstr "/Беседа/Вставить изображение..."
msgid "/Options/Enable Logging"
msgstr "/Параметры/Вести журнал"
msgid "/Options/Enable Sounds"
msgstr "/Параметры/Воспроизводить звуки"
msgid "/Options/Show Formatting Toolbar"
msgstr "/Параметры/Показывать панель инструментов форматирования"
msgid "/Options/Show Timestamps"
msgstr "/Параметры/Показывать время сообщений"
#. The buttons, from left to right
msgstr "Сделать предупреждение"
msgstr "Сделать пользователю предупреждение"
-#: src/gtkconv.c:3842 src/gtkprivacy.c:623 src/gtkprivacy.c:634+#: src/gtkconv.c:3848 src/gtkprivacy.c:623 src/gtkprivacy.c:634
msgstr "Блокировать пользователя"
msgid "Send a file to the user"
msgstr "Отправить пользователю файл"
msgid "Add the user to your buddy list"
msgstr "Добавить пользователя в список контактов"
msgid "Remove the user from your buddy list"
msgstr "Удалить пользователя из списка контактов"
-#: src/gtkconv.c:3871 src/gtkconv.c:4206+#: src/gtkconv.c:3877 src/gtkconv.c:4212 msgid "Get the user's information"
msgstr "Получить информацию о пользователе"
-#: 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 msgstr "Отправить сообщение"
#. The buttons, from left to right
msgstr "Пригласить пользователя"
msgid "Add the chat to your buddy list"
msgstr "Добавить чат в список контактов"
msgid "Remove the chat from your buddy list"
msgstr "Удалить чат из списка контактов"
#. Setup the label telling how many people are in the room.
msgstr "0 пользователей в комнате"
msgstr "Отправить пользователю сообщение"
msgstr "Игнорировать пользователя"
msgid "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 пользователь в комнате"
msgstr[1] "%d пользователей в комнате"
-#: src/gtkconv.c:6079 src/gtkconv.c:6082+#: src/gtkconv.c:6085 src/gtkconv.c:6088 msgid "<main>/Conversation/Close"
msgstr "<main>/Беседа/Закрыть"
"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."
"me <действие>: Отправить действие в стиле IRC пользователю или в чат."
"debug <option>: Send various debug information to the current "
@@ -2869,7 +2889,7 @@
"debug <параметр>: Отправить различную отладочную информацию в текущую "
msgid "help <command>: Help on a specific command."
msgstr "help <команда>: Получить помощь по конкретной команде."
@@ -2897,20 +2917,21 @@
msgstr "ведущий разработчик"
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:68 src/gtkdialogs.c:69 +#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72 msgid "developer & webmaster"
msgstr "разработчик и веб-мастер"
-#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69-#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:73@@ -2939,9 +2960,8 @@
#: src/gtkdialogs.c:101 src/gtkdialogs.c:142
@@ -3024,9 +3044,8 @@
@@ -3070,7 +3089,7 @@
@@ -3109,7 +3128,7 @@
msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3120,75 +3139,75 @@
"и Gadu-Gadu одновременно. Он написан с использованием Gtk+ и "
"распространяется под лицензией GPL.<BR><BR>"
msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim на irc.freenode.net<BR><BR>"
msgid "Active Developers"
msgstr "Активные разработчики"
msgid "Crazy Patch Writers"
msgstr "Одержимые авторы заплаток"
msgid "Retired Developers"
msgstr "Разработчики, отошедшие от дел"
msgid "Current Translators"
msgstr "Текущие переводчики"
msgstr "Предыдущие переводчики"
-#: src/gtkdialogs.c:468 src/gtkdialogs.c:610 src/gtkdialogs.c:663+#: src/gtkdialogs.c:467 src/gtkdialogs.c:609 src/gtkdialogs.c:662 msgstr "Идентификатор пользователя"
-#: src/gtkdialogs.c:474 src/gtkdialogs.c:616 src/gtkdialogs.c:669+#: src/gtkdialogs.c:473 src/gtkdialogs.c:615 src/gtkdialogs.c:668
msgid "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 whose info you would like to view."
"Введите идентификатор пользователя персоны, информацию о которой вы хотели "
msgstr "Получить журнал пользователя"
"Please enter the screen name of the person whose log you would like to view."
"Введите идентификатор пользователя персоны, журнал которой вы хотели бы "
msgstr "Сделать предупреждение пользователю"
"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3201,45 +3220,45 @@
"Это увеличит уровень предупреждения %s, и пользователь будет подвержен "
"ужесточению ограничения уровня.\n"
msgid "Warn _anonymously?"
msgstr "Сделать предупреждение анонимно?"
msgid "<b>Anonymous warnings are less severe.</b>"
msgstr "<b>Анонимные предупреждения менее серьёзны.</b>"
+msgstr "Псевдоним контакта"
-msgstr "Псевдоним контакта" msgid "Enter an alias for this contact."
msgstr "Введите псевдоним для этого контакта."
-#: src/gtkdialogs.c:780 src/gtkdialogs.c:802 src/gtkdialogs.c:822+#: 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 "Введите псевдоним для %s."
msgstr "Псевдоним пользователя"
msgid "Enter an alias for this chat."
msgstr "Введите псевдоним для этого чата."
"You are about to remove the contact containing %s and %d other buddies from "
@@ -3248,7 +3267,7 @@
"Вы удалите контакт, содержащий %s и %d других пользователей из списка "
"контактов. Хотите продолжить?"
"You are about to remove the group %s and all its members from your buddy "
@@ -3256,28 +3275,28 @@
"Вы удалите группу %s и всех её членов из списка контактов. Хотите продолжить?"
-#: src/gtkdialogs.c:918 src/gtkdialogs.c:919+#: src/gtkdialogs.c:917 src/gtkdialogs.c:918
"You are about to remove %s from your buddy list. Do you want to continue?"
msgstr "Вы удалите %s из списка контактов. Хотите продолжить?"
-#: src/gtkdialogs.c:960 src/gtkdialogs.c:962+#: src/gtkdialogs.c:959 src/gtkdialogs.c:961 msgstr "Удалить пользователя"
"You are about to remove the chat %s from your buddy list. Do you want to "
msgstr "Вы удалите чат %s из списка контактов. Хотите продолжить?"
-#: src/gtkdialogs.c:999 src/gtkdialogs.c:1000+#: src/gtkdialogs.c:998 src/gtkdialogs.c:999 @@ -3413,22 +3432,22 @@
msgid "_Open Link in Browser"
msgstr "Открыть ссылку в браузере"
"Unable to guess the image type based on the file extension supplied. "
msgid "Error saving image: %s"
msgstr "Ошибка сохранения изображения: %s"
-#: src/gtkimhtml.c:2934 src/gtkimhtml.c:2946+#: src/gtkimhtml.c:2937 src/gtkimhtml.c:2949 msgstr "Сохранить изображение"
msgstr "Сохранить изображение..."
@@ -3436,23 +3455,23 @@
-#: src/gtkimhtmltoolbar.c:239+#: src/gtkimhtmltoolbar.c:240 msgid "Select Text Color"
msgstr "Выбрать цвет текста"
-#: src/gtkimhtmltoolbar.c:312+#: src/gtkimhtmltoolbar.c:314 msgid "Select Background Color"
msgstr "Выбрать цвет фона"
-#: 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."
@@ -3460,77 +3479,77 @@
"Введите URL и описание ссылки, которую вы хотите вставить. Описание "
-#: src/gtkimhtmltoolbar.c:410+#: src/gtkimhtmltoolbar.c:413 msgid "Please enter the URL of the link that you want to insert."
msgstr "Введите URL ссылки, которую вы хотите вставить."
-#: 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 "Не удалось сохранить изображение: %s\n"
-#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524+#: src/gtkimhtmltoolbar.c:517 src/gtkimhtmltoolbar.c:527 msgstr "Вставить изображение"
-#: src/gtkimhtmltoolbar.c:662+#: src/gtkimhtmltoolbar.c:665 msgid "This theme has no available smileys."
msgstr "Эта тема не имеет доступных смайликов."
-#: 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 "Больший размер шрифта"
-#: src/gtkimhtmltoolbar.c:945+#: src/gtkimhtmltoolbar.c:948 msgid "Smaller font size"
msgstr "Меньший размер шрифта "
-#: src/gtkimhtmltoolbar.c:962+#: src/gtkimhtmltoolbar.c:965 -#: src/gtkimhtmltoolbar.c:974+#: src/gtkimhtmltoolbar.c:977 msgid "Foreground font color"
-#: src/gtkimhtmltoolbar.c:986+#: src/gtkimhtmltoolbar.c:989 -#: src/gtkimhtmltoolbar.c:1001+#: src/gtkimhtmltoolbar.c:1004 -#: src/gtkimhtmltoolbar.c:1011+#: src/gtkimhtmltoolbar.c:1014 msgstr "Вставить изображение"
-#: src/gtkimhtmltoolbar.c:1022+#: src/gtkimhtmltoolbar.c:1025 msgstr "Вставить смайлик"
@@ -3778,7 +3797,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 @@ -3983,8 +4002,8 @@
msgid "New conversation _placement:"
msgstr "Расположение новой беседы:"
-#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:732-#: src/protocols/oscar/oscar.c:5017+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:733 +#: src/protocols/oscar/oscar.c:5072 @@ -4226,9 +4245,9 @@
msgid "When away and idle"
msgstr "Во время отсутствия и бездействия"
-#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1323+#: 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:4170 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
@@ -4375,7 +4394,7 @@
msgid "Block only the users below"
msgstr "Блокировать только пользователей, указанных ниже"
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1478+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1479 msgstr "Конфиденциальность"
@@ -4441,16 +4460,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
@@ -4460,7 +4479,7 @@
-#: 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
@@ -4629,7 +4648,7 @@
@@ -4665,16 +4684,16 @@
" -h, --help показать эту справку и выйти\n"
msgid "Gaim %s. Try `%s -h' for more information.\n"
msgstr "Gaim %s. Наберите `%s -h' для получения дополнительной информации.\n"
msgid "Unable to load preferences"
msgstr "Не удаётся загрузить настройки"
"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 "
@@ -4706,11 +4725,11 @@
msgstr "Сообщение об отсутствии по умолчанию"
#: 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:754 src/protocols/yahoo/yahoo.c:2925+#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2925 #: src/protocols/yahoo/yahoo.c:3041
@@ -4723,11 +4742,11 @@
msgid "Away for friends only"
msgstr "Отошёл только для друзей"
-#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:976-#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:672-#: src/protocols/oscar/oscar.c:5528 src/protocols/oscar/oscar.c:5606-#: src/protocols/oscar/oscar.c:5630 src/protocols/oscar/oscar.c:6812-#: src/protocols/oscar/oscar.c:6817 src/protocols/yahoo/yahoo.c:2578+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977 +#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:673 +#: src/protocols/oscar/oscar.c:5583 src/protocols/oscar/oscar.c:5661 +#: src/protocols/oscar/oscar.c:5685 src/protocols/oscar/oscar.c:6867 +#: src/protocols/oscar/oscar.c:6872 src/protocols/yahoo/yahoo.c:2578 #: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:3053
@@ -4748,9 +4767,9 @@
msgid "Unable to connect to server."
msgstr "Не удаётся соединиться с сервером."
-#: 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/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 "Неверный отклик от сервера."
@@ -4771,7 +4790,7 @@
msgid "Unknown Error Code."
msgstr "Неизвестный код ошибки."
-#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:3971+#: 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>Статус:</B> %s<HR>%s"
@@ -4779,8 +4798,8 @@
#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1012
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3975-#: src/protocols/oscar/oscar.c:4199 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:1130
msgid "Buddy Information"
@@ -4867,25 +4886,25 @@
-#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5009+#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5064 -#: src/protocols/gg/gg.c:958 src/protocols/jabber/jabber.c:621-#: src/protocols/oscar/oscar.c:5020 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:626-#: src/protocols/oscar/oscar.c:5021 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:5010+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5065 #: src/protocols/silc/ops.c:1204
@@ -4900,8 +4919,8 @@
-#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:636-#: src/protocols/oscar/oscar.c:5064 src/protocols/oscar/oscar.c:5072+#: 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
@@ -5006,7 +5025,7 @@
msgstr "Поиск в каталоге"
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1074+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1075 #: src/protocols/toc/toc.c:1564
@@ -5059,14 +5078,14 @@
msgstr "Пользователь %s (%s%s%s%s%s) хочет, чтобы вы авторизовали его."
#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:248
-#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3710-#: src/protocols/oscar/oscar.c:6260+#: 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:3712-#: src/protocols/oscar/oscar.c:6261+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3767 +#: src/protocols/oscar/oscar.c:6316 @@ -5091,13 +5110,13 @@
msgid "Unknown command: %s"
msgstr "Неизвестная команда: %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 "текущая тема: %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
msgstr "Тема не установлена"
@@ -5106,7 +5125,7 @@
#: src/protocols/yahoo/yahoo_filexfer.c:182
#: src/protocols/yahoo/yahoo_filexfer.c:191
msgid "File Transfer Aborted"
-msgstr "Передача файла прервана"+msgstr "Передача файлов прервана" #: src/protocols/irc/dcc_send.c:273
msgid "Gaim could not open a listening port."
@@ -5129,7 +5148,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 "Сервер разорвал соединение"
@@ -5149,31 +5168,35 @@
msgid "IRC nicks may not contain whitespace"
msgstr "Псевдонимы IRC не могут содержать пробелы"
-#: src/protocols/irc/irc.c:236 src/protocols/toc/toc.c:198-msgstr "Подключение: %s"-#: 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 "Не удалось создать сокет"
-#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:301-#: src/protocols/oscar/oscar.c:1671 src/protocols/oscar/oscar.c:1735+#: 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 "Не удалось соединиться с узлом"
-#: 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 @@ -5185,39 +5208,39 @@
-#: src/protocols/irc/irc.c:663+#: src/protocols/irc/irc.c:662 msgid "IRC Protocol Plugin"
msgstr "Модуль протокола IRC"
-#: src/protocols/irc/irc.c:664+#: src/protocols/irc/irc.c:663 msgid "The IRC Protocol Plugin that Sucks Less"
msgstr "Наименее плохой модуль протокола IRC"
-#: src/protocols/irc/irc.c:683 src/protocols/irc/msgs.c:201-#: src/protocols/jabber/jabber.c:1591 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:1612-#: src/protocols/msn/msn.c:1930 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:596 src/protocols/silc/buddy.c:1454+#: 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
msgstr "Имя пользователя"
-#: src/protocols/irc/irc.c:695+#: src/protocols/irc/irc.c:694 @@ -5250,7 +5273,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:1323 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>"
@@ -5282,111 +5305,111 @@
msgid "Buddy Information for %s"
msgstr "Информация о пользователе %s"
-#: src/protocols/irc/msgs.c:286+#: src/protocols/irc/msgs.c:287 msgid "%s has changed the topic to: %s"
msgstr "%s сменил тему на: %s"
-#: src/protocols/irc/msgs.c:291+#: src/protocols/irc/msgs.c:292 msgid "The topic for %s is: %s"
-#: src/protocols/irc/msgs.c:308+#: src/protocols/irc/msgs.c:309 msgid "Unknown message '%s'"
msgstr "Неизвестное сообщение '%s'"
-#: src/protocols/irc/msgs.c:309+#: src/protocols/irc/msgs.c:310 msgstr "Неизвестное сообщение"
-#: 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 отправил сообщение, которое не понял сервер IRC."
-#: src/protocols/irc/msgs.c:332+#: src/protocols/irc/msgs.c:333 msgstr "Пользователи на %s: %s"
-#: src/protocols/irc/msgs.c:426+#: src/protocols/irc/msgs.c:427 msgstr "Нет такого канала"
-#: src/protocols/irc/msgs.c:437+#: src/protocols/irc/msgs.c:438 msgstr "нет такого канала"
-#: src/protocols/irc/msgs.c:440+#: src/protocols/irc/msgs.c:441 msgid "User is not logged in"
msgstr "Пользователь не в сети"
-#: src/protocols/irc/msgs.c:445+#: src/protocols/irc/msgs.c:446 msgid "No such nick or channel"
msgstr "Нет такого псевдонима или канала"
-#: src/protocols/irc/msgs.c:465+#: src/protocols/irc/msgs.c:466 msgstr "Не удалось отправить"
-#: src/protocols/irc/msgs.c:521+#: src/protocols/irc/msgs.c:522 msgid "Joining %s requires an invitation."
msgstr "Присоединение к %s требует приглашения."
-#: src/protocols/irc/msgs.c:522+#: src/protocols/irc/msgs.c:523 msgstr "Только по приглашению"
-#: src/protocols/irc/msgs.c:625+#: src/protocols/irc/msgs.c:626 msgid "You have been kicked by %s: (%s)"
msgstr "Вы были удалены оператором %s: (%s)"
-#: src/protocols/irc/msgs.c:630+#: src/protocols/irc/msgs.c:631 msgid "Kicked by %s (%s)"
msgstr "Удалён оператором %s (%s)"
-#: src/protocols/irc/msgs.c:651+#: src/protocols/irc/msgs.c:652 msgid "mode (%s %s) by %s"
msgstr "режим (%s %s) установлен %s"
-#: src/protocols/irc/msgs.c:760+#: src/protocols/irc/msgs.c:762 msgid "Could not change nick"
msgstr "Не удалось изменить псевдоним"
-#: src/protocols/irc/msgs.c:761+#: src/protocols/irc/msgs.c:763 msgid "Cannot change nick"
msgstr "Не удаётся изменить псевдоним"
-#: src/protocols/irc/msgs.c:782+#: src/protocols/irc/msgs.c:784 msgid "You have parted the channel%s%s"
msgstr "Вы покинули канал%s%s"
-#: src/protocols/irc/msgs.c:822+#: src/protocols/irc/msgs.c:824 msgid "Error: invalid PONG from server"
msgstr "Ошибка: неверный PONG с сервера"
-#: src/protocols/irc/msgs.c:824+#: src/protocols/irc/msgs.c:826 msgid "PING reply -- Lag: %lu seconds"
msgstr "Ответ PING -- задержка: %lu секунд"
-#: src/protocols/irc/msgs.c:899+#: src/protocols/irc/msgs.c:901 msgstr "Не удаётся присоединиться к %s:"
-#: 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 "Не удаётся присоединиться к каналу"
-#: src/protocols/irc/msgs.c:936+#: src/protocols/irc/msgs.c:938 @@ -5481,7 +5504,7 @@
"names [канал]: Вывести список пользователей, присутствующих сейчас на "
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1422+#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1423 msgid "nick <new nickname>: Change your nickname."
msgstr "nick <новый псевдоним>: Изменить свой псевдоним."
@@ -5565,40 +5588,48 @@
msgid "whois <nick>: Get information on a user."
msgstr "whois <псевдоним>: Получить информацию о пользователе."
-#: src/protocols/irc/parse.c:414+#: src/protocols/irc/parse.c:417 msgid "Reply time from %s: %lu seconds"
msgstr "Время ответа от %s: %lu секунд"
-#: 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:1568 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
msgstr "Соединение разорвано."
-#: src/protocols/jabber/auth.c:51-msgid "Server requires SSL for login"-msgstr "Сервер требует SSL для входа"-#: src/protocols/jabber/auth.c:111+#: src/protocols/jabber/auth.c:52 +"Server requires TLS/SSL for login. Select \"Use TLS if available\" in " +"Сервер требует TLS/SSL для входа. Выберите \"Использовать TLS, если доступно" +"\" в свойствах учётной записи" +#: src/protocols/jabber/auth.c:54 +msgid "Server requires TLS/SSL for login. No TLS/SSL support found." +msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена." +#: src/protocols/jabber/auth.c:115 msgid "Server requires plaintext authentication over an unencrypted stream"
msgstr "Сервер требует идентификацию простым текстом через нешифрованный поток"
-#: 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 "Идентификация простым текстом"
-#: 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?"
@@ -5606,11 +5637,11 @@
"Этот сервер требует идентификацию простым текстом через нешифрованное "
"соединение. Позволить это и продолжить идентификацию?"
-#: 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 "Сервер не использует ни одного поддерживаемого метода идентификации"
-#: src/protocols/jabber/auth.c:386+#: src/protocols/jabber/auth.c:390 msgid "Invalid challenge from server"
msgstr "Неверный запрос с сервера"
@@ -5629,14 +5660,14 @@
#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1313+#: 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:656+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:657 @@ -5657,7 +5688,7 @@
#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:646+#: src/protocols/jabber/jabber.c:647 @@ -5696,7 +5727,7 @@
#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5045+#: src/protocols/oscar/oscar.c:5100 @@ -5716,15 +5747,15 @@
#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:950-#: src/protocols/msn/msn.c:490 src/protocols/novell/novell.c:2819-#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:714-#: src/protocols/oscar/oscar.c:720 src/protocols/oscar/oscar.c:722+#: 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:1594+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1595 @@ -5732,8 +5763,8 @@
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:631-#: src/protocols/oscar/oscar.c:5063 src/protocols/oscar/oscar.c:5071+#: 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
@@ -5778,7 +5809,7 @@
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6331+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6386 #: src/protocols/yahoo/yahoochat.c:1003
@@ -5818,51 +5849,51 @@
msgid "Invalid Room Handle"
msgstr "Неверное имя комнаты"
-#: src/protocols/jabber/chat.c:377+#: src/protocols/jabber/chat.c:379 msgid "Configuration error"
msgstr "Ошибка настройки"
-#: 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 "Не удаётся настроить"
-#: src/protocols/jabber/chat.c:402+#: src/protocols/jabber/chat.c:404 msgid "Room Configuration Error"
msgstr "Ошибка настройки комнаты"
-#: src/protocols/jabber/chat.c:403+#: src/protocols/jabber/chat.c:405 msgid "This room is not capable of being configured"
msgstr "Эта комната не имеет возможности настройки"
-#: 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 "Ошибка регистрации"
-#: src/protocols/jabber/chat.c:605+#: src/protocols/jabber/chat.c:607 msgid "Nick changing not supported in non-MUC chatrooms"
msgstr "Изменение псевдонима не поддерживается в чатах не-MUC"
-#: src/protocols/jabber/chat.c:649 src/protocols/jabber/chat.c:660+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662 msgstr "Ошибка списка комнат"
-#: 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 "Ошибка загрузки списка комнат"
-#: 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 "Войти на сервер конференций"
-#: src/protocols/jabber/chat.c:748+#: src/protocols/jabber/chat.c:750 msgid "Select a conference server to query"
msgstr "Выберите сервер конференций для опроса"
-#: src/protocols/jabber/chat.c:751+#: src/protocols/jabber/chat.c:753 @@ -5870,446 +5901,438 @@
msgid "Error initializing session"
msgstr "Ошибка инициализации сессии"
-#: src/protocols/jabber/jabber.c:210 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:248 src/protocols/jabber/jabber.c:268+#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269 -#: src/protocols/jabber/jabber.c:328+#: src/protocols/jabber/jabber.c:329 msgid "Connection Failed"
msgstr "Не удалось установить соединение"
-#: src/protocols/jabber/jabber.c:331+#: src/protocols/jabber/jabber.c:332 msgid "SSL Handshake Failed"
msgstr "Не удалось выполнить согласование SSL"
-#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708+#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709 msgid "Invalid Jabber ID"
msgstr "Неверный Jabber ID"
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:739 msgid "SSL support unavailable"
msgstr "Поддержка SSL недоступна"
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748+#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749 #: src/protocols/trepia/trepia.c:1071
msgid "Unable to create socket"
msgstr "Не удаётся создать сокет"
-#: src/protocols/jabber/jabber.c:441+#: src/protocols/jabber/jabber.c:442 msgid "Registration of %s@%s successful"
msgstr "Регистрация %s@%s завершена успешно"
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445 msgid "Registration Successful"
msgstr "Регистрация завершена успешно"
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1193+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1194 msgstr "Неизвестная ошибка"
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454 msgid "Registration Failed"
msgstr "Регистрация завершилась неудачно"
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565+#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566 msgid "Already Registered"
msgstr "Уже зарегистрировано"
-#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1048+#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1049 -#: src/protocols/jabber/jabber.c:611+#: src/protocols/jabber/jabber.c:612 -#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5065-#: src/protocols/oscar/oscar.c:5073 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:651 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:661+#: src/protocols/jabber/jabber.c:662 -#: src/protocols/jabber/jabber.c:669+#: src/protocols/jabber/jabber.c:670 msgid "Please fill out the information below to register your new account."
msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
-#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673+#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674 msgid "Register New Jabber Account"
msgstr "Зарегистрировать новую учётную запись Jabber"
-#: src/protocols/jabber/jabber.c:756+#: src/protocols/jabber/jabber.c:757 -#. connect to the server-#: src/protocols/jabber/jabber.c:795 src/protocols/msn/msn.c:654-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2152-#: src/protocols/oscar/oscar.c:1739 src/protocols/trepia/trepia.c:1065-#: src/protocols/yahoo/yahoo.c:2439 src/protocols/zephyr/zephyr.c:1452-#: src/protocols/jabber/jabber.c:799+#: src/protocols/jabber/jabber.c:800 msgid "Initializing Stream"
msgstr "Инициализация потока"
-#: src/protocols/jabber/jabber.c:805+#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:340 -#: src/protocols/jabber/jabber.c:814+#: src/protocols/jabber/jabber.c:815 msgid "Re-initializing Stream"
msgstr "Повторная инициализация потока"
-#: src/protocols/jabber/jabber.c:894 src/protocols/jabber/jabber.c:1171-#: src/protocols/jabber/jabber.c:1212 src/protocols/jabber/jabber.c:1245-#: src/protocols/oscar/oscar.c:720 src/protocols/oscar/oscar.c:6615+#: 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:925+#: src/protocols/jabber/jabber.c:926 -#: src/protocols/jabber/jabber.c:927+#: src/protocols/jabber/jabber.c:928 msgid "From (To pending)"
-#: src/protocols/jabber/jabber.c:929+#: src/protocols/jabber/jabber.c:930 -#: src/protocols/jabber/jabber.c:932+#: src/protocols/jabber/jabber.c:933 -#: src/protocols/jabber/jabber.c:934+#: src/protocols/jabber/jabber.c:935 msgid "None (To pending)"
-#: src/protocols/jabber/jabber.c:938+#: src/protocols/jabber/jabber.c:939 -#: src/protocols/jabber/jabber.c:958+#: src/protocols/jabber/jabber.c:959 -#: src/protocols/jabber/jabber.c:971 src/protocols/jabber/jutil.c:35+#: src/protocols/jabber/jabber.c:972 src/protocols/jabber/jutil.c:35 #: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
msgstr "Готов пообщаться"
-#: src/protocols/jabber/jabber.c:973 src/protocols/jabber/jutil.c:38+#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jutil.c:38 #: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
msgstr "Расширенный \"Отошёл\""
-#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jutil.c:41+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41 #: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
-#: src/protocols/oscar/oscar.c:662 src/protocols/oscar/oscar.c:5618-#: src/protocols/oscar/oscar.c:6808+#: src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:5673 +#: src/protocols/oscar/oscar.c:6863 -#: src/protocols/jabber/jabber.c:991-msgid "Password Changed" #: src/protocols/jabber/jabber.c:992
+msgid "Password Changed" +#: src/protocols/jabber/jabber.c:993 msgid "Your password has been changed."
msgstr "Пароль был изменён."
-#: src/protocols/jabber/jabber.c:996 src/protocols/jabber/jabber.c:997+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jabber.c:998 msgid "Error changing password"
msgstr "Ошибка изменения пароля"
-#: src/protocols/jabber/jabber.c:1053+#: src/protocols/jabber/jabber.c:1054 msgstr "Пароль (ещё раз)"
-#: src/protocols/jabber/jabber.c:1058 src/protocols/jabber/jabber.c:1059+#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/jabber.c:1060 msgid "Change Jabber Password"
msgstr "Изменить пароль Jabber"
-#: src/protocols/jabber/jabber.c:1059+#: src/protocols/jabber/jabber.c:1060 msgid "Please enter your new password"
msgstr "Введите новый пароль"
-#: src/protocols/jabber/jabber.c:1069 src/protocols/toc/toc.c:1554+#: src/protocols/jabber/jabber.c:1070 src/protocols/toc/toc.c:1554 msgstr "Установить информацию о пользователе"
-#: src/protocols/jabber/jabber.c:1151+#: src/protocols/jabber/jabber.c:1152 -#: src/protocols/jabber/jabber.c:1153+#: src/protocols/jabber/jabber.c:1154 -#: src/protocols/jabber/jabber.c:1155+#: src/protocols/jabber/jabber.c:1156 msgid "Feature Not Implemented"
msgstr "Функция не реализована"
-#: src/protocols/jabber/jabber.c:1157+#: src/protocols/jabber/jabber.c:1158 -#: src/protocols/jabber/jabber.c:1159+#: src/protocols/jabber/jabber.c:1160 -#: src/protocols/jabber/jabber.c:1161 src/protocols/jabber/jabber.c:1235+#: src/protocols/jabber/jabber.c:1162 src/protocols/jabber/jabber.c:1236 msgid "Internal Server Error"
msgstr "Внутренняя ошибка сервера"
-#: src/protocols/jabber/jabber.c:1163+#: src/protocols/jabber/jabber.c:1164 msgstr "Элемент не найден"
-#: src/protocols/jabber/jabber.c:1165+#: src/protocols/jabber/jabber.c:1166 msgid "Malformed Jabber ID"
msgstr "Неверный Jabber ID"
-#: src/protocols/jabber/jabber.c:1167+#: src/protocols/jabber/jabber.c:1168 -#: src/protocols/jabber/jabber.c:1169+#: src/protocols/jabber/jabber.c:1170 -#: src/protocols/jabber/jabber.c:1173+#: src/protocols/jabber/jabber.c:1174 -#: src/protocols/jabber/jabber.c:1175+#: src/protocols/jabber/jabber.c:1176 msgid "Recipient Unavailable"
msgstr "Получатель недоступен"
-#: src/protocols/jabber/jabber.c:1179+#: src/protocols/jabber/jabber.c:1180 msgid "Registration Required"
msgstr "Требуется регистрация"
-#: src/protocols/jabber/jabber.c:1181+#: src/protocols/jabber/jabber.c:1182 msgid "Remote Server Not Found"
msgstr "Удалённый сервер не найден"
-#: src/protocols/jabber/jabber.c:1183+#: src/protocols/jabber/jabber.c:1184 msgid "Remote Server Timeout"
msgstr "Истекло время ожидания удалённого сервера"
-#: src/protocols/jabber/jabber.c:1185+#: src/protocols/jabber/jabber.c:1186 msgid "Server Overloaded"
msgstr "Сервер перегружен"
-#: src/protocols/jabber/jabber.c:1187+#: src/protocols/jabber/jabber.c:1188 msgid "Service Unavailable"
msgstr "Служба недоступна"
-#: src/protocols/jabber/jabber.c:1189+#: src/protocols/jabber/jabber.c:1190 msgid "Subscription Required"
msgstr "Требуется подписка"
-#: src/protocols/jabber/jabber.c:1191+#: src/protocols/jabber/jabber.c:1192 msgid "Unexpected Request"
msgstr "Непредвиденный запрос"
-#: src/protocols/jabber/jabber.c:1198+#: src/protocols/jabber/jabber.c:1199 msgid "Authorization Aborted"
msgstr "Авторизация прервана"
-#: src/protocols/jabber/jabber.c:1200+#: src/protocols/jabber/jabber.c:1201 msgid "Incorrect encoding in authorization"
msgstr "Некорректная кодировка в авторизации"
-#: src/protocols/jabber/jabber.c:1203+#: src/protocols/jabber/jabber.c:1204 msgstr "Неверный идентификатор авторизации"
-#: src/protocols/jabber/jabber.c:1206+#: src/protocols/jabber/jabber.c:1207 msgid "Invalid Authorization Mechanism"
msgstr "Неверный механизм авторизации"
-#: src/protocols/jabber/jabber.c:1209+#: src/protocols/jabber/jabber.c:1210 msgid "Authorization mechanism too weak"
msgstr "Механизм авторизации слишком слаб"
-#: src/protocols/jabber/jabber.c:1214+#: src/protocols/jabber/jabber.c:1215 msgid "Temporary Authentication Failure"
msgstr "Временная ошибка идентификации"
-#: src/protocols/jabber/jabber.c:1216+#: src/protocols/jabber/jabber.c:1217 msgid "Authentication Failure"
msgstr "Ошибка идентификации"
-#: src/protocols/jabber/jabber.c:1220+#: src/protocols/jabber/jabber.c:1221 -#: src/protocols/jabber/jabber.c:1222+#: src/protocols/jabber/jabber.c:1223 msgid "Bad Namespace Prefix"
msgstr "Неверный префикс пространства имён"
-#: src/protocols/jabber/jabber.c:1225+#: src/protocols/jabber/jabber.c:1226 msgid "Resource Conflict"
msgstr "Конфликт ресурсов"
-#: src/protocols/jabber/jabber.c:1227 src/protocols/silc/ops.c:1511+#: src/protocols/jabber/jabber.c:1228 src/protocols/silc/ops.c:1511 msgid "Connection Timeout"
msgstr "Истекло время ожидания соединения"
-#: src/protocols/jabber/jabber.c:1229+#: src/protocols/jabber/jabber.c:1230 -#: src/protocols/jabber/jabber.c:1231+#: src/protocols/jabber/jabber.c:1232 -#: src/protocols/jabber/jabber.c:1233+#: src/protocols/jabber/jabber.c:1234 msgid "Improper Addressing"
msgstr "Неправильная адресация"
-#: src/protocols/jabber/jabber.c:1237+#: src/protocols/jabber/jabber.c:1238 -#: src/protocols/jabber/jabber.c:1239+#: src/protocols/jabber/jabber.c:1240 msgid "Invalid Namespace"
msgstr "Неверное пространство имён"
-#: src/protocols/jabber/jabber.c:1241+#: src/protocols/jabber/jabber.c:1242 -#: src/protocols/jabber/jabber.c:1243+#: src/protocols/jabber/jabber.c:1244 msgid "Non-matching Hosts"
msgstr "Несочетаемые узлы"
-#: src/protocols/jabber/jabber.c:1247+#: src/protocols/jabber/jabber.c:1248 msgstr "Нарушение правил"
-#: src/protocols/jabber/jabber.c:1249+#: src/protocols/jabber/jabber.c:1250 msgid "Remote Connection Failed"
msgstr "Не удалось установить удалённое соединение"
-#: src/protocols/jabber/jabber.c:1251+#: src/protocols/jabber/jabber.c:1252 msgid "Resource Constraint"
msgstr "Недостаток ресурсов"
-#: src/protocols/jabber/jabber.c:1253+#: src/protocols/jabber/jabber.c:1254 msgstr "Ограниченный XML"
-#: src/protocols/jabber/jabber.c:1255+#: src/protocols/jabber/jabber.c:1256 msgstr "Обратитесь к другому узлу"
-#: src/protocols/jabber/jabber.c:1257+#: src/protocols/jabber/jabber.c:1258 msgstr "Выключение системы"
-#: src/protocols/jabber/jabber.c:1259+#: src/protocols/jabber/jabber.c:1260 msgid "Undefined Condition"
msgstr "Неопределённое состояние"
-#: src/protocols/jabber/jabber.c:1261+#: src/protocols/jabber/jabber.c:1262 msgid "Unsupported Encoding"
msgstr "Неподдерживаемая кодировка"
-#: src/protocols/jabber/jabber.c:1263+#: src/protocols/jabber/jabber.c:1264 msgid "Unsupported Stanza Type"
msgstr "Неподдерживаемый тип строфы"
-#: src/protocols/jabber/jabber.c:1265+#: src/protocols/jabber/jabber.c:1266 msgid "Unsupported Version"
msgstr "Неподдерживаемая версия"
-#: src/protocols/jabber/jabber.c:1267+#: src/protocols/jabber/jabber.c:1268 msgid "XML Not Well Formed"
msgstr "XML не сформирован должным образом"
-#: src/protocols/jabber/jabber.c:1269+#: src/protocols/jabber/jabber.c:1270 -#: src/protocols/jabber/jabber.c:1336+#: src/protocols/jabber/jabber.c:1337 msgid "Unable to ban user %s"
msgstr "Не удаётся выгнать пользователя %s"
-#: src/protocols/jabber/jabber.c:1388+#: src/protocols/jabber/jabber.c:1389 msgid "Unable to kick user %s"
msgstr "Не удаётся удалить пользователя %s"
-#: src/protocols/jabber/jabber.c:1414+#: src/protocols/jabber/jabber.c:1415 msgid "config: Configure a chat room."
msgstr "config: Настроить комнату."
-#: src/protocols/jabber/jabber.c:1418+#: src/protocols/jabber/jabber.c:1419 msgid "configure: Configure a chat room."
msgstr "configure: Настроить комнату."
-#: src/protocols/jabber/jabber.c:1427+#: src/protocols/jabber/jabber.c:1428 msgid "part [room]: Leave the room."
msgstr "part [комната]: Покинуть комнату."
-#: src/protocols/jabber/jabber.c:1432+#: src/protocols/jabber/jabber.c:1433 msgid "register: Register with a chat room."
msgstr "register: Зарегистрировать комнату."
-#: src/protocols/jabber/jabber.c:1438+#: src/protocols/jabber/jabber.c:1439 msgid "topic [new topic]: View or change the topic."
msgstr "topic [новая тема]: Просмотреть или изменить тему."
-#: src/protocols/jabber/jabber.c:1444+#: src/protocols/jabber/jabber.c:1445 msgid "ban <user> [room]: Ban a user from the room."
msgstr "ban <пользователь> [комната]: Выгнать пользователя из комнаты."
-#: src/protocols/jabber/jabber.c:1450+#: src/protocols/jabber/jabber.c:1451 msgid "invite <user> [room]: Invite a user to the room."
"invite <пользователь> [комната]: Пригласить пользователя в комнату."
-#: src/protocols/jabber/jabber.c:1456+#: src/protocols/jabber/jabber.c:1457 msgid "join: <room> [server]: Join a chat on this server."
"join: <комната> [сервер]: Присоединиться к чату на этом сервере."
-#: src/protocols/jabber/jabber.c:1462+#: src/protocols/jabber/jabber.c:1463 msgid "kick <user> [room]: Kick a user from the room."
msgstr "kick <пользователь> [комната]: Удалить пользователя из комнаты."
-#: src/protocols/jabber/jabber.c:1467+#: src/protocols/jabber/jabber.c:1468 "msg <user> <message>: Send a private message to another user."
"msg <пользователь> <сообщение>: Отправить пользователю личное "
-#: src/protocols/jabber/jabber.c:1482+#: src/protocols/jabber/jabber.c:1483 msgid "Hide Operating System"
msgstr "Скрывать операционную систему"
@@ -6323,24 +6346,24 @@
-#: src/protocols/jabber/jabber.c:1569 src/protocols/jabber/jabber.c:1571+#: src/protocols/jabber/jabber.c:1570 src/protocols/jabber/jabber.c:1572 msgid "Jabber Protocol Plugin"
msgstr "Модуль протокола Jabber"
-#: src/protocols/jabber/jabber.c:1597+#: src/protocols/jabber/jabber.c:1598 msgid "Use TLS if available"
msgstr "Использовать TLS, если доступно"
-#: src/protocols/jabber/jabber.c:1602+#: src/protocols/jabber/jabber.c:1603 msgstr "Принудительно использовать старый SSL"
-#: src/protocols/jabber/jabber.c:1607+#: src/protocols/jabber/jabber.c:1608 msgid "Allow plaintext auth over unencrypted streams"
msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
-#: src/protocols/jabber/jabber.c:1616 src/protocols/silc/silc.c:1589+#: src/protocols/jabber/jabber.c:1617 src/protocols/silc/silc.c:1589 msgstr "Соединиться с сервером"
@@ -6427,18 +6450,6 @@
msgstr "Не удалось отправить файл"
-#: src/protocols/msn/cmdproc.c:358-msgid "Miscellaneous error"-msgstr "Неопределённая ошибка"-#: src/protocols/msn/cmdproc.c:361-msgid "You have signed on from another location."-msgstr "Вы подключены из другого места."-#: src/protocols/msn/cmdproc.c:363-msgid "The MSN servers are going down temporarily."-msgstr "Серверы MSN временно выключаются." #: src/protocols/msn/dialog.c:91
msgid "Buddy list synchronization issue in %s (%s)"
@@ -6651,7 +6662,7 @@
msgstr "Сервер слишком занят"
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2170+#: 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 "Идентификация завершилась неудачно"
@@ -6686,58 +6697,58 @@
msgstr "Ошибка MSN: %s\n"
-#: src/protocols/msn/msn.c:116+#: src/protocols/msn/msn.c:114 msgid "Your new MSN friendly name is too long."
msgstr "Ваше новое дружеское имя MSN слишком велико."
-#: src/protocols/msn/msn.c:224+#: src/protocols/msn/msn.c:222 msgid "Set your friendly name."
msgstr "Введите ваше дружеское имя."
-#: 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 "Это имя, под которым вас будут видеть другие пользователи MSN."
-#: src/protocols/msn/msn.c:241+#: src/protocols/msn/msn.c:239 msgid "Set your home phone number."
msgstr "Введите номер вашего домашнего телефона."
-#: src/protocols/msn/msn.c:256+#: src/protocols/msn/msn.c:254 msgid "Set your work phone number."
msgstr "Введите номер вашего рабочего телефона."
-#: src/protocols/msn/msn.c:271+#: src/protocols/msn/msn.c:269 msgid "Set your mobile phone number."
msgstr "Введите номер вашего мобильного телефона."
-#: src/protocols/msn/msn.c:284+#: src/protocols/msn/msn.c:282 msgid "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?"
-#: 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 "Отправить мобильное сообщение." #: src/protocols/msn/msn.c:313
-msgid "Send a mobile message."-msgstr "Отправить мобильное сообщение."-#: 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 @@ -6746,26 +6757,26 @@
-#: 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:825+#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:795 #: src/protocols/msn/state.c:34
msgid "Away From Computer"
msgstr "Отошёл от компьютера"
-#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:827+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:797 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2560
#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3043
-#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:829+#: 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:1392 src/protocols/silc/silc.c:48
@@ -6774,56 +6785,56 @@
-#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:831+#: 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
msgstr "Разговариваю по телефону"
-#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:833+#: 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
msgstr "Пошёл перекусить"
-#: src/protocols/msn/msn.c:520 src/protocols/msn/msn.c:835+#: 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 "Ввести дружеское имя"
-#: src/protocols/msn/msn.c:536+#: src/protocols/msn/msn.c:534 msgid "Set Home Phone Number"
msgstr "Ввести номер домашнего телефона"
-#: src/protocols/msn/msn.c:540+#: src/protocols/msn/msn.c:538 msgid "Set Work Phone Number"
msgstr "Ввести номер рабочего телефона"
-#: src/protocols/msn/msn.c:544+#: src/protocols/msn/msn.c:542 msgid "Set Mobile Phone Number"
msgstr "Ввести номер мобильного телефона"
-#: src/protocols/msn/msn.c:550+#: src/protocols/msn/msn.c:548 msgid "Enable/Disable Mobile Devices"
msgstr "Разрешить/запретить мобильные устройства"
-#: src/protocols/msn/msn.c:555+#: src/protocols/msn/msn.c:553 msgid "Allow/Disallow Mobile Pages"
msgstr "Разрешить/запретить мобильные страницы"
-#: src/protocols/msn/msn.c:578+#: src/protocols/msn/msn.c:576 -#: src/protocols/msn/msn.c:588+#: src/protocols/msn/msn.c:585 src/protocols/novell/novell.c:3369 -#: src/protocols/msn/msn.c:624+#: 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."
@@ -6831,112 +6842,112 @@
"Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL. "
"За дополнительной информацией обращайтесь на http://gaim.sf.net/faq-ssl.php."
-#: src/protocols/msn/msn.c:1305 src/protocols/yahoo/yahoo_profile.c:659+#: 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>Псевдоним:</b> %s<br>"
#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1313 src/protocols/msn/msn.c:1671+#: 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:1401+#: src/protocols/msn/msn.c:1364 -#: src/protocols/msn/msn.c:1406 src/protocols/msn/msn.c:1658+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1621 #: src/protocols/yahoo/yahoo_profile.c:761
msgid "Error retrieving profile"
msgstr "Ошибка загрузки профиля"
-#: src/protocols/msn/msn.c:1477 src/protocols/oscar/oscar.c:5050+#: 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:1484 src/protocols/oscar/oscar.c:5036+#: 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:1493 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:1500 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:1508 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:1525 src/protocols/msn/msn.c:1531-#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1546-#: src/protocols/msn/msn.c:1553+#: 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"
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1568-#: src/protocols/msn/msn.c:1575 src/protocols/msn/msn.c:1582+#: src/protocols/msn/msn.c:1525 src/protocols/msn/msn.c:1531 +#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1545 -#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1597-#: src/protocols/msn/msn.c:1604+#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1560 +#: src/protocols/msn/msn.c:1567 msgid "Hobbies and Interests"
msgstr "Хобби и интересы"
-#: src/protocols/msn/msn.c:1613 src/protocols/msn/msn.c:1619+#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582 #: src/protocols/yahoo/yahoo_profile.c:1072
-#: src/protocols/msn/msn.c:1627 src/protocols/yahoo/yahoo_profile.c:1123+#: src/protocols/msn/msn.c:1590 src/protocols/yahoo/yahoo_profile.c:1123 msgstr "Последнее обновление"
-#: src/protocols/msn/msn.c:1638 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
msgstr "Домашняя страница"
-#: src/protocols/msn/msn.c:1660+#: src/protocols/msn/msn.c:1623 msgid "The user has not created a public profile."
-#: src/protocols/msn/msn.c:1661+#: 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 "
-#: src/protocols/msn/msn.c:1665+#: src/protocols/msn/msn.c:1628 "Gaim could not find any information in the user's profile. The user most "
-#: src/protocols/msn/msn.c:1671 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:1812+#: src/protocols/msn/msn.c:1775 msgid "Display conversation closed notices"
msgstr "Выводить уведомления о закрытии беседы"
-#: src/protocols/msn/msn.c:1817+#: src/protocols/msn/msn.c:1780 msgid "Display timeout notices"
msgstr "Выводить уведомления об истечении времени ожидания"
@@ -6950,48 +6961,72 @@
-#: src/protocols/msn/msn.c:1904 src/protocols/msn/msn.c:1906+#: src/protocols/msn/msn.c:1867 src/protocols/msn/msn.c:1869 msgid "MSN Protocol Plugin"
msgstr "Модуль протокола MSN"
-#: src/protocols/msn/msn.c:1925 src/protocols/trepia/trepia.c:1296+#: src/protocols/msn/msn.c:1888 src/protocols/trepia/trepia.c:1296 msgstr "Сервер входа в сеть:"
-#: src/protocols/msn/msn.c:1934+#: src/protocols/msn/msn.c:1897 msgstr "Использовать метод HTTP"
-#: src/protocols/msn/nexus.c:79-msgid "Unable to connect to server"-msgstr "Не удаётся соединиться с сервером"-#: src/protocols/msn/nexus.c:218-msgid "Unknown error when attempting to authorize with MSN login server."-"Неизвестная ошибка при попытке авторизации с сервером входа в сеть MSN."-#: src/protocols/msn/notification.c:85-msgid "Requesting to send password"-msgstr "Запрос на отправку пароля"-#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636-msgid "Retrieving buddy list"-msgstr "Загрузка списка контактов"-#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174-#: src/protocols/oscar/oscar.c:2460-msgstr "Пароль отправлен"-#: src/protocols/msn/notification.c:720-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "-#: src/protocols/msn/notification.c:1116+#: src/protocols/msn/nexus.c:111 src/protocols/msn/servconn.c:127 +#: src/protocols/yahoo/yahoochat.c:1357 +msgid "Unable to connect" +msgstr "Не удаётся установить соединение" +#: src/protocols/msn/notification.c:178 +msgid "%s is not a valid group." +msgstr "%s не является допустимой группой." +#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:495 +#: src/protocols/msn/session.c:320 +msgstr "Неизвестная ошибка." +#: src/protocols/msn/notification.c:187 +#: src/protocols/msn/notification.c:465 +msgid "Unable to add user on %s (%s)" +msgstr "Не удаётся добавить пользователя на %s (%s)" +#: src/protocols/msn/notification.c:469 +msgid "Unable to block user on %s (%s)" +msgstr "Не удаётся заблокировать пользователя на %s (%s)" +#: src/protocols/msn/notification.c:473 +msgid "Unable to permit user on %s (%s)" +msgstr "Не удаётся допустить пользователя на %s (%s)" +#: src/protocols/msn/notification.c:481 +msgid "%s could not be added because your buddy list is full." +msgstr "Не удалось добавить %s, так как список контактов полон." +#: src/protocols/msn/notification.c:490 +msgid "%s is not a valid passport account." +msgstr "%s не является допустимой паспортной учётной записью." +#: src/protocols/msn/notification.c:746 +msgid "Unable to rename group" +msgstr "Не удаётся переименовать группу" +#: src/protocols/msn/notification.c:801 +msgid "Unable to delete group" +msgstr "Не удаётся удалить группу" +#: src/protocols/msn/notification.c:1203 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7010,66 +7045,117 @@
-#: src/protocols/msn/servconn.c:93-msgid "Unable to connect to %s server"-msgstr "Не удаётся соединиться с сервером %s"-#: src/protocols/msn/servconn.c:97-msgid "Error writing to %s server"-msgstr "Ошибка записи на сервер %s"-#: src/protocols/msn/servconn.c:101-msgid "Error reading from %s server"-msgstr "Ошибка чтения с сервера %s"-#: src/protocols/msn/servconn.c:105-msgid "Unknown error from %s server"-msgstr "Неизвестная ошибка от сервера %s"-#: src/protocols/msn/servconn.c:334-msgid "Received HTTP error. Please report this."-msgstr "Принята ошибка HTTP. Сообщите об этом."-#: src/protocols/msn/switchboard.c:359+#: 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 +msgstr "Неизвестная ошибка" +#: src/protocols/msn/servconn.c:136 +"Connection error from %s server (%s):\n" +"Ошибка соединения от сервера %s (%s):\n" +#: src/protocols/msn/session.c:295 +msgid "Our protocol is not supported by the server." +msgstr "Наш протокол не поддерживается сервером." +#: src/protocols/msn/session.c:299 +msgid "Error parsing HTTP." +msgstr "Ошибка разбора HTTP." +#: src/protocols/msn/session.c:303 +msgid "You have signed on from another location." +msgstr "Вы подключены из другого места." +#: src/protocols/msn/session.c:306 +msgid "The MSN servers are going down temporarily." +msgstr "Серверы MSN временно выключаются." +#: src/protocols/msn/session.c:310 +msgid "Unable to authenticate: %s" +msgstr "Не удаётся отправить сообщение: %s" +#: src/protocols/msn/session.c:315 +"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 "Message may have not been sent because a time out occurred:"+msgid "Starting authentication" +msgstr "Идентификация простым текстом" +#: 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 "Загрузка списка контактов" +#: src/protocols/msn/switchboard.c:368 +msgid "Message may have not been sent because a timeout occurred:" msgstr "Не удалось отправить сообщение, так как произошла ошибка соединения"
-#: src/protocols/msn/switchboard.c:367+#: src/protocols/msn/switchboard.c:376 msgid "Message could not be sent, not allowed while invisible:"
msgstr "Не удалось отправить сообщение по неизвестной причине"
-#: src/protocols/msn/switchboard.c:371+#: src/protocols/msn/switchboard.c:380 msgid "Message could not be sent because the user is offline:"
msgstr "Не удалось отправить сообщение, так как пользователь не в сети"
-#: src/protocols/msn/switchboard.c:375+#: src/protocols/msn/switchboard.c:384 msgid "Message could not be sent because a connection error occurred:"
msgstr "Не удалось отправить сообщение, так как произошла ошибка соединения"
-#: src/protocols/msn/switchboard.c:379+#: src/protocols/msn/switchboard.c:388 "Message could not be sent because an error with the switchboard occurred:"
msgstr "Не удалось отправить сообщение, так как произошла ошибка соединения"
-#: src/protocols/msn/switchboard.c:387+#: src/protocols/msn/switchboard.c:396 msgid "Message may have not been sent because an unknown error occurred:"
msgstr "Не удалось отправить сообщение, так как произошла ошибка соединения"
-#: src/protocols/msn/switchboard.c:455+#: src/protocols/msn/switchboard.c:626 msgid "The conversation has become inactive and timed out."
msgstr "Беседа потеряла активность."
-#: src/protocols/msn/switchboard.c:474+#: src/protocols/msn/switchboard.c:645 msgid "%s has closed the conversation window."
msgstr "%s закрыл окно беседы."
@@ -7385,8 +7471,8 @@
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5023-#: src/protocols/oscar/oscar.c:5030+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5078 +#: src/protocols/oscar/oscar.c:5085 @@ -7489,8 +7575,8 @@
"Эта конференция была закрыта. Больше не может быть отправлено ни одного "
-#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:722-#: src/protocols/oscar/oscar.c:6617 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 @@ -7502,10 +7588,6 @@
msgstr "Вероятно не в сети"
-#: src/protocols/novell/novell.c:3369-msgstr "Начать разговор"@@ -7624,163 +7706,163 @@
-#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484+#: 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.)"
-#: src/protocols/oscar/oscar.c:577+#: src/protocols/oscar/oscar.c:578 -#: src/protocols/oscar/oscar.c:580+#: src/protocols/oscar/oscar.c:581 msgstr "Прямое соединение AIM"
-#: src/protocols/oscar/oscar.c:583 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:586 src/protocols/oscar/oscar.c:6919+#: src/protocols/oscar/oscar.c:587 src/protocols/oscar/oscar.c:6974 -#: src/protocols/oscar/oscar.c:593+#: src/protocols/oscar/oscar.c:594 -#: src/protocols/oscar/oscar.c:596+#: src/protocols/oscar/oscar.c:597 -#: src/protocols/oscar/oscar.c:599+#: src/protocols/oscar/oscar.c:600 msgstr "Отправить список контактов"
-#: src/protocols/oscar/oscar.c:602+#: src/protocols/oscar/oscar.c:603 msgid "ICQ Direct Connect"
msgstr "Прямое соединение ICQ"
-#: src/protocols/oscar/oscar.c:605+#: src/protocols/oscar/oscar.c:606 -#: src/protocols/oscar/oscar.c:608+#: src/protocols/oscar/oscar.c:609 -#: src/protocols/oscar/oscar.c:611+#: src/protocols/oscar/oscar.c:612 -#: src/protocols/oscar/oscar.c:614+#: src/protocols/oscar/oscar.c:615 msgstr "Релейный сервер ICQ"
-#: src/protocols/oscar/oscar.c:617+#: src/protocols/oscar/oscar.c:618 -#: src/protocols/oscar/oscar.c:620+#: src/protocols/oscar/oscar.c:621 msgid "Trillian Encryption"
msgstr "Кодирование Trillian"
-#: src/protocols/oscar/oscar.c:623+#: src/protocols/oscar/oscar.c:624 -#: src/protocols/oscar/oscar.c:626+#: src/protocols/oscar/oscar.c:627 -#: src/protocols/oscar/oscar.c:629+#: src/protocols/oscar/oscar.c:630 msgstr "Безопасность включена"
-#: src/protocols/oscar/oscar.c:632+#: src/protocols/oscar/oscar.c:633 -#: src/protocols/oscar/oscar.c:636+#: src/protocols/oscar/oscar.c:637 -#: src/protocols/oscar/oscar.c:639+#: src/protocols/oscar/oscar.c:640 -#: src/protocols/oscar/oscar.c:642+#: src/protocols/oscar/oscar.c:643 -#: src/protocols/oscar/oscar.c:660 src/protocols/oscar/oscar.c:5627-#: src/protocols/oscar/oscar.c:6811+#: src/protocols/oscar/oscar.c:661 src/protocols/oscar/oscar.c:5682 +#: src/protocols/oscar/oscar.c:6866 msgstr "Готов пообщаться"
-#: src/protocols/oscar/oscar.c:664 src/protocols/oscar/oscar.c:5621-#: src/protocols/oscar/oscar.c:6809+#: src/protocols/oscar/oscar.c:665 src/protocols/oscar/oscar.c:5676 +#: src/protocols/oscar/oscar.c:6864 -#: src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:5624-#: src/protocols/oscar/oscar.c:6810+#: src/protocols/oscar/oscar.c:667 src/protocols/oscar/oscar.c:5679 +#: src/protocols/oscar/oscar.c:6865 -#: src/protocols/oscar/oscar.c:670+#: src/protocols/oscar/oscar.c:671 -#: src/protocols/oscar/oscar.c:738+#: src/protocols/oscar/oscar.c:739 -#: src/protocols/oscar/oscar.c:747+#: src/protocols/oscar/oscar.c:748 msgstr "Комментарий пользователя"
-#: src/protocols/oscar/oscar.c:882+#: src/protocols/oscar/oscar.c:883 msgid "Direct IM with %s closed"
msgstr "Прямое соединение с %s закрыто"
-#: src/protocols/oscar/oscar.c:884+#: src/protocols/oscar/oscar.c:885 msgid "Direct IM with %s failed"
msgstr "Не удалось создать прямое соединение с %s"
-#: src/protocols/oscar/oscar.c:891+#: src/protocols/oscar/oscar.c:892 msgid "Direct Connect failed"
msgstr "Не удалось создать прямое соединение"
-#: src/protocols/oscar/oscar.c:968 src/protocols/oscar/oscar.c:1099+#: src/protocols/oscar/oscar.c:969 src/protocols/oscar/oscar.c:1100 msgid "Direct IM with %s established"
msgstr "Прямое соединение с %s установлено"
-#: src/protocols/oscar/oscar.c:1049+#: src/protocols/oscar/oscar.c:1050 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
msgstr "Попытка создания прямого соединения с %s в %s:%hu."
-#: src/protocols/oscar/oscar.c:1466+#: src/protocols/oscar/oscar.c:1470 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
msgstr "Запрос создания прямого соединения %s с нами в %s:%hu."
-#: src/protocols/oscar/oscar.c:1471+#: src/protocols/oscar/oscar.c:1475 msgid "Unable to open Direct IM"
msgstr "Не удаётся открыть прямое соединение"
-#: src/protocols/oscar/oscar.c:1506+#: src/protocols/oscar/oscar.c:1510 msgid "You have selected to open a Direct IM connection with %s."
msgstr "Вы выбрали открытие прямого соединения с %s."
-#: src/protocols/oscar/oscar.c:1510+#: src/protocols/oscar/oscar.c:1514 "Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
@@ -7788,24 +7870,24 @@
"Так как это обнаружит ваш IP-адрес, это можно считать угрозой "
"конфиденциальности. Хотите продолжить?"
-#: src/protocols/oscar/oscar.c:1514 src/protocols/oscar/oscar.c:3467+#: src/protocols/oscar/oscar.c:1518 src/protocols/oscar/oscar.c:3522 -#: src/protocols/oscar/oscar.c:1581 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 "Вы были отсоединены от чата %s."
-#: src/protocols/oscar/oscar.c:1600+#: src/protocols/oscar/oscar.c:1604 msgid "Chat is currently unavailable"
msgstr "Чат сейчас недоступен"
-#: src/protocols/oscar/oscar.c:1681+#: src/protocols/oscar/oscar.c:1685 msgstr "Идентификатор пользователя отправлен"
-#: src/protocols/oscar/oscar.c:1695+#: src/protocols/oscar/oscar.c:1699 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7813,46 +7895,46 @@
"letters, numbers and spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:1723+#: src/protocols/oscar/oscar.c:1727 msgid "Unable to login to AIM"
msgstr "Не удаётся войти в сеть AIM"
-#: src/protocols/oscar/oscar.c:1824 src/protocols/oscar/oscar.c:2263+#: src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:2275 msgid "Could Not Connect"
msgstr "Не удалось установить соединение"
-#: src/protocols/oscar/oscar.c:1832+#: src/protocols/oscar/oscar.c:1837 msgid "Connection established, cookie sent"
msgstr "Соединение установлено, данные отправлены"
-#: src/protocols/oscar/oscar.c:1945 src/protocols/yahoo/yahoo_filexfer.c:174+#: 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 "Не удаётся установить дескриптор файла."
-#: src/protocols/oscar/oscar.c:1950+#: src/protocols/oscar/oscar.c:1962 msgid "Unable to create new connection."
msgstr "Не удаётся создать новое соединение."
-#: src/protocols/oscar/oscar.c:2022+#: src/protocols/oscar/oscar.c:2034 msgid "Unable to establish listener socket."
msgstr "Не удаётся установить сокет для прослушивания."
-#: src/protocols/oscar/oscar.c:2147 src/protocols/toc/toc.c:541+#: src/protocols/oscar/oscar.c:2159 src/protocols/toc/toc.c:541 msgid "Incorrect nickname or password."
msgstr "Некорректный псевдоним или пароль."
-#: src/protocols/oscar/oscar.c:2152+#: src/protocols/oscar/oscar.c:2164 msgid "Your account is currently suspended."
msgstr "Ваша учётная запись сейчас заблокирована."
#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2156+#: src/protocols/oscar/oscar.c:2168 msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "Служба AOL Instant Messenger временно недоступна."
-#: src/protocols/oscar/oscar.c:2161+#: 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."
@@ -7860,21 +7942,33 @@
"Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
"попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
-#: src/protocols/oscar/oscar.c:2166+#: src/protocols/oscar/oscar.c:2178 msgid "The client version you are using is too old. Please upgrade at %s"
msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
-#: src/protocols/oscar/oscar.c:2198+#: src/protocols/oscar/oscar.c:2210 msgstr "Внутренняя ошибка"
-#: src/protocols/oscar/oscar.c:2270+#: src/protocols/oscar/oscar.c:2282 msgid "Received authorization"
msgstr "Принята авторизация"
-#: src/protocols/oscar/oscar.c:2306 src/protocols/oscar/oscar.c:2336-#: src/protocols/oscar/oscar.c:2425+#: src/protocols/oscar/oscar.c:2306 +msgid "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." +#: 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 "
@@ -7883,20 +7977,24 @@
"Вы можете быть скоро отсоединены. Возможно, вы захотите использовать TOC, "
"пока это не будет исправлено. Смотрите обновления на %s."
-#: src/protocols/oscar/oscar.c:2309 src/protocols/oscar/oscar.c:2339+#: 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 не удалось получить допустимый хэш входа AIM."
-#: src/protocols/oscar/oscar.c:2428+#: src/protocols/oscar/oscar.c:2483 msgid "Gaim was unable to get a valid login hash."
msgstr "Gaim не удалось получить допустимый хэш входа."
-#: src/protocols/oscar/oscar.c:3459+#: src/protocols/oscar/oscar.c:2515 +msgstr "Пароль отправлен" +#: src/protocols/oscar/oscar.c:3514 msgid "%s has just asked to directly connect to %s"
msgstr "%s запросил прямое соединение с %s"
-#: src/protocols/oscar/oscar.c:3462+#: 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 "
@@ -7906,19 +8004,19 @@
"необходимым для изображений. Так как ваш IP-адрес будет обнаружен, это можно "
"считать угрозой конфиденциальности."
-#: src/protocols/oscar/oscar.c:3500+#: src/protocols/oscar/oscar.c:3555 msgid "Please authorize me so I can add you to my buddy list."
-#: src/protocols/oscar/oscar.c:3508+#: src/protocols/oscar/oscar.c:3563 msgid "Authorization Request Message:"
msgstr "Сообщение запроса авторизации:"
-#: src/protocols/oscar/oscar.c:3509+#: src/protocols/oscar/oscar.c:3564 msgid "Please authorize me!"
-#: src/protocols/oscar/oscar.c:3539+#: src/protocols/oscar/oscar.c:3594 "The user %s requires authorization before being added to a buddy list. Do "
@@ -7927,22 +8025,22 @@
"Пользователь %s требует авторизацию перед добавлением его в список "
"контактов. Хотите отправить запрос авторизации?"
-#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:3546+#: src/protocols/oscar/oscar.c:3599 src/protocols/oscar/oscar.c:3601 msgid "Request Authorization"
msgstr "Запросить авторизацию"
-#: src/protocols/oscar/oscar.c:3594 src/protocols/oscar/oscar.c:3596-#: src/protocols/oscar/oscar.c:3603 src/protocols/oscar/oscar.c:3700-#: src/protocols/oscar/oscar.c:3720 src/protocols/oscar/oscar.c:6252-#: src/protocols/oscar/oscar.c:6298+#: 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 "Причина не указана."
-#: src/protocols/oscar/oscar.c:3602+#: src/protocols/oscar/oscar.c:3657 msgid "Authorization Denied Message:"
msgstr "Сообщение отказа в авторизации:"
-#: src/protocols/oscar/oscar.c:3700+#: src/protocols/oscar/oscar.c:3755 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7952,11 +8050,11 @@
-#: src/protocols/oscar/oscar.c:3708 src/protocols/oscar/oscar.c:6258+#: src/protocols/oscar/oscar.c:3763 src/protocols/oscar/oscar.c:6313 msgid "Authorization Request"
msgstr "Запрос авторизации"
-#: src/protocols/oscar/oscar.c:3720+#: src/protocols/oscar/oscar.c:3775 "The user %u has denied your request to add them to your buddy list for the "
@@ -7967,17 +8065,17 @@
-#: src/protocols/oscar/oscar.c:3721+#: src/protocols/oscar/oscar.c:3776 msgid "ICQ authorization denied."
msgstr "В авторизации ICQ отказано."
#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3728+#: src/protocols/oscar/oscar.c:3783 msgid "The user %u has granted your request to add them to your buddy list."
msgstr "Пользователь %u дал своё согласие добавить его в ваш список контактов."
-#: src/protocols/oscar/oscar.c:3736+#: src/protocols/oscar/oscar.c:3791 "You have received a special message\n"
@@ -7990,7 +8088,7 @@
-#: src/protocols/oscar/oscar.c:3744+#: src/protocols/oscar/oscar.c:3799 "You have received an ICQ page\n"
@@ -8003,7 +8101,7 @@
-#: src/protocols/oscar/oscar.c:3752+#: src/protocols/oscar/oscar.c:3807 "You have received an ICQ email from %s [%s]\n"
@@ -8016,27 +8114,27 @@
-#: src/protocols/oscar/oscar.c:3773+#: src/protocols/oscar/oscar.c:3828 msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "Пользователь ICQ %u отправил вам контакт: %s (%s)"
-#: src/protocols/oscar/oscar.c:3779+#: src/protocols/oscar/oscar.c:3834 msgid "Do you want to add this buddy to your buddy list?"
msgstr "Хотите добавить этого пользователя в список контактов?"
-#: src/protocols/oscar/oscar.c:3783+#: src/protocols/oscar/oscar.c:3838 -#: src/protocols/oscar/oscar.c:3867+#: 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] "Вы не получили %hu сообщение от %s, так как оно было некорректно."
msgstr[1] "Вы не получили %hu сообщений от %s, так как они были некорректны."
-#: src/protocols/oscar/oscar.c:3876+#: 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."
@@ -8045,7 +8143,7 @@
"Вы не получили %hu сообщений от %s, так как они были слишком велики."
-#: src/protocols/oscar/oscar.c:3885+#: src/protocols/oscar/oscar.c:3940 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8056,7 +8154,7 @@
"Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
-#: src/protocols/oscar/oscar.c:3894+#: 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."
@@ -8065,7 +8163,7 @@
"Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
-#: src/protocols/oscar/oscar.c:3903+#: 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."
@@ -8074,66 +8172,62 @@
"Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
-#: src/protocols/oscar/oscar.c:3912+#: 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] "Вы не получили %hu сообщение от %s по неизвестной причине."
msgstr[1] "Вы не получили %hu сообщений от %s по неизвестной причине."
-#: src/protocols/oscar/oscar.c:3966 src/protocols/oscar/oscar.c:4198+#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4253 msgstr "Информация для %s"
-#: src/protocols/oscar/oscar.c:4032+#: src/protocols/oscar/oscar.c:4087 msgid "SNAC threw error: %s\n"
msgstr "SNAC вызвал ошибку: %s\n"
-#: src/protocols/oscar/oscar.c:4033-msgstr "Неизвестная ошибка" #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4068+#: src/protocols/oscar/oscar.c:4123 msgid "Unable to send message: %s"
msgstr "Не удаётся отправить сообщение: %s"
-#: src/protocols/oscar/oscar.c:4068 src/protocols/oscar/oscar.c:4073-#: src/protocols/oscar/oscar.c:4131 src/protocols/oscar/oscar.c:4135+#: src/protocols/oscar/oscar.c:4123 src/protocols/oscar/oscar.c:4128 +#: src/protocols/oscar/oscar.c:4186 src/protocols/oscar/oscar.c:4190 msgstr "Причина неизвестна."
-#: src/protocols/oscar/oscar.c:4131+#: src/protocols/oscar/oscar.c:4186 msgid "User information not available: %s"
msgstr "Информация о пользователе недоступна: %s"
-#: src/protocols/oscar/oscar.c:4134+#: src/protocols/oscar/oscar.c:4189 msgid "User information for %s unavailable:"
msgstr "Информация о пользователе %s недоступна:"
-#: src/protocols/oscar/oscar.c:4156+#: src/protocols/oscar/oscar.c:4211 msgstr "Уровень предупреждения"
-#: src/protocols/oscar/oscar.c:4160+#: src/protocols/oscar/oscar.c:4215 -#: src/protocols/oscar/oscar.c:4165 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:4249+#: src/protocols/oscar/oscar.c:4304 msgid "Your AIM connection may be lost."
msgstr "Ваше соединение AIM может быть разорвано."
#. The conversion failed!
-#: src/protocols/oscar/oscar.c:4435+#: src/protocols/oscar/oscar.c:4490 "[Unable to display a message from this user because it contained invalid "
@@ -8141,11 +8235,11 @@
"[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
-#: src/protocols/oscar/oscar.c:4655+#: src/protocols/oscar/oscar.c:4710 msgid "Rate limiting error."
msgstr "Ошибка ограничения предела."
-#: src/protocols/oscar/oscar.c:4656+#: 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."
@@ -8153,7 +8247,7 @@
"Не удалось выполнить последнее действие, так как вы превысили предел. "
"Подождите 10 секунд и попытайтесь снова."
-#: src/protocols/oscar/oscar.c:4719+#: src/protocols/oscar/oscar.c:4774 "You have been disconnected because you have signed on with this screen name "
@@ -8161,109 +8255,109 @@
"Вы были отсоединены, так как вошли с этим идентификатором пользователя из "
-#: src/protocols/oscar/oscar.c:4721+#: src/protocols/oscar/oscar.c:4776 msgid "You have been signed off for an unknown reason."
msgstr "Вы были отключены по неизвестной причине."
-#: src/protocols/oscar/oscar.c:4752+#: src/protocols/oscar/oscar.c:4807 msgid "Finalizing connection"
msgstr "Завершение установления соединения"
-#: src/protocols/oscar/oscar.c:5035 src/protocols/silc/util.c:538+#: src/protocols/oscar/oscar.c:5090 src/protocols/silc/util.c:538 msgstr "Мобильный телефон"
-#: src/protocols/oscar/oscar.c:5036+#: src/protocols/oscar/oscar.c:5091 -#: src/protocols/oscar/oscar.c:5037 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:5037 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:5053+#: src/protocols/oscar/oscar.c:5108 msgid "Personal Web Page"
msgstr "Персональная Web-страница"
-#: src/protocols/oscar/oscar.c:5057+#: src/protocols/oscar/oscar.c:5112 msgid "Additional Information"
msgstr "Дополнительная информация"
-#: src/protocols/oscar/oscar.c:5062+#: src/protocols/oscar/oscar.c:5117 -#: src/protocols/oscar/oscar.c:5066 src/protocols/oscar/oscar.c:5074+#: src/protocols/oscar/oscar.c:5121 src/protocols/oscar/oscar.c:5129 -#: src/protocols/oscar/oscar.c:5070+#: src/protocols/oscar/oscar.c:5125 -#: src/protocols/oscar/oscar.c:5078+#: src/protocols/oscar/oscar.c:5133 msgstr "Информация о работе"
-#: src/protocols/oscar/oscar.c:5079+#: src/protocols/oscar/oscar.c:5134 -#: src/protocols/oscar/oscar.c:5080+#: src/protocols/oscar/oscar.c:5135 -#: src/protocols/oscar/oscar.c:5081+#: src/protocols/oscar/oscar.c:5136 -#: src/protocols/oscar/oscar.c:5083+#: src/protocols/oscar/oscar.c:5138 -#: src/protocols/oscar/oscar.c:5093+#: src/protocols/oscar/oscar.c:5148 msgstr "ICQ-информация для %s"
-#: src/protocols/oscar/oscar.c:5142+#: src/protocols/oscar/oscar.c:5197 msgstr "Всплывающее сообщение"
-#: src/protocols/oscar/oscar.c:5163+#: src/protocols/oscar/oscar.c:5218 msgid "The following screen names are associated with %s"
msgstr "Следующие идентификаторы пользователя соотнесены с %s"
-#: src/protocols/oscar/oscar.c:5167+#: src/protocols/oscar/oscar.c:5222 msgstr "Результаты поиска"
-#: src/protocols/oscar/oscar.c:5184+#: src/protocols/oscar/oscar.c:5239 msgid "No results found for email address %s"
msgstr "Ничего не найдено для адреса e-mail %s"
-#: src/protocols/oscar/oscar.c:5205+#: src/protocols/oscar/oscar.c:5260 msgid "You should receive an email asking to confirm %s."
msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
-#: src/protocols/oscar/oscar.c:5207+#: src/protocols/oscar/oscar.c:5262 msgid "Account Confirmation Requested"
msgstr "Запрошено подтверждение учётной записи"
-#: src/protocols/oscar/oscar.c:5238+#: src/protocols/oscar/oscar.c:5293 msgid "Error Changing Account Info"
msgstr "Ошибка изменения информации об учётной записи"
-#: src/protocols/oscar/oscar.c:5241+#: src/protocols/oscar/oscar.c:5296 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8272,7 +8366,7 @@
"Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
"как запрошенный идентификатор пользователя отличается от оригинального."
-#: src/protocols/oscar/oscar.c:5244+#: src/protocols/oscar/oscar.c:5299 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8281,7 +8375,7 @@
"Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
"как запрошенный идентификатор пользователя оканчивается пробелом."
-#: src/protocols/oscar/oscar.c:5247+#: src/protocols/oscar/oscar.c:5302 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8290,14 +8384,14 @@
"Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
"как запрошенный идентификатор пользователя слишком велик."
-#: src/protocols/oscar/oscar.c:5250+#: src/protocols/oscar/oscar.c:5305 "Error 0x%04x: Unable to change email address because there is already a "
"request pending for this screen name."
-#: src/protocols/oscar/oscar.c:5253+#: src/protocols/oscar/oscar.c:5308 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8306,7 +8400,7 @@
"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
"соотнесено слишком много идентификаторов пользователя."
-#: src/protocols/oscar/oscar.c:5256+#: src/protocols/oscar/oscar.c:5311 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8315,12 +8409,12 @@
"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
-#: src/protocols/oscar/oscar.c:5259+#: src/protocols/oscar/oscar.c:5314 msgid "Error 0x%04x: Unknown error."
msgstr "Ошибка 0x%04x: Неизвестная ошибка."
-#: src/protocols/oscar/oscar.c:5269+#: src/protocols/oscar/oscar.c:5324 "Your screen name is currently formatted as follows:\n"
@@ -8329,34 +8423,34 @@
"Сейчас ваш идентификатор пользователя отформатирован следующим образом:\n"
-#: src/protocols/oscar/oscar.c:5270 src/protocols/oscar/oscar.c:5277+#: src/protocols/oscar/oscar.c:5325 src/protocols/oscar/oscar.c:5332 msgstr "Информация об учётной записи"
-#: src/protocols/oscar/oscar.c:5275+#: src/protocols/oscar/oscar.c:5330 msgid "The email address for %s is %s"
msgstr "Адрес e-mail для %s: %s"
-#: src/protocols/oscar/oscar.c:5340+#: src/protocols/oscar/oscar.c:5395 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
"Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
-#: src/protocols/oscar/oscar.c:5476+#: src/protocols/oscar/oscar.c:5531 msgid "Unable to set AIM profile."
msgstr "Не удаётся установить профиль AIM."
-#: src/protocols/oscar/oscar.c:5477+#: 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 "
-#: src/protocols/oscar/oscar.c:5504+#: src/protocols/oscar/oscar.c:5559 "The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -8367,26 +8461,26 @@
-#: src/protocols/oscar/oscar.c:5509+#: src/protocols/oscar/oscar.c:5564 msgid "Profile too long."
msgstr "Профиль слишком велик."
-#: src/protocols/oscar/oscar.c:5525 src/protocols/oscar/oscar.c:6816+#: src/protocols/oscar/oscar.c:5580 src/protocols/oscar/oscar.c:6871 -#: src/protocols/oscar/oscar.c:5543+#: src/protocols/oscar/oscar.c:5598 msgid "Unable to set AIM away message."
msgstr "Не удаётся установить сообщение об отсутствии для AIM."
-#: src/protocols/oscar/oscar.c:5544+#: 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 "
"again when you are fully connected."
-#: src/protocols/oscar/oscar.c:5584+#: src/protocols/oscar/oscar.c:5639 "The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -8397,11 +8491,11 @@
-#: src/protocols/oscar/oscar.c:5589+#: src/protocols/oscar/oscar.c:5644 msgid "Away message too long."
msgstr "Сообщение об отсутствии слишком велико."
-#: src/protocols/oscar/oscar.c:5667+#: src/protocols/oscar/oscar.c:5722 "Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -8409,16 +8503,16 @@
"spaces, or contain only numbers."
-#: src/protocols/oscar/oscar.c:5669 src/protocols/oscar/oscar.c:6118-#: src/protocols/oscar/oscar.c:6132+#: src/protocols/oscar/oscar.c:5724 src/protocols/oscar/oscar.c:6173 +#: src/protocols/oscar/oscar.c:6187 msgstr "Не удаётся добавить"
-#: src/protocols/oscar/oscar.c:5830+#: src/protocols/oscar/oscar.c:5885 msgid "Unable To Retrieve Buddy List"
msgstr "Не удаётся загрузить список контактов"
-#: src/protocols/oscar/oscar.c:5831+#: 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 "
@@ -8428,13 +8522,13 @@
"Список контактов не потерян и, вероятно, станет доступен в течение "
-#: src/protocols/oscar/oscar.c:6013 src/protocols/oscar/oscar.c:6014-#: src/protocols/oscar/oscar.c:6019 src/protocols/oscar/oscar.c:6176-#: src/protocols/oscar/oscar.c:6177 src/protocols/oscar/oscar.c:6182+#: 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:6116+#: src/protocols/oscar/oscar.c:6171 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8443,11 +8537,11 @@
"Не удалось добавить пользователя %s, так как в списке контактов слишком "
"много пользователей. Удалите одного и попытайтесь снова."
-#: src/protocols/oscar/oscar.c:6116 src/protocols/oscar/oscar.c:6130+#: src/protocols/oscar/oscar.c:6171 src/protocols/oscar/oscar.c:6185 -#: src/protocols/oscar/oscar.c:6130+#: src/protocols/oscar/oscar.c:6185 "Could not add the buddy %s for an unknown reason. The most common reason "
@@ -8455,7 +8549,7 @@
-#: src/protocols/oscar/oscar.c:6213+#: src/protocols/oscar/oscar.c:6268 "The user %s has given you permission to add you to their buddy list. Do you "
@@ -8464,11 +8558,11 @@
"Пользователь %s разрешил добавить его в ваш список контактов. Хотите "
-#: src/protocols/oscar/oscar.c:6219+#: src/protocols/oscar/oscar.c:6274 msgid "Authorization Given"
msgstr "Авторизация дана"
-#: src/protocols/oscar/oscar.c:6252+#: src/protocols/oscar/oscar.c:6307 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8479,17 +8573,17 @@
-#: src/protocols/oscar/oscar.c:6294+#: src/protocols/oscar/oscar.c:6349 msgid "The user %s has granted your request to add them to your buddy list."
msgstr "Пользователь %s разрешил добавить его в ваш список контактов."
-#: src/protocols/oscar/oscar.c:6295+#: src/protocols/oscar/oscar.c:6350 msgid "Authorization Granted"
msgstr "Авторизация дана"
-#: src/protocols/oscar/oscar.c:6298+#: src/protocols/oscar/oscar.c:6353 "The user %s has denied your request to add them to your buddy list for the "
@@ -8500,80 +8594,80 @@
-#: src/protocols/oscar/oscar.c:6299+#: src/protocols/oscar/oscar.c:6354 msgid "Authorization Denied"
msgstr "В авторизации отказано"
-#: src/protocols/oscar/oscar.c:6336 src/protocols/toc/toc.c:1273+#: src/protocols/oscar/oscar.c:6391 src/protocols/toc/toc.c:1273 -#: src/protocols/oscar/oscar.c:6374+#: src/protocols/oscar/oscar.c:6429 msgid "Invalid chat name specified."
msgstr "Указано неверное имя чата."
-#: src/protocols/oscar/oscar.c:6463+#: src/protocols/oscar/oscar.c:6518 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
"Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
-#: src/protocols/oscar/oscar.c:6589+#: src/protocols/oscar/oscar.c:6644 msgstr "Сообщение об отсутствии"
-#: src/protocols/oscar/oscar.c:6875+#: src/protocols/oscar/oscar.c:6930 msgid "Buddy Comment for %s"
msgstr "Комментарий пользователя для %s"
-#: src/protocols/oscar/oscar.c:6876+#: src/protocols/oscar/oscar.c:6931 msgstr "Комментарий пользователя:"
-#: src/protocols/oscar/oscar.c:6895+#: src/protocols/oscar/oscar.c:6950 msgid "Edit Buddy Comment"
msgstr "Изменить комментарий пользователя"
-#: src/protocols/oscar/oscar.c:6901+#: src/protocols/oscar/oscar.c:6956 msgstr "Получить сообщение о статусе"
-#: src/protocols/oscar/oscar.c:6913+#: src/protocols/oscar/oscar.c:6968 msgstr "Прямое соединение"
-#: src/protocols/oscar/oscar.c:6930+#: src/protocols/oscar/oscar.c:6985 msgid "Re-request Authorization"
msgstr "Повторный запрос авторизации"
-#: src/protocols/oscar/oscar.c:6960+#: src/protocols/oscar/oscar.c:7015 msgid "The new formatting is invalid."
msgstr "Новое форматирование недопустимо."
-#: src/protocols/oscar/oscar.c:6961+#: src/protocols/oscar/oscar.c:7016 msgid "Screen name formatting can change only capitalization and whitespace."
"Форматирование идентификатора пользователя может влиять только на регистр "
-#: src/protocols/oscar/oscar.c:6968+#: src/protocols/oscar/oscar.c:7023 msgid "New screen name formatting:"
msgstr "Новое форматирование идентификатора пользователя:"
-#: src/protocols/oscar/oscar.c:7020+#: src/protocols/oscar/oscar.c:7075 msgid "Change Address To:"
msgstr "Изменить адрес на:"
-#: src/protocols/oscar/oscar.c:7065+#: src/protocols/oscar/oscar.c:7120 msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>вы не ожидаете авторизацию</i>"
-#: src/protocols/oscar/oscar.c:7068+#: src/protocols/oscar/oscar.c:7123 msgid "You are awaiting authorization from the following buddies"
msgstr "Вы ожидаете авторизацию от следующих пользователей"
-#: src/protocols/oscar/oscar.c:7069+#: src/protocols/oscar/oscar.c:7124 "You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -8581,75 +8675,75 @@
"Вы можете запросить авторизацию от этих пользователей повторно, щёлкнув на "
"них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
-#: src/protocols/oscar/oscar.c:7086+#: src/protocols/oscar/oscar.c:7141 msgid "Find Buddy by E-mail"
msgstr "Найти пользователя по e-mail"
-#: src/protocols/oscar/oscar.c:7087+#: src/protocols/oscar/oscar.c:7142 msgid "Search for a buddy by e-mail address"
msgstr "Искать пользователя по адресу e-mail"
-#: src/protocols/oscar/oscar.c:7088+#: src/protocols/oscar/oscar.c:7143 msgid "Type the e-mail address of the buddy you are searching for."
msgstr "Введите адрес e-mail пользователя, которого вы ищете."
-#: src/protocols/oscar/oscar.c:7105+#: src/protocols/oscar/oscar.c:7160 msgid "Available Message:"
msgstr "Статусное сообщение:"
-#: src/protocols/oscar/oscar.c:7106+#: src/protocols/oscar/oscar.c:7161 msgid "I'm doing work and hoping for a distraction--IM me!"
-#: src/protocols/oscar/oscar.c:7187 src/protocols/silc/silc.c:800+#: src/protocols/oscar/oscar.c:7242 src/protocols/silc/silc.c:800 msgstr "Установить информацию о пользователе..."
-#: src/protocols/oscar/oscar.c:7192+#: src/protocols/oscar/oscar.c:7247 msgid "Set User Info (URL)..."
msgstr "Установить информацию о пользователе (URL)..."
-#: src/protocols/oscar/oscar.c:7198+#: src/protocols/oscar/oscar.c:7253 msgid "Set Available Message..."
msgstr "Установить статусное сообщение..."
-#: src/protocols/oscar/oscar.c:7203 src/protocols/silc/silc.c:796+#: src/protocols/oscar/oscar.c:7258 src/protocols/silc/silc.c:796 msgid "Change Password..."
msgstr "Изменить пароль..."
-#: src/protocols/oscar/oscar.c:7208+#: src/protocols/oscar/oscar.c:7263 msgid "Change Password (URL)"
msgstr "Изменить пароль (URL)"
-#: src/protocols/oscar/oscar.c:7212+#: src/protocols/oscar/oscar.c:7267 msgid "Configure IM Forwarding (URL)"
msgstr "Настроить перенаправление сообщений (URL)"
-#: src/protocols/oscar/oscar.c:7221+#: src/protocols/oscar/oscar.c:7276 msgid "Format Screen Name..."
msgstr "Форматировать идентификатор пользователя..."
-#: src/protocols/oscar/oscar.c:7225+#: src/protocols/oscar/oscar.c:7280 msgstr "Подтвердить учётную запись"
-#: src/protocols/oscar/oscar.c:7229+#: src/protocols/oscar/oscar.c:7284 msgid "Display Currently Registered Address"
msgstr "Показать текущий зарегистрированный адрес"
-#: src/protocols/oscar/oscar.c:7233+#: src/protocols/oscar/oscar.c:7288 msgid "Change Currently Registered Address..."
msgstr "Изменить текущий зарегистрированный адрес..."
-#: src/protocols/oscar/oscar.c:7240+#: src/protocols/oscar/oscar.c:7295 msgid "Show Buddies Awaiting Authorization"
msgstr "Показать пользователей, ожидающих авторизацию"
-#: src/protocols/oscar/oscar.c:7246+#: src/protocols/oscar/oscar.c:7301 msgid "Search for Buddy by Email..."
msgstr "Искать пользователя по e-mail..."
-#: src/protocols/oscar/oscar.c:7251+#: src/protocols/oscar/oscar.c:7306 msgid "Search for Buddy by Information"
msgstr "Искать пользователя по информации"
@@ -8663,19 +8757,19 @@
-#: src/protocols/oscar/oscar.c:7372 src/protocols/oscar/oscar.c:7374+#: src/protocols/oscar/oscar.c:7427 src/protocols/oscar/oscar.c:7429 msgid "AIM/ICQ Protocol Plugin"
msgstr "Модуль протокола AIM/ICQ"
-#: src/protocols/oscar/oscar.c:7393+#: src/protocols/oscar/oscar.c:7448 msgstr "Узел идентификации"
-#: src/protocols/oscar/oscar.c:7396+#: src/protocols/oscar/oscar.c:7451 msgstr "Порт идентификации"
-#: src/protocols/oscar/oscar.c:7399 src/protocols/zephyr/zephyr.c:2760+#: src/protocols/oscar/oscar.c:7454 src/protocols/zephyr/zephyr.c:2760 @@ -9981,6 +10075,11 @@
+#: src/protocols/toc/toc.c:198 +msgstr "Подключение: %s" #: src/protocols/toc/toc.c:480
msgid "Unable to write file %s."
@@ -10075,7 +10174,7 @@
#: src/protocols/toc/toc.c:544
msgid "The service is temporarily unavailable."
-msgstr "Сервис временно недоступен."+msgstr "Служба временно недоступна." #: src/protocols/toc/toc.c:547
msgid "Your warning level is currently too high to log in."
@@ -10142,7 +10241,7 @@
#: src/protocols/toc/toc.c:1717
msgid "File transfer failed; other side probably canceled."
-"Не удалось произвести передачу файла; вероятно, отменили на той стороне."+"Не удалось произвести передачу файлов; вероятно, отменили на той стороне." #: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
@@ -10167,7 +10266,7 @@
#: src/protocols/toc/toc.c:2100
msgid "%s requests you to send them a file"
-msgstr "%s запросил передачу файла ему"+msgstr "%s запрашивает передачу файла ему" @@ -10381,7 +10480,7 @@
#: 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 "Проблема с соединением"
@@ -10609,27 +10708,23 @@
msgid "Maybe they're not in a chat?"
msgstr "Может быть, он не в чате?"
-#: src/protocols/yahoo/yahoochat.c:1356-msgid "Unable to connect"-msgstr "Не удаётся установить соединение"-#: src/protocols/yahoo/yahoochat.c:1356+#: src/protocols/yahoo/yahoochat.c:1357 msgid "Fetching the room list failed."
msgstr "Не удалось загрузить список комнат."
-#: 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 "Не удаётся загрузить список комнат."
-#: src/protocols/yahoo/yahoochat.c:1469+#: src/protocols/yahoo/yahoochat.c:1470 msgstr "Комнаты пользователя"
@@ -10809,69 +10904,71 @@
msgid "%s is now known as %s.\n"
msgstr "%s теперь известен как %s.\n"
msgid_plural "(%d messages)"
msgstr[0] "(%d сообщение)"
msgstr[1] "(%d сообщений)"
-#: src/server.c:1187 src/server.c:1196+#: src/server.c:1203 src/server.c:1212
msgstr "%s начал бездействовать"
msgstr "%s перестал бездействовать"
-#: src/server.c:1260 src/server.c:1267+#: src/server.c:1276 src/server.c:1283
"%s has just been warned by %s.\n"
"Your new warning level is %d%%"
+"%s был предупреждён %s.\n" +"Ваш новый уровень предупреждения %d%%" msgid "an anonymous person"
msgstr "анонимная персона"
"%s has invited %s to the chat room %s:\n"
@@ -10880,12 +10977,12 @@
"%s приглашает %s в чат %s:\n"
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s приглашает %s в чат %s\n"
msgid "Accept chat invitation?"
msgstr "Принять приглашение в чат?"
@@ -10916,38 +11013,38 @@
msgstr "Сделать предупреждение"
msgid "g003: Error opening connection.\n"
msgstr "g003: Ошибка открытия соединения.\n"
--- a/po/zh_CN.po Tue Jan 18 14:13:49 2005 -0500
+++ b/po/zh_CN.po Tue Jan 18 14:31:13 2005 -0500
@@ -7,8 +7,8 @@
"Project-Id-Version: gaim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-20 13:54+0800\n"-"PO-Revision-Date: 2004-12-20 13:59+0800\n"+"POT-Creation-Date: 2005-01-18 21:13+0800\n" +"PO-Revision-Date: 2005-01-18 21:22+0800\n" "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -144,7 +144,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 @@ -161,12 +161,12 @@
#: 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:972+#: 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/novell/novell.c:2917 src/protocols/novell/novell.c:2969
-#: src/protocols/oscar/oscar.c:668 src/protocols/oscar/oscar.c:5615-#: src/protocols/oscar/oscar.c:6607 src/protocols/oscar/oscar.c:6807+#: 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
@@ -174,7 +174,7 @@
#: plugins/docklet/docklet.c:190 src/away.c:584
-#: src/protocols/oscar/oscar.c:5533 src/protocols/oscar/oscar.c:6815+#: src/protocols/oscar/oscar.c:5588 src/protocols/oscar/oscar.c:6870 @@ -186,7 +186,7 @@
-#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2341+#: plugins/docklet/docklet.c:204 src/gtkaccount.c:2357 @@ -313,7 +313,7 @@
-#: plugins/gaim-remote/remote.c:669+#: plugins/gaim-remote/remote.c:670 "Failed to assign %s to a socket:\n"
@@ -322,7 +322,7 @@
-#: plugins/gaim-remote/remote.c:692+#: plugins/gaim-remote/remote.c:694 msgid "Unable to open socket"
@@ -332,19 +332,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 "提供 gaim 程序的远程控制。"
-#: 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."
@@ -434,8 +434,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:606-#: src/protocols/msn/msn.c:1470 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 @@ -450,13 +450,13 @@
#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7091+#: 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 @@ -493,13 +493,13 @@
#: 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:936+#: 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
@@ -518,7 +518,7 @@
msgid "Select all accounts that buddies should be auto-added to."
msgstr "选择要将好友自动添加到哪些账户。"
-#: 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 @@ -562,8 +562,8 @@
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:574+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379 +#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:575 @@ -785,7 +785,7 @@
msgid "Message Notification"
@@ -793,7 +793,7 @@
#: plugins/notify.c:802 plugins/notify.c:804
msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供各种方法通知您有未读邮件。"+msgstr "提供各种方法通知您有消息邮件。" @@ -1053,11 +1053,11 @@
msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
-#: plugins/tcl/tcl.c:363+#: plugins/tcl/tcl.c:364 msgid "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"
@@ -1184,7 +1184,7 @@
msgstr "Windows 启动时启动 Gaim(_S)"
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3127+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3129 @@ -1205,7 +1205,7 @@
#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
-#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1807+#: src/gtkprefs.c:2420 src/protocols/msn/msn.c:1770 @@ -1221,7 +1221,7 @@
msgid "Options specific to Windows Gaim."
msgstr "Windows Gaim 特定的选项。"
-#: src/account.c:277 src/protocols/jabber/jabber.c:1013+#: src/account.c:277 src/protocols/jabber/jabber.c:1014 msgid "New passwords do not match."
@@ -1253,47 +1253,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:409 src/gtkdialogs.c:551 src/gtkdialogs.c:605-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1060-#: 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:3510-#: src/protocols/oscar/oscar.c:3604 src/protocols/oscar/oscar.c:6878-#: src/protocols/oscar/oscar.c:6970 src/protocols/oscar/oscar.c:7022-#: src/protocols/oscar/oscar.c:7108 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:410-#: src/gtkdialogs.c:552 src/gtkdialogs.c:606 src/gtkdialogs.c:704-#: src/gtkdialogs.c:726 src/gtkdialogs.c:746 src/gtkdialogs.c:783-#: src/gtkdialogs.c:843 src/gtkdialogs.c:886 src/gtkdialogs.c:924-#: 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:675-#: src/protocols/jabber/jabber.c:1061 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:1515-#: src/protocols/oscar/oscar.c:3468 src/protocols/oscar/oscar.c:3511-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3605-#: src/protocols/oscar/oscar.c:6879 src/protocols/oscar/oscar.c:6971-#: src/protocols/oscar/oscar.c:7023 src/protocols/oscar/oscar.c:7092-#: src/protocols/oscar/oscar.c:7109 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 @@ -1334,7 +1336,7 @@
-#: 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 @@ -1384,7 +1386,7 @@
"%d buddy from group %s was not removed because its account was not logged "
@@ -1396,18 +1398,18 @@
"%2$s 组中的 %1$d 个好友未删除，原因是其账户未登入。这些好友和该组不会被删"
msgid "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~."
"分析您的好友列表时出错。好友列表未装入，旧文件被移动到 blist.xml~ 中了。"
@@ -1434,7 +1436,7 @@
#: src/conversation.c:237 src/conversation.c:251
-#: src/protocols/oscar/oscar.c:4071+#: src/protocols/oscar/oscar.c:4126 msgid "Unable to send message to %s:"
@@ -1447,67 +1449,67 @@
msgid "Unable to send message."
-#: src/conversation.c:1989+#: src/conversation.c:1992 msgid "%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>] 进入了聊天室。"
-#: src/conversation.c:2088+#: src/conversation.c:2091 msgid "You are now known as %s"
-#: src/conversation.c:2091+#: src/conversation.c:2094 msgid "%s is now known as %s"
-#: src/conversation.c:2132+#: src/conversation.c:2135 msgid "%s left the room (%s)."
-#: src/conversation.c:2134+#: src/conversation.c:2137 msgid "%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)."
-#: src/conversation.c:2610+#: src/conversation.c:2613 msgid "Last created window"
-#: src/conversation.c:2612+#: src/conversation.c:2615 msgid "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 @@ -1547,17 +1549,22 @@
msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
msgid "%s wants to send you %s (%s)"
msgstr "%s 想要给您发送 %s (%s)"
+msgid "%s wants to send you a file" msgid "Accept file transfer request from %s?"
"A file is available for download from:\n"
@@ -1568,37 +1575,50 @@
msgid "%s is not a valid filename.\n"
msgid "Offering to send %s to %s"
-msgid "Transfer of %s complete"+msgid "Transfer of file %s complete" +msgid "File transfer complete" msgid "You canceled the transfer of %s"
+msgid "File transfer cancelled" msgid "%s canceled the transfer of %s"
+msgid "%s canceled the file transfer" msgid "File transfer to %s aborted.\n"
msgstr "您中止了给 %s 的文件传送。\n"
msgid "File transfer from %s aborted.\n"
msgstr "%s 中止了给您的文件传送。\n"
@@ -1709,7 +1729,7 @@
@@ -1721,164 +1741,164 @@
#. 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"
#. Build the user options frame.
msgid "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"
-#: 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"
-#: src/gtkaccount.c:1153+#: src/gtkaccount.c:1166 msgid "you can see the butterflies mating"
-#: src/gtkaccount.c:1157+#: src/gtkaccount.c:1170 msgid "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"
-#: src/gtkaccount.c:1612+#: src/gtkaccount.c:1628 msgid "Show fewer options"
-#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:674+#: 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?"
-#: 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:4155+#: src/gtkaccount.c:2139 src/protocols/oscar/oscar.c:4210 -#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:970-#: src/protocols/oscar/oscar.c:674 src/protocols/oscar/oscar.c:5613-#: src/protocols/oscar/oscar.c:6806 src/protocols/silc/silc.c:45+#: 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 已经将 %s 加为好友%s%s%s"
-#: src/gtkaccount.c:2495+#: src/gtkaccount.c:2511 @@ -1888,18 +1908,18 @@
-#: src/gtkaccount.c:2499+#: src/gtkaccount.c:2515 -#: src/gtkaccount.c:2503+#: src/gtkaccount.c:2519 msgid "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:3782+#: 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
@@ -1918,11 +1938,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 @@ -1950,7 +1970,7 @@
-#: src/gtkblist.c:1200 src/gtkdialogs.c:780 src/gtkdialogs.c:782+#: src/gtkblist.c:1200 src/gtkdialogs.c:856 src/gtkdialogs.c:858 @@ -1997,135 +2017,135 @@
-#: 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."
msgstr "您目前登入的协议中没有一个可以添加好友的。"
msgid "/Buddies/New Instant _Message..."
msgstr "/好友(B)/新即时消息(_M)..."
msgid "/Buddies/Join a _Chat..."
msgstr "/好友(B)/加入聊天(_C)..."
msgid "/Buddies/Get User _Info..."
msgstr "/好友(B)/获取用户信息(_I)..."
msgid "/Buddies/View User _Log..."
msgstr "/好友(B)/查看用户日志(_L)..."
msgid "/Buddies/Show _Offline Buddies"
msgstr "/好友(B)/显示离线好友(_O)"
msgid "/Buddies/Show _Empty Groups"
msgid "/Buddies/_Add Buddy..."
msgstr "/好友(B)/添加好友(_A)..."
msgid "/Buddies/Add C_hat..."
msgstr "/好友(B)/添加聊天(_H)..."
msgid "/Buddies/Add _Group..."
msgstr "/好友(B)/添加组(_G)..."
msgid "/Buddies/_Signoff"
msgid "/Tools/Buddy _Pounce"
msgstr "/工具(T)/好友千里眼(_P)"
msgid "/Tools/Account Ac_tions"
-msgid "/Tools/Pl_ugin Actions"-msgstr "/工具(T)/插件操作(_U)"+msgid "/Tools/Pl_ugin Actions" +msgstr "/工具(T)/插件操作(_U)"
msgid "/Tools/_File Transfers"
msgid "/Tools/R_oom List"
msgid "/Tools/Pr_eferences"
msgid "/Tools/View System _Log"
msgstr "/工具(T)/查看系统日志(_L)"
msgid "/Help/Online _Help"
msgid "/Help/_Debug Window"
msgid "Please enter a new name for the selected group."
@@ -2134,7 +2154,7 @@
@@ -2142,12 +2162,12 @@
@@ -2155,7 +2175,7 @@
@@ -2163,7 +2183,7 @@
@@ -2171,7 +2191,7 @@
@@ -2179,7 +2199,7 @@
@@ -2187,7 +2207,7 @@
@@ -2195,7 +2215,7 @@
@@ -2203,7 +2223,7 @@
"<b>Description:</b> Spooky"
@@ -2211,7 +2231,7 @@
@@ -2219,7 +2239,7 @@
@@ -2227,108 +2247,108 @@
msgstr "瞌睡中 (%d小时%02d分) "
#. Make menu items sensitive/insensitive where appropriate
msgid "/Buddies/Join a Chat..."
msgstr "/好友(B)/加入聊天(C)..."
msgid "/Tools/Buddy Pounce"
msgid "/Tools/Account Actions"
msgid "/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 "/好友(B)/显示离线好友(O)"
msgid "/Buddies/Show Empty Groups"
msgid "Send a message to the selected buddy"
msgid "Get information on the selected buddy"
msgid "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. "
@@ -2338,39 +2358,39 @@
#. 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."
"You are not currently signed on with any protocols that have the ability to "
msgstr "您目前登入的协议中没有一个可以聊天的。"
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
msgstr "您想要将聊天加入您的好友列表，请输入该聊天的别名和对应信息。\n"
msgid "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"
@@ -2390,11 +2410,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"
@@ -2407,15 +2427,15 @@
@@ -2492,7 +2512,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."
@@ -2513,333 +2533,333 @@
-#: src/gtkconv.c:1459 src/gtkconv.c:3849 src/protocols/oscar/oscar.c:589+#: 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."
msgid "User is typing..."
msgid "User has typed something and paused"
#. Build the Send As menu
msgid "/Conversation/New Instant _Message..."
msgstr "/对话(C)/新即时消息(_M)..."
msgid "/Conversation/_Find..."
msgstr "/对话(C)/查找(_F)..."
msgid "/Conversation/View _Log"
msgid "/Conversation/_Save As..."
msgstr "/对话(C)/另存为(_S)..."
msgid "/Conversation/Clear"
msgid "/Conversation/Se_nd File..."
msgstr "/对话(C)/发送文件(_N)..."
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/对话(C)/添加好友千里眼(_P)..."
msgid "/Conversation/_Get Info"
msgid "/Conversation/_Warn..."
msgstr "/对话(C)/警告(_W)..."
msgid "/Conversation/In_vite..."
msgstr "/对话(C)/邀请(_V)..."
msgid "/Conversation/A_lias..."
msgstr "/对话(C)/别名(_L)..."
msgid "/Conversation/_Block..."
msgstr "/对话(C)/屏蔽(_B)..."
msgid "/Conversation/_Add..."
msgstr "/对话(C)/添加(_A)..."
msgid "/Conversation/_Remove..."
msgstr "/对话(C)/删除(_R)..."
msgid "/Conversation/Insert Lin_k..."
msgstr "/对话(C)/插入链接(_K)..."
msgid "/Conversation/Insert Imag_e..."
msgstr "/对话(C)/插入图像(_E)..."
msgid "/Conversation/_Close"
msgid "/Options/Enable _Logging"
msgstr "/选项(O)/允许记录日志(_L)"
msgid "/Options/Enable _Sounds"
msgid "/Options/Show Formatting _Toolbar"
msgstr "/选项(O)/显示格式工具栏(_T)"
msgid "/Options/Show T_imestamps"
msgid "/Conversation/View Log"
msgid "/Conversation/Send File..."
msgstr "/对话(C)/发送文件(N)..."
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/对话(C)/添加好友千里眼(P)..."
msgid "/Conversation/Get Info"
msgid "/Conversation/Warn..."
msgid "/Conversation/Invite..."
msgid "/Conversation/Alias..."
msgid "/Conversation/Block..."
msgid "/Conversation/Add..."
-msgid "/Conversation/Remove..."-msgstr "/对话(C)/删除(R)..."+msgid "/Conversation/Remove..." +msgstr "/对话(C)/删除(R)..." msgid "/Conversation/Insert Link..."
msgstr "/对话(C)/插入链接(K)..."
msgid "/Conversation/Insert Image..."
msgstr "/对话(C)/插入图像(I)..."
msgid "/Options/Enable Logging"
msgid "/Options/Enable Sounds"
msgid "/Options/Show Formatting Toolbar"
msgstr "/选项(O)/显示格式工具栏(T)"
msgid "/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"
msgid "Add the user to your buddy list"
msgid "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"
-#: 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"
msgid "Remove the chat from your buddy list"
#. Setup the label telling how many people are in the room.
msgid "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"
-#: src/gtkconv.c:6079 src/gtkconv.c:6082+#: src/gtkconv.c:6085 src/gtkconv.c:6088 msgid "<main>/Conversation/Close"
msgstr "<main>/对话(C)/关闭(C)"
"say <message>: Send a message normally as if you weren't using a "
msgstr "say <消息>: 发送普通消息，就好像您未使用命令。"
msgid "me <action>: Send an IRC style action to a buddy or chat."
msgstr "me <动作>: 向好友或聊天发送 IRC 风格的动作。"
"debug <option>: Send various debug information to the current "
msgstr "debug <选项>: 在当前对话中发送各种调试信息。"
msgid "help <command>: Help on a specific command."
msgstr "help <命令>: 关于具体命令的帮助。"
@@ -2867,20 +2887,21 @@
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:68 src/gtkdialogs.c:69 +#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72 msgid "developer & webmaster"
-#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69-#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:73@@ -2993,8 +3014,8 @@
@@ -3077,7 +3098,7 @@
msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3087,69 +3108,69 @@
"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
"成，并以 GPL 许可协议发行。<BR><BR>"
msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
msgid "Active Developers"
msgid "Crazy Patch Writers"
msgid "Retired Developers"
msgid "Current Translators"
-#: src/gtkdialogs.c:391 src/gtkdialogs.c:533 src/gtkdialogs.c:586+#: src/gtkdialogs.c:467 src/gtkdialogs.c:609 src/gtkdialogs.c:662 -#: src/gtkdialogs.c:397 src/gtkdialogs.c:539 src/gtkdialogs.c:592+#: src/gtkdialogs.c:473 src/gtkdialogs.c:615 src/gtkdialogs.c:668
msgid "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 whose info you would like to view."
msgstr "您想要查看谁的信息？请输入他/她的用户名。"
"Please enter the screen name of the person whose log you would like to view."
msgstr "您想要查看谁的日志？请输入他/她的用户名。"
"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3161,45 +3182,45 @@
"这将增加 %s 的警告级别，他/她也将被迫遵守更加严格的速度限制。\n"
msgid "Warn _anonymously?"
msgid "<b>Anonymous warnings are less severe.</b>"
msgstr "<b>匿名警告较不容易引起注意。</b>"
msgid "Enter an alias for this contact."
-#: src/gtkdialogs.c:703 src/gtkdialogs.c:725 src/gtkdialogs.c:745+#: 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."
msgid "Enter an alias for this chat."
"You are about to remove the contact containing %s and %d other buddies from "
@@ -3208,35 +3229,35 @@
"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
"You are about to remove the group %s and all its members from your buddy "
"list. Do you want to continue?"
msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗？"
-#: src/gtkdialogs.c:841 src/gtkdialogs.c:842+#: src/gtkdialogs.c:917 src/gtkdialogs.c:918
"You are about to remove %s from your buddy list. Do you want to continue?"
msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗？"
-#: src/gtkdialogs.c:883 src/gtkdialogs.c:885+#: src/gtkdialogs.c:959 src/gtkdialogs.c:961
"You are about to remove the chat %s from your buddy list. Do you want to "
msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗？"
-#: src/gtkdialogs.c:922 src/gtkdialogs.c:923+#: src/gtkdialogs.c:998 src/gtkdialogs.c:999 @@ -3372,22 +3393,22 @@
msgid "_Open Link in Browser"
"Unable to guess the image type based on the file extension supplied. "
msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
msgid "Error saving image: %s"
-#: src/gtkimhtml.c:2934 src/gtkimhtml.c:2946+#: src/gtkimhtml.c:2937 src/gtkimhtml.c:2949
@@ -3395,99 +3416,99 @@
-#: src/gtkimhtmltoolbar.c:239+#: src/gtkimhtmltoolbar.c:240 msgid "Select Text Color"
-#: src/gtkimhtmltoolbar.c:312+#: src/gtkimhtmltoolbar.c:314 msgid "Select Background Color"
-#: 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."
msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
-#: src/gtkimhtmltoolbar.c:410+#: src/gtkimhtmltoolbar.c:413 msgid "Please enter the URL of the link that you want to insert."
msgstr "请输入您想要插入链接的 URL。"
-#: 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"
-#: 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."
-#: 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 -#: src/gtkimhtmltoolbar.c:945+#: src/gtkimhtmltoolbar.c:948 msgid "Smaller font size"
-#: src/gtkimhtmltoolbar.c:962+#: src/gtkimhtmltoolbar.c:965 -#: src/gtkimhtmltoolbar.c:974+#: src/gtkimhtmltoolbar.c:977 msgid "Foreground font color"
-#: src/gtkimhtmltoolbar.c:986+#: src/gtkimhtmltoolbar.c:989 -#: src/gtkimhtmltoolbar.c:1001+#: src/gtkimhtmltoolbar.c:1004 -#: src/gtkimhtmltoolbar.c:1011+#: src/gtkimhtmltoolbar.c:1014 -#: src/gtkimhtmltoolbar.c:1022+#: src/gtkimhtmltoolbar.c:1025 @@ -3732,7 +3753,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 @@ -3935,8 +3956,8 @@
msgid "New conversation _placement:"
-#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:732-#: src/protocols/oscar/oscar.c:5017+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:733 +#: src/protocols/oscar/oscar.c:5072 @@ -4178,9 +4199,9 @@
msgid "When away and idle"
-#: src/gtkprefs.c:1823 src/protocols/msn/msn.c:1323+#: 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:4170 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
@@ -4327,7 +4348,7 @@
msgid "Block only the users below"
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1478+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1479 @@ -4392,16 +4413,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
@@ -4411,7 +4432,7 @@
-#: 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
@@ -4577,7 +4598,7 @@
@@ -4610,16 +4631,16 @@
msgid "Gaim %s. Try `%s -h' for more information.\n"
msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
msgid "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 "
@@ -4649,11 +4670,11 @@
#: 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:754 src/protocols/yahoo/yahoo.c:2925+#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2925 #: src/protocols/yahoo/yahoo.c:3041
@@ -4666,11 +4687,11 @@
msgid "Away for friends only"
-#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:976-#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:672-#: src/protocols/oscar/oscar.c:5528 src/protocols/oscar/oscar.c:5606-#: src/protocols/oscar/oscar.c:5630 src/protocols/oscar/oscar.c:6812-#: src/protocols/oscar/oscar.c:6817 src/protocols/yahoo/yahoo.c:2578+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:977 +#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:673 +#: src/protocols/oscar/oscar.c:5583 src/protocols/oscar/oscar.c:5661 +#: src/protocols/oscar/oscar.c:5685 src/protocols/oscar/oscar.c:6867 +#: src/protocols/oscar/oscar.c:6872 src/protocols/yahoo/yahoo.c:2578 #: src/protocols/yahoo/yahoo.c:2945 src/protocols/yahoo/yahoo.c:3053
@@ -4691,9 +4712,9 @@
msgid "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/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."
@@ -4714,7 +4735,7 @@
msgid "Unknown Error Code."
-#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:3971+#: 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>状态:</B> %s<HR>%s"
@@ -4722,8 +4743,8 @@
#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1012
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3975-#: src/protocols/oscar/oscar.c:4199 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:1130
msgid "Buddy Information"
@@ -4810,25 +4831,25 @@
-#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5009+#: src/protocols/gg/gg.c:954 src/protocols/oscar/oscar.c:5064 -#: src/protocols/gg/gg.c:958 src/protocols/jabber/jabber.c:621-#: src/protocols/oscar/oscar.c:5020 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:626-#: src/protocols/oscar/oscar.c:5021 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:5010+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5065 #: src/protocols/silc/ops.c:1204
@@ -4843,8 +4864,8 @@
-#: src/protocols/gg/gg.c:991 src/protocols/jabber/jabber.c:636-#: src/protocols/oscar/oscar.c:5064 src/protocols/oscar/oscar.c:5072+#: 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
@@ -4942,7 +4963,7 @@
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1074+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1075 #: src/protocols/toc/toc.c:1564
@@ -4994,14 +5015,14 @@
msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:248
-#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3710-#: src/protocols/oscar/oscar.c:6260+#: 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:3712-#: src/protocols/oscar/oscar.c:6261+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3767 +#: src/protocols/oscar/oscar.c:6316 @@ -5026,13 +5047,13 @@
msgid "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"
-#: 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
@@ -5064,7 +5085,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"
@@ -5084,31 +5105,35 @@
msgid "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"
-#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:301-#: src/protocols/oscar/oscar.c:1671 src/protocols/oscar/oscar.c:1735+#: 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"
-#: 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 @@ -5120,39 +5145,39 @@
-#: src/protocols/irc/irc.c:663+#: src/protocols/irc/irc.c:662 msgid "IRC Protocol Plugin"
-#: src/protocols/irc/irc.c:664+#: src/protocols/irc/irc.c:663 msgid "The IRC Protocol Plugin that Sucks Less"
-#: src/protocols/irc/irc.c:683 src/protocols/irc/msgs.c:201-#: src/protocols/jabber/jabber.c:1591 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:1612-#: src/protocols/msn/msn.c:1930 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:596 src/protocols/silc/buddy.c:1454+#: 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 @@ -5185,7 +5210,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:1323 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>"
@@ -5217,111 +5242,111 @@
msgid "Buddy Information for %s"
-#: src/protocols/irc/msgs.c:286+#: src/protocols/irc/msgs.c:287 msgid "%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"
-#: src/protocols/irc/msgs.c:308+#: src/protocols/irc/msgs.c:309 msgid "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 发送了 IRC 服务器无法理解的信息。"
-#: 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"
-#: src/protocols/irc/msgs.c:445+#: src/protocols/irc/msgs.c:446 msgid "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."
-#: 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)"
-#: src/protocols/irc/msgs.c:630+#: src/protocols/irc/msgs.c:631 msgid "Kicked by %s (%s)"
-#: src/protocols/irc/msgs.c:651+#: src/protocols/irc/msgs.c:652 msgid "mode (%s %s) by %s"
msgstr "由 %3$s 管理(%1$s %2$s)"
-#: src/protocols/irc/msgs.c:760+#: src/protocols/irc/msgs.c:762 msgid "Could not change nick"
-#: src/protocols/irc/msgs.c:761+#: src/protocols/irc/msgs.c:763 msgid "Cannot change nick"
-#: src/protocols/irc/msgs.c:782+#: src/protocols/irc/msgs.c:784 msgid "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 "错误: 服务器的 PONG 无效"
-#: src/protocols/irc/msgs.c:824+#: src/protocols/irc/msgs.c:826 msgid "PING reply -- Lag: %lu seconds"
msgstr "PING 响应 -- 延后: %lu 秒"
-#: 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"
-#: src/protocols/irc/msgs.c:936+#: src/protocols/irc/msgs.c:938 @@ -5408,7 +5433,7 @@
msgid "names [channel]: List the users currently in a channel."
msgstr "name [频道]: 列出频道中目前的用户。"
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1422+#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1423 msgid "nick <new nickname>: Change your nickname."
msgstr "nick <新昵称>: 更改您的昵称。"
@@ -5482,50 +5507,57 @@
msgid "whois <nick>: Get information on a user."
msgstr "whois <昵称>: 获得用户信息。"
-#: src/protocols/irc/parse.c:414+#: src/protocols/irc/parse.c:417 msgid "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:1568 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"-#: src/protocols/jabber/auth.c:111+#: src/protocols/jabber/auth.c:52 +"Server requires TLS/SSL for login. Select \"Use TLS if available\" in " +"服务器需要 TLS/SSL 才能登录。请在账户属性中选择“如果可用的话请使用 TLS”" +#: src/protocols/jabber/auth.c:54 +msgid "Server requires TLS/SSL for login. No TLS/SSL support found." +msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。" +#: src/protocols/jabber/auth.c:115 msgid "Server requires plaintext authentication over an unencrypted stream"
msgstr "服务器需要在不加密流上使用纯文本验证"
-#: 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"
-#: 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?"
msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗？"
-#: 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 "服务器未使用任何支持的身份验证方法"
-#: src/protocols/jabber/auth.c:386+#: src/protocols/jabber/auth.c:390 msgid "Invalid challenge from server"
@@ -5544,14 +5576,14 @@
#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1313+#: 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:656+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:657 @@ -5572,7 +5604,7 @@
#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:646+#: src/protocols/jabber/jabber.c:647 @@ -5611,7 +5643,7 @@
#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5045+#: src/protocols/oscar/oscar.c:5100 @@ -5630,15 +5662,15 @@
#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:950-#: src/protocols/msn/msn.c:490 src/protocols/novell/novell.c:2819-#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:714-#: src/protocols/oscar/oscar.c:720 src/protocols/oscar/oscar.c:722+#: 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:1594+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1595 @@ -5646,8 +5678,8 @@
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:631-#: src/protocols/oscar/oscar.c:5063 src/protocols/oscar/oscar.c:5071+#: 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
@@ -5692,7 +5724,7 @@
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6331+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6386 #: src/protocols/yahoo/yahoochat.c:1003
@@ -5732,51 +5764,51 @@
msgid "Invalid Room Handle"
-#: src/protocols/jabber/chat.c:377+#: src/protocols/jabber/chat.c:379 msgid "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"
-#: src/protocols/jabber/chat.c:402+#: src/protocols/jabber/chat.c:404 msgid "Room Configuration Error"
-#: src/protocols/jabber/chat.c:403+#: src/protocols/jabber/chat.c:405 msgid "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"
-#: src/protocols/jabber/chat.c:605+#: src/protocols/jabber/chat.c:607 msgid "Nick changing not supported in non-MUC chatrooms"
msgstr "不支持在非 MUC 聊天室中更改昵称"
-#: 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"
-#: 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"
-#: src/protocols/jabber/chat.c:748+#: src/protocols/jabber/chat.c:750 msgid "Select a conference server to query"
-#: src/protocols/jabber/chat.c:751+#: src/protocols/jabber/chat.c:753 @@ -5784,442 +5816,434 @@
msgid "Error initializing session"
-#: src/protocols/jabber/jabber.c:210 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:248 src/protocols/jabber/jabber.c:268+#: src/protocols/jabber/jabber.c:249 src/protocols/jabber/jabber.c:269 -#: src/protocols/jabber/jabber.c:328+#: src/protocols/jabber/jabber.c:329 msgid "Connection Failed"
-#: src/protocols/jabber/jabber.c:331+#: src/protocols/jabber/jabber.c:332 msgid "SSL Handshake Failed"
-#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708+#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709 msgid "Invalid Jabber ID"
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:739 msgid "SSL support unavailable"
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748+#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749 #: src/protocols/trepia/trepia.c:1071
msgid "Unable to create socket"
-#: src/protocols/jabber/jabber.c:441+#: src/protocols/jabber/jabber.c:442 msgid "Registration of %s@%s successful"
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445 msgid "Registration Successful"
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1193+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1194 -#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454 msgid "Registration Failed"
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565+#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566 msgid "Already Registered"
-#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1048+#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1049 -#: src/protocols/jabber/jabber.c:611+#: src/protocols/jabber/jabber.c:612 -#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5065-#: src/protocols/oscar/oscar.c:5073 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:651 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:661+#: src/protocols/jabber/jabber.c:662 -#: src/protocols/jabber/jabber.c:669+#: src/protocols/jabber/jabber.c:670 msgid "Please fill out the information below to register your new account."
msgstr "请在下面填入信息以注册您新的账户。"
-#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673+#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674 msgid "Register New Jabber Account"
-#: src/protocols/jabber/jabber.c:756+#: src/protocols/jabber/jabber.c:757 -#. connect to the server-#: src/protocols/jabber/jabber.c:795 src/protocols/msn/msn.c:654-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2152-#: src/protocols/oscar/oscar.c:1739 src/protocols/trepia/trepia.c:1065-#: src/protocols/yahoo/yahoo.c:2439 src/protocols/zephyr/zephyr.c:1452-#: src/protocols/jabber/jabber.c:799+#: src/protocols/jabber/jabber.c:800 msgid "Initializing Stream"
-#: src/protocols/jabber/jabber.c:805+#: src/protocols/jabber/jabber.c:806 src/protocols/msn/session.c:340 -#: src/protocols/jabber/jabber.c:814+#: src/protocols/jabber/jabber.c:815 msgid "Re-initializing Stream"
-#: src/protocols/jabber/jabber.c:894 src/protocols/jabber/jabber.c:1171-#: src/protocols/jabber/jabber.c:1212 src/protocols/jabber/jabber.c:1245-#: src/protocols/oscar/oscar.c:720 src/protocols/oscar/oscar.c:6615+#: 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:925+#: src/protocols/jabber/jabber.c:926 -#: src/protocols/jabber/jabber.c:927+#: src/protocols/jabber/jabber.c:928 msgid "From (To pending)"
-#: src/protocols/jabber/jabber.c:929+#: src/protocols/jabber/jabber.c:930 -#: src/protocols/jabber/jabber.c:932+#: src/protocols/jabber/jabber.c:933 -#: src/protocols/jabber/jabber.c:934+#: src/protocols/jabber/jabber.c:935 msgid "None (To pending)"
-#: src/protocols/jabber/jabber.c:938+#: src/protocols/jabber/jabber.c:939 -#: src/protocols/jabber/jabber.c:958+#: src/protocols/jabber/jabber.c:959 -#: src/protocols/jabber/jabber.c:971 src/protocols/jabber/jutil.c:35+#: src/protocols/jabber/jabber.c:972 src/protocols/jabber/jutil.c:35 #: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
-#: src/protocols/jabber/jabber.c:973 src/protocols/jabber/jutil.c:38+#: src/protocols/jabber/jabber.c:974 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:41+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jutil.c:41 #: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
-#: src/protocols/oscar/oscar.c:662 src/protocols/oscar/oscar.c:5618-#: src/protocols/oscar/oscar.c:6808+#: src/protocols/oscar/oscar.c:663 src/protocols/oscar/oscar.c:5673 +#: src/protocols/oscar/oscar.c:6863 -#: src/protocols/jabber/jabber.c:991-msgid "Password Changed" #: src/protocols/jabber/jabber.c:992
+msgid "Password Changed" +#: src/protocols/jabber/jabber.c:993 msgid "Your password has been changed."
-#: src/protocols/jabber/jabber.c:996 src/protocols/jabber/jabber.c:997+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jabber.c:998 msgid "Error changing password"
-#: src/protocols/jabber/jabber.c:1053+#: src/protocols/jabber/jabber.c:1054 -#: src/protocols/jabber/jabber.c:1058 src/protocols/jabber/jabber.c:1059+#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/jabber.c:1060 msgid "Change Jabber Password"
-#: src/protocols/jabber/jabber.c:1059+#: src/protocols/jabber/jabber.c:1060 msgid "Please enter your new password"
-#: src/protocols/jabber/jabber.c:1069 src/protocols/toc/toc.c:1554+#: src/protocols/jabber/jabber.c:1070 src/protocols/toc/toc.c:1554 -#: src/protocols/jabber/jabber.c:1151+#: src/protocols/jabber/jabber.c:1152 -#: src/protocols/jabber/jabber.c:1153+#: src/protocols/jabber/jabber.c:1154 -#: src/protocols/jabber/jabber.c:1155+#: src/protocols/jabber/jabber.c:1156 msgid "Feature Not Implemented"
-#: src/protocols/jabber/jabber.c:1157+#: src/protocols/jabber/jabber.c:1158 -#: src/protocols/jabber/jabber.c:1159+#: src/protocols/jabber/jabber.c:1160 -#: src/protocols/jabber/jabber.c:1161 src/protocols/jabber/jabber.c:1235+#: src/protocols/jabber/jabber.c:1162 src/protocols/jabber/jabber.c:1236 msgid "Internal Server Error"
-#: src/protocols/jabber/jabber.c:1163+#: src/protocols/jabber/jabber.c:1164 -#: src/protocols/jabber/jabber.c:1165+#: src/protocols/jabber/jabber.c:1166 msgid "Malformed Jabber ID"
-#: src/protocols/jabber/jabber.c:1167+#: src/protocols/jabber/jabber.c:1168 -#: src/protocols/jabber/jabber.c:1169+#: src/protocols/jabber/jabber.c:1170 -#: src/protocols/jabber/jabber.c:1173+#: src/protocols/jabber/jabber.c:1174 -#: src/protocols/jabber/jabber.c:1175+#: src/protocols/jabber/jabber.c:1176 msgid "Recipient Unavailable"
-#: src/protocols/jabber/jabber.c:1179+#: src/protocols/jabber/jabber.c:1180 msgid "Registration Required"
-#: src/protocols/jabber/jabber.c:1181+#: src/protocols/jabber/jabber.c:1182 msgid "Remote Server Not Found"
-#: src/protocols/jabber/jabber.c:1183+#: src/protocols/jabber/jabber.c:1184 msgid "Remote Server Timeout"
-#: src/protocols/jabber/jabber.c:1185+#: src/protocols/jabber/jabber.c:1186 msgid "Server Overloaded"
-#: src/protocols/jabber/jabber.c:1187+#: src/protocols/jabber/jabber.c:1188 msgid "Service Unavailable"
-#: src/protocols/jabber/jabber.c:1189+#: src/protocols/jabber/jabber.c:1190 msgid "Subscription Required"
-#: src/protocols/jabber/jabber.c:1191+#: src/protocols/jabber/jabber.c:1192 msgid "Unexpected Request"
-#: src/protocols/jabber/jabber.c:1198+#: src/protocols/jabber/jabber.c:1199 msgid "Authorization Aborted"
-#: src/protocols/jabber/jabber.c:1200+#: src/protocols/jabber/jabber.c:1201 msgid "Incorrect encoding in authorization"
-#: src/protocols/jabber/jabber.c:1203+#: src/protocols/jabber/jabber.c:1204 -#: src/protocols/jabber/jabber.c:1206+#: src/protocols/jabber/jabber.c:1207 msgid "Invalid Authorization Mechanism"
-#: src/protocols/jabber/jabber.c:1209+#: src/protocols/jabber/jabber.c:1210 msgid "Authorization mechanism too weak"
-#: src/protocols/jabber/jabber.c:1214+#: src/protocols/jabber/jabber.c:1215 msgid "Temporary Authentication Failure"
-#: src/protocols/jabber/jabber.c:1216+#: src/protocols/jabber/jabber.c:1217 msgid "Authentication Failure"
-#: src/protocols/jabber/jabber.c:1220+#: src/protocols/jabber/jabber.c:1221 -#: src/protocols/jabber/jabber.c:1222+#: src/protocols/jabber/jabber.c:1223 msgid "Bad Namespace Prefix"
-#: src/protocols/jabber/jabber.c:1225+#: src/protocols/jabber/jabber.c:1226 msgid "Resource Conflict"
-#: src/protocols/jabber/jabber.c:1227 src/protocols/silc/ops.c:1511+#: src/protocols/jabber/jabber.c:1228 src/protocols/silc/ops.c:1511 msgid "Connection Timeout"
-#: src/protocols/jabber/jabber.c:1229+#: src/protocols/jabber/jabber.c:1230 -#: src/protocols/jabber/jabber.c:1231+#: src/protocols/jabber/jabber.c:1232 -#: src/protocols/jabber/jabber.c:1233+#: src/protocols/jabber/jabber.c:1234 msgid "Improper Addressing"
-#: src/protocols/jabber/jabber.c:1237+#: src/protocols/jabber/jabber.c:1238 -#: src/protocols/jabber/jabber.c:1239+#: src/protocols/jabber/jabber.c:1240 msgid "Invalid Namespace"
-#: src/protocols/jabber/jabber.c:1241+#: src/protocols/jabber/jabber.c:1242 -#: src/protocols/jabber/jabber.c:1243+#: src/protocols/jabber/jabber.c:1244 msgid "Non-matching Hosts"
-#: src/protocols/jabber/jabber.c:1247+#: src/protocols/jabber/jabber.c:1248 -#: src/protocols/jabber/jabber.c:1249+#: src/protocols/jabber/jabber.c:1250 msgid "Remote Connection Failed"
-#: src/protocols/jabber/jabber.c:1251+#: src/protocols/jabber/jabber.c:1252 msgid "Resource Constraint"
-#: src/protocols/jabber/jabber.c:1253+#: src/protocols/jabber/jabber.c:1254 -#: src/protocols/jabber/jabber.c:1255+#: src/protocols/jabber/jabber.c:1256 -#: src/protocols/jabber/jabber.c:1257+#: src/protocols/jabber/jabber.c:1258 -#: src/protocols/jabber/jabber.c:1259+#: src/protocols/jabber/jabber.c:1260 msgid "Undefined Condition"
-#: src/protocols/jabber/jabber.c:1261+#: src/protocols/jabber/jabber.c:1262 msgid "Unsupported Encoding"
-#: src/protocols/jabber/jabber.c:1263+#: src/protocols/jabber/jabber.c:1264 msgid "Unsupported Stanza Type"
-#: src/protocols/jabber/jabber.c:1265+#: src/protocols/jabber/jabber.c:1266 msgid "Unsupported Version"
-#: src/protocols/jabber/jabber.c:1267+#: src/protocols/jabber/jabber.c:1268 msgid "XML Not Well Formed"
-#: src/protocols/jabber/jabber.c:1269+#: src/protocols/jabber/jabber.c:1270 -#: src/protocols/jabber/jabber.c:1336+#: src/protocols/jabber/jabber.c:1337 msgid "Unable to ban user %s"
-#: src/protocols/jabber/jabber.c:1388+#: src/protocols/jabber/jabber.c:1389 msgid "Unable to kick user %s"
-#: src/protocols/jabber/jabber.c:1414+#: src/protocols/jabber/jabber.c:1415 msgid "config: Configure a chat room."
-#: src/protocols/jabber/jabber.c:1418+#: src/protocols/jabber/jabber.c:1419 msgid "configure: Configure a chat room."
msgstr "configure: 配置聊天室。"
-#: src/protocols/jabber/jabber.c:1427+#: src/protocols/jabber/jabber.c:1428 msgid "part [room]: Leave the room."
msgstr "part [房间]: 离开聊天室。"
-#: src/protocols/jabber/jabber.c:1432+#: src/protocols/jabber/jabber.c:1433 msgid "register: Register with a chat room."
msgstr "register: 注册聊天室。"
-#: src/protocols/jabber/jabber.c:1438+#: src/protocols/jabber/jabber.c:1439 msgid "topic [new topic]: View or change the topic."
msgstr "topic [新话题]: 查看或更改话题。"
-#: src/protocols/jabber/jabber.c:1444+#: src/protocols/jabber/jabber.c:1445 msgid "ban <user> [room]: Ban a user from the room."
msgstr "ban <用户> [房间]: 在房间中屏蔽一个用户。"
-#: src/protocols/jabber/jabber.c:1450+#: src/protocols/jabber/jabber.c:1451 msgid "invite <user> [room]: Invite a user to the room."
msgstr "invite <用户> [房间]: 邀请用户加入房间。"
-#: src/protocols/jabber/jabber.c:1456+#: src/protocols/jabber/jabber.c:1457 msgid "join: <room> [server]: Join a chat on this server."
msgstr "join: <房间> [服务器]: 加入此服务器上的聊天聊天室。"
-#: src/protocols/jabber/jabber.c:1462+#: src/protocols/jabber/jabber.c:1463 msgid "kick <user> [room]: Kick a user from the room."
msgstr "kick <用户> [房间]: 从房间中踢出一个用户。"
-#: src/protocols/jabber/jabber.c:1467+#: src/protocols/jabber/jabber.c:1468 "msg <user> <message>: Send a private message to another user."
msgstr "msg <用户> <消息>: 向另外的好友发送私人消息。"
-#: src/protocols/jabber/jabber.c:1482+#: src/protocols/jabber/jabber.c:1483 msgid "Hide Operating System"
@@ -6233,24 +6257,24 @@
-#: src/protocols/jabber/jabber.c:1569 src/protocols/jabber/jabber.c:1571+#: src/protocols/jabber/jabber.c:1570 src/protocols/jabber/jabber.c:1572 msgid "Jabber Protocol Plugin"
-#: src/protocols/jabber/jabber.c:1597+#: src/protocols/jabber/jabber.c:1598 msgid "Use TLS if available"
-#: src/protocols/jabber/jabber.c:1602+#: src/protocols/jabber/jabber.c:1603 -#: src/protocols/jabber/jabber.c:1607+#: src/protocols/jabber/jabber.c:1608 msgid "Allow plaintext auth over unencrypted streams"
-#: src/protocols/jabber/jabber.c:1616 src/protocols/silc/silc.c:1589+#: src/protocols/jabber/jabber.c:1617 src/protocols/silc/silc.c:1589 @@ -6333,18 +6357,6 @@
-#: src/protocols/msn/cmdproc.c:358-msgid "Miscellaneous error"-#: src/protocols/msn/cmdproc.c:361-msgid "You have signed on from another location."-msgstr "您在其它位置用此用户名登入了。"-#: src/protocols/msn/cmdproc.c:363-msgid "The MSN servers are going down temporarily." #: src/protocols/msn/dialog.c:91
msgid "Buddy list synchronization issue in %s (%s)"
@@ -6554,7 +6566,7 @@
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2170+#: 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"
@@ -6589,35 +6601,35 @@
-#: src/protocols/msn/msn.c:116+#: src/protocols/msn/msn.c:114 msgid "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."
-#: 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 "这是其他的 MSN 好友看到的名字。"
-#: src/protocols/msn/msn.c:241+#: src/protocols/msn/msn.c:239 msgid "Set your home phone number."
-#: src/protocols/msn/msn.c:256+#: src/protocols/msn/msn.c:254 msgid "Set your work phone number."
-#: src/protocols/msn/msn.c:271+#: src/protocols/msn/msn.c:269 msgid "Set your mobile phone number."
-#: src/protocols/msn/msn.c:284+#: src/protocols/msn/msn.c:282 msgid "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?"
@@ -6625,24 +6637,24 @@
"在您的允许之下，您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
-#: 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." #: src/protocols/msn/msn.c:313
-msgid "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 @@ -6651,26 +6663,26 @@
-#: 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:825+#: src/protocols/msn/msn.c:513 src/protocols/msn/msn.c:795 #: src/protocols/msn/state.c:34
msgid "Away From Computer"
-#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:827+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:797 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2560
#: src/protocols/yahoo/yahoo.c:2927 src/protocols/yahoo/yahoo.c:3043
-#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:829+#: 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:1392 src/protocols/silc/silc.c:48
@@ -6679,56 +6691,56 @@
-#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:831+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:801 #: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2570
#: src/protocols/yahoo/yahoo.c:2937 src/protocols/yahoo/yahoo.c:3048
-#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:833+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:803 #: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2574
#: src/protocols/yahoo/yahoo.c:2941 src/protocols/yahoo/yahoo.c:3050
-#: src/protocols/msn/msn.c:520 src/protocols/msn/msn.c:835+#: 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"
-#: src/protocols/msn/msn.c:536+#: src/protocols/msn/msn.c:534 msgid "Set Home Phone Number"
-#: src/protocols/msn/msn.c:540+#: src/protocols/msn/msn.c:538 msgid "Set Work Phone Number"
-#: src/protocols/msn/msn.c:544+#: src/protocols/msn/msn.c:542 msgid "Set Mobile Phone Number"
-#: src/protocols/msn/msn.c:550+#: src/protocols/msn/msn.c:548 msgid "Enable/Disable Mobile Devices"
-#: src/protocols/msn/msn.c:555+#: src/protocols/msn/msn.c:553 msgid "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."
@@ -6736,91 +6748,91 @@
"MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
-#: src/protocols/msn/msn.c:1305 src/protocols/yahoo/yahoo_profile.c:659+#: 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>别名:</b> %s<br>"
#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1313 src/protocols/msn/msn.c:1671+#: 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:1401+#: src/protocols/msn/msn.c:1364 -#: src/protocols/msn/msn.c:1406 src/protocols/msn/msn.c:1658+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1621 #: src/protocols/yahoo/yahoo_profile.c:761
msgid "Error retrieving profile"
-#: src/protocols/msn/msn.c:1477 src/protocols/oscar/oscar.c:5050+#: 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:1484 src/protocols/oscar/oscar.c:5036+#: 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:1493 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:1500 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:1508 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:1525 src/protocols/msn/msn.c:1531-#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1546-#: src/protocols/msn/msn.c:1553+#: 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"
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1568-#: src/protocols/msn/msn.c:1575 src/protocols/msn/msn.c:1582+#: src/protocols/msn/msn.c:1525 src/protocols/msn/msn.c:1531 +#: src/protocols/msn/msn.c:1538 src/protocols/msn/msn.c:1545 -#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1597-#: src/protocols/msn/msn.c:1604+#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1560 +#: src/protocols/msn/msn.c:1567 msgid "Hobbies and Interests"
-#: src/protocols/msn/msn.c:1613 src/protocols/msn/msn.c:1619+#: src/protocols/msn/msn.c:1576 src/protocols/msn/msn.c:1582 #: src/protocols/yahoo/yahoo_profile.c:1072
-#: src/protocols/msn/msn.c:1627 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:1638 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:1660+#: src/protocols/msn/msn.c:1623 msgid "The user has not created a public profile."
-#: src/protocols/msn/msn.c:1661+#: 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 "
@@ -6829,21 +6841,21 @@
"MSN 报告找不到用户的个人资料。这可能是因为用户不存在，或者用户没有创建公开的"
-#: src/protocols/msn/msn.c:1665+#: src/protocols/msn/msn.c:1628 "Gaim could not find any information in the user's profile. The user most "
msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
-#: src/protocols/msn/msn.c:1671 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:1812+#: src/protocols/msn/msn.c:1775 msgid "Display conversation closed notices"
-#: src/protocols/msn/msn.c:1817+#: src/protocols/msn/msn.c:1780 msgid "Display timeout notices"
@@ -6857,47 +6869,72 @@
-#: src/protocols/msn/msn.c:1904 src/protocols/msn/msn.c:1906+#: src/protocols/msn/msn.c:1867 src/protocols/msn/msn.c:1869 msgid "MSN Protocol Plugin"
-#: src/protocols/msn/msn.c:1925 src/protocols/trepia/trepia.c:1296+#: src/protocols/msn/msn.c:1888 src/protocols/trepia/trepia.c:1296 -#: src/protocols/msn/msn.c:1934+#: src/protocols/msn/msn.c:1897 -#: src/protocols/msn/nexus.c:79-msgid "Unable to connect to server"-#: src/protocols/msn/nexus.c:218-msgid "Unknown error when attempting to authorize with MSN login server."-msgstr "试图认证 MSN 登录服务器时发生了未知错误。"-#: src/protocols/msn/notification.c:85-msgid "Requesting to send password"-#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636-msgid "Retrieving buddy list"-#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174-#: src/protocols/oscar/oscar.c:2460-#: src/protocols/msn/notification.c:720-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "-msgstr "%s 的 MSN 好友列表临时不可用。请稍候再试一次。"-#: src/protocols/msn/notification.c:1116+#: src/protocols/msn/nexus.c:111 src/protocols/msn/servconn.c:127 +#: src/protocols/yahoo/yahoochat.c:1357 +msgid "Unable to connect" +#: src/protocols/msn/notification.c:178 +msgid "%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 +msgstr "%2$s(%3$s) 上的 %1$s" +#: src/protocols/msn/notification.c:465 +msgid "Unable to add user on %s (%s)" +msgstr "无法添加 %s (%s) 上的用户" +#: src/protocols/msn/notification.c:469 +msgid "Unable to block user on %s (%s)" +msgstr "无法屏蔽 %s (%s) 上的用户" +#: src/protocols/msn/notification.c:473 +msgid "Unable to permit user on %s (%s)" +msgstr "无法允许 %s (%s) 上的用户" +#: src/protocols/msn/notification.c:481 +msgid "%s could not be added because your buddy list is full." +msgstr "无法添加 %s，因为您的好友列表已满。" +#: src/protocols/msn/notification.c:490 +msgid "%s is not a valid passport account." +msgstr "%s 不是有效的 Passport 账户。" +#: src/protocols/msn/notification.c:746 +msgid "Unable to rename group" +#: src/protocols/msn/notification.c:801 +msgid "Unable to delete group" +#: src/protocols/msn/notification.c:1203 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6919,60 +6956,106 @@
-#: src/protocols/msn/servconn.c:93-msgid "Unable to connect to %s server"-#: src/protocols/msn/servconn.c:97-msgid "Error writing to %s server"-#: src/protocols/msn/servconn.c:101-msgid "Error reading from %s server"-#: src/protocols/msn/servconn.c:105-msgid "Unknown error from %s server"-#: src/protocols/msn/servconn.c:334-msgid "Received HTTP error. Please report this."-msgstr "收到了 HTTP 错误。请进行报告。"-#: src/protocols/msn/switchboard.c:359-msgid "Message may have not been sent because a time out occurred:"+#: 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" +msgstr "%s 服务器的连接错误(%s):\n%s" +#: src/protocols/msn/session.c:295 +msgid "Our protocol is not supported by the server." +#: src/protocols/msn/session.c:299 +msgid "Error parsing HTTP." +#: src/protocols/msn/session.c:303 +msgid "You have signed on from another location." +msgstr "您在其它位置用此用户名登入了。" +#: src/protocols/msn/session.c:306 +msgid "The MSN servers are going down temporarily." +#: src/protocols/msn/session.c:310 +msgid "Unable to authenticate: %s" +#: src/protocols/msn/session.c:315 +"Your MSN buddy list is temporarily unavailable. Please wait and try again." +msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。" +#: 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" +#: 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" +#: src/protocols/msn/switchboard.c:368 +msgid "Message may have not been sent because a timeout occurred:" -#: src/protocols/msn/switchboard.c:367+#: src/protocols/msn/switchboard.c:376 msgid "Message could not be sent, not allowed while invisible:"
-#: src/protocols/msn/switchboard.c:371+#: src/protocols/msn/switchboard.c:380 msgid "Message could not be sent because the user is offline:"
-#: src/protocols/msn/switchboard.c:375+#: src/protocols/msn/switchboard.c:384 msgid "Message could not be sent because a connection error occurred:"
msgstr "消息未发出，因为发生了连接错误:"
-#: src/protocols/msn/switchboard.c:379+#: src/protocols/msn/switchboard.c:388 "Message could not be sent because an error with the switchboard occurred:"
msgstr "消息未发出，因为切换板发生了错误:"
-#: src/protocols/msn/switchboard.c:387+#: src/protocols/msn/switchboard.c:396 msgid "Message may have not been sent because an unknown error occurred:"
msgstr "消息未发出，因为发生了未知错误:"
-#: src/protocols/msn/switchboard.c:455+#: src/protocols/msn/switchboard.c:626 msgid "The conversation has become inactive and timed out."
-#: src/protocols/msn/switchboard.c:474+#: src/protocols/msn/switchboard.c:645 msgid "%s has closed the conversation window."
@@ -7277,8 +7360,8 @@
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5023-#: src/protocols/oscar/oscar.c:5030+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5078 +#: src/protocols/oscar/oscar.c:5085 @@ -7375,8 +7458,8 @@
msgid "This conference has been closed. No more messages can be sent."
-#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:722-#: src/protocols/oscar/oscar.c:6617 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 @@ -7388,10 +7471,6 @@
-#: src/protocols/novell/novell.c:3369@@ -7510,187 +7589,187 @@
-#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484+#: 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.)"
msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
-#: src/protocols/oscar/oscar.c:577+#: src/protocols/oscar/oscar.c:578 -#: src/protocols/oscar/oscar.c:580+#: src/protocols/oscar/oscar.c:581 -#: src/protocols/oscar/oscar.c:583 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:586 src/protocols/oscar/oscar.c:6919+#: src/protocols/oscar/oscar.c:587 src/protocols/oscar/oscar.c:6974 -#: src/protocols/oscar/oscar.c:593+#: src/protocols/oscar/oscar.c:594 -#: src/protocols/oscar/oscar.c:596+#: src/protocols/oscar/oscar.c:597 -#: src/protocols/oscar/oscar.c:599+#: src/protocols/oscar/oscar.c:600 -#: src/protocols/oscar/oscar.c:602+#: src/protocols/oscar/oscar.c:603 msgid "ICQ Direct Connect"
-#: src/protocols/oscar/oscar.c:605+#: src/protocols/oscar/oscar.c:606 -#: src/protocols/oscar/oscar.c:608+#: src/protocols/oscar/oscar.c:609 -#: src/protocols/oscar/oscar.c:611+#: src/protocols/oscar/oscar.c:612 -#: src/protocols/oscar/oscar.c:614+#: src/protocols/oscar/oscar.c:615 -#: src/protocols/oscar/oscar.c:617+#: src/protocols/oscar/oscar.c:618 -#: src/protocols/oscar/oscar.c:620+#: src/protocols/oscar/oscar.c:621 msgid "Trillian Encryption"
-#: src/protocols/oscar/oscar.c:623+#: src/protocols/oscar/oscar.c:624 -#: src/protocols/oscar/oscar.c:626+#: src/protocols/oscar/oscar.c:627 -#: src/protocols/oscar/oscar.c:629+#: src/protocols/oscar/oscar.c:630 -#: src/protocols/oscar/oscar.c:632+#: src/protocols/oscar/oscar.c:633 -#: src/protocols/oscar/oscar.c:636+#: src/protocols/oscar/oscar.c:637 -#: src/protocols/oscar/oscar.c:639+#: src/protocols/oscar/oscar.c:640 -#: src/protocols/oscar/oscar.c:642+#: src/protocols/oscar/oscar.c:643 -#: src/protocols/oscar/oscar.c:660 src/protocols/oscar/oscar.c:5627-#: src/protocols/oscar/oscar.c:6811+#: src/protocols/oscar/oscar.c:661 src/protocols/oscar/oscar.c:5682 +#: src/protocols/oscar/oscar.c:6866 -#: src/protocols/oscar/oscar.c:664 src/protocols/oscar/oscar.c:5621-#: src/protocols/oscar/oscar.c:6809+#: src/protocols/oscar/oscar.c:665 src/protocols/oscar/oscar.c:5676 +#: src/protocols/oscar/oscar.c:6864 -#: src/protocols/oscar/oscar.c:666 src/protocols/oscar/oscar.c:5624-#: src/protocols/oscar/oscar.c:6810+#: src/protocols/oscar/oscar.c:667 src/protocols/oscar/oscar.c:5679 +#: src/protocols/oscar/oscar.c:6865 -#: src/protocols/oscar/oscar.c:670+#: src/protocols/oscar/oscar.c:671 -#: src/protocols/oscar/oscar.c:738+#: src/protocols/oscar/oscar.c:739 -#: src/protocols/oscar/oscar.c:747+#: src/protocols/oscar/oscar.c:748 -#: src/protocols/oscar/oscar.c:882+#: src/protocols/oscar/oscar.c:883 msgid "Direct IM with %s closed"
-#: src/protocols/oscar/oscar.c:884+#: src/protocols/oscar/oscar.c:885 msgid "Direct IM with %s failed"
-#: src/protocols/oscar/oscar.c:891+#: src/protocols/oscar/oscar.c:892 msgid "Direct Connect failed"
-#: src/protocols/oscar/oscar.c:968 src/protocols/oscar/oscar.c:1099+#: src/protocols/oscar/oscar.c:969 src/protocols/oscar/oscar.c:1100 msgid "Direct IM with %s established"
-#: src/protocols/oscar/oscar.c:1049+#: src/protocols/oscar/oscar.c:1050 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
-#: src/protocols/oscar/oscar.c:1466+#: src/protocols/oscar/oscar.c:1470 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
-#: src/protocols/oscar/oscar.c:1471+#: src/protocols/oscar/oscar.c:1475 msgid "Unable to open Direct IM"
-#: src/protocols/oscar/oscar.c:1506+#: src/protocols/oscar/oscar.c:1510 msgid "You have selected to open a Direct IM connection with %s."
msgstr "您选择了与 %s 进行二人世界连接。"
-#: src/protocols/oscar/oscar.c:1510+#: src/protocols/oscar/oscar.c:1514 "Because this reveals your IP address, it may be considered a privacy risk. "
"Do you wish to continue?"
"由于这样将暴露您的 IP 地址，所以可能带来潜在的隐私风险。您是否想要继续？"
-#: src/protocols/oscar/oscar.c:1514 src/protocols/oscar/oscar.c:3467+#: src/protocols/oscar/oscar.c:1518 src/protocols/oscar/oscar.c:3522 -#: src/protocols/oscar/oscar.c:1581 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 "您已经断开与聊天室 %s 的连接。"
-#: src/protocols/oscar/oscar.c:1600+#: src/protocols/oscar/oscar.c:1604 msgid "Chat is currently unavailable"
-#: src/protocols/oscar/oscar.c:1681+#: src/protocols/oscar/oscar.c:1685 -#: src/protocols/oscar/oscar.c:1695+#: src/protocols/oscar/oscar.c:1699 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7700,46 +7779,46 @@
"无法登入: 无法以 %s 登入，原因是用户名无效。用户名必须以字母开头，其中只能包"
-#: src/protocols/oscar/oscar.c:1723+#: src/protocols/oscar/oscar.c:1727 msgid "Unable to login to AIM"
-#: src/protocols/oscar/oscar.c:1824 src/protocols/oscar/oscar.c:2263+#: src/protocols/oscar/oscar.c:1829 src/protocols/oscar/oscar.c:2275 msgid "Could Not Connect"
-#: src/protocols/oscar/oscar.c:1832+#: src/protocols/oscar/oscar.c:1837 msgid "Connection established, cookie sent"
msgstr "连接已建立，已发送 cookie"
-#: src/protocols/oscar/oscar.c:1945 src/protocols/yahoo/yahoo_filexfer.c:174+#: 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."
-#: src/protocols/oscar/oscar.c:1950+#: src/protocols/oscar/oscar.c:1962 msgid "Unable to create new connection."
-#: src/protocols/oscar/oscar.c:2022+#: src/protocols/oscar/oscar.c:2034 msgid "Unable to establish listener socket."
-#: src/protocols/oscar/oscar.c:2147 src/protocols/toc/toc.c:541+#: src/protocols/oscar/oscar.c:2159 src/protocols/toc/toc.c:541 msgid "Incorrect nickname or password."
-#: src/protocols/oscar/oscar.c:2152+#: src/protocols/oscar/oscar.c:2164 msgid "Your account is currently suspended."
#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2156+#: src/protocols/oscar/oscar.c:2168 msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "AOL 即时通讯服务暂时不可用。"
-#: src/protocols/oscar/oscar.c:2161+#: 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."
@@ -7747,21 +7826,33 @@
"您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
-#: src/protocols/oscar/oscar.c:2166+#: src/protocols/oscar/oscar.c:2178 msgid "The client version you are using is too old. Please upgrade at %s"
msgstr "您使用的客户版本太老。请在 %s 升级"
-#: src/protocols/oscar/oscar.c:2198+#: src/protocols/oscar/oscar.c:2210 -#: src/protocols/oscar/oscar.c:2270+#: src/protocols/oscar/oscar.c:2282 msgid "Received authorization"
-#: src/protocols/oscar/oscar.c:2306 src/protocols/oscar/oscar.c:2336-#: src/protocols/oscar/oscar.c:2425+#: src/protocols/oscar/oscar.c:2306 +msgid "The SecurID key entered is invalid." +msgstr "输入的 SecurID 密钥无效。" +#: src/protocols/oscar/oscar.c:2320 +#: src/protocols/oscar/oscar.c:2321 +msgid "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 "
@@ -7769,20 +7860,24 @@
"您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
-#: src/protocols/oscar/oscar.c:2309 src/protocols/oscar/oscar.c:2339+#: 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 无法获取有效的 AIM 登录码。"
-#: src/protocols/oscar/oscar.c:2428+#: src/protocols/oscar/oscar.c:2483 msgid "Gaim was unable to get a valid login hash."
msgstr "Gaim 无法获取有效的登录码。"
-#: src/protocols/oscar/oscar.c:3459+#: src/protocols/oscar/oscar.c:2515 +#: src/protocols/oscar/oscar.c:3514 msgid "%s has just asked to directly connect to %s"
msgstr "%s 刚刚请求和 %s 二人世界"
-#: src/protocols/oscar/oscar.c:3462+#: 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 "
@@ -7791,41 +7886,41 @@
"现在需要在两台计算机之间建立直接连接，这对于即时传送图像是必要的。但是这将暴"
"露您的 IP 地址，所以可能造成潜在的隐私风险。"
-#: src/protocols/oscar/oscar.c:3500+#: src/protocols/oscar/oscar.c:3555 msgid "Please authorize me so I can add you to my buddy list."
-#: src/protocols/oscar/oscar.c:3508+#: src/protocols/oscar/oscar.c:3563 msgid "Authorization Request Message:"
-#: src/protocols/oscar/oscar.c:3509+#: src/protocols/oscar/oscar.c:3564 msgid "Please authorize me!"
-#: src/protocols/oscar/oscar.c:3539+#: src/protocols/oscar/oscar.c:3594 "The user %s requires authorization before being added to a buddy list. Do "
"you want to send an authorization request?"
msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求？"
-#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:3546+#: src/protocols/oscar/oscar.c:3599 src/protocols/oscar/oscar.c:3601 msgid "Request Authorization"
-#: src/protocols/oscar/oscar.c:3594 src/protocols/oscar/oscar.c:3596-#: src/protocols/oscar/oscar.c:3603 src/protocols/oscar/oscar.c:3700-#: src/protocols/oscar/oscar.c:3720 src/protocols/oscar/oscar.c:6252-#: src/protocols/oscar/oscar.c:6298+#: src/protocols/oscar/oscar.c:3649 src/protocols/oscar/oscar.c:3651 +#: src/protocols/oscar/oscar.c:3658 src/protocols/oscar/oscar.c:3755 +#: src/protocols/oscar/oscar.c:3775 src/protocols/oscar/oscar.c:6307 +#: src/protocols/oscar/oscar.c:6353 -#: src/protocols/oscar/oscar.c:3602+#: src/protocols/oscar/oscar.c:3657 msgid "Authorization Denied Message:"
-#: src/protocols/oscar/oscar.c:3700+#: src/protocols/oscar/oscar.c:3755 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7834,11 +7929,11 @@
"用户 %u 想要将您加为他/她的好友，理由如下:\n"
-#: src/protocols/oscar/oscar.c:3708 src/protocols/oscar/oscar.c:6258+#: src/protocols/oscar/oscar.c:3763 src/protocols/oscar/oscar.c:6313 msgid "Authorization Request"
-#: src/protocols/oscar/oscar.c:3720+#: src/protocols/oscar/oscar.c:3775 "The user %u has denied your request to add them to your buddy list for the "
@@ -7848,17 +7943,17 @@
"用户 %u 拒绝了您将他/她加为好友的请求，原因如下:\n"
-#: src/protocols/oscar/oscar.c:3721+#: src/protocols/oscar/oscar.c:3776 msgid "ICQ authorization denied."
#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3728+#: src/protocols/oscar/oscar.c:3783 msgid "The user %u has granted your request to add them to your buddy list."
msgstr "用户 %u 同意您将他/她加为好友。"
-#: src/protocols/oscar/oscar.c:3736+#: src/protocols/oscar/oscar.c:3791 "You have received a special message\n"
@@ -7871,7 +7966,7 @@
-#: src/protocols/oscar/oscar.c:3744+#: src/protocols/oscar/oscar.c:3799 "You have received an ICQ page\n"
@@ -7884,7 +7979,7 @@
-#: src/protocols/oscar/oscar.c:3752+#: src/protocols/oscar/oscar.c:3807 "You have received an ICQ email from %s [%s]\n"
@@ -7897,32 +7992,32 @@
-#: src/protocols/oscar/oscar.c:3773+#: src/protocols/oscar/oscar.c:3828 msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
-#: src/protocols/oscar/oscar.c:3779+#: src/protocols/oscar/oscar.c:3834 msgid "Do you want to add this buddy to your buddy list?"
-#: src/protocols/oscar/oscar.c:3783+#: src/protocols/oscar/oscar.c:3838 -#: src/protocols/oscar/oscar.c:3867+#: 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] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息无效。"
-#: src/protocols/oscar/oscar.c:3876+#: 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] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息太大。"
-#: src/protocols/oscar/oscar.c:3885+#: src/protocols/oscar/oscar.c:3940 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7930,87 +8025,83 @@
"You missed %hu messages from %s because the rate limit has been exceeded."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是达到了等级限制。"
-#: src/protocols/oscar/oscar.c:3894+#: 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] "您错过了 %2$s 的 %1$hu 条消息，原因是他/她太可恶了。"
-#: src/protocols/oscar/oscar.c:3903+#: 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] "您错过了 %2$s 的 %1$hu 条消息，原因是您太可恶了。"
-#: src/protocols/oscar/oscar.c:3912+#: 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] "您错过了 %2$s 的 %1$hu 条消息，原因未知。"
-#: src/protocols/oscar/oscar.c:3966 src/protocols/oscar/oscar.c:4198+#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4253 -#: src/protocols/oscar/oscar.c:4032+#: src/protocols/oscar/oscar.c:4087 msgid "SNAC threw error: %s\n"
-#: src/protocols/oscar/oscar.c:4033 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4068+#: src/protocols/oscar/oscar.c:4123 msgid "Unable to send message: %s"
-#: src/protocols/oscar/oscar.c:4068 src/protocols/oscar/oscar.c:4073-#: src/protocols/oscar/oscar.c:4131 src/protocols/oscar/oscar.c:4135+#: 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:4131+#: src/protocols/oscar/oscar.c:4186 msgid "User information not available: %s"
-#: src/protocols/oscar/oscar.c:4134+#: src/protocols/oscar/oscar.c:4189 msgid "User information for %s unavailable:"
-#: src/protocols/oscar/oscar.c:4156+#: src/protocols/oscar/oscar.c:4211 -#: src/protocols/oscar/oscar.c:4160+#: src/protocols/oscar/oscar.c:4215 -#: src/protocols/oscar/oscar.c:4165 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:4249+#: src/protocols/oscar/oscar.c:4304 msgid "Your AIM connection may be lost."
#. The conversion failed!
-#: src/protocols/oscar/oscar.c:4435+#: src/protocols/oscar/oscar.c:4490 "[Unable to display a message from this user because it contained invalid "
msgstr "[无法显示来自此用户的信息，原因是其中包含了无效的字符。"
-#: src/protocols/oscar/oscar.c:4655+#: src/protocols/oscar/oscar.c:4710 msgid "Rate limiting error."
-#: src/protocols/oscar/oscar.c:4656+#: 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."
@@ -8018,162 +8109,162 @@
"您试图的最后一次操作未执行，原因是您已经得到了速度极限。请等 10 秒，然后再试"
-#: src/protocols/oscar/oscar.c:4719+#: src/protocols/oscar/oscar.c:4774 "You have been disconnected because you have signed on with this screen name "
msgstr "您已经断开了连接，原因是您在其它位置用此用户名登入了。"
-#: src/protocols/oscar/oscar.c:4721+#: src/protocols/oscar/oscar.c:4776 msgid "You have been signed off for an unknown reason."
-#: src/protocols/oscar/oscar.c:4752+#: src/protocols/oscar/oscar.c:4807 msgid "Finalizing connection"
-#: src/protocols/oscar/oscar.c:5035 src/protocols/silc/util.c:538+#: src/protocols/oscar/oscar.c:5090 src/protocols/silc/util.c:538 -#: src/protocols/oscar/oscar.c:5036+#: src/protocols/oscar/oscar.c:5091 -#: src/protocols/oscar/oscar.c:5037 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:5037 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:5053+#: src/protocols/oscar/oscar.c:5108 msgid "Personal Web Page"
-#: src/protocols/oscar/oscar.c:5057+#: src/protocols/oscar/oscar.c:5112 msgid "Additional Information"
-#: src/protocols/oscar/oscar.c:5062+#: src/protocols/oscar/oscar.c:5117 -#: src/protocols/oscar/oscar.c:5066 src/protocols/oscar/oscar.c:5074+#: src/protocols/oscar/oscar.c:5121 src/protocols/oscar/oscar.c:5129 -#: src/protocols/oscar/oscar.c:5070+#: src/protocols/oscar/oscar.c:5125 -#: src/protocols/oscar/oscar.c:5078+#: src/protocols/oscar/oscar.c:5133 -#: src/protocols/oscar/oscar.c:5079+#: src/protocols/oscar/oscar.c:5134 -#: src/protocols/oscar/oscar.c:5080+#: src/protocols/oscar/oscar.c:5135 -#: src/protocols/oscar/oscar.c:5081+#: src/protocols/oscar/oscar.c:5136 -#: src/protocols/oscar/oscar.c:5083+#: src/protocols/oscar/oscar.c:5138 -#: src/protocols/oscar/oscar.c:5093+#: src/protocols/oscar/oscar.c:5148 -#: src/protocols/oscar/oscar.c:5142+#: src/protocols/oscar/oscar.c:5197 -#: src/protocols/oscar/oscar.c:5163+#: src/protocols/oscar/oscar.c:5218 msgid "The following screen names are associated with %s"
-#: src/protocols/oscar/oscar.c:5167+#: src/protocols/oscar/oscar.c:5222 -#: src/protocols/oscar/oscar.c:5184+#: src/protocols/oscar/oscar.c:5239 msgid "No results found for email address %s"
msgstr "未找到与电子邮件地址 %s 匹配的结果"
-#: src/protocols/oscar/oscar.c:5205+#: src/protocols/oscar/oscar.c:5260 msgid "You should receive an email asking to confirm %s."
msgstr "您应当收到询问确认 %s 的邮件。"
-#: src/protocols/oscar/oscar.c:5207+#: src/protocols/oscar/oscar.c:5262 msgid "Account Confirmation Requested"
-#: src/protocols/oscar/oscar.c:5238+#: src/protocols/oscar/oscar.c:5293 msgid "Error Changing Account Info"
-#: src/protocols/oscar/oscar.c:5241+#: src/protocols/oscar/oscar.c:5296 "Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
msgstr "错误 0x%04x: 无法格式化用户名，原因是请求的用户名与原始用户名不符。"
-#: src/protocols/oscar/oscar.c:5244+#: src/protocols/oscar/oscar.c:5299 "Error 0x%04x: Unable to format screen name because the requested screen name "
msgstr "错误 0x%04x: 无法格式化用户名，原因是请求的用户名以空格结尾。"
-#: src/protocols/oscar/oscar.c:5247+#: src/protocols/oscar/oscar.c:5302 "Error 0x%04x: Unable to format screen name because the requested screen name "
msgstr "错误 0x%04x: 无法格式化用户名，原因是请求的用户名太长。"
-#: src/protocols/oscar/oscar.c:5250+#: src/protocols/oscar/oscar.c:5305 "Error 0x%04x: Unable to change email address because there is already a "
"request pending for this screen name."
msgstr "错误 0x%04x: 无法更改电子邮件地址，原因是此用户名已经有被推后的请求。"
-#: src/protocols/oscar/oscar.c:5253+#: src/protocols/oscar/oscar.c:5308 "Error 0x%04x: Unable to change email address because the given address has "
"too many screen names associated with it."
msgstr "错误 0x%04x: 无法更改电子邮件地址，原因是给定的地址关联的用户名太多。"
-#: src/protocols/oscar/oscar.c:5256+#: src/protocols/oscar/oscar.c:5311 "Error 0x%04x: Unable to change email address because the given address is "
msgstr "错误 0x%04x: 无法更改电子邮件地址，原因是给定的地址无效。"
-#: src/protocols/oscar/oscar.c:5259+#: src/protocols/oscar/oscar.c:5314 msgid "Error 0x%04x: Unknown error."
msgstr "错误 0x%04x: 未知错误。"
-#: src/protocols/oscar/oscar.c:5269+#: src/protocols/oscar/oscar.c:5324 "Your screen name is currently formatted as follows:\n"
@@ -8182,25 +8273,25 @@
-#: src/protocols/oscar/oscar.c:5270 src/protocols/oscar/oscar.c:5277+#: src/protocols/oscar/oscar.c:5325 src/protocols/oscar/oscar.c:5332 -#: src/protocols/oscar/oscar.c:5275+#: src/protocols/oscar/oscar.c:5330 msgid "The email address for %s is %s"
-#: src/protocols/oscar/oscar.c:5340+#: src/protocols/oscar/oscar.c:5395 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
msgstr "您的聊天图像未送出。要发送聊天图像，您必须连接为二人世界。"
-#: src/protocols/oscar/oscar.c:5476+#: src/protocols/oscar/oscar.c:5531 msgid "Unable to set AIM profile."
-#: src/protocols/oscar/oscar.c:5477+#: 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 "
@@ -8209,7 +8300,7 @@
"您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定；请在您完全连接后"
-#: src/protocols/oscar/oscar.c:5504+#: src/protocols/oscar/oscar.c:5559 "The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -8219,19 +8310,19 @@
msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
-#: src/protocols/oscar/oscar.c:5509+#: src/protocols/oscar/oscar.c:5564 msgid "Profile too long."
-#: src/protocols/oscar/oscar.c:5525 src/protocols/oscar/oscar.c:6816+#: src/protocols/oscar/oscar.c:5580 src/protocols/oscar/oscar.c:6871 -#: src/protocols/oscar/oscar.c:5543+#: src/protocols/oscar/oscar.c:5598 msgid "Unable to set AIM away message."
-#: src/protocols/oscar/oscar.c:5544+#: 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 "
@@ -8240,7 +8331,7 @@
"您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态；请在您完全连接后"
-#: src/protocols/oscar/oscar.c:5584+#: src/protocols/oscar/oscar.c:5639 "The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -8252,11 +8343,11 @@
"已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息，并将您设为离"
-#: src/protocols/oscar/oscar.c:5589+#: src/protocols/oscar/oscar.c:5644 msgid "Away message too long."
-#: src/protocols/oscar/oscar.c:5667+#: src/protocols/oscar/oscar.c:5722 "Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -8266,16 +8357,16 @@
"无法添加好友 %s，原因是用户名无效。用户名必须以字母开头，其中只能包含字母、数"
"字和空格，或者只包含数字。该好友将从您的好友列表中删除。"
-#: src/protocols/oscar/oscar.c:5669 src/protocols/oscar/oscar.c:6118-#: src/protocols/oscar/oscar.c:6132+#: src/protocols/oscar/oscar.c:5724 src/protocols/oscar/oscar.c:6173 +#: src/protocols/oscar/oscar.c:6187 -#: src/protocols/oscar/oscar.c:5830+#: src/protocols/oscar/oscar.c:5885 msgid "Unable To Retrieve Buddy List"
-#: src/protocols/oscar/oscar.c:5831+#: 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 "
@@ -8284,13 +8375,13 @@
"Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失，可能稍等几"
-#: src/protocols/oscar/oscar.c:6013 src/protocols/oscar/oscar.c:6014-#: src/protocols/oscar/oscar.c:6019 src/protocols/oscar/oscar.c:6176-#: src/protocols/oscar/oscar.c:6177 src/protocols/oscar/oscar.c:6182+#: 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:6116+#: src/protocols/oscar/oscar.c:6171 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8298,11 +8389,11 @@
"无法将 %s 加为好友，原因是您的好友太多。请删除其中一个好友，然后再试一次。"
-#: src/protocols/oscar/oscar.c:6116 src/protocols/oscar/oscar.c:6130+#: src/protocols/oscar/oscar.c:6171 src/protocols/oscar/oscar.c:6185 -#: src/protocols/oscar/oscar.c:6130+#: src/protocols/oscar/oscar.c:6185 "Could not add the buddy %s for an unknown reason. The most common reason "
@@ -8312,18 +8403,18 @@
"无法添加好友 %s，原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
-#: src/protocols/oscar/oscar.c:6213+#: src/protocols/oscar/oscar.c:6268 "The user %s has given you permission to add you to their buddy list. Do you "
msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加？"
-#: src/protocols/oscar/oscar.c:6219+#: src/protocols/oscar/oscar.c:6274 msgid "Authorization Given"
-#: src/protocols/oscar/oscar.c:6252+#: src/protocols/oscar/oscar.c:6307 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8333,17 +8424,17 @@
-#: src/protocols/oscar/oscar.c:6294+#: src/protocols/oscar/oscar.c:6349 msgid "The user %s has granted your request to add them to your buddy list."
msgstr "用户 %s 允许您将他/她加入好友。"
-#: src/protocols/oscar/oscar.c:6295+#: src/protocols/oscar/oscar.c:6350 msgid "Authorization Granted"
-#: src/protocols/oscar/oscar.c:6298+#: src/protocols/oscar/oscar.c:6353 "The user %s has denied your request to add them to your buddy list for the "
@@ -8353,76 +8444,76 @@
"用户 %s 拒绝了您将其加入好友列表的请求，原因如下:\n"
-#: src/protocols/oscar/oscar.c:6299+#: src/protocols/oscar/oscar.c:6354 msgid "Authorization Denied"
-#: src/protocols/oscar/oscar.c:6336 src/protocols/toc/toc.c:1273+#: src/protocols/oscar/oscar.c:6391 src/protocols/toc/toc.c:1273 -#: src/protocols/oscar/oscar.c:6374+#: src/protocols/oscar/oscar.c:6429 msgid "Invalid chat name specified."
-#: src/protocols/oscar/oscar.c:6463+#: src/protocols/oscar/oscar.c:6518 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
-#: src/protocols/oscar/oscar.c:6589+#: src/protocols/oscar/oscar.c:6644 -#: src/protocols/oscar/oscar.c:6875+#: src/protocols/oscar/oscar.c:6930 msgid "Buddy Comment for %s"
-#: src/protocols/oscar/oscar.c:6876+#: src/protocols/oscar/oscar.c:6931 -#: src/protocols/oscar/oscar.c:6895+#: src/protocols/oscar/oscar.c:6950 msgid "Edit Buddy Comment"
-#: src/protocols/oscar/oscar.c:6901+#: src/protocols/oscar/oscar.c:6956 -#: src/protocols/oscar/oscar.c:6913+#: src/protocols/oscar/oscar.c:6968 -#: src/protocols/oscar/oscar.c:6930+#: src/protocols/oscar/oscar.c:6985 msgid "Re-request Authorization"
-#: src/protocols/oscar/oscar.c:6960+#: src/protocols/oscar/oscar.c:7015 msgid "The new formatting is invalid."
-#: src/protocols/oscar/oscar.c:6961+#: src/protocols/oscar/oscar.c:7016 msgid "Screen name formatting can change only capitalization and whitespace."
-#: src/protocols/oscar/oscar.c:6968+#: src/protocols/oscar/oscar.c:7023 msgid "New screen name formatting:"
-#: src/protocols/oscar/oscar.c:7020+#: src/protocols/oscar/oscar.c:7075 msgid "Change Address To:"
-#: src/protocols/oscar/oscar.c:7065+#: src/protocols/oscar/oscar.c:7120 msgid "<i>you are not waiting for authorization</i>"
-#: src/protocols/oscar/oscar.c:7068+#: src/protocols/oscar/oscar.c:7123 msgid "You are awaiting authorization from the following buddies"
-#: src/protocols/oscar/oscar.c:7069+#: src/protocols/oscar/oscar.c:7124 "You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -8430,75 +8521,75 @@
"如果您想要向这些好友重新请求认证，只需用鼠标右键单击这些好友，然后单击“重新请"
-#: src/protocols/oscar/oscar.c:7086+#: src/protocols/oscar/oscar.c:7141 msgid "Find Buddy by E-mail"
-#: src/protocols/oscar/oscar.c:7087+#: src/protocols/oscar/oscar.c:7142 msgid "Search for a buddy by e-mail address"
-#: src/protocols/oscar/oscar.c:7088+#: src/protocols/oscar/oscar.c:7143 msgid "Type the e-mail address of the buddy you are searching for."
msgstr "输入您想要搜索的好友的电子邮件地址。"
-#: src/protocols/oscar/oscar.c:7105+#: src/protocols/oscar/oscar.c:7160 msgid "Available Message:"
-#: src/protocols/oscar/oscar.c:7106+#: src/protocols/oscar/oscar.c:7161 msgid "I'm doing work and hoping for a distraction--IM me!"
msgstr "我正在工作，渴望被打扰 - 呼我!"
-#: src/protocols/oscar/oscar.c:7187 src/protocols/silc/silc.c:800+#: src/protocols/oscar/oscar.c:7242 src/protocols/silc/silc.c:800 -#: src/protocols/oscar/oscar.c:7192+#: src/protocols/oscar/oscar.c:7247 msgid "Set User Info (URL)..."
-#: src/protocols/oscar/oscar.c:7198+#: src/protocols/oscar/oscar.c:7253 msgid "Set Available Message..."
-#: src/protocols/oscar/oscar.c:7203 src/protocols/silc/silc.c:796+#: src/protocols/oscar/oscar.c:7258 src/protocols/silc/silc.c:796 msgid "Change Password..."
-#: src/protocols/oscar/oscar.c:7208+#: src/protocols/oscar/oscar.c:7263 msgid "Change Password (URL)"
-#: src/protocols/oscar/oscar.c:7212+#: src/protocols/oscar/oscar.c:7267 msgid "Configure IM Forwarding (URL)"
-#: src/protocols/oscar/oscar.c:7221+#: src/protocols/oscar/oscar.c:7276 msgid "Format Screen Name..."
-#: src/protocols/oscar/oscar.c:7225+#: src/protocols/oscar/oscar.c:7280 -#: src/protocols/oscar/oscar.c:7229+#: src/protocols/oscar/oscar.c:7284 msgid "Display Currently Registered Address"
-#: src/protocols/oscar/oscar.c:7233+#: src/protocols/oscar/oscar.c:7288 msgid "Change Currently Registered Address..."
-#: src/protocols/oscar/oscar.c:7240+#: src/protocols/oscar/oscar.c:7295 msgid "Show Buddies Awaiting Authorization"
-#: src/protocols/oscar/oscar.c:7246+#: src/protocols/oscar/oscar.c:7301 msgid "Search for Buddy by Email..."
-#: src/protocols/oscar/oscar.c:7251+#: src/protocols/oscar/oscar.c:7306 msgid "Search for Buddy by Information"
@@ -8512,19 +8603,19 @@
-#: src/protocols/oscar/oscar.c:7372 src/protocols/oscar/oscar.c:7374+#: src/protocols/oscar/oscar.c:7427 src/protocols/oscar/oscar.c:7429 msgid "AIM/ICQ Protocol Plugin"
-#: src/protocols/oscar/oscar.c:7393+#: src/protocols/oscar/oscar.c:7448 -#: src/protocols/oscar/oscar.c:7396+#: src/protocols/oscar/oscar.c:7451 -#: src/protocols/oscar/oscar.c:7399 src/protocols/zephyr/zephyr.c:2760+#: src/protocols/oscar/oscar.c:7454 src/protocols/zephyr/zephyr.c:2760 @@ -9829,6 +9920,11 @@
+#: src/protocols/toc/toc.c:198 #: src/protocols/toc/toc.c:480
msgid "Unable to write file %s."
@@ -10230,7 +10326,7 @@
#: 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"
@@ -10458,27 +10554,23 @@
msgid "Maybe they're not in a chat?"
-#: src/protocols/yahoo/yahoochat.c:1356-msgid "Unable to connect"-#: src/protocols/yahoo/yahoochat.c:1356+#: src/protocols/yahoo/yahoochat.c:1357 msgid "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."
-#: src/protocols/yahoo/yahoochat.c:1469+#: src/protocols/yahoo/yahoochat.c:1470 @@ -10661,57 +10753,57 @@
msgid "%s is now known as %s.\n"
msgid_plural "(%d messages)"
-#: src/server.c:1187 src/server.c:1196+#: src/server.c:1203 src/server.c:1212
-#: src/server.c:1260 src/server.c:1267+#: src/server.c:1276 src/server.c:1283
"%s has just been warned by %s.\n"
@@ -10720,11 +10812,11 @@
msgid "an anonymous person"
"%s has invited %s to the chat room %s:\n"
@@ -10733,12 +10825,12 @@
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s 邀请了 %s 加入聊天室 %s\n"
msgid "Accept chat invitation?"
@@ -10769,52 +10861,35 @@
msgid "g003: Error opening connection.\n"
-#~ msgid "Syncing with server"-#~ msgid "Message could not be sent for an unknown reason"-#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "-#~ msgstr "Gaim 无法通过雅虎发送超过 %d 兆(%d 字节)的文件。"